RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

vmdaudio: output audio samples for standalone silent blocks. 

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 9b73f78600)
This commit is contained in:
Justin Ruggles 2011-02-23 13:11:02 -05:00 committed by Michael Niedermayer
parent 2ac19b75c0
commit c11c79222e
2 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/vmdav.c
View File

@ -534,7 +534,7 @@ static int vmdaudio_decode_frame(AVCodecContext *avctx,
*data_size += vmdaudio_loadsound(s, output_samples, p + 4, 0, buf_size - 20);
} else if (buf[6] == 3) {
/* silent chunk */
*data_size = vmdaudio_loadsound(s, output_samples, p, 1, 0);
*data_size = vmdaudio_loadsound(s, output_samples, p, 1, s->block_align);
}
return buf_size;

29
tests/ref/fate/sierra-vmd
View File

@ -301,3 +301,32 @@
1, 1890000, 4410, 0x5d2b15f4
1, 1899000, 4410, 0x48764b7c
1, 1908000, 4410, 0x1294e119
1, 1917000, 4410, 0x00000000
1, 1926000, 4410, 0x00000000
1, 1935000, 4410, 0x00000000
1, 1944000, 4410, 0x00000000
1, 1953000, 4410, 0x00000000
1, 1962000, 4410, 0x00000000
1, 1971000, 4410, 0x00000000
1, 1980000, 4410, 0x00000000
1, 1989000, 4410, 0x00000000
1, 1998000, 4410, 0x00000000
1, 2007000, 4410, 0x00000000
1, 2016000, 4410, 0x00000000
1, 2025000, 4410, 0x00000000
1, 2034000, 4410, 0x00000000
1, 2043000, 4410, 0x00000000
1, 2052000, 4410, 0x00000000
1, 2061000, 4410, 0x00000000
1, 2070000, 4410, 0x00000000
1, 2079000, 4410, 0x00000000
1, 2088000, 4410, 0x00000000
1, 2097000, 4410, 0x00000000
1, 2106000, 4410, 0x00000000
1, 2115000, 4410, 0x00000000
1, 2124000, 4410, 0x00000000
1, 2133000, 4410, 0x00000000
1, 2142000, 4410, 0x00000000
1, 2151000, 4410, 0x00000000
1, 2160000, 4410, 0x00000000
1, 2169000, 4410, 0x00000000