1. ffmpeg
  2. Commit e2bb185e62e3017735d39ab3e38b7d4f11541ba4
Browse code

nut: Support XYZ12 rawvideo

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Michael Niedermayer authored on 2014/01/11 01:50:33
Showing 13 changed files
Changelog
History View file @ e2bb185
... ... 
@@ -19,6 +19,7 @@ version <next>
19 19 
 - VP8 in Ogg demuxing
20 20 
 - side & metadata support in NUT
21 21 
 - framepack filter
22 
+- XYZ12 rawvideo support in NUT
22 23
23 24
24 25 
 version 2.1:
libavcodec/raw.c
History View file @ e2bb185
... ... 
@@ -178,6 +178,9 @@ const PixelFormatTag ff_raw_pix_fmt_tags[] = {
178 178 
     { AV_PIX_FMT_GBRP16LE,     MKTAG('G', '3', 00 , 16 ) },
179 179 
     { AV_PIX_FMT_GBRP16BE,     MKTAG(16 , 00 , '3', 'G') },
180 180
181 
+    { AV_PIX_FMT_XYZ12LE,      MKTAG('X', 'Y', 'Z' , 36 ) },
182 
+    { AV_PIX_FMT_XYZ12BE,      MKTAG(36 , 'Z' , 'Y', 'X') },
183 
+
181 184 
     /* quicktime */
182 185 
     { AV_PIX_FMT_YUV420P, MKTAG('R', '4', '2', '0') }, /* Radius DV YUV PAL */
183 186 
     { AV_PIX_FMT_YUV411P, MKTAG('R', '4', '1', '1') }, /* Radius DV YUV NTSC */
libavformat/nut.c
History View file @ e2bb185
... ... 
@@ -157,6 +157,9 @@ const AVCodecTag ff_nut_video_tags[] = {
157 157 
     { AV_CODEC_ID_RAWVIDEO,         MKTAG('G', '3',   0,  16) },
158 158 
     { AV_CODEC_ID_RAWVIDEO,         MKTAG(16,    0, '3', 'G') },
159 159
160 
+    { AV_CODEC_ID_RAWVIDEO,         MKTAG('X', 'Y', 'Z' , 36 ) },
161 
+    { AV_CODEC_ID_RAWVIDEO,         MKTAG(36 , 'Z' , 'Y', 'X') },
162 
+
160 163 
     { AV_CODEC_ID_NONE,             0 }
161 164 
 };
162 165
tests/ref/fate/filter-pixdesc
History View file @ e2bb185
... ... 
@@ -48,8 +48,8 @@ rgba                53796fa4c392a1b2659595b6a284f8c4
48 48 
 rgba64be            c05fbb1ada1b48fb1eb192fc200af2b6
49 49 
 rgba64le            1b826cc613666f545274e8a7799d69f1
50 50 
 uyvy422             3f411f947e3ac8f842c88e717d68bd9a
51 
-xyz12be             6821e6d23d0df67ffad830fb8105d0da
52 
-xyz12le             dc524e3726ba1df0d2f406db3a2c08aa
51 
+xyz12be             7fb449368615139d47192c4543b5d125
52 
+xyz12le             bfa1cde86dece70348e48f6293a7c2ef
53 53 
 yuv410p             7dcf3f4770c8b494290ceacd2c2ce6db
54 54 
 yuv411p             9461b188dab6f8b90d9a27e353a89f58
55 55 
 yuv420p             61fffd2d8425759a33ae07e718d0242d
tests/ref/fate/filter-pixfmts-copy
History View file @ e2bb185
... ... 
@@ -49,8 +49,8 @@ rgba                53796fa4c392a1b2659595b6a284f8c4
49 49 
 rgba64be            c05fbb1ada1b48fb1eb192fc200af2b6
50 50 
 rgba64le            1b826cc613666f545274e8a7799d69f1
51 51 
 uyvy422             3f411f947e3ac8f842c88e717d68bd9a
52 
-xyz12be             6821e6d23d0df67ffad830fb8105d0da
53 
-xyz12le             dc524e3726ba1df0d2f406db3a2c08aa
52 
+xyz12be             7fb449368615139d47192c4543b5d125
53 
+xyz12le             bfa1cde86dece70348e48f6293a7c2ef
54 54 
 yuv410p             7dcf3f4770c8b494290ceacd2c2ce6db
55 55 
 yuv411p             9461b188dab6f8b90d9a27e353a89f58
56 56 
 yuv420p             61fffd2d8425759a33ae07e718d0242d
tests/ref/fate/filter-pixfmts-crop
History View file @ e2bb185
... ... 
@@ -46,8 +46,8 @@ rgb8                87cf541b110e35a6f9a983e9cde85e15
46 46 
 rgba                7abe1af7b97f5b9a7aa5ad3e4bf32f76
47 47 
 rgba64be            2eed28b61af25790c02cc658e5f86b9b
48 48 
 rgba64le            de8bc34c6d573488d87e87ce8c7ad07f
49 
-xyz12be             cc917400e1174b5137083b27ec02bf94
50 
-xyz12le             e4e86ef100e07cda561a22811f242e5d
49 
+xyz12be             c3783bcad9f962049f9992d5c907bbf2
50 
+xyz12le             20a9ebf2256ceda449ba5603f1dab7e3
51 51 
 yuv410p             126e0da1da4fd89be28087b8367bbb36
52 52 
 yuv411p             b94f0af107fc4796aca70c0a36d374c5
53 53 
 yuv420p             74c6b331bd30f005e6c75a192423ad90
tests/ref/fate/filter-pixfmts-field
History View file @ e2bb185
... ... 
@@ -49,8 +49,8 @@ rgba                d0ebdf1495bc6b7e9d3bfbe2813a9d16
49 49 
 rgba64be            53363baf266592e0ac02b3f8242ec4fb
50 50 
 rgba64le            a630eaa38545b2be741f000ab58451e5
51 51 
 uyvy422             a6a52504a16f09b8f2ec2405bc8190b5
52 
-xyz12be             6eb0891658dfd71adf41432a947e210c
53 
-xyz12le             bab6403abf58e69575900802ffef8f38
52 
+xyz12be             98775fdf313afa1c20da37b74b57c926
53 
+xyz12le             39edc4f30363a00401a62acd7a65e173
54 54 
 yuv410p             3feb55b1e2a385b488c82e808a12587b
55 55 
 yuv411p             ab3dd8e6cf1452afe2d2e976e4726370
56 56 
 yuv420p             52e26ad198368e2326bef97cdfa6a2bb
tests/ref/fate/filter-pixfmts-fieldorder
History View file @ e2bb185
... ... 
@@ -44,8 +44,8 @@ rgba                af33be882959a2fc963d6e5984d24b6d
44 44 
 rgba64be            9ae73ceaa9d95e7981b4df559b0d3b6d
45 45 
 rgba64le            86997e62f62d2a5351b5ca9c9c93c2d1
46 46 
 uyvy422             a07829fe630b59855c80d87d0e8f0dbb
47 
-xyz12be             1f0873abd159a9c94200670b7e7bc661
48 
-xyz12le             3645601dc8bfbdff68cc823a0fc85b27
47 
+xyz12be             dcb691784f80fd6b438844e8e30299fd
48 
+xyz12le             c63cdd81442c37d710da95d9be70a24d
49 49 
 yuv411p             3d3d427999863945aa5ec03edf98c19a
50 50 
 yuv422p             961d8a22bfe8868eb3c743b4241a3c99
51 51 
 yuv422p10be         845e80406c880f33a384b5ebdd21796d
tests/ref/fate/filter-pixfmts-hflip
History View file @ e2bb185
... ... 
@@ -46,8 +46,8 @@ rgb8                22fdbd14ce296c1afa9bb4a6ea09b3fe
46 46 
 rgba                a37789c4df73c3bd8648ad1fe9d3f991
47 47 
 rgba64be            286067334e4bca33fba7ebb1706890a2
48 48 
 rgba64le            2a8b3dd5045df299259636d8e6b62589
49 
-xyz12be             84ecf49fea8e0eae954e7c511bd17b75
50 
-xyz12le             31c4f953548326b27920c5939bcf2cce
49 
+xyz12be             92f8189963a977ee758b77a85d6e99ac
50 
+xyz12le             d5591761e71436d71e35788b46e873c3
51 51 
 yuv410p             a1280c2b9b562dba3c2d35a1e5fc4b23
52 52 
 yuv411p             6bf10756ac5c7841db63a97106ff911b
53 53 
 yuv420p             45f4a06481f2cd8e28fb29c7c151e110
tests/ref/fate/filter-pixfmts-il
History View file @ e2bb185
... ... 
@@ -48,8 +48,8 @@ rgba                8ca9c8db589615ebbaa964be4ce62d08
48 48 
 rgba64be            576dfc2fd1937f9e594c4004fafd83f2
49 49 
 rgba64le            7938eccc1f05f13710ec351767b47a36
50 50 
 uyvy422             8be40aded4b407ff66305911ba5ce2ce
51 
-xyz12be             210d55ba1296a33846169489fbd2b1ae
52 
-xyz12le             1f20849dcf44539ce351346c73bdff1a
51 
+xyz12be             fe74cfbcd18ada951bfa943e990e0e32
52 
+xyz12le             6a0c4d381f06a6d43a6c1d2e3e87672d
53 53 
 yuv410p             92112d85ba4f74cbd3044945c0f33402
54 54 
 yuv411p             b6b22000e5275c92baf5afc417c32a70
55 55 
 yuv420p             fca7fbbff753612a718ee13e1dfe2af2
tests/ref/fate/filter-pixfmts-null
History View file @ e2bb185
... ... 
@@ -49,8 +49,8 @@ rgba                53796fa4c392a1b2659595b6a284f8c4
49 49 
 rgba64be            c05fbb1ada1b48fb1eb192fc200af2b6
50 50 
 rgba64le            1b826cc613666f545274e8a7799d69f1
51 51 
 uyvy422             3f411f947e3ac8f842c88e717d68bd9a
52 
-xyz12be             6821e6d23d0df67ffad830fb8105d0da
53 
-xyz12le             dc524e3726ba1df0d2f406db3a2c08aa
52 
+xyz12be             7fb449368615139d47192c4543b5d125
53 
+xyz12le             bfa1cde86dece70348e48f6293a7c2ef
54 54 
 yuv410p             7dcf3f4770c8b494290ceacd2c2ce6db
55 55 
 yuv411p             9461b188dab6f8b90d9a27e353a89f58
56 56 
 yuv420p             61fffd2d8425759a33ae07e718d0242d
tests/ref/fate/filter-pixfmts-scale
History View file @ e2bb185
... ... 
@@ -49,8 +49,8 @@ rgba                aec2346373d91abdc8c0301b44513128
49 49 
 rgba64be            5ce6f591ac8be4edcf5c3350d2d2d3f5
50 50 
 rgba64le            12baab5162019de2053db39a3bfca868
51 51 
 uyvy422             479105bc4c7fbb4a33ca8745aa8c2de8
52 
-xyz12be             7ad7fd42ad8c1f823fa5f0aba16d2247
53 
-xyz12le             b4f967df71db5c38c222f9236c341031
52 
+xyz12be             8b9767926ff233a5820f99923e8331df
53 
+xyz12le             a76c6cd0b058ade67104a8bb3217aaef
54 54 
 yuv410p             d0daa93f5cee83360e219e39563ab6da
55 55 
 yuv411p             e5c8f3ca024a88dd07e0a92db3e2133d
56 56 
 yuv420p             485d9af8608f926ffffbf42230b4150d
tests/ref/fate/filter-pixfmts-vflip
History View file @ e2bb185
... ... 
@@ -49,8 +49,8 @@ rgba                a6973a2940a378d2a8284194da26eec0
49 49 
 rgba64be            52ee01b66ee3d52e4726a12fbb819950
50 50 
 rgba64le            60541d81afcea71a27629c4e5d137dcb
51 51 
 uyvy422             21c48162379321bb83ec2399535f9253
52 
-xyz12be             7070af64e30fa689e3627b1dde7506f4
53 
-xyz12le             4c4b31100b836638e7e61181997c49e1
52 
+xyz12be             3c00294e1e56ac7673226c75faafc247
53 
+xyz12le             edfc0b6dd18510d9dd605a83d74ba5b9
54 54 
 yuv410p             8699f50c04f8ac931aa5a8306827364b
55 55 
 yuv411p             47af34559b92b68851df4c2b170f7736
56 56 
 yuv420p             c59b35b82b5a195128736021913b35a4