RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-28 02:12:28 +00:00
Code Issues Projects Releases Wiki Activity

Make our flac decoder decode all the data at EOF.

Browse Source 
Fixes issue524

Originally committed as revision 14223 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2008-07-13 21:51:29 +00:00
parent 4a8361f848
commit 4c453ddbbc
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavcodec/flac.c
View File

@ -624,7 +624,7 @@ static int flac_decode_frame(AVCodecContext *avctx,
buf_size += s->bitstream_size;
s->bitstream_size= buf_size;
if(buf_size < s->max_framesize){
if(buf_size < s->max_framesize && input_buf_size){
// printf("wanna more data ...\n");
return input_buf_size;
}
@ -773,6 +773,7 @@ AVCodec flac_decoder = {
NULL,
flac_decode_close,
flac_decode_frame,
CODEC_CAP_DELAY,
.flush= flac_flush,
.long_name= NULL_IF_CONFIG_SMALL("FLAC (Free Lossless Audio Codec)"),
};

4
tests/ffmpeg.regression.ref
View File

@ -195,8 +195,8 @@ e48b800e2d9be6afcd430d4f08a34eb6 *./tests/data/adpcm_swf.vsynth.out.wav
stddev:934.30 PSNR:36.91 bytes:1056768
c3382f03ce2efb5d475240d288a33898 *./tests/data/a-flac.flac
353368 ./tests/data/a-flac.flac
c4228df189aad9567a037727d0e763e4 *./tests/data/flac.vsynth.out.wav
stddev: 33.31 PSNR:65.87 bytes:1040384
95e54b261530a1bcf6de6fe3b21dc5f6 *./tests/data/flac.vsynth.out.wav
stddev: 0.00 PSNR:99.99 bytes:1056768
4435d87463cd6c5407bd88cca241ca56 *./tests/data/a-wmav1.asf
106004 ./tests/data/a-wmav1.asf
stddev:12251.50 PSNR:14.56 bytes:1056768

2
tests/libav.regression.ref
View File

@ -93,7 +93,7 @@ ae3a23a7ea13c92a2909445ca8144dcd *./tests/data/b-libav.aif
./tests/data/b-libav.voc CRC=0x49972c8c
9268c90bd2623a5ab3c2a1a751826f69 *./tests/data/b-libav.ogg
14210 ./tests/data/b-libav.ogg
./tests/data/b-libav.ogg CRC=0x6bcbb966
./tests/data/b-libav.ogg CRC=0x37a143ea
ce356ce2708cb6033ab5d762da93cfd4 *./tests/data/b-libav-yuv420p.yuv
304128 ./tests/data/b-libav-yuv420p.yuv
ce356ce2708cb6033ab5d762da93cfd4 *./tests/data/b-libav-yuv422p.yuv

4
tests/rotozoom.regression.ref
View File

@ -195,8 +195,8 @@ e48b800e2d9be6afcd430d4f08a34eb6 *./tests/data/adpcm_swf.rotozoom.out.wav
stddev:934.30 PSNR:36.91 bytes:1056768
c3382f03ce2efb5d475240d288a33898 *./tests/data/a-flac.flac
353368 ./tests/data/a-flac.flac
c4228df189aad9567a037727d0e763e4 *./tests/data/flac.rotozoom.out.wav
stddev: 33.31 PSNR:65.87 bytes:1040384
95e54b261530a1bcf6de6fe3b21dc5f6 *./tests/data/flac.rotozoom.out.wav
stddev: 0.00 PSNR:99.99 bytes:1056768
4435d87463cd6c5407bd88cca241ca56 *./tests/data/a-wmav1.asf
106004 ./tests/data/a-wmav1.asf
stddev:12251.50 PSNR:14.56 bytes:1056768