Browse Source
avcodec/dcaenc: return correct number of bytes in output packet
Signed-off-by: Paul B Mahol <onemda@gmail.com>tags/n3.0
Paul B Mahol
9 years ago
2 changed files with 3 additions and 3 deletions
Unified View
Diff Options
-
+2 -2libavcodec/dcaenc.c
-
+1 -1tests/fate/acodec.mak
+ 2
- 2
libavcodec/dcaenc.c
View File
| @@ -938,7 +938,7 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *avpkt, | |||||
| const int32_t *samples; | const int32_t *samples; | ||||
| int ret, i; | 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; | return ret; | ||||
| samples = (const int32_t *)frame->data[0]; | samples = (const int32_t *)frame->data[0]; | ||||
| @@ -968,7 +968,7 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *avpkt, | |||||
| avpkt->pts = frame->pts; | avpkt->pts = frame->pts; | ||||
| avpkt->duration = ff_samples_to_time_base(avctx, frame->nb_samples); | 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; | *got_packet_ptr = 1; | ||||
| return 0; | return 0; | ||||
| } | } | ||||
+ 1
- 1
tests/fate/acodec.mak
View File
| @@ -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: 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: CMD = md5 -i $(TARGET_PATH)/$(SRC) -c:a dca -strict -2 -f dts -flags +bitexact | ||||
| fate-acodec-dca: CMP = oneline | 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-$(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 | fate-acodec-dca2: CMD = enc_dec_pcm dts wav s16le $(SRC) -c:a dca -strict -2 -flags +bitexact | ||||