[FFmpeg-cvslog] r9447 - trunk/libavcodec/wmv2.c

[Panagiotis Issaris]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Hi,

Panagiotis Issaris wrote:
> Op 27-jun-07, om 16:27 heeft iive het volgende geschreven:
> 
>> Author: iive
>> Date: Wed Jun 27 16:27:47 2007
>> New Revision: 9447
>>
>> Log:
>> Identify the loop_filter flag as such and remove the unused  
>> variables in the context.
>>
>>
>> Modified:
>>    trunk/libavcodec/wmv2.c
>>
>> Modified: trunk/libavcodec/wmv2.c
>> ====================================================================== 
>> ========
>> --- trunk/libavcodec/wmv2.c	(original)
>> +++ trunk/libavcodec/wmv2.c	Wed Jun 27 16:27:47 2007
>> @@ -36,8 +36,6 @@ typedef struct Wmv2Context{
>>      MpegEncContext s;
>>      int j_type_bit;
>>      int j_type;
>> -    int flag3;
>> -    int flag63;
>>      int abt_flag;
>>      int abt_type;
>>      int abt_type_table[6];
>> @@ -74,7 +72,7 @@ static int encode_ext_header(Wmv2Context
>>      put_bits(&pb, 11, FFMIN(s->bit_rate/1024, 2047));
>>
>>      put_bits(&pb, 1, w->mspel_bit=1);
>> -    put_bits(&pb, 1, w->flag3=1);
>> +    put_bits(&pb, 1, s->loop_filter);

Maybe because this bit isn't always 1 as it was before this patch?

>>      put_bits(&pb, 1, w->abt_flag=1);
>>      put_bits(&pb, 1, w->j_type_bit=1);
>>      put_bits(&pb, 1, w->top_left_mv_flag=0);
>> @@ -329,7 +327,7 @@ static int decode_ext_header(Wmv2Context
>>      fps                = get_bits(&gb, 5);
>>      s->bit_rate        = get_bits(&gb, 11)*1024;
>>      w->mspel_bit       = get_bits1(&gb);
>> -    w->flag3           = get_bits1(&gb);
>> +    s->loop_filter     = get_bits1(&gb);
>>      w->abt_flag        = get_bits1(&gb);
>>      w->j_type_bit      = get_bits1(&gb);
>>      w->top_left_mv_flag= get_bits1(&gb);
>> @@
> ...
> 
> Is it possible that this change broke the regression tests?

Here's the output I'm getting:

- --- ./tests/data/ffmpeg.regression      2007-06-28 13:10:57.000000000
+0200
+++ /usr/local/src/rw/ffmpeg/tests/ffmpeg.regression.ref
2007-06-08 10:56:51.000000000 +0200
@@ -43,7 +43,7 @@
 641448 ./tests/data/a-wmv1.avi
 69454f78ca636e83a600834e5a90660e *./tests/data/out.yuv
 stddev:  8.01 PSNR:30.04 bytes:7602176
- -f524505cf92daef42882d688ed6eadc7 *./tests/data/a-wmv2.avi
+044b1b5bd5899d54a8fe09eac2181d8b *./tests/data/a-wmv2.avi
 675342 ./tests/data/a-wmv2.avi
 69454f78ca636e83a600834e5a90660e *./tests/data/out.yuv
 stddev:  8.01 PSNR:30.04 bytes:7602176

Regression test: Error.
make: *** [codectest] Error 1




With friendly regards,
Takis

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFGg5hg9kOxLuzz4CkRAkYBAJsHCcZnPuLBL+CwdlJfN5EUrALFJQCdFV/F
cLBmd1ZECnaNhfxSb52m8/k=
=fJd2
-----END PGP SIGNATURE-----