October 2024 - ffmpeg-cvslog - lists.ffmpeg.org

fate/vp60-interlace: add test
by Peter Ross 31 Oct '24

31 Oct '24

ffmpeg | branch: master | Peter Ross <pross(a)xvid.org> | Thu Oct 31 17:49:48 2024 +1100| [87068b9600daa522e3f45b5501ecd487a3c0be57] | committer: Peter Ross fate/vp60-interlace: add test > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=87068b9600daa522e… --- tests/fate/vpx.mak | 6 ++ tests/ref/fate/vp60-interlace1 | 156 +++++++++++++++++++++++++++++++++++++++++ tests/ref/fate/vp60-interlace2 | 156 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 318 insertions(+) diff --git a/tests/fate/vpx.mak b/tests/fate/vpx.mak index 6c479a6fb5..b8750190b3 100644 --- a/tests/fate/vpx.mak +++ b/tests/fate/vpx.mak @@ -46,6 +46,12 @@ fate-vp60: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/ea-vp6/g36.vp6 FATE_VP6-$(call FRAMECRC, EA, VP6) += fate-vp61 fate-vp61: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/ea-vp6/MovieSkirmishGondor.vp6 -t 4 +FATE_VP6-$(call FRAMECRC, AVI, VP6) += fate-vp60-interlace1 +fate-vp60-interlace1: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/vp6/interlaced32x32.avi + +FATE_VP6-$(call FRAMECRC, AVI, VP6) += fate-vp60-interlace2 +fate-vp60-interlace2: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/vp6/interlaced32x64.avi + FATE_VP6-$(call FRAMECRC, MOV, VP6A) += fate-vp6a fate-vp6a: CMD = framecrc -flags +bitexact -i $(TARGET_SAMPLES)/flash-vp6/300x180-Scr-f8-056alpha.mov diff --git a/tests/ref/fate/vp60-interlace1 b/tests/ref/fate/vp60-interlace1 new file mode 100644 index 0000000000..ebdf3428bf --- /dev/null +++ b/tests/ref/fate/vp60-interlace1 @@ -0,0 +1,156 @@ +#tb 0: 1/23 +#media_type 0: video +#codec_id 0: rawvideo +#dimensions 0: 32x32 +#sar 0: 0/1 +0, 0, 0, 1, 1536, 0xea9250ee +0, 1, 1, 1, 1536, 0x5d8d6ee5 +0, 2, 2, 1, 1536, 0x89629903 +0, 3, 3, 1, 1536, 0x36c0b5f3 +0, 4, 4, 1, 1536, 0x477ce2e5 +0, 5, 5, 1, 1536, 0x8bc60152 +0, 6, 6, 1, 1536, 0x020a2c51 +0, 7, 7, 1, 1536, 0x466b4a20 +0, 8, 8, 1, 1536, 0x0f07729f +0, 9, 9, 1, 1536, 0x965d845c +0, 10, 10, 1, 1536, 0x80d288fd +0, 11, 11, 1, 1536, 0x288b89e7 +0, 12, 12, 1, 1536, 0x19dd8a8e +0, 13, 13, 1, 1536, 0xceee8ac4 +0, 14, 14, 1, 1536, 0x87728a7d +0, 15, 15, 1, 1536, 0x326e8a68 +0, 16, 16, 1, 1536, 0xbdc38afa +0, 17, 17, 1, 1536, 0x09978a87 +0, 18, 18, 1, 1536, 0x408e8a8d +0, 19, 19, 1, 1536, 0x0b018a6d +0, 20, 20, 1, 1536, 0xaeec8a49 +0, 21, 21, 1, 1536, 0xfa638a51 +0, 22, 22, 1, 1536, 0x3c2c8a81 +0, 23, 23, 1, 1536, 0xf0d78961 +0, 24, 24, 1, 1536, 0xbd94895b +0, 25, 25, 1, 1536, 0x366289d0 +0, 26, 26, 1, 1536, 0x9ac28930 +0, 27, 27, 1, 1536, 0x27dc89c4 +0, 28, 28, 1, 1536, 0x943c8ad7 +0, 29, 29, 1, 1536, 0x13318afc +0, 30, 30, 1, 1536, 0x35ed8c41 +0, 31, 31, 1, 1536, 0x46f98e04 +0, 32, 32, 1, 1536, 0x24178f02 +0, 33, 33, 1, 1536, 0x097d8ffc +0, 34, 34, 1, 1536, 0xd0bf93cd +0, 35, 35, 1, 1536, 0xb3be9447 +0, 36, 36, 1, 1536, 0xb94d9623 +0, 37, 37, 1, 1536, 0x91b99794 +0, 38, 38, 1, 1536, 0xa5f3988e +0, 39, 39, 1, 1536, 0x1ca09bea +0, 40, 40, 1, 1536, 0xf3a89ebb +0, 41, 41, 1, 1536, 0x7f99a125 +0, 42, 42, 1, 1536, 0x936da323 +0, 43, 43, 1, 1536, 0x24a5a67f +0, 44, 44, 1, 1536, 0x2b08a903 +0, 45, 45, 1, 1536, 0xbad1ab9e +0, 46, 46, 1, 1536, 0x4ef5ae90 +0, 47, 47, 1, 1536, 0x3f99b00f +0, 48, 48, 1, 1536, 0x6db7b1ec +0, 49, 49, 1, 1536, 0xf030b53e +0, 50, 50, 1, 1536, 0x0f58b83e +0, 51, 51, 1, 1536, 0xa834bbf7 +0, 52, 52, 1, 1536, 0x1604c012 +0, 53, 53, 1, 1536, 0xb617c1ce +0, 54, 54, 1, 1536, 0x5ea0c4cb +0, 55, 55, 1, 1536, 0xdc4ccb22 +0, 56, 56, 1, 1536, 0xd62fceda +0, 57, 57, 1, 1536, 0xfae4d237 +0, 58, 58, 1, 1536, 0x8a23d362 +0, 59, 59, 1, 1536, 0x9882d23f +0, 60, 60, 1, 1536, 0xd717cf91 +0, 61, 61, 1, 1536, 0x0f40cbe3 +0, 62, 62, 1, 1536, 0xd684c8e8 +0, 63, 63, 1, 1536, 0xa03dc642 +0, 64, 64, 1, 1536, 0xeb49c29f +0, 65, 65, 1, 1536, 0xd310c14f +0, 66, 66, 1, 1536, 0x24b6beeb +0, 67, 67, 1, 1536, 0x648cbb4f +0, 68, 68, 1, 1536, 0x6814b9f6 +0, 69, 69, 1, 1536, 0x5299b9b5 +0, 70, 70, 1, 1536, 0xab1db64b +0, 71, 71, 1, 1536, 0xf7d2b41e +0, 72, 72, 1, 1536, 0x64beb209 +0, 73, 73, 1, 1536, 0x7a3ab1f6 +0, 74, 74, 1, 1536, 0x6fc0aff9 +0, 75, 75, 1, 1536, 0xa1f1b065 +0, 76, 76, 1, 1536, 0x4f4baf4b +0, 77, 77, 1, 1536, 0x3f68adf4 +0, 78, 78, 1, 1536, 0x2c63ad7b +0, 79, 79, 1, 1536, 0xbb92afa0 +0, 80, 80, 1, 1536, 0x04ecb064 +0, 81, 81, 1, 1536, 0x2ce1af07 +0, 82, 82, 1, 1536, 0xdc19b2d0 +0, 83, 83, 1, 1536, 0xc214b900 +0, 84, 84, 1, 1536, 0x4fc6c364 +0, 85, 85, 1, 1536, 0x4a7ad23a +0, 86, 86, 1, 1536, 0x9b68e2ee +0, 87, 87, 1, 1536, 0xf48be311 +0, 88, 88, 1, 1536, 0x9c0fdee9 +0, 89, 89, 1, 1536, 0x0fc5d87d +0, 90, 90, 1, 1536, 0x7d1fd237 +0, 91, 91, 1, 1536, 0xe7dcccb4 +0, 92, 92, 1, 1536, 0x4bc6c6ba +0, 93, 93, 1, 1536, 0x47a6c1ca +0, 94, 94, 1, 1536, 0x5bcbbda6 +0, 95, 95, 1, 1536, 0x2465b9e2 +0, 96, 96, 1, 1536, 0x9558b4bf +0, 97, 97, 1, 1536, 0x9363b1f3 +0, 98, 98, 1, 1536, 0xc539b090 +0, 99, 99, 1, 1536, 0x8528aff8 +0, 100, 100, 1, 1536, 0xeb52af34 +0, 101, 101, 1, 1536, 0x7be7ae53 +0, 102, 102, 1, 1536, 0xfcc3ad3c +0, 103, 103, 1, 1536, 0xf12aaafe +0, 104, 104, 1, 1536, 0xfe7da957 +0, 105, 105, 1, 1536, 0x5590a58f +0, 106, 106, 1, 1536, 0x4e5fa35d +0, 107, 107, 1, 1536, 0xa50a9fd0 +0, 108, 108, 1, 1536, 0x53a1a038 +0, 109, 109, 1, 1536, 0xbf8da136 +0, 110, 110, 1, 1536, 0x4b0da008 +0, 111, 111, 1, 1536, 0xb1dd9d26 +0, 112, 112, 1, 1536, 0x6c7e9ab1 +0, 113, 113, 1, 1536, 0x9fa597e7 +0, 114, 114, 1, 1536, 0xec3c94d1 +0, 115, 115, 1, 1536, 0x369b92fb +0, 116, 116, 1, 1536, 0x073b9227 +0, 117, 117, 1, 1536, 0x8dda9294 +0, 118, 118, 1, 1536, 0xe006922e +0, 119, 119, 1, 1536, 0xc36b8fe3 +0, 120, 120, 1, 1536, 0x33ae8fc6 +0, 121, 121, 1, 1536, 0xf6468dec +0, 122, 122, 1, 1536, 0x01328b77 +0, 123, 123, 1, 1536, 0xb105889e +0, 124, 124, 1, 1536, 0xff7585f6 +0, 125, 125, 1, 1536, 0x65408439 +0, 126, 126, 1, 1536, 0x318b83b3 +0, 127, 127, 1, 1536, 0x2ff682d2 +0, 128, 128, 1, 1536, 0x51b081f8 +0, 129, 129, 1, 1536, 0xae468044 +0, 130, 130, 1, 1536, 0x03427f32 +0, 131, 131, 1, 1536, 0xcd677e87 +0, 132, 132, 1, 1536, 0x1b2f7e6e +0, 133, 133, 1, 1536, 0xfde47ea3 +0, 134, 134, 1, 1536, 0x62be7ebd +0, 135, 135, 1, 1536, 0x95707eb8 +0, 136, 136, 1, 1536, 0x77327ec7 +0, 137, 137, 1, 1536, 0xb3987e64 +0, 138, 138, 1, 1536, 0x51297e97 +0, 139, 139, 1, 1536, 0x1d137e96 +0, 140, 140, 1, 1536, 0x498d7eaa +0, 141, 141, 1, 1536, 0x57ea37cc +0, 142, 142, 1, 1536, 0xecb2ec3f +0, 143, 143, 1, 1536, 0xe597ec6c +0, 144, 144, 1, 1536, 0xfb0cebab +0, 145, 145, 1, 1536, 0xa97eeb36 +0, 146, 146, 1, 1536, 0xb866f9f3 +0, 147, 147, 1, 1536, 0xa99ee2aa +0, 148, 148, 1, 1536, 0x10d4e344 +0, 149, 149, 1, 1536, 0x8e78e5b0 +0, 150, 150, 1, 1536, 0x7ee4e852 diff --git a/tests/ref/fate/vp60-interlace2 b/tests/ref/fate/vp60-interlace2 new file mode 100644 index 0000000000..ea663729c6 --- /dev/null +++ b/tests/ref/fate/vp60-interlace2 @@ -0,0 +1,156 @@ +#tb 0: 200/2397 +#media_type 0: video +#codec_id 0: rawvideo +#dimensions 0: 32x64 +#sar 0: 0/1 +0, 0, 0, 1, 3072, 0x9d4fa1a4 +0, 1, 1, 1, 3072, 0x7e06de2f +0, 2, 2, 1, 3072, 0x0516327e +0, 3, 3, 1, 3072, 0x650f6ca6 +0, 4, 4, 1, 3072, 0xe3b0c571 +0, 5, 5, 1, 3072, 0x594e0371 +0, 6, 6, 1, 3072, 0x38895875 +0, 7, 7, 1, 3072, 0xedf59426 +0, 8, 8, 1, 3072, 0x2468e64c +0, 9, 9, 1, 3072, 0x02520916 +0, 10, 10, 1, 3072, 0x49ee129d +0, 11, 11, 1, 3072, 0x142d1482 +0, 12, 12, 1, 3072, 0xa47b1535 +0, 13, 13, 1, 3072, 0x8a9f1609 +0, 14, 14, 1, 3072, 0x6ccb1587 +0, 15, 15, 1, 3072, 0x13b915dd +0, 16, 16, 1, 3072, 0x92cd16ae +0, 17, 17, 1, 3072, 0x58f0161d +0, 18, 18, 1, 3072, 0x65e515c7 +0, 19, 19, 1, 3072, 0x9f6a1617 +0, 20, 20, 1, 3072, 0x3474150e +0, 21, 21, 1, 3072, 0x6a101500 +0, 22, 22, 1, 3072, 0x9f1f152e +0, 23, 23, 1, 3072, 0xb07413a6 +0, 24, 24, 1, 3072, 0x22f9138d +0, 25, 25, 1, 3072, 0xc1db13ef +0, 26, 26, 1, 3072, 0xc3161377 +0, 27, 27, 1, 3072, 0xc74c148b +0, 28, 28, 1, 3072, 0x85e01693 +0, 29, 29, 1, 3072, 0xd3f616af +0, 30, 30, 1, 3072, 0xd0571935 +0, 31, 31, 1, 3072, 0xe49c1d00 +0, 32, 32, 1, 3072, 0xf2b61e4f +0, 33, 33, 1, 3072, 0x92402139 +0, 34, 34, 1, 3072, 0x897f26d2 +0, 35, 35, 1, 3072, 0xccd528dd +0, 36, 36, 1, 3072, 0x7e9a2cc2 +0, 37, 37, 1, 3072, 0xccf22f5a +0, 38, 38, 1, 3072, 0xa93931b9 +0, 39, 39, 1, 3072, 0x2f9b36bc +0, 40, 40, 1, 3072, 0x6af63cf9 +0, 41, 41, 1, 3072, 0x27ea41d6 +0, 42, 42, 1, 3072, 0x54dc4667 +0, 43, 43, 1, 3072, 0x75014d6f +0, 44, 44, 1, 3072, 0x383b51b2 +0, 45, 45, 1, 3072, 0x61ec5782 +0, 46, 46, 1, 3072, 0x3e6b5d7f +0, 47, 47, 1, 3072, 0xda8760d4 +0, 48, 48, 1, 3072, 0x66686397 +0, 49, 49, 1, 3072, 0x73716a8b +0, 50, 50, 1, 3072, 0x05db70bc +0, 51, 51, 1, 3072, 0xb6f47860 +0, 52, 52, 1, 3072, 0x7e3e80bf +0, 53, 53, 1, 3072, 0x78fd8480 +0, 54, 54, 1, 3072, 0x6d638a54 +0, 55, 55, 1, 3072, 0xea4396b3 +0, 56, 56, 1, 3072, 0x03689e2a +0, 57, 57, 1, 3072, 0x36b0a4a0 +0, 58, 58, 1, 3072, 0x715ba7e6 +0, 59, 59, 1, 3072, 0x314da5b8 +0, 60, 60, 1, 3072, 0xb0559f6f +0, 61, 61, 1, 3072, 0xde5f98e1 +0, 62, 62, 1, 3072, 0x3b9d9232 +0, 63, 63, 1, 3072, 0x8fef8d6e +0, 64, 64, 1, 3072, 0xaa658629 +0, 65, 65, 1, 3072, 0x21bf8160 +0, 66, 66, 1, 3072, 0x098a7df1 +0, 67, 67, 1, 3072, 0xc10778b8 +0, 68, 68, 1, 3072, 0xa9a2746c +0, 69, 69, 1, 3072, 0x47207175 +0, 70, 70, 1, 3072, 0xbd566d15 +0, 71, 71, 1, 3072, 0x68536934 +0, 72, 72, 1, 3072, 0xff2a64c8 +0, 73, 73, 1, 3072, 0x560663f2 +0, 74, 74, 1, 3072, 0xfcb360d0 +0, 75, 75, 1, 3072, 0xf6c060a9 +0, 76, 76, 1, 3072, 0x3f6d5f0f +0, 77, 77, 1, 3072, 0x81485d34 +0, 78, 78, 1, 3072, 0x6c635bdb +0, 79, 79, 1, 3072, 0x57cf60b7 +0, 80, 80, 1, 3072, 0xfe1e60af +0, 81, 81, 1, 3072, 0x15875f66 +0, 82, 82, 1, 3072, 0xe2dd6621 +0, 83, 83, 1, 3072, 0x7cfd7381 +0, 84, 84, 1, 3072, 0xc161877b +0, 85, 85, 1, 3072, 0x7a50a37a +0, 86, 86, 1, 3072, 0x402bc704 +0, 87, 87, 1, 3072, 0xc3bcc71f +0, 88, 88, 1, 3072, 0xe3efbf26 +0, 89, 89, 1, 3072, 0xfd5db2a4 +0, 90, 90, 1, 3072, 0x62bfa4e9 +0, 91, 91, 1, 3072, 0xd25399cb +0, 92, 92, 1, 3072, 0x8c828de5 +0, 93, 93, 1, 3072, 0x5d2483d5 +0, 94, 94, 1, 3072, 0xb99a7bb7 +0, 95, 95, 1, 3072, 0x4c6b743a +0, 96, 96, 1, 3072, 0x3a126af0 +0, 97, 97, 1, 3072, 0x1bdc6589 +0, 98, 98, 1, 3072, 0x88ec61a4 +0, 99, 99, 1, 3072, 0x23c66059 +0, 100, 100, 1, 3072, 0xdb675f24 +0, 101, 101, 1, 3072, 0xbe1c5d6e +0, 102, 102, 1, 3072, 0xb6d15ba4 +0, 103, 103, 1, 3072, 0x0ad3558c +0, 104, 104, 1, 3072, 0x65aa52ed +0, 105, 105, 1, 3072, 0x298c4d9f +0, 106, 106, 1, 3072, 0x277247c3 +0, 107, 107, 1, 3072, 0x2d0541c6 +0, 108, 108, 1, 3072, 0x5bd04050 +0, 109, 109, 1, 3072, 0x88613dd3 +0, 110, 110, 1, 3072, 0x83ee404a +0, 111, 111, 1, 3072, 0x802e3c82 +0, 112, 112, 1, 3072, 0x71563605 +0, 113, 113, 1, 3072, 0x58383036 +0, 114, 114, 1, 3072, 0xa4822a59 +0, 115, 115, 1, 3072, 0xcdcf2718 +0, 116, 116, 1, 3072, 0xd94d253f +0, 117, 117, 1, 3072, 0x99232548 +0, 118, 118, 1, 3072, 0x7b6f241a +0, 119, 119, 1, 3072, 0x44bd22f0 +0, 120, 120, 1, 3072, 0x3f882092 +0, 121, 121, 1, 3072, 0x96001c68 +0, 122, 122, 1, 3072, 0xa59d17aa +0, 123, 123, 1, 3072, 0xd36110ea +0, 124, 124, 1, 3072, 0x391d0c3a +0, 125, 125, 1, 3072, 0x59e40943 +0, 126, 126, 1, 3072, 0xb7f5079d +0, 127, 127, 1, 3072, 0x5cd60631 +0, 128, 128, 1, 3072, 0x2ec20363 +0, 129, 129, 1, 3072, 0xbde10030 +0, 130, 130, 1, 3072, 0x4d37fe03 +0, 131, 131, 1, 3072, 0x69e3fd2d +0, 132, 132, 1, 3072, 0x262efcbd +0, 133, 133, 1, 3072, 0x9e06fda7 +0, 134, 134, 1, 3072, 0xcbc6fd9d +0, 135, 135, 1, 3072, 0x3465fd79 +0, 136, 136, 1, 3072, 0x9692fd14 +0, 137, 137, 1, 3072, 0xd6d6fceb +0, 138, 138, 1, 3072, 0x72eafcdd +0, 139, 139, 1, 3072, 0x4310fcc4 +0, 140, 140, 1, 3072, 0x8b10fccb +0, 141, 141, 1, 3072, 0x30f96bff +0, 142, 142, 1, 3072, 0xe5b9d83c +0, 143, 143, 1, 3072, 0x0b1fd919 +0, 144, 144, 1, 3072, 0xd346d813 +0, 145, 145, 1, 3072, 0xe73fd6f6 +0, 146, 146, 1, 3072, 0x6612f4d1 +0, 147, 147, 1, 3072, 0x9874c583 +0, 148, 148, 1, 3072, 0xcde3c709 +0, 149, 149, 1, 3072, 0x275dcc64 +0, 150, 150, 1, 3072, 0x4261d055

1 0

avcodec/vp56: decode interlace content
by Peter Ross 31 Oct '24

31 Oct '24

ffmpeg | branch: master | Peter Ross <pross(a)xvid.org> | Thu Oct 31 17:49:48 2024 +1100| [492a3b4b895ceac27c3ed0239e9e40940479998a] | committer: Peter Ross avcodec/vp56: decode interlace content Modification of patch submitted by Aurelien Jacobs (November 2007). Fixes ticket #5581 and #5582. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=492a3b4b895ceac27… --- libavcodec/vp5.c | 5 +---- libavcodec/vp56.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++------ libavcodec/vp56.h | 6 ++++++ libavcodec/vp6.c | 11 ++++++----- libavcodec/vp6data.h | 11 +++++++++++ 5 files changed, 72 insertions(+), 15 deletions(-) diff --git a/libavcodec/vp5.c b/libavcodec/vp5.c index 78d4b38ce3..77b479471b 100644 --- a/libavcodec/vp5.c +++ b/libavcodec/vp5.c @@ -58,10 +58,7 @@ static int vp5_parse_header(VP56Context *s, const uint8_t *buf, int buf_size) if(vp56_rac_gets(c, 5) > 5) return AVERROR_INVALIDDATA; vp56_rac_gets(c, 2); - if (vpx_rac_get(c)) { - avpriv_report_missing_feature(s->avctx, "Interlacing"); - return AVERROR_PATCHWELCOME; - } + s->interlaced = vp56_rac_gets(c, 1); rows = vp56_rac_gets(c, 8); /* number of stored macroblock rows */ cols = vp56_rac_gets(c, 8); /* number of stored macroblock cols */ if (!rows || !cols) { diff --git a/libavcodec/vp56.c b/libavcodec/vp56.c index 1da47ca43f..4f2381f64a 100644 --- a/libavcodec/vp56.c +++ b/libavcodec/vp56.c @@ -338,7 +338,7 @@ static void vp56_deblock_filter(VP56Context *s, uint8_t *yuv, } static void vp56_mc(VP56Context *s, int b, int plane, uint8_t *src, - ptrdiff_t stride, int x, int y) + ptrdiff_t stride, int x, int y, ptrdiff_t ref_stride) { uint8_t *dst = s->frames[VP56_FRAME_CURRENT]->data[plane] + s->block_offset[b]; uint8_t *src_block; @@ -364,7 +364,17 @@ static void vp56_mc(VP56Context *s, int b, int plane, uint8_t *src, x += dx - 2; y += dy - 2; - if (x<0 || x+12>=s->plane_width[plane] || + if (s->interlaced && s->il_block) { + /* extract 12*(4+16+4) block from frame (containing both fields), then treat src_block as specific field */ + s->vdsp.emulated_edge_mc(s->edge_emu_buffer, + src + s->block_offset[b] + (dy-4)*ref_stride + (dx-2), + ref_stride, ref_stride, + 12, 24, x, y - 2, + s->plane_width[plane], + s->plane_height[plane]); + src_block = s->edge_emu_buffer; + src_offset = 2 + 4*ref_stride; + } else if (x<0 || x+12>=s->plane_width[plane] || y<0 || y+12>=s->plane_height[plane]) { s->vdsp.emulated_edge_mc(s->edge_emu_buffer, src + s->block_offset[b] + (dy-2)*stride + (dx-2), @@ -431,6 +441,7 @@ static av_always_inline void vp56_render_mb(VP56Context *s, int row, int col, in int b, ab, b_max, plane, off; AVFrame *frame_current, *frame_ref; VP56Frame ref_frame = ff_vp56_reference_frame[mb_type]; + ptrdiff_t ref_stride[4]; vp56_add_predictors_dc(s, ref_frame); @@ -439,6 +450,13 @@ static av_always_inline void vp56_render_mb(VP56Context *s, int row, int col, in if (mb_type != VP56_MB_INTRA && !frame_ref->data[0]) return; + memcpy(ref_stride, s->stride, sizeof(s->stride)); + if (s->interlaced && s->il_block) { + s->block_offset[2] -= s->stride[0] * 7; + s->block_offset[3] -= s->stride[0] * 7; + s->stride[0] *= 2; + } + ab = 6*is_alpha; b_max = 6 - 2*is_alpha; @@ -473,10 +491,10 @@ static av_always_inline void vp56_render_mb(VP56Context *s, int row, int col, in case VP56_MB_INTER_V2_GF: for (b=0; b<b_max; b++) { int x_off = b==1 || b==3 ? 8 : 0; - int y_off = b==2 || b==3 ? 8 : 0; + int y_off = b==2 || b==3 ? (s->interlaced && s->il_block ? 1 : 8) : 0; plane = ff_vp56_b2p[b+ab]; vp56_mc(s, b, plane, frame_ref->data[plane], s->stride[plane], - 16*col+x_off, 16*row+y_off); + 16*col+x_off, 16*row+y_off, ref_stride[plane]); vp56_idct_add(s, frame_current->data[plane] + s->block_offset[b], s->stride[plane], s->block_coeff[b], s->idct_selector[b]); } @@ -487,6 +505,12 @@ static av_always_inline void vp56_render_mb(VP56Context *s, int row, int col, in s->block_coeff[4][0] = 0; s->block_coeff[5][0] = 0; } + + if (s->interlaced && s->il_block) { + s->stride[0] /= 2; + s->block_offset[2] += s->stride[0] * 7; + s->block_offset[3] += s->stride[0] * 7; + } } static int vp56_decode_mb(VP56Context *s, int row, int col, int is_alpha) @@ -494,6 +518,19 @@ static int vp56_decode_mb(VP56Context *s, int row, int col, int is_alpha) VP56mb mb_type; int ret; + if (s->interlaced) { + int prob = s->il_prob; + + if (col > 0) { + if (s->il_block) + prob -= prob >> 1; + else + prob += (256 - prob) >> 1; /* can be simplified/combined */ + } + + s->il_block = vpx_rac_get_prob(&s->c, prob); + } + if (s->frames[VP56_FRAME_CURRENT]->flags & AV_FRAME_FLAG_KEY) mb_type = VP56_MB_INTRA; else @@ -552,12 +589,12 @@ static int vp56_size_changed(VP56Context *s) av_reallocp_array(&s->macroblocks, s->mb_width*s->mb_height, sizeof(*s->macroblocks)); av_free(s->edge_emu_buffer_alloc); - s->edge_emu_buffer_alloc = av_malloc(16*stride); + s->edge_emu_buffer_alloc = av_malloc(16*stride*2); s->edge_emu_buffer = s->edge_emu_buffer_alloc; if (!s->above_blocks || !s->macroblocks || !s->edge_emu_buffer_alloc) return AVERROR(ENOMEM); if (s->flip < 0) - s->edge_emu_buffer += 15 * stride; + s->edge_emu_buffer += 15 * stride * 2; if (s->alpha_context) return vp56_size_changed(s->alpha_context); @@ -686,6 +723,11 @@ static int ff_vp56_decode_mbs(AVCodecContext *avctx, void *data, if (s->parse_coeff_models(s)) goto next; + if (s->interlaced) { + s->frames[VP56_FRAME_CURRENT]->flags |= AV_FRAME_FLAG_INTERLACED; + s->il_prob = vp56_rac_gets(&s->c, 8); + } + memset(s->prev_dc, 0, sizeof(s->prev_dc)); s->prev_dc[1][VP56_FRAME_CURRENT] = 128; s->prev_dc[2][VP56_FRAME_CURRENT] = 128; diff --git a/libavcodec/vp56.h b/libavcodec/vp56.h index 9dc0b9c7ad..87b7e06e0b 100644 --- a/libavcodec/vp56.h +++ b/libavcodec/vp56.h @@ -151,6 +151,7 @@ struct vp56_context { VP56Macroblock *macroblocks; DECLARE_ALIGNED(16, int16_t, block_coeff)[6][64]; int idct_selector[6]; + const uint8_t *def_coeff_reorder;/* used in vp6 only */ /* motion vectors */ VP56mv mv[6]; /* vectors for each block in MB */ @@ -171,6 +172,11 @@ struct vp56_context { int has_alpha; + /* interlacing params */ + int interlaced; + int il_prob; + int il_block; + /* upside-down flipping hints */ int flip; /* are we flipping ? */ int frbi; /* first row block index in MB */ diff --git a/libavcodec/vp6.c b/libavcodec/vp6.c index 97d63a5870..73d117c871 100644 --- a/libavcodec/vp6.c +++ b/libavcodec/vp6.c @@ -68,10 +68,11 @@ static int vp6_parse_header(VP56Context *s, const uint8_t *buf, int buf_size) if (sub_version > 8) return AVERROR_INVALIDDATA; s->filter_header = buf[1] & 0x06; - if (buf[1] & 1) { - avpriv_report_missing_feature(s->avctx, "Interlacing"); - return AVERROR_PATCHWELCOME; - } + s->interlaced = buf[1] & 1; + if (s->interlaced) + s->def_coeff_reorder = vp6_il_coeff_reorder; + else + s->def_coeff_reorder = vp6_def_coeff_reorder; if (separated_coeff || !s->filter_header) { coeff_offset = AV_RB16(buf+2) - 2; buf += 2; @@ -228,7 +229,7 @@ static void vp6_default_models_init(VP56Context *s) memcpy(model->vector_fdv, vp6_def_fdv_vector_model, sizeof(model->vector_fdv)); memcpy(model->vector_pdv, vp6_def_pdv_vector_model, sizeof(model->vector_pdv)); memcpy(model->coeff_runv, vp6_def_runv_coeff_model, sizeof(model->coeff_runv)); - memcpy(model->coeff_reorder, vp6_def_coeff_reorder, sizeof(model->coeff_reorder)); + memcpy(model->coeff_reorder, s->def_coeff_reorder, sizeof(model->coeff_reorder)); vp6_coeff_order_table_init(s); } diff --git a/libavcodec/vp6data.h b/libavcodec/vp6data.h index 539e19a627..be6e86919d 100644 --- a/libavcodec/vp6data.h +++ b/libavcodec/vp6data.h @@ -51,6 +51,17 @@ static const uint8_t vp6_def_coeff_reorder[] = { 14, 14, 15, 15, 15, 15, 15, 15, }; +static const uint8_t vp6_il_coeff_reorder[] = { + 0, 1, 0, 1, 1, 2, 5, 3, + 2, 2, 2, 2, 4, 7, 8, 10, + 9, 7, 5, 4, 2, 3, 5, 6, + 8, 9, 11, 12, 13, 12, 11, 10, + 9, 7, 5, 4, 6, 7, 9, 11, + 12, 12, 13, 13, 14, 12, 11, 9, + 7, 9, 11, 12, 14, 14, 14, 15, + 13, 11, 13, 15, 15, 15, 15, 15, +}; + static const uint8_t vp6_def_runv_coeff_model[2][14] = { { 198, 197, 196, 146, 198, 204, 169, 142, 130, 136, 149, 149, 191, 249 }, { 135, 201, 181, 154, 98, 117, 132, 126, 146, 169, 184, 240, 246, 254 },

1 0

avcodec/decode: clean-up if get_hw_frames_parameters fails
by Thomas Guillem 30 Oct '24

30 Oct '24

ffmpeg | branch: master | Thomas Guillem <thomas(a)gllm.fr> | Mon Oct 7 17:43:07 2024 +0200| [44a0a0c050461abfc10de722c7e67534751ba760] | committer: Zhao Zhili avcodec/decode: clean-up if get_hw_frames_parameters fails Fixes the following assert: [00007f1df83d17e0] vaapi generic error: avcodec_get_hw_frames_parameters failed: -22 Assertion p_dst->hwaccel_threadsafe || (!dst->hwaccel && !dst->internal->hwaccel_priv_data) failed at libavcodec/pthread_frame.c:349 Reproduced from VLC with VAAPI, when fallbacking from hw to sw. Signed-off-by: Zhao Zhili <zhilizhao(a)tencent.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=44a0a0c050461abfc… --- libavcodec/decode.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libavcodec/decode.c b/libavcodec/decode.c index c331bb8596..3380cb27cf 100644 --- a/libavcodec/decode.c +++ b/libavcodec/decode.c @@ -19,6 +19,7 @@ */ #include <stdint.h> +#include <stdbool.h> #include <string.h> #include "config.h" @@ -1173,6 +1174,7 @@ int avcodec_get_hw_frames_parameters(AVCodecContext *avctx, const AVCodecHWConfigInternal *hw_config; const FFHWAccel *hwa; int i, ret; + bool clean_priv_data = false; for (i = 0;; i++) { hw_config = ffcodec(avctx->codec)->hw_configs[i]; @@ -1197,6 +1199,7 @@ int avcodec_get_hw_frames_parameters(AVCodecContext *avctx, av_buffer_unref(&frames_ref); return AVERROR(ENOMEM); } + clean_priv_data = true; } ret = hwa->frame_params(avctx, frames_ref); @@ -1217,6 +1220,8 @@ int avcodec_get_hw_frames_parameters(AVCodecContext *avctx, *out_frames_ref = frames_ref; } else { + if (clean_priv_data) + av_freep(&avctx->internal->hwaccel_priv_data); av_buffer_unref(&frames_ref); } return ret;

1 0

avutil/hwcontext: Don't assume frames_uninit is reentrant
by Zhao Zhili 28 Oct '24

28 Oct '24

ffmpeg | branch: release/6.1 | Zhao Zhili <zhilizhao(a)tencent.com> | Tue Feb 20 20:08:55 2024 +0800| [7d79d0a43b5533ff584249332bc1db7fedbab1d2] | committer: Zhao Zhili avutil/hwcontext: Don't assume frames_uninit is reentrant Fix heap use after free when vulkan_frames_init failed. Signed-off-by: Zhao Zhili <zhilizhao(a)tencent.com> (cherry picked from commit 3bb00c0a420c3ce83c6fafee30270d69622ccad7) > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7d79d0a43b5533ff5… --- libavutil/hwcontext.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/libavutil/hwcontext.c b/libavutil/hwcontext.c index 3650d4653a..0ef34796f6 100644 --- a/libavutil/hwcontext.c +++ b/libavutil/hwcontext.c @@ -363,7 +363,7 @@ int av_hwframe_ctx_init(AVBufferRef *ref) if (ctx->internal->hw_type->frames_init) { ret = ctx->internal->hw_type->frames_init(ctx); if (ret < 0) - goto fail; + return ret; } if (ctx->internal->pool_internal && !ctx->pool) @@ -373,14 +373,10 @@ int av_hwframe_ctx_init(AVBufferRef *ref) if (ctx->initial_pool_size > 0) { ret = hwframe_pool_prealloc(ref); if (ret < 0) - goto fail; + return ret; } return 0; -fail: - if (ctx->internal->hw_type->frames_uninit) - ctx->internal->hw_type->frames_uninit(ctx); - return ret; } int av_hwframe_transfer_get_formats(AVBufferRef *hwframe_ref,

1 0

avutil/hwcontext_vulkan: add missing packed YUV444 format mappings
by James Almer 27 Oct '24

27 Oct '24

ffmpeg | branch: master | James Almer <jamrial(a)gmail.com> | Sun Oct 27 14:50:54 2024 -0300| [bb57b780134f59e3bddfab295e34e88468bbd545] | committer: James Almer avutil/hwcontext_vulkan: add missing packed YUV444 format mappings Signed-off-by: James Almer <jamrial(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bb57b780134f59e3b… --- libavutil/hwcontext_vulkan.c | 7 ++++++- libavutil/vulkan.c | 4 +++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/libavutil/hwcontext_vulkan.c b/libavutil/hwcontext_vulkan.c index ea33c815aa..0b52ad5112 100644 --- a/libavutil/hwcontext_vulkan.c +++ b/libavutil/hwcontext_vulkan.c @@ -363,14 +363,18 @@ static const struct FFVkFormatEntry { { VK_FORMAT_G16_B16_R16_3PLANE_444_UNORM, AV_PIX_FMT_YUV444P12, ASPECT_3PLANE, 3, 1, 3, { VK_FORMAT_R16_UNORM, VK_FORMAT_R16_UNORM, VK_FORMAT_R16_UNORM } }, { VK_FORMAT_G16_B16_R16_3PLANE_444_UNORM, AV_PIX_FMT_YUV444P16, ASPECT_3PLANE, 3, 1, 3, { VK_FORMAT_R16_UNORM, VK_FORMAT_R16_UNORM, VK_FORMAT_R16_UNORM } }, - /* Single plane 422 at 8, 10 and 12 bits */ + /* Single plane 422 at 8, 10, 12 and 16 bits */ { VK_FORMAT_G8B8G8R8_422_UNORM, AV_PIX_FMT_YUYV422, VK_IMAGE_ASPECT_COLOR_BIT, 1, 1, 1, { VK_FORMAT_R8G8B8A8_UNORM } }, { VK_FORMAT_B8G8R8G8_422_UNORM, AV_PIX_FMT_UYVY422, VK_IMAGE_ASPECT_COLOR_BIT, 1, 1, 1, { VK_FORMAT_R8G8B8A8_UNORM } }, { VK_FORMAT_G10X6B10X6G10X6R10X6_422_UNORM_4PACK16, AV_PIX_FMT_Y210, VK_IMAGE_ASPECT_COLOR_BIT, 1, 1, 1, { VK_FORMAT_R16G16B16A16_UNORM } }, { VK_FORMAT_G12X4B12X4G12X4R12X4_422_UNORM_4PACK16, AV_PIX_FMT_Y212, VK_IMAGE_ASPECT_COLOR_BIT, 1, 1, 1, { VK_FORMAT_R16G16B16A16_UNORM } }, { VK_FORMAT_G16B16G16R16_422_UNORM, AV_PIX_FMT_Y216, VK_IMAGE_ASPECT_COLOR_BIT, 1, 1, 1, { VK_FORMAT_R16G16B16A16_UNORM } }, + + /* Single plane 444 at 8, 10, 12 and 16 bits */ + { VK_FORMAT_B8G8R8A8_UNORM, AV_PIX_FMT_UYVA, VK_IMAGE_ASPECT_COLOR_BIT, 1, 1, 1, { VK_FORMAT_B8G8R8A8_UNORM } }, { VK_FORMAT_A2R10G10B10_UNORM_PACK32, AV_PIX_FMT_XV30, VK_IMAGE_ASPECT_COLOR_BIT, 1, 1, 1, { VK_FORMAT_R16G16B16A16_UNORM } }, { VK_FORMAT_R12X4G12X4B12X4A12X4_UNORM_4PACK16, AV_PIX_FMT_XV36, VK_IMAGE_ASPECT_COLOR_BIT, 1, 1, 1, { VK_FORMAT_R16G16B16A16_UNORM } }, + { VK_FORMAT_R16G16B16A16_UNORM, AV_PIX_FMT_XV48, VK_IMAGE_ASPECT_COLOR_BIT, 1, 1, 1, { VK_FORMAT_R16G16B16A16_UNORM } }, }; static const int nb_vk_formats_list = FF_ARRAY_ELEMS(vk_formats_list); @@ -2869,6 +2873,7 @@ static const struct { { DRM_FORMAT_XYUV8888, VK_FORMAT_R8G8B8A8_UNORM }, { DRM_FORMAT_XVYU2101010, VK_FORMAT_A2R10G10B10_UNORM_PACK32 } , { DRM_FORMAT_XVYU12_16161616, VK_FORMAT_R12X4G12X4B12X4A12X4_UNORM_4PACK16 } , + { DRM_FORMAT_XVYU16161616, VK_FORMAT_R16G16B16A16_UNORM } , #endif }; diff --git a/libavutil/vulkan.c b/libavutil/vulkan.c index b7654d0f36..2c71312d78 100644 --- a/libavutil/vulkan.c +++ b/libavutil/vulkan.c @@ -1300,6 +1300,7 @@ const char *ff_vk_shader_rep_fmt(enum AVPixelFormat pix_fmt, case AV_PIX_FMT_RGB0: case AV_PIX_FMT_RGB565: case AV_PIX_FMT_BGR565: + case AV_PIX_FMT_UYVA: case AV_PIX_FMT_YUYV422: case AV_PIX_FMT_UYVY422: { const char *rep_tab[] = { @@ -1326,7 +1327,8 @@ const char *ff_vk_shader_rep_fmt(enum AVPixelFormat pix_fmt, case AV_PIX_FMT_RGBA64: case AV_PIX_FMT_Y212: case AV_PIX_FMT_Y216: - case AV_PIX_FMT_XV36: { + case AV_PIX_FMT_XV36: + case AV_PIX_FMT_XV48: { const char *rep_tab[] = { [FF_VK_REP_NATIVE] = "rgba16ui", [FF_VK_REP_FLOAT] = "rgba16",

1 0

jpeg2000dec: fix tile-part header state reset
by Pierre-Anthony Lemieux 27 Oct '24

27 Oct '24

ffmpeg | branch: master | Pierre-Anthony Lemieux <pal(a)palemieux.com> | Thu Oct 24 16:28:38 2024 -0700| [839f6d38a0ff32d8fb89fc1f1b281ed874ae3543] | committer: Pierre-Anthony Lemieux jpeg2000dec: fix tile-part header state reset Fixes https://trac.ffmpeg.org/ticket/11266 > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=839f6d38a0ff32d8f… --- libavcodec/jpeg2000dec.c | 19 ++++++++++--------- libavcodec/jpeg2000dec.h | 1 - 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c index 2e09b279dc..5b05ff2455 100644 --- a/libavcodec/jpeg2000dec.c +++ b/libavcodec/jpeg2000dec.c @@ -2402,6 +2402,7 @@ static int jpeg2000_read_main_headers(Jpeg2000DecoderContext *s) Jpeg2000QuantStyle *qntsty = s->qntsty; Jpeg2000POC *poc = &s->poc; uint8_t *properties = s->properties; + uint8_t in_tile_headers = 0; for (;;) { int len, ret = 0; @@ -2484,7 +2485,7 @@ static int jpeg2000_read_main_headers(Jpeg2000DecoderContext *s) ret = get_cap(s, codsty); break; case JPEG2000_COC: - if (s->in_tile_headers == 1 && s->isHT && (!s->Ccap15_b11)) { + if (in_tile_headers == 1 && s->isHT && (!s->Ccap15_b11)) { av_log(s->avctx, AV_LOG_ERROR, "COC marker found in a tile header but the codestream belongs to the HOMOGENEOUS set\n"); return AVERROR_INVALIDDATA; @@ -2492,7 +2493,7 @@ static int jpeg2000_read_main_headers(Jpeg2000DecoderContext *s) ret = get_coc(s, codsty, properties); break; case JPEG2000_COD: - if (s->in_tile_headers == 1 && s->isHT && (!s->Ccap15_b11)) { + if (in_tile_headers == 1 && s->isHT && (!s->Ccap15_b11)) { av_log(s->avctx, AV_LOG_ERROR, "COD marker found in a tile header but the codestream belongs to the HOMOGENEOUS set\n"); return AVERROR_INVALIDDATA; @@ -2500,7 +2501,7 @@ static int jpeg2000_read_main_headers(Jpeg2000DecoderContext *s) ret = get_cod(s, codsty, properties); break; case JPEG2000_RGN: - if (s->in_tile_headers == 1 && s->isHT && (!s->Ccap15_b11)) { + if (in_tile_headers == 1 && s->isHT && (!s->Ccap15_b11)) { av_log(s->avctx, AV_LOG_ERROR, "RGN marker found in a tile header but the codestream belongs to the HOMOGENEOUS set\n"); return AVERROR_INVALIDDATA; @@ -2512,7 +2513,7 @@ static int jpeg2000_read_main_headers(Jpeg2000DecoderContext *s) } break; case JPEG2000_QCC: - if (s->in_tile_headers == 1 && s->isHT && (!s->Ccap15_b11)) { + if (in_tile_headers == 1 && s->isHT && (!s->Ccap15_b11)) { av_log(s->avctx, AV_LOG_ERROR, "QCC marker found in a tile header but the codestream belongs to the HOMOGENEOUS set\n"); return AVERROR_INVALIDDATA; @@ -2520,7 +2521,7 @@ static int jpeg2000_read_main_headers(Jpeg2000DecoderContext *s) ret = get_qcc(s, len, qntsty, properties); break; case JPEG2000_QCD: - if (s->in_tile_headers == 1 && s->isHT && (!s->Ccap15_b11)) { + if (in_tile_headers == 1 && s->isHT && (!s->Ccap15_b11)) { av_log(s->avctx, AV_LOG_ERROR, "QCD marker found in a tile header but the codestream belongs to the HOMOGENEOUS set\n"); return AVERROR_INVALIDDATA; @@ -2528,7 +2529,7 @@ static int jpeg2000_read_main_headers(Jpeg2000DecoderContext *s) ret = get_qcd(s, len, qntsty, properties); break; case JPEG2000_POC: - if (s->in_tile_headers == 1 && s->isHT && (!s->Ccap15_b11)) { + if (in_tile_headers == 1 && s->isHT && (!s->Ccap15_b11)) { av_log(s->avctx, AV_LOG_ERROR, "POC marker found in a tile header but the codestream belongs to the HOMOGENEOUS set\n"); return AVERROR_INVALIDDATA; @@ -2536,8 +2537,8 @@ static int jpeg2000_read_main_headers(Jpeg2000DecoderContext *s) ret = get_poc(s, len, poc); break; case JPEG2000_SOT: - if (!s->in_tile_headers) { - s->in_tile_headers = 1; + if (!in_tile_headers) { + in_tile_headers = 1; if (s->has_ppm) { bytestream2_init(&s->packed_headers_stream, s->packed_headers, s->packed_headers_size); } @@ -2569,7 +2570,7 @@ static int jpeg2000_read_main_headers(Jpeg2000DecoderContext *s) break; case JPEG2000_PPM: // Packed headers, main header - if (s->in_tile_headers) { + if (in_tile_headers) { av_log(s->avctx, AV_LOG_ERROR, "PPM Marker can only be in Main header\n"); return AVERROR_INVALIDDATA; } diff --git a/libavcodec/jpeg2000dec.h b/libavcodec/jpeg2000dec.h index 78eba27ed9..fce3823164 100644 --- a/libavcodec/jpeg2000dec.h +++ b/libavcodec/jpeg2000dec.h @@ -86,7 +86,6 @@ typedef struct Jpeg2000DecoderContext { uint8_t *packed_headers; // contains packed headers. Used only along with PPM marker int packed_headers_size; GetByteContext packed_headers_stream; - uint8_t in_tile_headers; int cdx[4], cdy[4]; int precision;

1 0

checkasm/sw_range_convert: indent after previous couple of commits
by Ramiro Polla 27 Oct '24

27 Oct '24

ffmpeg | branch: master | Ramiro Polla <ramiro.polla(a)gmail.com> | Mon Sep 23 14:03:43 2024 +0200| [562524587ea80c1b5f6a91b86b53e06d799e5667] | committer: Ramiro Polla checkasm/sw_range_convert: indent after previous couple of commits > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=562524587ea80c1b5… --- tests/checkasm/sw_range_convert.c | 48 +++++++++++++++++++-------------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/tests/checkasm/sw_range_convert.c b/tests/checkasm/sw_range_convert.c index 7c39f71660..f8167a411e 100644 --- a/tests/checkasm/sw_range_convert.c +++ b/tests/checkasm/sw_range_convert.c @@ -85,19 +85,19 @@ static void check_lumConvertRange(int from) c->dstFormat = pix_fmt; c->dstBpc = bit_depth; ff_sws_init_scale(c); - for (int dstWi = 0; dstWi < FF_ARRAY_ELEMS(input_sizes); dstWi++) { - int width = input_sizes[dstWi]; - if (check_func(c->lumConvertRange, "%s%d_%d", func_str, bit_depth, width)) { - randomize_buffers(dst0, dst1, bit_depth, width); - call_ref(dst0, width); - call_new(dst1, width); - if (memcmp(dst0, dst1, width * sample_size)) - fail(); - if (width == LARGEST_INPUT_SIZE && (bit_depth == 8 || bit_depth == 16)) - bench_new(dst1, width); + for (int dstWi = 0; dstWi < FF_ARRAY_ELEMS(input_sizes); dstWi++) { + int width = input_sizes[dstWi]; + if (check_func(c->lumConvertRange, "%s%d_%d", func_str, bit_depth, width)) { + randomize_buffers(dst0, dst1, bit_depth, width); + call_ref(dst0, width); + call_new(dst1, width); + if (memcmp(dst0, dst1, width * sample_size)) + fail(); + if (width == LARGEST_INPUT_SIZE && (bit_depth == 8 || bit_depth == 16)) + bench_new(dst1, width); + } } } - } sws_freeContext(sws); } @@ -135,21 +135,21 @@ static void check_chrConvertRange(int from) c->dstFormat = pix_fmt; c->dstBpc = bit_depth; ff_sws_init_scale(c); - for (int dstWi = 0; dstWi < FF_ARRAY_ELEMS(input_sizes); dstWi++) { - int width = input_sizes[dstWi]; - if (check_func(c->chrConvertRange, "%s%d_%d", func_str, bit_depth, width)) { - randomize_buffers(dstU0, dstU1, bit_depth, width); - randomize_buffers(dstV0, dstV1, bit_depth, width); - call_ref(dstU0, dstV0, width); - call_new(dstU1, dstV1, width); - if (memcmp(dstU0, dstU1, width * sample_size) || - memcmp(dstV0, dstV1, width * sample_size)) - fail(); - if (width == LARGEST_INPUT_SIZE && (bit_depth == 8 || bit_depth == 16)) - bench_new(dstU1, dstV1, width); + for (int dstWi = 0; dstWi < FF_ARRAY_ELEMS(input_sizes); dstWi++) { + int width = input_sizes[dstWi]; + if (check_func(c->chrConvertRange, "%s%d_%d", func_str, bit_depth, width)) { + randomize_buffers(dstU0, dstU1, bit_depth, width); + randomize_buffers(dstV0, dstV1, bit_depth, width); + call_ref(dstU0, dstV0, width); + call_new(dstU1, dstV1, width); + if (memcmp(dstU0, dstU1, width * sample_size) || + memcmp(dstV0, dstV1, width * sample_size)) + fail(); + if (width == LARGEST_INPUT_SIZE && (bit_depth == 8 || bit_depth == 16)) + bench_new(dstU1, dstV1, width); + } } } - } sws_freeContext(sws); }

1 0

checkasm/sw_range_convert: test all supported bit depths
by Ramiro Polla 27 Oct '24

27 Oct '24

ffmpeg | branch: master | Ramiro Polla <ramiro.polla(a)gmail.com> | Wed Sep 18 16:43:34 2024 +0200| [031d98790ee06d8acd6182738e6f9c8d3c760d66] | committer: Ramiro Polla checkasm/sw_range_convert: test all supported bit depths This commit also reduces the number of times ff_sws_init_scale() gets called (only once per bit depth), and the number of times randomize_buffers() gets called (only if the function must be checked). Benchmarks are only performed on bit depths 8 and 16 (since they are different functions, and not only different constants). > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=031d98790ee06d8ac… --- tests/checkasm/sw_range_convert.c | 94 ++++++++++++++++++++++++++------------- 1 file changed, 63 insertions(+), 31 deletions(-) diff --git a/tests/checkasm/sw_range_convert.c b/tests/checkasm/sw_range_convert.c index bce7a7e3e5..7c39f71660 100644 --- a/tests/checkasm/sw_range_convert.c +++ b/tests/checkasm/sw_range_convert.c @@ -28,6 +28,33 @@ #include "checkasm.h" +static const enum AVPixelFormat pixel_formats[] = { + AV_PIX_FMT_YUV444P, + AV_PIX_FMT_YUV444P9, + AV_PIX_FMT_YUV444P10, + AV_PIX_FMT_YUV444P12, + AV_PIX_FMT_YUV444P14, + AV_PIX_FMT_YUV444P16, +}; + +static void randomize_buffers(int16_t *buf0, int16_t *buf1, int bit_depth, int width) +{ + int32_t *buf0_32 = (int32_t *) buf0; + int32_t *buf1_32 = (int32_t *) buf1; + int mask = (1 << bit_depth) - 1; + int src_shift = bit_depth <= 14 ? 15 - bit_depth : 19 - bit_depth; + for (int i = 0; i < width; i++) { + int32_t r = rnd() & mask; + if (bit_depth == 16) { + buf0_32[i] = r << src_shift; + buf1_32[i] = r << src_shift; + } else { + buf0[i] = r << src_shift; + buf1[i] = r << src_shift; + } + } +} + static void check_lumConvertRange(int from) { const char *func_str = from ? "lumRangeFromJpeg" : "lumRangeToJpeg"; @@ -36,8 +63,8 @@ static void check_lumConvertRange(int from) SwsContext *sws; SwsInternal *c; - LOCAL_ALIGNED_32(int16_t, dst0, [LARGEST_INPUT_SIZE]); - LOCAL_ALIGNED_32(int16_t, dst1, [LARGEST_INPUT_SIZE]); + LOCAL_ALIGNED_32(int16_t, dst0, [LARGEST_INPUT_SIZE * 2]); + LOCAL_ALIGNED_32(int16_t, dst1, [LARGEST_INPUT_SIZE * 2]); declare_func(void, int16_t *dst, int width); @@ -46,28 +73,31 @@ static void check_lumConvertRange(int from) fail(); c = sws_internal(sws); - c->srcFormat = AV_PIX_FMT_YUV444P; - c->dstFormat = AV_PIX_FMT_YUV444P; c->srcRange = from; c->dstRange = !from; + for (int pfi = 0; pfi < FF_ARRAY_ELEMS(pixel_formats); pfi++) { + enum AVPixelFormat pix_fmt = pixel_formats[pfi]; + const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(pix_fmt); + int bit_depth = desc->comp[0].depth; + int sample_size = bit_depth == 16 ? sizeof(int32_t) : sizeof(int16_t); + c->srcFormat = pix_fmt; + c->dstFormat = pix_fmt; + c->dstBpc = bit_depth; + ff_sws_init_scale(c); for (int dstWi = 0; dstWi < FF_ARRAY_ELEMS(input_sizes); dstWi++) { int width = input_sizes[dstWi]; - for (int i = 0; i < width; i++) { - uint8_t r = rnd(); - dst0[i] = (int16_t) r << 7; - dst1[i] = (int16_t) r << 7; - } - ff_sws_init_scale(c); - if (check_func(c->lumConvertRange, "%s_%d", func_str, width)) { + if (check_func(c->lumConvertRange, "%s%d_%d", func_str, bit_depth, width)) { + randomize_buffers(dst0, dst1, bit_depth, width); call_ref(dst0, width); call_new(dst1, width); - if (memcmp(dst0, dst1, width * sizeof(int16_t))) + if (memcmp(dst0, dst1, width * sample_size)) fail(); - if (width == LARGEST_INPUT_SIZE) + if (width == LARGEST_INPUT_SIZE && (bit_depth == 8 || bit_depth == 16)) bench_new(dst1, width); } } + } sws_freeContext(sws); } @@ -81,10 +111,10 @@ static void check_chrConvertRange(int from) SwsContext *sws; SwsInternal *c; - LOCAL_ALIGNED_32(int16_t, dstU0, [LARGEST_INPUT_SIZE]); - LOCAL_ALIGNED_32(int16_t, dstV0, [LARGEST_INPUT_SIZE]); - LOCAL_ALIGNED_32(int16_t, dstU1, [LARGEST_INPUT_SIZE]); - LOCAL_ALIGNED_32(int16_t, dstV1, [LARGEST_INPUT_SIZE]); + LOCAL_ALIGNED_32(int16_t, dstU0, [LARGEST_INPUT_SIZE * 2]); + LOCAL_ALIGNED_32(int16_t, dstV0, [LARGEST_INPUT_SIZE * 2]); + LOCAL_ALIGNED_32(int16_t, dstU1, [LARGEST_INPUT_SIZE * 2]); + LOCAL_ALIGNED_32(int16_t, dstV1, [LARGEST_INPUT_SIZE * 2]); declare_func(void, int16_t *dstU, int16_t *dstV, int width); @@ -93,31 +123,33 @@ static void check_chrConvertRange(int from) fail(); c = sws_internal(sws); - c->srcFormat = AV_PIX_FMT_YUV444P; - c->dstFormat = AV_PIX_FMT_YUV444P; c->srcRange = from; c->dstRange = !from; + for (int pfi = 0; pfi < FF_ARRAY_ELEMS(pixel_formats); pfi++) { + enum AVPixelFormat pix_fmt = pixel_formats[pfi]; + const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(pix_fmt); + int bit_depth = desc->comp[0].depth; + int sample_size = bit_depth == 16 ? sizeof(int32_t) : sizeof(int16_t); + c->srcFormat = pix_fmt; + c->dstFormat = pix_fmt; + c->dstBpc = bit_depth; + ff_sws_init_scale(c); for (int dstWi = 0; dstWi < FF_ARRAY_ELEMS(input_sizes); dstWi++) { int width = input_sizes[dstWi]; - for (int i = 0; i < width; i++) { - uint8_t r = rnd(); - dstU0[i] = (int16_t) r << 7; - dstV0[i] = (int16_t) r << 7; - dstU1[i] = (int16_t) r << 7; - dstV1[i] = (int16_t) r << 7; - } - ff_sws_init_scale(c); - if (check_func(c->chrConvertRange, "%s_%d", func_str, width)) { + if (check_func(c->chrConvertRange, "%s%d_%d", func_str, bit_depth, width)) { + randomize_buffers(dstU0, dstU1, bit_depth, width); + randomize_buffers(dstV0, dstV1, bit_depth, width); call_ref(dstU0, dstV0, width); call_new(dstU1, dstV1, width); - if (memcmp(dstU0, dstU1, width * sizeof(int16_t)) || - memcmp(dstV0, dstV1, width * sizeof(int16_t))) + if (memcmp(dstU0, dstU1, width * sample_size) || + memcmp(dstV0, dstV1, width * sample_size)) fail(); - if (width == LARGEST_INPUT_SIZE) + if (width == LARGEST_INPUT_SIZE && (bit_depth == 8 || bit_depth == 16)) bench_new(dstU1, dstV1, width); } } + } sws_freeContext(sws); }

1 0

checkasm/sw_range_convert: only run benchmarks on largest input width
by Ramiro Polla 27 Oct '24

27 Oct '24

ffmpeg | branch: master | Ramiro Polla <ramiro.polla(a)gmail.com> | Sun Sep 22 12:59:23 2024 +0200| [2c44393c011033f18131865d16ce3e01209bc6c2] | committer: Ramiro Polla checkasm/sw_range_convert: only run benchmarks on largest input width > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2c44393c011033f18… --- tests/checkasm/sw_range_convert.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/checkasm/sw_range_convert.c b/tests/checkasm/sw_range_convert.c index 121a459eb6..bce7a7e3e5 100644 --- a/tests/checkasm/sw_range_convert.c +++ b/tests/checkasm/sw_range_convert.c @@ -64,6 +64,7 @@ static void check_lumConvertRange(int from) call_new(dst1, width); if (memcmp(dst0, dst1, width * sizeof(int16_t))) fail(); + if (width == LARGEST_INPUT_SIZE) bench_new(dst1, width); } } @@ -113,6 +114,7 @@ static void check_chrConvertRange(int from) if (memcmp(dstU0, dstU1, width * sizeof(int16_t)) || memcmp(dstV0, dstV1, width * sizeof(int16_t))) fail(); + if (width == LARGEST_INPUT_SIZE) bench_new(dstU1, dstV1, width); } }

1 0

checkasm/sw_range_convert: reduce number of input sizes tested
by Ramiro Polla 27 Oct '24

27 Oct '24

ffmpeg | branch: master | Ramiro Polla <ramiro.polla(a)gmail.com> | Wed Sep 18 16:35:23 2024 +0200| [e308d09fba4dcfc585d1105848a024234fcb9b5b] | committer: Ramiro Polla checkasm/sw_range_convert: reduce number of input sizes tested Reduce input sizes to 8 (to test that the function works with widths smaller than the vector length) and 1920 (raising the largest input size to improve benchmark results). > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e308d09fba4dcfc58… --- tests/checkasm/sw_range_convert.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/checkasm/sw_range_convert.c b/tests/checkasm/sw_range_convert.c index 005a732f85..121a459eb6 100644 --- a/tests/checkasm/sw_range_convert.c +++ b/tests/checkasm/sw_range_convert.c @@ -31,8 +31,8 @@ static void check_lumConvertRange(int from) { const char *func_str = from ? "lumRangeFromJpeg" : "lumRangeToJpeg"; -#define LARGEST_INPUT_SIZE 512 - static const int input_sizes[] = {8, 24, 128, 144, 256, 512}; +#define LARGEST_INPUT_SIZE 1920 + static const int input_sizes[] = {8, LARGEST_INPUT_SIZE}; SwsContext *sws; SwsInternal *c; @@ -75,8 +75,8 @@ static void check_lumConvertRange(int from) static void check_chrConvertRange(int from) { const char *func_str = from ? "chrRangeFromJpeg" : "chrRangeToJpeg"; -#define LARGEST_INPUT_SIZE 512 - static const int input_sizes[] = {8, 24, 128, 144, 256, 512}; +#define LARGEST_INPUT_SIZE 1920 + static const int input_sizes[] = {8, LARGEST_INPUT_SIZE}; SwsContext *sws; SwsInternal *c;

1 0