[FFmpeg-cvslog] nut: add gray12 support
Michael Niedermayer
git at videolan.org
Thu Nov 10 03:16:34 EET 2016
ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Thu Nov 10 01:05:42 2016 +0100| [2bc66d9e432005c71c17565c28496be5308e023b] | committer: Michael Niedermayer
nut: add gray12 support
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2bc66d9e432005c71c17565c28496be5308e023b
---
libavcodec/raw.c | 2 ++
libavformat/nut.c | 2 ++
tests/ref/fate/filter-pixdesc-gray12be | 2 +-
tests/ref/fate/filter-pixdesc-gray12le | 2 +-
tests/ref/fate/filter-pixfmts-copy | 4 ++--
tests/ref/fate/filter-pixfmts-crop | 4 ++--
tests/ref/fate/filter-pixfmts-field | 4 ++--
tests/ref/fate/filter-pixfmts-fieldorder | 4 ++--
tests/ref/fate/filter-pixfmts-hflip | 4 ++--
tests/ref/fate/filter-pixfmts-il | 4 ++--
tests/ref/fate/filter-pixfmts-null | 4 ++--
tests/ref/fate/filter-pixfmts-pad | 2 +-
tests/ref/fate/filter-pixfmts-scale | 4 ++--
tests/ref/fate/filter-pixfmts-vflip | 4 ++--
14 files changed, 25 insertions(+), 21 deletions(-)
diff --git a/libavcodec/raw.c b/libavcodec/raw.c
index f73a134..1e11345 100644
--- a/libavcodec/raw.c
+++ b/libavcodec/raw.c
@@ -119,6 +119,8 @@ const PixelFormatTag ff_raw_pix_fmt_tags[] = {
{ AV_PIX_FMT_RGB48BE, MKTAG( 48, 'R', 'G', 'B') },
{ AV_PIX_FMT_BGR48LE, MKTAG('B', 'G', 'R', 48 ) },
{ AV_PIX_FMT_BGR48BE, MKTAG( 48, 'B', 'G', 'R') },
+ { AV_PIX_FMT_GRAY12LE, MKTAG('Y', '1', 0 , 12 ) },
+ { AV_PIX_FMT_GRAY12BE, MKTAG(12 , 0 , '1', 'Y') },
{ AV_PIX_FMT_GRAY16LE, MKTAG('Y', '1', 0 , 16 ) },
{ AV_PIX_FMT_GRAY16BE, MKTAG(16 , 0 , '1', 'Y') },
{ AV_PIX_FMT_YUV420P9LE, MKTAG('Y', '3', 11 , 9 ) },
diff --git a/libavformat/nut.c b/libavformat/nut.c
index 452fc35..04776e2 100644
--- a/libavformat/nut.c
+++ b/libavformat/nut.c
@@ -142,6 +142,8 @@ const AVCodecTag ff_nut_video_tags[] = {
{ AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '4', 0, 10) },
{ AV_CODEC_ID_RAWVIDEO, MKTAG(10, 0, '4', 'Y') },
+ { AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '1', 0, 12) },
+ { AV_CODEC_ID_RAWVIDEO, MKTAG(12, 0, '1', 'Y') },
{ AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '1', 0, 16) },
{ AV_CODEC_ID_RAWVIDEO, MKTAG(16, 0, '1', 'Y') },
{ AV_CODEC_ID_RAWVIDEO, MKTAG('Y', '4', 11, 16) },
diff --git a/tests/ref/fate/filter-pixdesc-gray12be b/tests/ref/fate/filter-pixdesc-gray12be
index 36b83b8..3c843f0 100644
--- a/tests/ref/fate/filter-pixdesc-gray12be
+++ b/tests/ref/fate/filter-pixdesc-gray12be
@@ -1 +1 @@
-pixdesc-gray12be 70e9407f889eff43c03fb7820be6b036
+pixdesc-gray12be 13d6d8d2656fdccb8bcb9a4c573fc1f7
diff --git a/tests/ref/fate/filter-pixdesc-gray12le b/tests/ref/fate/filter-pixdesc-gray12le
index 266267f..5dbad1d 100644
--- a/tests/ref/fate/filter-pixdesc-gray12le
+++ b/tests/ref/fate/filter-pixdesc-gray12le
@@ -1 +1 @@
-pixdesc-gray12le 9695430c20d61979c628f2a0b3a4adc7
+pixdesc-gray12le 9e42f419cdf05b2bfc8760520767f759
diff --git a/tests/ref/fate/filter-pixfmts-copy b/tests/ref/fate/filter-pixfmts-copy
index 967a47f..c39ea51 100644
--- a/tests/ref/fate/filter-pixfmts-copy
+++ b/tests/ref/fate/filter-pixfmts-copy
@@ -33,8 +33,8 @@ gbrp14le 1607f5c8f13360b53b8186f523996b1b
gbrp9be a4dc6f6f9bb051de2dc348b592ad4282
gbrp9le 699da3a3b324f3fd001a56aee9683384
gray 188590b1231afd231ea910815aef2b25
-gray12be 8375654261417e91589008bc7b7872d5
-gray12le e4adfe848d5c55f8765619d4117d1b75
+gray12be fb9c00496453d233d2f0f0f81141bc31
+gray12le c3cccaeb21ed9b894f9ef99ebebaf1cd
gray16be 08d997a3faa25a3db9d6be272d282eef
gray16le df65eb804360795e3e38a2701fa9641a
monob 8b04f859fee6a0be856be184acd7a0b5
diff --git a/tests/ref/fate/filter-pixfmts-crop b/tests/ref/fate/filter-pixfmts-crop
index 811c39f..d4319b8 100644
--- a/tests/ref/fate/filter-pixfmts-crop
+++ b/tests/ref/fate/filter-pixfmts-crop
@@ -33,8 +33,8 @@ gbrp14le d4764dba3c3efd1263c2c8e0f5ac9f6a
gbrp9be 4af43999e5e9742992b6550ea5ad9b23
gbrp9le b4cbfa7878706a14295f09212e41f7fe
gray 0d70b54b4b888ec4dbd89713620ac1ee
-gray12be dba5691dea1c70b7b595c908ee739319
-gray12le 8000def742a6786371226cbd44bb5623
+gray12be ffc8ec5de51e2998d666a5e209d1f7f5
+gray12le 548dc0885922d2f5898a904b40287b92
gray16be 38f599da990224de86e3dc7a543121a9
gray16le 9ff7c866bd98def4e6c91542c1c45f80
nv12 92cda427f794374731ec0321ee00caac
diff --git a/tests/ref/fate/filter-pixfmts-field b/tests/ref/fate/filter-pixfmts-field
index 534ecc4..380a53b 100644
--- a/tests/ref/fate/filter-pixfmts-field
+++ b/tests/ref/fate/filter-pixfmts-field
@@ -33,8 +33,8 @@ gbrp14le ed9ccbc7a4f3e269a2ec37d210359fd8
gbrp9be 170da3a8644cbea61c3caeadc45354c5
gbrp9le da5d80e6f12cabaa7081bb85d3b7fd30
gray 57fd8e6e00f6be8752726005974cce1b
-gray12be 0e21613faa5cbc694fd1890af7c94eba
-gray12le 900bb0c8a2393304db57c0387cc06655
+gray12be cb75ba58b07cdf33fb3a75f6c1f139eb
+gray12le a243f45461d946e70c5a7f3f8eff37f1
gray16be e1700e056de9917744a7ff4ab2ca63fd
gray16le 338de7ac5f7d36d5ad5ac2c8d5bbea68
monob 2129cc72a484d7e10a44de9117aa9f80
diff --git a/tests/ref/fate/filter-pixfmts-fieldorder b/tests/ref/fate/filter-pixfmts-fieldorder
index 0bfdf8c..6170916 100644
--- a/tests/ref/fate/filter-pixfmts-fieldorder
+++ b/tests/ref/fate/filter-pixfmts-fieldorder
@@ -33,8 +33,8 @@ gbrp14le b01b1a05d8de36f51a133d25102fe1f3
gbrp9be b8d294d4bc81ceef1fb529e917c02e48
gbrp9le 0d42cc9e222d806c33172781b45cb3e3
gray d96e0f1c73d3f0b9506d691b5cd36c73
-gray12be 735e47ae85f878954a07c817996d289a
-gray12le 6a56b7f5b010a18a4abe12a5d80f6d30
+gray12be 37950a95be3ada46b6404b1e1860fd93
+gray12le c7431f01abd6e639bab036a46a18e423
gray16be 293a36548ce16543494790f8f7f76a05
gray16le 84f83f5fcbb5d458efb8395a50a3797e
rgb0 2e3d8c91c7a83d451593dfd06607ff39
diff --git a/tests/ref/fate/filter-pixfmts-hflip b/tests/ref/fate/filter-pixfmts-hflip
index 0fb812d..1bde49c 100644
--- a/tests/ref/fate/filter-pixfmts-hflip
+++ b/tests/ref/fate/filter-pixfmts-hflip
@@ -33,8 +33,8 @@ gbrp14le 91bb636f4e1f5d50312b136c185542e9
gbrp9be 174de037c2a9f2b6fb4d9444ae0ff82f
gbrp9le ba7c2631fb2967aa909c66509bd243fe
gray 8bd4ece1dbf89b20ee785e0515356e07
-gray12be c2ef1cde6ea344aafe5704acd6647bd0
-gray12le 0da963962f2c58e3cb0389e9747fc739
+gray12be aff18f944e023a767c59357eb362fab2
+gray12le 6a50f886754a32a01254bddbb0823880
gray16be cf7294d9aa23e1b838692ec01ade587b
gray16le d91ce41e304419bcf32ac792f01bd64f
nv12 801e58f1be5fd0b5bc4bf007c604b0b4
diff --git a/tests/ref/fate/filter-pixfmts-il b/tests/ref/fate/filter-pixfmts-il
index bd824a4..431a2a9 100644
--- a/tests/ref/fate/filter-pixfmts-il
+++ b/tests/ref/fate/filter-pixfmts-il
@@ -33,8 +33,8 @@ gbrp14le bf3d5dec9b58cecd4ca1c5d3a4d57c31
gbrp9be f029d87fa642f4261160471ad27fd53f
gbrp9le b310d3cf37f7b41d706155993f8f0584
gray 52ae18648161ac43144f5c9cd2127786
-gray12be 40aa2f5c03092d3fb62756b79764806f
-gray12le 18cc77553b14f9591db48fa9a7384ade
+gray12be cbff647cbf9693e95ce67ee663447afa
+gray12le e44a1ed1755441ecf07ad7dbe2e033fa
gray16be 92c3b09f371b610cc1b6a9776034f4d0
gray16le 1db278d23a554e01910cedacc6c02521
monob faba75df28033ba7ce3d82ff2a99ee68
diff --git a/tests/ref/fate/filter-pixfmts-null b/tests/ref/fate/filter-pixfmts-null
index 967a47f..c39ea51 100644
--- a/tests/ref/fate/filter-pixfmts-null
+++ b/tests/ref/fate/filter-pixfmts-null
@@ -33,8 +33,8 @@ gbrp14le 1607f5c8f13360b53b8186f523996b1b
gbrp9be a4dc6f6f9bb051de2dc348b592ad4282
gbrp9le 699da3a3b324f3fd001a56aee9683384
gray 188590b1231afd231ea910815aef2b25
-gray12be 8375654261417e91589008bc7b7872d5
-gray12le e4adfe848d5c55f8765619d4117d1b75
+gray12be fb9c00496453d233d2f0f0f81141bc31
+gray12le c3cccaeb21ed9b894f9ef99ebebaf1cd
gray16be 08d997a3faa25a3db9d6be272d282eef
gray16le df65eb804360795e3e38a2701fa9641a
monob 8b04f859fee6a0be856be184acd7a0b5
diff --git a/tests/ref/fate/filter-pixfmts-pad b/tests/ref/fate/filter-pixfmts-pad
index b4c3c6a..4bef06c 100644
--- a/tests/ref/fate/filter-pixfmts-pad
+++ b/tests/ref/fate/filter-pixfmts-pad
@@ -14,7 +14,7 @@ gbrp12le 91fdad0d1edf7bfa2805e2041e8da3cd
gbrp14le deb2c3af6b48faa52f6a1f6590a0cdf7
gbrp9le 9e827f438e081d334a6cae7e282698b0
gray ddc663a0491df3959d9c5795dceaa72e
-gray12le c8a531d125f738530cef6a307e29413b
+gray12le 94b3d77e56b5a094720842fea6138cb1
gray16le 468bda6155bdc7a7a20c34d6e599fd16
nv12 381574979cb04be10c9168540310afad
nv21 0fdeb2cdd56cf5a7147dc273456fa217
diff --git a/tests/ref/fate/filter-pixfmts-scale b/tests/ref/fate/filter-pixfmts-scale
index 7e03120..05f3512 100644
--- a/tests/ref/fate/filter-pixfmts-scale
+++ b/tests/ref/fate/filter-pixfmts-scale
@@ -33,8 +33,8 @@ gbrp14le 456f7d1ff5990aa6379137d84dd63862
gbrp9be d9c88968001e1452ff31fbc8d16b18a0
gbrp9le 2ccfed0816bf6bd4bb3a5b7591d9603a
gray 221201cc7cfc4964eacd8b3e426fd276
-gray12be b2da9b7739444cfaf88af7e005beea03
-gray12le 236e83ecc19a3bc74f8857e24482667c
+gray12be 7ae04a6e966d23df34f95dc66507d334
+gray12le 255a75f40496c3adcd07700441dfc307
gray16be 32891cb0928b1119d8d43a6e1bef0e2b
gray16le f96cfb5652b090dad52615930f0ce65f
monob f01cb0b623357387827902d9d0963435
diff --git a/tests/ref/fate/filter-pixfmts-vflip b/tests/ref/fate/filter-pixfmts-vflip
index 809e121..ed423fc 100644
--- a/tests/ref/fate/filter-pixfmts-vflip
+++ b/tests/ref/fate/filter-pixfmts-vflip
@@ -33,8 +33,8 @@ gbrp14le 6e93b87047e433995111eb5397751c3f
gbrp9be 99c694dd47d12ae48fc8f47a0c410333
gbrp9le 26e103a4ab99fb3f58667df490997a36
gray 41811422d5819ed69389357294384c10
-gray12be 012299269000e424670e711f811c2d63
-gray12le d62aeaaf4974b934fd2c783892e38b96
+gray12be 29dd81b58b749d0037ba28430df77ded
+gray12le 989cb5cefd6aff20b732068e15ad2a88
gray16be 29f24ba7cb0fc4fd2ae78963d008f6e6
gray16le a37e9c4ea76e8eeddc2af8f600ba2c10
monob 7810c4857822ccfc844d78f5e803269a
More information about the ffmpeg-cvslog
mailing list