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

lavc/vp6: Disable deblock filtering for Simple Profile 

In vp6 Advanced Profile, deblock filtering is conditionally enabled in
each frame header.  In Simple Profile it should always be off.  vp6 was
inheriting the wrong default from ff_vp56_init.

Signed-off-by: Ben Jackson <ben@ben.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Ben Jackson 2012-09-06 14:30:39 -07:00 committed by Michael Niedermayer
parent c5278cb84f
commit de9f5b6853
2 changed files with 97 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libavcodec/vp6.c
View File

@ -596,6 +596,7 @@ static av_cold int vp6_decode_init(AVCodecContext *avctx)
ff_vp56_init(avctx, avctx->codec->id == AV_CODEC_ID_VP6,
avctx->codec->id == AV_CODEC_ID_VP6A);
s->deblock_filtering = 0;
s->vp56_coord_div = vp6_coord_div;
s->parse_vector_adjustment = vp6_parse_vector_adjustment;
s->filter = vp6_filter;

192
tests/ref/fate/vp60
View File

@ -6,8 +6,8 @@
0, 4, 4, 1, 55296, 0x17720594
0, 5, 5, 1, 55296, 0x49440805
0, 6, 6, 1, 55296, 0x5b2e0d32
0, 7, 7, 1, 55296, 0x207891c1
0, 8, 8, 1, 55296, 0x502da4cd
0, 7, 7, 1, 55296, 0x5cf691c3
0, 8, 8, 1, 55296, 0x61a5a4c8
0, 9, 9, 1, 55296, 0x75a22a75
0, 10, 10, 1, 55296, 0xd55099af
0, 11, 11, 1, 55296, 0x48778bb6
@ -16,85 +16,85 @@
0, 14, 14, 1, 55296, 0xc83d9b90
0, 15, 15, 1, 55296, 0x567877b8
0, 16, 16, 1, 55296, 0x334c7f6e
0, 17, 17, 1, 55296, 0x8717945c
0, 18, 18, 1, 55296, 0xe432831e
0, 19, 19, 1, 55296, 0x032e8d2d
0, 17, 17, 1, 55296, 0x9317945c
0, 18, 18, 1, 55296, 0xf032831e
0, 19, 19, 1, 55296, 0x7b6c8d2c
0, 20, 20, 1, 55296, 0x37109fd6
0, 21, 21, 1, 55296, 0xe9b0b61b
0, 22, 22, 1, 55296, 0x7385dae8
0, 23, 23, 1, 55296, 0x74b8a9f5
0, 24, 24, 1, 55296, 0xbce2e218
0, 25, 25, 1, 55296, 0x0ab6c623
0, 26, 26, 1, 55296, 0x2234d6d6
0, 27, 27, 1, 55296, 0xd18be4d6
0, 28, 28, 1, 55296, 0x5247ecc9
0, 29, 29, 1, 55296, 0xc89f10ca
0, 30, 30, 1, 55296, 0x16181f87
0, 31, 31, 1, 55296, 0x893bfa85
0, 32, 32, 1, 55296, 0x1fd9f1c0
0, 33, 33, 1, 55296, 0xa2e8e6a9
0, 34, 34, 1, 55296, 0x1b42dfd5
0, 35, 35, 1, 55296, 0x0fa9f509
0, 36, 36, 1, 55296, 0x4449c216
0, 37, 37, 1, 55296, 0xb66baa36
0, 38, 38, 1, 55296, 0x38c19f3b
0, 39, 39, 1, 55296, 0xcdce83a0
0, 23, 23, 1, 55296, 0x74a8a9f5
0, 24, 24, 1, 55296, 0xbcd2e218
0, 25, 25, 1, 55296, 0x0aa6c623
0, 26, 26, 1, 55296, 0x2224d6d6
0, 27, 27, 1, 55296, 0x8c8ee4d9
0, 28, 28, 1, 55296, 0x0d4ceccc
0, 29, 29, 1, 55296, 0x623f10c7
0, 30, 30, 1, 55296, 0x13a61f8f
0, 31, 31, 1, 55296, 0x5343fa8d
0, 32, 32, 1, 55296, 0x21fef1b5
0, 33, 33, 1, 55296, 0x380de6b4
0, 34, 34, 1, 55296, 0x04bedfd3
0, 35, 35, 1, 55296, 0x428cf510
0, 36, 36, 1, 55296, 0xbca8c214
0, 37, 37, 1, 55296, 0x947faa34
0, 38, 38, 1, 55296, 0x70769f45
0, 39, 39, 1, 55296, 0xcb9483ad
0, 40, 40, 1, 55296, 0xac4ea82b
0, 41, 41, 1, 55296, 0xb77a6979
0, 42, 42, 1, 55296, 0xc8834ec2
0, 43, 43, 1, 55296, 0x181d3f0f
0, 44, 44, 1, 55296, 0x2ae04252
0, 45, 45, 1, 55296, 0x07633c18
0, 46, 46, 1, 55296, 0xdc6a3340
0, 47, 47, 1, 55296, 0xa456ebb1
0, 48, 48, 1, 55296, 0xbf7de5e2
0, 49, 49, 1, 55296, 0x54a1c39b
0, 50, 50, 1, 55296, 0x08fc9423
0, 51, 51, 1, 55296, 0x926f968a
0, 52, 52, 1, 55296, 0x5c908481
0, 53, 53, 1, 55296, 0x6b257f16
0, 54, 54, 1, 55296, 0xbaf8658a
0, 55, 55, 1, 55296, 0x61c957b1
0, 56, 56, 1, 55296, 0xa6d181ff
0, 57, 57, 1, 55296, 0xef476e69
0, 58, 58, 1, 55296, 0x74f72f9a
0, 59, 59, 1, 55296, 0x3a9328e9
0, 60, 60, 1, 55296, 0xbe962874
0, 61, 61, 1, 55296, 0x5f8b58cc
0, 62, 62, 1, 55296, 0x1e066d22
0, 63, 63, 1, 55296, 0x9ef72b34
0, 64, 64, 1, 55296, 0x525c2bb1
0, 65, 65, 1, 55296, 0x8e5a20a3
0, 66, 66, 1, 55296, 0x1c6723d0
0, 67, 67, 1, 55296, 0x2b1023c8
0, 68, 68, 1, 55296, 0x8f682691
0, 69, 69, 1, 55296, 0x3a0624f5
0, 41, 41, 1, 55296, 0xa3816977
0, 42, 42, 1, 55296, 0xcfd54ec4
0, 43, 43, 1, 55296, 0x97743f0e
0, 44, 44, 1, 55296, 0x4cb4424d
0, 45, 45, 1, 55296, 0x0b503c11
0, 46, 46, 1, 55296, 0x879f333a
0, 47, 47, 1, 55296, 0x6ff9eb8f
0, 48, 48, 1, 55296, 0x7cd6e5af
0, 49, 49, 1, 55296, 0x44e2c36f
0, 50, 50, 1, 55296, 0x4e8993fb
0, 51, 51, 1, 55296, 0xf0bb9664
0, 52, 52, 1, 55296, 0xde608458
0, 53, 53, 1, 55296, 0xb3017f01
0, 54, 54, 1, 55296, 0x2e096579
0, 55, 55, 1, 55296, 0xd7295790
0, 56, 56, 1, 55296, 0xc40b81cb
0, 57, 57, 1, 55296, 0x53a86e41
0, 58, 58, 1, 55296, 0x74142f89
0, 59, 59, 1, 55296, 0x2a1428ce
0, 60, 60, 1, 55296, 0x5d0c2852
0, 61, 61, 1, 55296, 0x162058a4
0, 62, 62, 1, 55296, 0x4e8c6ce8
0, 63, 63, 1, 55296, 0x1d382af2
0, 64, 64, 1, 55296, 0x35dd2b75
0, 65, 65, 1, 55296, 0x1e4c205f
0, 66, 66, 1, 55296, 0x74a22383
0, 67, 67, 1, 55296, 0x6ddb237d
0, 68, 68, 1, 55296, 0xd290263b
0, 69, 69, 1, 55296, 0xc778249f
0, 70, 70, 1, 55296, 0xbc1046fb
0, 71, 71, 1, 55296, 0x2859470e
0, 72, 72, 1, 55296, 0x61d45a12
0, 73, 73, 1, 55296, 0xa68853b6
0, 74, 74, 1, 55296, 0x36543ce4
0, 75, 75, 1, 55296, 0x95b953d4
0, 76, 76, 1, 55296, 0x804b3c53
0, 77, 77, 1, 55296, 0x743960f6
0, 78, 78, 1, 55296, 0x23916b9c
0, 79, 79, 1, 55296, 0x8f5a59e3
0, 80, 80, 1, 55296, 0xf1285f83
0, 81, 81, 1, 55296, 0xde75640f
0, 82, 82, 1, 55296, 0xde146188
0, 83, 83, 1, 55296, 0xb5315cc9
0, 71, 71, 1, 55296, 0xf44d470f
0, 72, 72, 1, 55296, 0x28d85a11
0, 73, 73, 1, 55296, 0xa68953b6
0, 74, 74, 1, 55296, 0x02593ce5
0, 75, 75, 1, 55296, 0x61be53d5
0, 76, 76, 1, 55296, 0x4c503c54
0, 77, 77, 1, 55296, 0x3d3e60f7
0, 78, 78, 1, 55296, 0xec876b9d
0, 79, 79, 1, 55296, 0x5b5f59e4
0, 80, 80, 1, 55296, 0xbd2d5f84
0, 81, 81, 1, 55296, 0xaa7a6410
0, 82, 82, 1, 55296, 0xaa196189
0, 83, 83, 1, 55296, 0x81365cca
0, 84, 84, 1, 55296, 0xa85f6861
0, 85, 85, 1, 55296, 0x4fda562f
0, 86, 86, 1, 55296, 0xa0185863
0, 87, 87, 1, 55296, 0xe4dc5a5f
0, 88, 88, 1, 55296, 0x8a2aabb6
0, 89, 89, 1, 55296, 0x3ba89b4f
0, 90, 90, 1, 55296, 0x82b07c21
0, 91, 91, 1, 55296, 0xb7998478
0, 92, 92, 1, 55296, 0xceca8046
0, 93, 93, 1, 55296, 0xe652b325
0, 94, 94, 1, 55296, 0xc26bb607
0, 95, 95, 1, 55296, 0x40c99200
0, 85, 85, 1, 55296, 0xcb46562e
0, 86, 86, 1, 55296, 0x1b935862
0, 87, 87, 1, 55296, 0x80a45a60
0, 88, 88, 1, 55296, 0x8e8aabba
0, 89, 89, 1, 55296, 0x38939b53
0, 90, 90, 1, 55296, 0x4f397c22
0, 91, 91, 1, 55296, 0x7d0d8476
0, 92, 92, 1, 55296, 0x943e8044
0, 93, 93, 1, 55296, 0xabc6b323
0, 94, 94, 1, 55296, 0x87dfb605
0, 95, 95, 1, 55296, 0x5ca89202
0, 96, 96, 1, 55296, 0x61bc9b27
0, 97, 97, 1, 55296, 0x1e4baa30
0, 98, 98, 1, 55296, 0xd8a7adb0
@ -110,25 +110,25 @@
0, 108, 108, 1, 55296, 0xe208d626
0, 109, 109, 1, 55296, 0x28cc0616
0, 110, 110, 1, 55296, 0xc545179e
0, 111, 111, 1, 55296, 0xdf9205af
0, 112, 112, 1, 55296, 0x31d6ed99
0, 113, 113, 1, 55296, 0x866bf86e
0, 114, 114, 1, 55296, 0x0490fbd1
0, 115, 115, 1, 55296, 0xe1102987
0, 116, 116, 1, 55296, 0x7f860c29
0, 117, 117, 1, 55296, 0xc3a91f7a
0, 118, 118, 1, 55296, 0x69641a52
0, 119, 119, 1, 55296, 0x05b12204
0, 120, 120, 1, 55296, 0x715b6206
0, 121, 121, 1, 55296, 0xdcf55139
0, 122, 122, 1, 55296, 0x1369f746
0, 111, 111, 1, 55296, 0xd38e05af
0, 112, 112, 1, 55296, 0x25d6ed99
0, 113, 113, 1, 55296, 0x7a6bf86e
0, 114, 114, 1, 55296, 0xbb3bfbcd
0, 115, 115, 1, 55296, 0x33de2984
0, 116, 116, 1, 55296, 0xd5b10c27
0, 117, 117, 1, 55296, 0x19e31f78
0, 118, 118, 1, 55296, 0xf62f1a4f
0, 119, 119, 1, 55296, 0x3f792203
0, 120, 120, 1, 55296, 0xe4ed6202
0, 121, 121, 1, 55296, 0xee265136
0, 122, 122, 1, 55296, 0x408af73c
0, 123, 123, 1, 55296, 0xc1533ef5
0, 124, 124, 1, 55296, 0xc00ff85f
0, 125, 125, 1, 55296, 0x4f5f70dc
0, 126, 126, 1, 55296, 0x85720ccc
0, 127, 127, 1, 55296, 0xfdff0780
0, 128, 128, 1, 55296, 0x57ef04ff
0, 129, 129, 1, 55296, 0xbf94041f
0, 130, 130, 1, 55296, 0x4cee0392
0, 131, 131, 1, 55296, 0x80160314
0, 132, 132, 1, 55296, 0x396802af
0, 124, 124, 1, 55296, 0xf671f85d
0, 125, 125, 1, 55296, 0xae2670e0
0, 126, 126, 1, 55296, 0xe4390cd0
0, 127, 127, 1, 55296, 0x5cd50784
0, 128, 128, 1, 55296, 0x05880500
0, 129, 129, 1, 55296, 0x6d2d0420
0, 130, 130, 1, 55296, 0xfa780393
0, 131, 131, 1, 55296, 0x2daf0315
0, 132, 132, 1, 55296, 0x982f02b3