Chiebot-Mirror
/
FFmpeg
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

avcodec/dcaenc: return correct number of bytes in output packet

Browse Source 
Signed-off-by: Paul B Mahol <onemda@gmail.com>
pull/172/head
Paul B Mahol 9 years ago
parent ed0c550564
commit 06f65fd026
2 changed files with 3 additions and 3 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      libavcodec/dcaenc.c
  2. 2
      tests/fate/acodec.mak

4
libavcodec/dcaenc.c
Unescape 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;
} }

2
tests/fate/acodec.mak
Unescape 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

Write Preview
Loading…
Cancel
Save