Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

nut: Support XYZ12 rawvideo

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
pull/53/head
Michael Niedermayer 11 years ago
parent ab9d7e0b12
commit e2bb185e62
13 changed files with 27 additions and 20 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      Changelog
  2. 3
      libavcodec/raw.c
  3. 3
      libavformat/nut.c
  4. 4
      tests/ref/fate/filter-pixdesc
  5. 4
      tests/ref/fate/filter-pixfmts-copy
  6. 4
      tests/ref/fate/filter-pixfmts-crop
  7. 4
      tests/ref/fate/filter-pixfmts-field
  8. 4
      tests/ref/fate/filter-pixfmts-fieldorder
  9. 4
      tests/ref/fate/filter-pixfmts-hflip
  10. 4
      tests/ref/fate/filter-pixfmts-il
  11. 4
      tests/ref/fate/filter-pixfmts-null
  12. 4
      tests/ref/fate/filter-pixfmts-scale
  13. 4
      tests/ref/fate/filter-pixfmts-vflip

1
Changelog
Unescape View File

@ -19,6 +19,7 @@ version <next>
- VP8 in Ogg demuxing
- side & metadata support in NUT
- framepack filter
- XYZ12 rawvideo support in NUT
version 2.1:

3
libavcodec/raw.c
Unescape View File

@ -178,6 +178,9 @@ const PixelFormatTag ff_raw_pix_fmt_tags[] = {
{ AV_PIX_FMT_GBRP16LE, MKTAG('G', '3', 00 , 16 ) },
{ AV_PIX_FMT_GBRP16BE, MKTAG(16 , 00 , '3', 'G') },
{ AV_PIX_FMT_XYZ12LE, MKTAG('X', 'Y', 'Z' , 36 ) },
{ AV_PIX_FMT_XYZ12BE, MKTAG(36 , 'Z' , 'Y', 'X') },
/* quicktime */
{ AV_PIX_FMT_YUV420P, MKTAG('R', '4', '2', '0') }, /* Radius DV YUV PAL */
{ AV_PIX_FMT_YUV411P, MKTAG('R', '4', '1', '1') }, /* Radius DV YUV NTSC */

3
libavformat/nut.c
Unescape View File

@ -157,6 +157,9 @@ const AVCodecTag ff_nut_video_tags[] = {
{ AV_CODEC_ID_RAWVIDEO, MKTAG('G', '3', 0, 16) },
{ AV_CODEC_ID_RAWVIDEO, MKTAG(16, 0, '3', 'G') },
{ AV_CODEC_ID_RAWVIDEO, MKTAG('X', 'Y', 'Z' , 36 ) },
{ AV_CODEC_ID_RAWVIDEO, MKTAG(36 , 'Z' , 'Y', 'X') },
{ AV_CODEC_ID_NONE, 0 }
};

4
tests/ref/fate/filter-pixdesc
Unescape View File

@ -48,8 +48,8 @@ rgba 53796fa4c392a1b2659595b6a284f8c4
rgba64be c05fbb1ada1b48fb1eb192fc200af2b6
rgba64le 1b826cc613666f545274e8a7799d69f1
uyvy422 3f411f947e3ac8f842c88e717d68bd9a
xyz12be 6821e6d23d0df67ffad830fb8105d0da
xyz12le dc524e3726ba1df0d2f406db3a2c08aa
xyz12be 7fb449368615139d47192c4543b5d125
xyz12le bfa1cde86dece70348e48f6293a7c2ef
yuv410p 7dcf3f4770c8b494290ceacd2c2ce6db
yuv411p 9461b188dab6f8b90d9a27e353a89f58
yuv420p 61fffd2d8425759a33ae07e718d0242d

4
tests/ref/fate/filter-pixfmts-copy
Unescape View File

@ -49,8 +49,8 @@ rgba 53796fa4c392a1b2659595b6a284f8c4
rgba64be c05fbb1ada1b48fb1eb192fc200af2b6
rgba64le 1b826cc613666f545274e8a7799d69f1
uyvy422 3f411f947e3ac8f842c88e717d68bd9a
xyz12be 6821e6d23d0df67ffad830fb8105d0da
xyz12le dc524e3726ba1df0d2f406db3a2c08aa
xyz12be 7fb449368615139d47192c4543b5d125
xyz12le bfa1cde86dece70348e48f6293a7c2ef
yuv410p 7dcf3f4770c8b494290ceacd2c2ce6db
yuv411p 9461b188dab6f8b90d9a27e353a89f58
yuv420p 61fffd2d8425759a33ae07e718d0242d

4
tests/ref/fate/filter-pixfmts-crop
Unescape View File

@ -46,8 +46,8 @@ rgb8 87cf541b110e35a6f9a983e9cde85e15
rgba 7abe1af7b97f5b9a7aa5ad3e4bf32f76
rgba64be 2eed28b61af25790c02cc658e5f86b9b
rgba64le de8bc34c6d573488d87e87ce8c7ad07f
xyz12be cc917400e1174b5137083b27ec02bf94
xyz12le e4e86ef100e07cda561a22811f242e5d
xyz12be c3783bcad9f962049f9992d5c907bbf2
xyz12le 20a9ebf2256ceda449ba5603f1dab7e3
yuv410p 126e0da1da4fd89be28087b8367bbb36
yuv411p b94f0af107fc4796aca70c0a36d374c5
yuv420p 74c6b331bd30f005e6c75a192423ad90

4
tests/ref/fate/filter-pixfmts-field
Unescape View File

@ -49,8 +49,8 @@ rgba d0ebdf1495bc6b7e9d3bfbe2813a9d16
rgba64be 53363baf266592e0ac02b3f8242ec4fb
rgba64le a630eaa38545b2be741f000ab58451e5
uyvy422 a6a52504a16f09b8f2ec2405bc8190b5
xyz12be 6eb0891658dfd71adf41432a947e210c
xyz12le bab6403abf58e69575900802ffef8f38
xyz12be 98775fdf313afa1c20da37b74b57c926
xyz12le 39edc4f30363a00401a62acd7a65e173
yuv410p 3feb55b1e2a385b488c82e808a12587b
yuv411p ab3dd8e6cf1452afe2d2e976e4726370
yuv420p 52e26ad198368e2326bef97cdfa6a2bb

4
tests/ref/fate/filter-pixfmts-fieldorder
Unescape View File

@ -44,8 +44,8 @@ rgba af33be882959a2fc963d6e5984d24b6d
rgba64be 9ae73ceaa9d95e7981b4df559b0d3b6d
rgba64le 86997e62f62d2a5351b5ca9c9c93c2d1
uyvy422 a07829fe630b59855c80d87d0e8f0dbb
xyz12be 1f0873abd159a9c94200670b7e7bc661
xyz12le 3645601dc8bfbdff68cc823a0fc85b27
xyz12be dcb691784f80fd6b438844e8e30299fd
xyz12le c63cdd81442c37d710da95d9be70a24d
yuv411p 3d3d427999863945aa5ec03edf98c19a
yuv422p 961d8a22bfe8868eb3c743b4241a3c99
yuv422p10be 845e80406c880f33a384b5ebdd21796d

4
tests/ref/fate/filter-pixfmts-hflip
Unescape View File

@ -46,8 +46,8 @@ rgb8 22fdbd14ce296c1afa9bb4a6ea09b3fe
rgba a37789c4df73c3bd8648ad1fe9d3f991
rgba64be 286067334e4bca33fba7ebb1706890a2
rgba64le 2a8b3dd5045df299259636d8e6b62589
xyz12be 84ecf49fea8e0eae954e7c511bd17b75
xyz12le 31c4f953548326b27920c5939bcf2cce
xyz12be 92f8189963a977ee758b77a85d6e99ac
xyz12le d5591761e71436d71e35788b46e873c3
yuv410p a1280c2b9b562dba3c2d35a1e5fc4b23
yuv411p 6bf10756ac5c7841db63a97106ff911b
yuv420p 45f4a06481f2cd8e28fb29c7c151e110

4
tests/ref/fate/filter-pixfmts-il
Unescape View File

@ -48,8 +48,8 @@ rgba 8ca9c8db589615ebbaa964be4ce62d08
rgba64be 576dfc2fd1937f9e594c4004fafd83f2
rgba64le 7938eccc1f05f13710ec351767b47a36
uyvy422 8be40aded4b407ff66305911ba5ce2ce
xyz12be 210d55ba1296a33846169489fbd2b1ae
xyz12le 1f20849dcf44539ce351346c73bdff1a
xyz12be fe74cfbcd18ada951bfa943e990e0e32
xyz12le 6a0c4d381f06a6d43a6c1d2e3e87672d
yuv410p 92112d85ba4f74cbd3044945c0f33402
yuv411p b6b22000e5275c92baf5afc417c32a70
yuv420p fca7fbbff753612a718ee13e1dfe2af2

4
tests/ref/fate/filter-pixfmts-null
Unescape View File

@ -49,8 +49,8 @@ rgba 53796fa4c392a1b2659595b6a284f8c4
rgba64be c05fbb1ada1b48fb1eb192fc200af2b6
rgba64le 1b826cc613666f545274e8a7799d69f1
uyvy422 3f411f947e3ac8f842c88e717d68bd9a
xyz12be 6821e6d23d0df67ffad830fb8105d0da
xyz12le dc524e3726ba1df0d2f406db3a2c08aa
xyz12be 7fb449368615139d47192c4543b5d125
xyz12le bfa1cde86dece70348e48f6293a7c2ef
yuv410p 7dcf3f4770c8b494290ceacd2c2ce6db
yuv411p 9461b188dab6f8b90d9a27e353a89f58
yuv420p 61fffd2d8425759a33ae07e718d0242d

4
tests/ref/fate/filter-pixfmts-scale
Unescape View File

@ -49,8 +49,8 @@ rgba aec2346373d91abdc8c0301b44513128
rgba64be 5ce6f591ac8be4edcf5c3350d2d2d3f5
rgba64le 12baab5162019de2053db39a3bfca868
uyvy422 479105bc4c7fbb4a33ca8745aa8c2de8
xyz12be 7ad7fd42ad8c1f823fa5f0aba16d2247
xyz12le b4f967df71db5c38c222f9236c341031
xyz12be 8b9767926ff233a5820f99923e8331df
xyz12le a76c6cd0b058ade67104a8bb3217aaef
yuv410p d0daa93f5cee83360e219e39563ab6da
yuv411p e5c8f3ca024a88dd07e0a92db3e2133d
yuv420p 485d9af8608f926ffffbf42230b4150d

4
tests/ref/fate/filter-pixfmts-vflip
Unescape View File

@ -49,8 +49,8 @@ rgba a6973a2940a378d2a8284194da26eec0
rgba64be 52ee01b66ee3d52e4726a12fbb819950
rgba64le 60541d81afcea71a27629c4e5d137dcb
uyvy422 21c48162379321bb83ec2399535f9253
xyz12be 7070af64e30fa689e3627b1dde7506f4
xyz12le 4c4b31100b836638e7e61181997c49e1
xyz12be 3c00294e1e56ac7673226c75faafc247
xyz12le edfc0b6dd18510d9dd605a83d74ba5b9
yuv410p 8699f50c04f8ac931aa5a8306827364b
yuv411p 47af34559b92b68851df4c2b170f7736
yuv420p c59b35b82b5a195128736021913b35a4

Write Preview
Loading…
Cancel
Save