Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

28_fix_parameters_in_G726.patch by (Calcium | calcium nurs or jp)

Browse Source 
Originally committed as revision 4070 to svn://svn.ffmpeg.org/ffmpeg/trunk
pull/126/head
Calcium 20 years ago committed by Michael Niedermayer
parent 59fa3f96f4
commit 58d2a1506d
3 changed files with 5 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
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      libavformat/wav.c
  2. 2
      tests/ffmpeg.regression.ref
  3. 2
      tests/rotozoom.regression.ref

4
libavformat/wav.c
Unescape View File

@ -65,7 +65,7 @@ int put_wav_header(ByteIOContext *pb, AVCodecContext *enc)
bps = 8;
} else if (enc->codec_id == CODEC_ID_MP2 || enc->codec_id == CODEC_ID_MP3) {
bps = 0;
} else if (enc->codec_id == CODEC_ID_ADPCM_IMA_WAV || enc->codec_id == CODEC_ID_ADPCM_MS) {
} else if (enc->codec_id == CODEC_ID_ADPCM_IMA_WAV || enc->codec_id == CODEC_ID_ADPCM_MS || enc->codec_id == CODEC_ID_ADPCM_G726) { //
bps = 4;
} else {
bps = 16;
@ -74,6 +74,8 @@ int put_wav_header(ByteIOContext *pb, AVCodecContext *enc)
if (enc->codec_id == CODEC_ID_MP2 || enc->codec_id == CODEC_ID_MP3) {
blkalign = enc->frame_size; //this is wrong, but seems many demuxers dont work if this is set correctly
//blkalign = 144 * enc->bit_rate/enc->sample_rate;
} else if (enc->codec_id == CODEC_ID_ADPCM_G726) { //
blkalign = 1;
} else if (enc->block_align != 0) { /* specified by the codec */
blkalign = enc->block_align;
} else

2
tests/ffmpeg.regression.ref
Unescape View File

@ -130,7 +130,7 @@ stddev:9330.70 PSNR:16.92 bytes:527360
stddev:4396.13 PSNR:23.46 bytes:526336
d056da679e6d6682812fffb28a7f0db6 *./data/a-ac3.rm
97983 ./data/a-ac3.rm
2d081e0e1f2e9bd4514e9ac8ec41884c *./data/a-g726.wav
9e6e66847a568ef4f1f229b0939d2aae *./data/a-g726.wav
24268 ./data/a-g726.wav
a719ab6d47d8d601520edb13bf6136b4 *./data/out.wav
stddev:8459.88 PSNR:17.77 bytes:48128

2
tests/rotozoom.regression.ref
Unescape View File

@ -130,7 +130,7 @@ stddev:9330.70 PSNR:16.92 bytes:527360
stddev:4396.13 PSNR:23.46 bytes:526336
d056da679e6d6682812fffb28a7f0db6 *./data/a-ac3.rm
97983 ./data/a-ac3.rm
2d081e0e1f2e9bd4514e9ac8ec41884c *./data/a-g726.wav
9e6e66847a568ef4f1f229b0939d2aae *./data/a-g726.wav
24268 ./data/a-g726.wav
a719ab6d47d8d601520edb13bf6136b4 *./data/out.wav
stddev:8459.88 PSNR:17.77 bytes:48128

Write Preview
Loading…
Cancel
Save