Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
FFmpeg
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
libremedia
Tethys
FFmpeg
Commits
06f65fd0
Commit
06f65fd0
authored
9 years ago
by
Paul B Mahol
Browse files
Options
Downloads
Patches
Plain Diff
avcodec/dcaenc: return correct number of bytes in output packet
Signed-off-by:
Paul B Mahol
<
onemda@gmail.com
>
parent
ed0c5505
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
libavcodec/dcaenc.c
+2
-2
2 additions, 2 deletions
libavcodec/dcaenc.c
tests/fate/acodec.mak
+1
-1
1 addition, 1 deletion
tests/fate/acodec.mak
with
3 additions
and
3 deletions
libavcodec/dcaenc.c
+
2
−
2
View file @
06f65fd0
...
...
@@ -938,7 +938,7 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
const
int32_t
*
samples
;
int
ret
,
i
;
if
((
ret
=
ff_alloc_packet2
(
avctx
,
avpkt
,
c
->
frame_size
,
0
))
<
0
)
if
((
ret
=
ff_alloc_packet2
(
avctx
,
avpkt
,
c
->
frame_size
,
0
))
<
0
)
return
ret
;
samples
=
(
const
int32_t
*
)
frame
->
data
[
0
];
...
...
@@ -968,7 +968,7 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
avpkt
->
pts
=
frame
->
pts
;
avpkt
->
duration
=
ff_samples_to_time_base
(
avctx
,
frame
->
nb_samples
);
avpkt
->
size
=
c
->
frame_size
+
1
;
avpkt
->
size
=
put_bits_count
(
&
c
->
pb
)
>>
3
;
*
got_packet_ptr
=
1
;
return
0
;
}
...
...
This diff is collapsed.
Click to expand it.
tests/fate/acodec.mak
+
1
−
1
View file @
06f65fd0
...
...
@@ -104,7 +104,7 @@ fate-acodec-dca: tests/data/asynth-44100-2.wav
fate-acodec-dca
:
SRC = tests/data/asynth-44100-2.wav
fate-acodec-dca
:
CMD = md5 -i $(TARGET_PATH)/$(SRC) -c:a dca -strict -2 -f dts -flags +bitexact
fate-acodec-dca
:
CMP = oneline
fate-acodec-dca
:
REF =
c54ca9a13711755ef90fa143a9b38386
fate-acodec-dca
:
REF =
7ffdefdf47069289990755c79387cc90
FATE_ACODEC-
$(
call
ENCDEC, DCA, WAV
)
+=
fate-acodec-dca2
fate-acodec-dca2
:
CMD = enc_dec_pcm dts wav s16le $(SRC) -c:a dca -strict -2 -flags +bitexact
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment