nut: add 12/14 bit yuv to nut/raw
authorCarl Eugen Hoyos <cehoyos@ag.or.at>
Thu, 5 Jul 2012 02:20:58 +0000 (04:20 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 5 Jul 2012 02:23:55 +0000 (04:23 +0200)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/raw.c
libavformat/nut.c
tests/ref/lavfi/pixfmts_copy
tests/ref/lavfi/pixfmts_null
tests/ref/lavfi/pixfmts_pixdesctest
tests/ref/lavfi/pixfmts_scale
tests/ref/lavfi/pixfmts_vflip

index 8919a65..33160c4 100644 (file)
@@ -123,6 +123,18 @@ const PixelFormatTag ff_raw_pix_fmt_tags[] = {
     { PIX_FMT_YUV422P10BE, MKTAG(10 , 10 , '3', 'Y') },
     { PIX_FMT_YUV444P10LE, MKTAG('Y', '3',  0 , 10 ) },
     { PIX_FMT_YUV444P10BE, MKTAG(10 ,  0 , '3', 'Y') },
+    { PIX_FMT_YUV420P12LE, MKTAG('Y', '3', 11 , 12 ) },
+    { PIX_FMT_YUV420P12BE, MKTAG(12 , 11 , '3', 'Y') },
+    { PIX_FMT_YUV422P12LE, MKTAG('Y', '3', 10 , 12 ) },
+    { PIX_FMT_YUV422P12BE, MKTAG(12 , 10 , '3', 'Y') },
+    { PIX_FMT_YUV444P12LE, MKTAG('Y', '3',  0 , 12 ) },
+    { PIX_FMT_YUV444P12BE, MKTAG(12 ,  0 , '3', 'Y') },
+    { PIX_FMT_YUV420P14LE, MKTAG('Y', '3', 11 , 14 ) },
+    { PIX_FMT_YUV420P14BE, MKTAG(14 , 11 , '3', 'Y') },
+    { PIX_FMT_YUV422P14LE, MKTAG('Y', '3', 10 , 14 ) },
+    { PIX_FMT_YUV422P14BE, MKTAG(14 , 10 , '3', 'Y') },
+    { PIX_FMT_YUV444P14LE, MKTAG('Y', '3',  0 , 14 ) },
+    { PIX_FMT_YUV444P14BE, MKTAG(14 ,  0 , '3', 'Y') },
     { PIX_FMT_YUV420P16LE, MKTAG('Y', '3', 11 , 16 ) },
     { PIX_FMT_YUV420P16BE, MKTAG(16 , 11 , '3', 'Y') },
     { PIX_FMT_YUV422P16LE, MKTAG('Y', '3', 10 , 16 ) },
index 0f9044c..4684cbe 100644 (file)
@@ -84,6 +84,18 @@ const AVCodecTag ff_nut_video_tags[] = {
     { CODEC_ID_RAWVIDEO, MKTAG(10 , 10 , '3', 'Y') },
     { CODEC_ID_RAWVIDEO, MKTAG('Y', '3',  0 , 10 ) },
     { CODEC_ID_RAWVIDEO, MKTAG(10 ,  0 , '3', 'Y') },
+    { CODEC_ID_RAWVIDEO, MKTAG('Y', '3', 11 , 12 ) },
+    { CODEC_ID_RAWVIDEO, MKTAG(12 , 11 , '3', 'Y') },
+    { CODEC_ID_RAWVIDEO, MKTAG('Y', '3', 10 , 12 ) },
+    { CODEC_ID_RAWVIDEO, MKTAG(12 , 10 , '3', 'Y') },
+    { CODEC_ID_RAWVIDEO, MKTAG('Y', '3',  0 , 12 ) },
+    { CODEC_ID_RAWVIDEO, MKTAG(12 ,  0 , '3', 'Y') },
+    { CODEC_ID_RAWVIDEO, MKTAG('Y', '3', 11 , 14 ) },
+    { CODEC_ID_RAWVIDEO, MKTAG(14 , 11 , '3', 'Y') },
+    { CODEC_ID_RAWVIDEO, MKTAG('Y', '3', 10 , 14 ) },
+    { CODEC_ID_RAWVIDEO, MKTAG(14 , 10 , '3', 'Y') },
+    { CODEC_ID_RAWVIDEO, MKTAG('Y', '3',  0 , 14 ) },
+    { CODEC_ID_RAWVIDEO, MKTAG(14 ,  0 , '3', 'Y') },
     { CODEC_ID_RAWVIDEO, MKTAG('Y', '1',  0 , 16 ) },
     { CODEC_ID_RAWVIDEO, MKTAG(16 ,  0 , '1', 'Y') },
     { CODEC_ID_RAWVIDEO, MKTAG('Y', '3', 11 , 16 ) },
index 2df6c30..837798c 100644 (file)
@@ -42,10 +42,10 @@ yuv411p             8b298af3e43348ca1b11eb8a3252ac6c
 yuv420p             eba2f135a08829387e2f698ff72a2939
 yuv420p10be         2f88c301feeaccd2a5fb55f54fc30be9
 yuv420p10le         93f175084af4e78f97c7710e505f3057
-yuv420p12be         4a5001c006b8ee177d10fe9fdb59b98a
-yuv420p12le         d8aa40e7907413d396f9b4ce55ae3a84
-yuv420p14be         cb3f0486a1eaa92bd2bf69c43eabf0b3
-yuv420p14le         f15e2673af0eb0d896caf9448b4422c4
+yuv420p12be         bbe2f6e9979345d3b99f387f6d473a57
+yuv420p12le         3d2d568c6d6bc310418173e8061efdb4
+yuv420p14be         45a8c959605b0f744cb35a4ffa774c25
+yuv420p14le         febbaa1cebff4f8f5fbd03d93b921812
 yuv420p16be         ba858ff4246368c28f03152487f57ef3
 yuv420p16le         de239729a4fe1d4cfa3743e006654e78
 yuv420p9be          64e36fd90573f67ac2006d103972a79b
@@ -53,10 +53,10 @@ yuv420p9le          9ed4b1dfabc53fd9e586ff6c4c43af80
 yuv422p             c9bba4529821d796a6ab09f6a5fd355a
 yuv422p10be         11af7dfafe8bc025c7e3bd82b830fe8a
 yuv422p10le         ec04efb76efa79bf0d02b21572371a56
-yuv422p12be         bdc13b630fd668b34c6fe1aae28dfc71
-yuv422p12le         d0607c260a45c973e6639f4e449730ad
-yuv422p14be         bdc13b630fd668b34c6fe1aae28dfc71
-yuv422p14le         d0607c260a45c973e6639f4e449730ad
+yuv422p12be         de756337b5b8dc021e6a0572090965fc
+yuv422p12le         7961e16d99fbb97f1f179e77474b650d
+yuv422p14be         33525ea5f76cc6e9597c1f7ae4356646
+yuv422p14le         5ccd364f299cc438104ad7c62cff38a1
 yuv422p16be         5499502e1c29534a158a1fe60e889f60
 yuv422p16le         e3d61fde6978591596bc36b914386623
 yuv422p9be          29b71579946940a8c00fa844c9dff507
@@ -65,10 +65,10 @@ yuv440p             5a064afe2b453bb52cdb3f176b1aa1cf
 yuv444p             0a98447b78fd476aa39686da6a74fa2e
 yuv444p10be         71be185a2fb7a353eb024df9bc63212d
 yuv444p10le         c1c6b30a12065c7901c0a267e4861a0f
-yuv444p12be         e65cbae7e4f1892c23defbc8e8052cf6
-yuv444p12le         767179dd82846cf00ee4c340c9c1ab74
-yuv444p14be         e65cbae7e4f1892c23defbc8e8052cf6
-yuv444p14le         767179dd82846cf00ee4c340c9c1ab74
+yuv444p12be         8dfc1cc7649e674a3e9a5f9e238eb11c
+yuv444p12le         e7fefaf5ba459cdd28e07d9b86dc3017
+yuv444p14be         019b3ee692b36adb1f44d0232e1b2a70
+yuv444p14le         6c56538e2adf4a1c97c944e3213dc3a9
 yuv444p16be         1c6ea2c2f5e539006112ceec3d4e7d90
 yuv444p16le         20f86bc2f68d2b3f1f2b48b97b2189f4
 yuv444p9be          6ab31f4c12b533ce318ecdff83cdd054
index 2df6c30..837798c 100644 (file)
@@ -42,10 +42,10 @@ yuv411p             8b298af3e43348ca1b11eb8a3252ac6c
 yuv420p             eba2f135a08829387e2f698ff72a2939
 yuv420p10be         2f88c301feeaccd2a5fb55f54fc30be9
 yuv420p10le         93f175084af4e78f97c7710e505f3057
-yuv420p12be         4a5001c006b8ee177d10fe9fdb59b98a
-yuv420p12le         d8aa40e7907413d396f9b4ce55ae3a84
-yuv420p14be         cb3f0486a1eaa92bd2bf69c43eabf0b3
-yuv420p14le         f15e2673af0eb0d896caf9448b4422c4
+yuv420p12be         bbe2f6e9979345d3b99f387f6d473a57
+yuv420p12le         3d2d568c6d6bc310418173e8061efdb4
+yuv420p14be         45a8c959605b0f744cb35a4ffa774c25
+yuv420p14le         febbaa1cebff4f8f5fbd03d93b921812
 yuv420p16be         ba858ff4246368c28f03152487f57ef3
 yuv420p16le         de239729a4fe1d4cfa3743e006654e78
 yuv420p9be          64e36fd90573f67ac2006d103972a79b
@@ -53,10 +53,10 @@ yuv420p9le          9ed4b1dfabc53fd9e586ff6c4c43af80
 yuv422p             c9bba4529821d796a6ab09f6a5fd355a
 yuv422p10be         11af7dfafe8bc025c7e3bd82b830fe8a
 yuv422p10le         ec04efb76efa79bf0d02b21572371a56
-yuv422p12be         bdc13b630fd668b34c6fe1aae28dfc71
-yuv422p12le         d0607c260a45c973e6639f4e449730ad
-yuv422p14be         bdc13b630fd668b34c6fe1aae28dfc71
-yuv422p14le         d0607c260a45c973e6639f4e449730ad
+yuv422p12be         de756337b5b8dc021e6a0572090965fc
+yuv422p12le         7961e16d99fbb97f1f179e77474b650d
+yuv422p14be         33525ea5f76cc6e9597c1f7ae4356646
+yuv422p14le         5ccd364f299cc438104ad7c62cff38a1
 yuv422p16be         5499502e1c29534a158a1fe60e889f60
 yuv422p16le         e3d61fde6978591596bc36b914386623
 yuv422p9be          29b71579946940a8c00fa844c9dff507
@@ -65,10 +65,10 @@ yuv440p             5a064afe2b453bb52cdb3f176b1aa1cf
 yuv444p             0a98447b78fd476aa39686da6a74fa2e
 yuv444p10be         71be185a2fb7a353eb024df9bc63212d
 yuv444p10le         c1c6b30a12065c7901c0a267e4861a0f
-yuv444p12be         e65cbae7e4f1892c23defbc8e8052cf6
-yuv444p12le         767179dd82846cf00ee4c340c9c1ab74
-yuv444p14be         e65cbae7e4f1892c23defbc8e8052cf6
-yuv444p14le         767179dd82846cf00ee4c340c9c1ab74
+yuv444p12be         8dfc1cc7649e674a3e9a5f9e238eb11c
+yuv444p12le         e7fefaf5ba459cdd28e07d9b86dc3017
+yuv444p14be         019b3ee692b36adb1f44d0232e1b2a70
+yuv444p14le         6c56538e2adf4a1c97c944e3213dc3a9
 yuv444p16be         1c6ea2c2f5e539006112ceec3d4e7d90
 yuv444p16le         20f86bc2f68d2b3f1f2b48b97b2189f4
 yuv444p9be          6ab31f4c12b533ce318ecdff83cdd054
index d11c290..b36a7fe 100644 (file)
@@ -42,10 +42,10 @@ yuv411p             8b298af3e43348ca1b11eb8a3252ac6c
 yuv420p             eba2f135a08829387e2f698ff72a2939
 yuv420p10be         2f88c301feeaccd2a5fb55f54fc30be9
 yuv420p10le         93f175084af4e78f97c7710e505f3057
-yuv420p12be         4a5001c006b8ee177d10fe9fdb59b98a
-yuv420p12le         d8aa40e7907413d396f9b4ce55ae3a84
-yuv420p14be         cb3f0486a1eaa92bd2bf69c43eabf0b3
-yuv420p14le         f15e2673af0eb0d896caf9448b4422c4
+yuv420p12be         bbe2f6e9979345d3b99f387f6d473a57
+yuv420p12le         3d2d568c6d6bc310418173e8061efdb4
+yuv420p14be         45a8c959605b0f744cb35a4ffa774c25
+yuv420p14le         febbaa1cebff4f8f5fbd03d93b921812
 yuv420p16be         ba858ff4246368c28f03152487f57ef3
 yuv420p16le         de239729a4fe1d4cfa3743e006654e78
 yuv420p9be          64e36fd90573f67ac2006d103972a79b
@@ -53,10 +53,10 @@ yuv420p9le          9ed4b1dfabc53fd9e586ff6c4c43af80
 yuv422p             c9bba4529821d796a6ab09f6a5fd355a
 yuv422p10be         11af7dfafe8bc025c7e3bd82b830fe8a
 yuv422p10le         ec04efb76efa79bf0d02b21572371a56
-yuv422p12be         bdc13b630fd668b34c6fe1aae28dfc71
-yuv422p12le         d0607c260a45c973e6639f4e449730ad
-yuv422p14be         bdc13b630fd668b34c6fe1aae28dfc71
-yuv422p14le         d0607c260a45c973e6639f4e449730ad
+yuv422p12be         de756337b5b8dc021e6a0572090965fc
+yuv422p12le         7961e16d99fbb97f1f179e77474b650d
+yuv422p14be         33525ea5f76cc6e9597c1f7ae4356646
+yuv422p14le         5ccd364f299cc438104ad7c62cff38a1
 yuv422p16be         5499502e1c29534a158a1fe60e889f60
 yuv422p16le         e3d61fde6978591596bc36b914386623
 yuv422p9be          29b71579946940a8c00fa844c9dff507
@@ -65,10 +65,10 @@ yuv440p             5a064afe2b453bb52cdb3f176b1aa1cf
 yuv444p             0a98447b78fd476aa39686da6a74fa2e
 yuv444p10be         71be185a2fb7a353eb024df9bc63212d
 yuv444p10le         c1c6b30a12065c7901c0a267e4861a0f
-yuv444p12be         e65cbae7e4f1892c23defbc8e8052cf6
-yuv444p12le         767179dd82846cf00ee4c340c9c1ab74
-yuv444p14be         e65cbae7e4f1892c23defbc8e8052cf6
-yuv444p14le         767179dd82846cf00ee4c340c9c1ab74
+yuv444p12be         8dfc1cc7649e674a3e9a5f9e238eb11c
+yuv444p12le         e7fefaf5ba459cdd28e07d9b86dc3017
+yuv444p14be         019b3ee692b36adb1f44d0232e1b2a70
+yuv444p14le         6c56538e2adf4a1c97c944e3213dc3a9
 yuv444p16be         1c6ea2c2f5e539006112ceec3d4e7d90
 yuv444p16le         20f86bc2f68d2b3f1f2b48b97b2189f4
 yuv444p9be          6ab31f4c12b533ce318ecdff83cdd054
index 635f32f..6b79d5e 100644 (file)
@@ -42,10 +42,10 @@ yuv411p             1143e7c5cc28fe0922b051b17733bc4c
 yuv420p             fdad2d8df8985e3d17e73c71f713cb14
 yuv420p10be         418039dbd82cf612db88417276aa0d1a
 yuv420p10le         ff7e5321208ab995b4f95634ebdf192b
-yuv420p12be         e50f22a1af717c8e986b760e082f67b9
-yuv420p12le         b94dae7fcf3f97cb591d727564168602
-yuv420p14be         6d335e75b553da590135cf8bb999610c
-yuv420p14le         d510ddbabefd03ef39ec943fcb51b709
+yuv420p12be         816c566952179b9723d68b5031882c09
+yuv420p12le         7bc483edbca22ae9e4e09395adc7a4ca
+yuv420p14be         d00e95efb73c5598c73922c909193dbf
+yuv420p14le         9cd18a56ff50aa4fde7294d2f67ec4fa
 yuv420p16be         31988e9a5d6acacaa710f67bc1172f3a
 yuv420p16le         f5390ce399f88e0e4e2621ed7833b250
 yuv420p9be          ec4983b7a949c0472110a7a2c58e278a
@@ -53,10 +53,10 @@ yuv420p9le          c136dce5913a722eee44ab72cff664b2
 yuv422p             918e37701ee7377d16a8a6c119c56a40
 yuv422p10be         315654908d50718e175aae018c484732
 yuv422p10le         91bbc78a9a56f659b55abc17722dcc09
-yuv422p12be         0e15336f06c20eb0224dbbb3c45e579e
-yuv422p12le         223b9235c541365d994160e7ff5bedf7
-yuv422p14be         091c5e50b7aff789f8f49d02aeb98cdb
-yuv422p14le         a42363449e2acbe784a57f15b389ded8
+yuv422p12be         3c50e9a3365da86e8b0645210d3679cc
+yuv422p12le         762051def8a4b3994b91099722fab749
+yuv422p14be         09d11457639e808f0db8428aabcdf97a
+yuv422p14le         041a8f46e026eb4d01770a5fa2f8fd28
 yuv422p16be         e7e34fe9264784763ab6cb406524c0f3
 yuv422p16le         c435b76b08204dda6908640fb5fd4621
 yuv422p9be          82494823944912f73cebc58ad2979bbd
@@ -65,10 +65,10 @@ yuv440p             461503fdb9b90451020aa3b25ddf041c
 yuv444p             81b2eba962d12e8d64f003ac56f6faf2
 yuv444p10be         fb304d77c6d2e18df5938662a22176f0
 yuv444p10le         b17136913eb066dca6be6af645b9f7e8
-yuv444p12be         eb0102b8ccbf3c0f1e493ebe8990345f
-yuv444p12le         059ee3758b0f184decc84ee16a574d1a
-yuv444p14be         00656b655ebc6d7d8787c966365d75c2
-yuv444p14le         3d7d0b41989fb416cb200533bad9435d
+yuv444p12be         55270eda3e388a0cb4d24c07bbf9677d
+yuv444p12le         fb6fca8a8578c482381e19efe8ce7dc8
+yuv444p14be         b3fb36c759967caf2d83dce3ed5f993d
+yuv444p14le         818c5583fa2e0b9befb3f60d58ece6c3
 yuv444p16be         0da9bed80f5542682ab286f3261cf24c
 yuv444p16le         a0c5d3c7bf3f181db503cf8e450d1335
 yuv444p9be          9ac2643ce7f7e5c4e17c8c9fd8494d4a
index 29dddd3..bae562b 100644 (file)
@@ -42,10 +42,10 @@ yuv411p             4a90048cc3a65fac150e53289700efe1
 yuv420p             2e6d6062e8cad37fb3ab2c433b55f382
 yuv420p10be         7ce787a888381dd46b0212c099ecaad9
 yuv420p10le         bf22a1c543a7b3dbc556a0eb9592e179
-yuv420p12be         dca4f9402d34c83a524ab319126e9948
-yuv420p12le         1800b5a8edc5997b79c12a645058da87
-yuv420p14be         0199fb46ed3e20d09aa226d444b875f9
-yuv420p14le         1f9a0543e0c1efa5e42ccb9f21a96f9e
+yuv420p12be         0304b4232d7ad0f0b98226b77c0a3bc4
+yuv420p12le         4a6560a4b6bef0824bb9cbd7e87f2ceb
+yuv420p14be         ebb012d885d41f9c4ee0228b097e4884
+yuv420p14le         52e5cca511d815f925698865e825d995
 yuv420p16be         b6d25ba55bc1831d352f379311b42b6d
 yuv420p16le         1d7ef427b6f79a02b93948738dab5442
 yuv420p9be          9865bf5c4392b56b1c4eb4f5a3fd32f9
@@ -53,10 +53,10 @@ yuv420p9le          0f1e371a1374d3cba2205b70cc7cac90
 yuv422p             d7f5cb44d9b0210d66d6a8762640ab34
 yuv422p10be         0be8378c3773e1c0b394315ef4994351
 yuv422p10le         6518094fe8de6bee95af21af1e5dc1e1
-yuv422p12be         588fe319b96513c32e21d3e32b45447f
-yuv422p12le         11b57f2bd9661024153f3973b9090cdb
-yuv422p14be         588fe319b96513c32e21d3e32b45447f
-yuv422p14le         11b57f2bd9661024153f3973b9090cdb
+yuv422p12be         2998546db265475930000ab8036422c7
+yuv422p12le         dc05df449f359dba9a1c3d2c1acb4efe
+yuv422p14be         3b512941aad47f2f7b8d051fbc989455
+yuv422p14le         c39ee86727d9414edbdf83f41a644f9b
 yuv422p16be         9bd8f8c961822b586fa4cf992be54acc
 yuv422p16le         9c4a1239605c7952b736ac3130163f14
 yuv422p9be          7c6f1e140b3999ee7d923854e507752a
@@ -65,10 +65,10 @@ yuv440p             876385e96165acf51271b20e5d85a416
 yuv444p             9c3c667d1613b72d15bc6d851c5eb8f7
 yuv444p10be         ee069cc6db48975eb029d72f889a7fe6
 yuv444p10le         645b3335248113cafe3c29edb1d7f3be
-yuv444p12be         944a4997c4edb3a8dd0f0493cfd5a1fd
-yuv444p12le         2d0947ae89ecc6a501eee6832cb27e06
-yuv444p14be         944a4997c4edb3a8dd0f0493cfd5a1fd
-yuv444p14le         2d0947ae89ecc6a501eee6832cb27e06
+yuv444p12be         9642a8a8d500cb215f140c58c84da413
+yuv444p12le         017322d353981fedb42cacc6aab5c1d4
+yuv444p14be         f32c0a1f94787a471267f1f33120e2db
+yuv444p14le         5fd471119cef50a49d0664a796729177
 yuv444p16be         de2dedfc6f12073ffead113f86e07ecf
 yuv444p16le         8e83323cf102d6c823a03ae8a7b7e033
 yuv444p9be          6ac92b7dc9ab2fc59bee99204886899a