Hi, On Fri, Feb 3, 2012 at 3:16 PM, Justin Ruggles <[email protected]> wrote: > On 02/01/2012 01:10 PM, Justin Ruggles wrote: > >> Current output packet size is twice as large as intended. >> --- >> In the previous patch I got the calculation backwards for mono. >> >> libavcodec/adpcmenc.c | 2 +- >> tests/ref/acodec/adpcm_yam | 8 ++++---- >> 2 files changed, 5 insertions(+), 5 deletions(-) >> >> diff --git a/libavcodec/adpcmenc.c b/libavcodec/adpcmenc.c >> index a24238c..25a07c4 100644 >> --- a/libavcodec/adpcmenc.c >> +++ b/libavcodec/adpcmenc.c >> @@ -122,7 +122,7 @@ static av_cold int adpcm_encode_init(AVCodecContext >> *avctx) >> } >> break; >> case CODEC_ID_ADPCM_YAMAHA: >> - avctx->frame_size = BLKSIZE * avctx->channels; >> + avctx->frame_size = BLKSIZE * 2 / avctx->channels; >> avctx->block_align = BLKSIZE; >> break; >> case CODEC_ID_ADPCM_SWF: >> diff --git a/tests/ref/acodec/adpcm_yam b/tests/ref/acodec/adpcm_yam >> index 0fd7029..f7c9f75 100644 >> --- a/tests/ref/acodec/adpcm_yam >> +++ b/tests/ref/acodec/adpcm_yam >> @@ -1,4 +1,4 @@ >> -006f8dc92eb4f7bab82eded314ca1124 *./tests/data/acodec/adpcm_yam.wav >> -266298 ./tests/data/acodec/adpcm_yam.wav >> -c36a9d5a1e0ad57fbe9665a31373b7c1 *./tests/data/adpcm_yam.acodec.out.wav >> -stddev: 1247.60 PSNR: 34.41 MAXDIFF:39895 bytes: 1064960/ 1058400 >> +e9c14f701d25947317db9367b9dc772d *./tests/data/acodec/adpcm_yam.wav >> +265274 ./tests/data/acodec/adpcm_yam.wav >> +1488b5974fa040a65f0d407fc0224c6a *./tests/data/adpcm_yam.acodec.out.wav >> +stddev: 1247.60 PSNR: 34.41 MAXDIFF:39895 bytes: 1060864/ 1058400 > > > ping.
Was already OK'ed by Luca, but just in case: OK. Ronald _______________________________________________ libav-devel mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-devel
