From b519298a1578e0c895d53d4b4ed8867b1c031a56 Mon Sep 17 00:00:00 2001 From: Paul B Mahol Date: Wed, 5 Dec 2012 00:38:09 +0000 Subject: [PATCH] pixdesc: fix yuva 10bit bit depth It was wrongly set as the yuva 16bit one. Signed-off-by: Paul B Mahol Signed-off-by: Luca Barbato --- libavutil/pixdesc.c | 40 +++++++++++++++++------------------ tests/ref/lavfi/pixdesc | 10 ++++----- tests/ref/lavfi/pixfmts_copy | 10 ++++----- tests/ref/lavfi/pixfmts_null | 10 ++++----- tests/ref/lavfi/pixfmts_scale | 10 ++++----- tests/ref/lavfi/pixfmts_vflip | 10 ++++----- 6 files changed, 45 insertions(+), 45 deletions(-) diff --git a/libavutil/pixdesc.c b/libavutil/pixdesc.c index 439c550adc..06d5defdba 100644 --- a/libavutil/pixdesc.c +++ b/libavutil/pixdesc.c @@ -655,10 +655,10 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 1, .log2_chroma_h = 1, .comp = { - { 0, 1, 1, 0, 15 }, /* Y */ - { 1, 1, 1, 0, 15 }, /* U */ - { 2, 1, 1, 0, 15 }, /* V */ - { 3, 1, 1, 0, 15 }, /* A */ + { 0, 1, 1, 0, 9 }, /* Y */ + { 1, 1, 1, 0, 9 }, /* U */ + { 2, 1, 1, 0, 9 }, /* V */ + { 3, 1, 1, 0, 9 }, /* A */ }, .flags = PIX_FMT_PLANAR | PIX_FMT_ALPHA, }, @@ -668,10 +668,10 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 1, .log2_chroma_h = 0, .comp = { - { 0, 1, 1, 0, 15 }, /* Y */ - { 1, 1, 1, 0, 15 }, /* U */ - { 2, 1, 1, 0, 15 }, /* V */ - { 3, 1, 1, 0, 15 }, /* A */ + { 0, 1, 1, 0, 9 }, /* Y */ + { 1, 1, 1, 0, 9 }, /* U */ + { 2, 1, 1, 0, 9 }, /* V */ + { 3, 1, 1, 0, 9 }, /* A */ }, .flags = PIX_FMT_BE | PIX_FMT_PLANAR | PIX_FMT_ALPHA, }, @@ -681,10 +681,10 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 1, .log2_chroma_h = 0, .comp = { - { 0, 1, 1, 0, 15 }, /* Y */ - { 1, 1, 1, 0, 15 }, /* U */ - { 2, 1, 1, 0, 15 }, /* V */ - { 3, 1, 1, 0, 15 }, /* A */ + { 0, 1, 1, 0, 9 }, /* Y */ + { 1, 1, 1, 0, 9 }, /* U */ + { 2, 1, 1, 0, 9 }, /* V */ + { 3, 1, 1, 0, 9 }, /* A */ }, .flags = PIX_FMT_PLANAR | PIX_FMT_ALPHA, }, @@ -694,10 +694,10 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 0, .log2_chroma_h = 0, .comp = { - { 0, 1, 1, 0, 15 }, /* Y */ - { 1, 1, 1, 0, 15 }, /* U */ - { 2, 1, 1, 0, 15 }, /* V */ - { 3, 1, 1, 0, 15 }, /* A */ + { 0, 1, 1, 0, 9 }, /* Y */ + { 1, 1, 1, 0, 9 }, /* U */ + { 2, 1, 1, 0, 9 }, /* V */ + { 3, 1, 1, 0, 9 }, /* A */ }, .flags = PIX_FMT_BE | PIX_FMT_PLANAR | PIX_FMT_ALPHA, }, @@ -707,10 +707,10 @@ const AVPixFmtDescriptor av_pix_fmt_descriptors[AV_PIX_FMT_NB] = { .log2_chroma_w = 0, .log2_chroma_h = 0, .comp = { - { 0, 1, 1, 0, 15 }, /* Y */ - { 1, 1, 1, 0, 15 }, /* U */ - { 2, 1, 1, 0, 15 }, /* V */ - { 3, 1, 1, 0, 15 }, /* A */ + { 0, 1, 1, 0, 9 }, /* Y */ + { 1, 1, 1, 0, 9 }, /* U */ + { 2, 1, 1, 0, 9 }, /* V */ + { 3, 1, 1, 0, 9 }, /* A */ }, .flags = PIX_FMT_PLANAR | PIX_FMT_ALPHA, }, diff --git a/tests/ref/lavfi/pixdesc b/tests/ref/lavfi/pixdesc index 5716cf11b1..d1ccbbcd17 100644 --- a/tests/ref/lavfi/pixdesc +++ b/tests/ref/lavfi/pixdesc @@ -58,21 +58,21 @@ yuv444p9be 6ab31f4c12b533ce318ecdff83cdd054 yuv444p9le f0606604a5c08becab6ba500124c4b7c yuva420p a29884f3f3dfe1e00b961bc17bef3d47 yuva420p10be 145366ff1632de3e300d947f49844284 -yuva420p10le 242b310218a41aacc59f78f42f949d60 +yuva420p10le d797038552d7f698e4d1db4dfa18ceb0 yuva420p16be 25a335f66a0670911ced818aa42fb670 yuva420p16le 97bf252e6c030f0f0412d3826c2ea259 yuva420p9be 06b764d85bd3c22e9b7ca4babed84d4f yuva420p9le 1f01cdd4fc46f98d4c11b2947307a0e3 yuva422p 92b6815f465297284cdb843711682cee -yuva422p10be c8722cb6e86d478f501d514a2d004867 -yuva422p10le 5c2767a47c94966052955bc48f72dd94 +yuva422p10be fb240ff9ac49b45b1b3d40df2c89e39d +yuva422p10le f767ede9ba1d427faadc963cf41d2412 yuva422p16be ef442b11b26e5e61f3c958fa309576dd yuva422p16le 5789009759d7a44dacc6da2194e402b1 yuva422p9be e0d2f45f7f5541eee988137c7ebb3495 yuva422p9le a4ec81f328efd3856dec430fb27f2f56 yuva444p c523716e4900cfe515eaab1d7124fdd9 -yuva444p10be 03df7c3936c25626ea596c28e0466129 -yuva444p10le 55398bb467bc7957288d59af9f0bfadd +yuva444p10be f5791a75fdb86da0c243511ef9ab8fbd +yuva444p10le 578e88dfbe4ab07f280fcc7554f3a5c4 yuva444p16be ee7b9dd854e36b165d5b7cffb646ba6c yuva444p16le ec93b2907923d5655e9fb085479260ef yuva444p9be 03414257d78e72c28d03e3c247319b7c diff --git a/tests/ref/lavfi/pixfmts_copy b/tests/ref/lavfi/pixfmts_copy index 5716cf11b1..d1ccbbcd17 100644 --- a/tests/ref/lavfi/pixfmts_copy +++ b/tests/ref/lavfi/pixfmts_copy @@ -58,21 +58,21 @@ yuv444p9be 6ab31f4c12b533ce318ecdff83cdd054 yuv444p9le f0606604a5c08becab6ba500124c4b7c yuva420p a29884f3f3dfe1e00b961bc17bef3d47 yuva420p10be 145366ff1632de3e300d947f49844284 -yuva420p10le 242b310218a41aacc59f78f42f949d60 +yuva420p10le d797038552d7f698e4d1db4dfa18ceb0 yuva420p16be 25a335f66a0670911ced818aa42fb670 yuva420p16le 97bf252e6c030f0f0412d3826c2ea259 yuva420p9be 06b764d85bd3c22e9b7ca4babed84d4f yuva420p9le 1f01cdd4fc46f98d4c11b2947307a0e3 yuva422p 92b6815f465297284cdb843711682cee -yuva422p10be c8722cb6e86d478f501d514a2d004867 -yuva422p10le 5c2767a47c94966052955bc48f72dd94 +yuva422p10be fb240ff9ac49b45b1b3d40df2c89e39d +yuva422p10le f767ede9ba1d427faadc963cf41d2412 yuva422p16be ef442b11b26e5e61f3c958fa309576dd yuva422p16le 5789009759d7a44dacc6da2194e402b1 yuva422p9be e0d2f45f7f5541eee988137c7ebb3495 yuva422p9le a4ec81f328efd3856dec430fb27f2f56 yuva444p c523716e4900cfe515eaab1d7124fdd9 -yuva444p10be 03df7c3936c25626ea596c28e0466129 -yuva444p10le 55398bb467bc7957288d59af9f0bfadd +yuva444p10be f5791a75fdb86da0c243511ef9ab8fbd +yuva444p10le 578e88dfbe4ab07f280fcc7554f3a5c4 yuva444p16be ee7b9dd854e36b165d5b7cffb646ba6c yuva444p16le ec93b2907923d5655e9fb085479260ef yuva444p9be 03414257d78e72c28d03e3c247319b7c diff --git a/tests/ref/lavfi/pixfmts_null b/tests/ref/lavfi/pixfmts_null index 5716cf11b1..d1ccbbcd17 100644 --- a/tests/ref/lavfi/pixfmts_null +++ b/tests/ref/lavfi/pixfmts_null @@ -58,21 +58,21 @@ yuv444p9be 6ab31f4c12b533ce318ecdff83cdd054 yuv444p9le f0606604a5c08becab6ba500124c4b7c yuva420p a29884f3f3dfe1e00b961bc17bef3d47 yuva420p10be 145366ff1632de3e300d947f49844284 -yuva420p10le 242b310218a41aacc59f78f42f949d60 +yuva420p10le d797038552d7f698e4d1db4dfa18ceb0 yuva420p16be 25a335f66a0670911ced818aa42fb670 yuva420p16le 97bf252e6c030f0f0412d3826c2ea259 yuva420p9be 06b764d85bd3c22e9b7ca4babed84d4f yuva420p9le 1f01cdd4fc46f98d4c11b2947307a0e3 yuva422p 92b6815f465297284cdb843711682cee -yuva422p10be c8722cb6e86d478f501d514a2d004867 -yuva422p10le 5c2767a47c94966052955bc48f72dd94 +yuva422p10be fb240ff9ac49b45b1b3d40df2c89e39d +yuva422p10le f767ede9ba1d427faadc963cf41d2412 yuva422p16be ef442b11b26e5e61f3c958fa309576dd yuva422p16le 5789009759d7a44dacc6da2194e402b1 yuva422p9be e0d2f45f7f5541eee988137c7ebb3495 yuva422p9le a4ec81f328efd3856dec430fb27f2f56 yuva444p c523716e4900cfe515eaab1d7124fdd9 -yuva444p10be 03df7c3936c25626ea596c28e0466129 -yuva444p10le 55398bb467bc7957288d59af9f0bfadd +yuva444p10be f5791a75fdb86da0c243511ef9ab8fbd +yuva444p10le 578e88dfbe4ab07f280fcc7554f3a5c4 yuva444p16be ee7b9dd854e36b165d5b7cffb646ba6c yuva444p16le ec93b2907923d5655e9fb085479260ef yuva444p9be 03414257d78e72c28d03e3c247319b7c diff --git a/tests/ref/lavfi/pixfmts_scale b/tests/ref/lavfi/pixfmts_scale index 7be8af4a11..e53580c944 100644 --- a/tests/ref/lavfi/pixfmts_scale +++ b/tests/ref/lavfi/pixfmts_scale @@ -58,21 +58,21 @@ yuv444p9be 9ac2643ce7f7e5c4e17c8c9fd8494d4a yuv444p9le 896a1cc9cccca1ba410dd53942d33cc4 yuva420p 8673a9131fb47de69788863f93a50eb7 yuva420p10be d92a95061809f251175f5d5e3074930e -yuva420p10le 8a06c377b8aa2b2979054e074582a5b5 +yuva420p10le bad90ba2d4c260e379a7aa6dc7760853 yuva420p16be a61d8ddb646e2d26020fc7ed2a48c1a9 yuva420p16le 90ef774f86ad3177ec57eca8744b4e09 yuva420p9be f7655546446bfdc875243d7cdeb13b30 yuva420p9le ada2b719827059d70ebc57e2a3f9da92 yuva422p 3c76ebeca0a7d3aa5f8e31ef80a86ffe -yuva422p10be 9a21b2f566c0761c8338edaa88006bee -yuva422p10le aefcda062e7e3463c887faa9d926aca7 +yuva422p10be 01dd539e4a62762a3c97e965c76bb6f7 +yuva422p10le 76355d9d8fdcd085a24d48832b72e40b yuva422p16be c21afa31ac18bd92e8e596b81552b52b yuva422p16le 0bc3720dba6076dcce3b74b1d3c6c4b7 yuva422p9be a60ac5b8026e9621724c033fbf79dbda yuva422p9le c3eda8831e9b9c94a3eb487d33114103 yuva444p 3268c6abe5e3cdbd16552a1eddced816 -yuva444p10be 3fbd1ece625c7aa7284b9ca3724d6abb -yuva444p10le 2eeda83856df77760cd30e477e8ba00b +yuva444p10be 856b37c1ee53459f46b9359d329ac9b5 +yuva444p10le 22790592361c007406d4ca9a9e0954a5 yuva444p16be ed5b07fe4d5b1137604568786777af1d yuva444p16le 3a3df23feb60d8832b566fd9765983d0 yuva444p9be 4fc479c5b1044ad37b4e6fc6488b4f7f diff --git a/tests/ref/lavfi/pixfmts_vflip b/tests/ref/lavfi/pixfmts_vflip index d820518aa8..9fd8bf6450 100644 --- a/tests/ref/lavfi/pixfmts_vflip +++ b/tests/ref/lavfi/pixfmts_vflip @@ -58,21 +58,21 @@ yuv444p9be 6ac92b7dc9ab2fc59bee99204886899a yuv444p9le 85aef13a654953d3455d89770b0d74bd yuva420p c705d1cf061d8c6580ac690b55f92276 yuva420p10be baa5e3b0ff6d0ebbb0958560cd763c6e -yuva420p10le 32473853156341586ed716090427fc10 +yuva420p10le a36dc59ad55b406e5fee475236e9753c yuva420p16be bf3b134eb70878df9afba61d03e930b8 yuva420p16le 105d375154329a381aa58379a0a6ec46 yuva420p9be 8273d591e055f48990c29dd905a6cdfd yuva420p9le 95ced0bb07e422d98db61a35cdb3fb8f yuva422p 6aed0ea657ed51cc047a4fbdd981aec8 -yuva422p10be b76d8be9b4035d3164c35a2fdb020636 -yuva422p10le 09aa2454075f999dbd3175b5c435dacf +yuva422p10be d69a3404984c5fd30c0fc548532bcb6b +yuva422p10le a40c8e6f50e12d94bf7484107ec98559 yuva422p16be 39552c259ca242f2417e913ffc602fde yuva422p16le 16faa558a34291ca32f6d94dce211ee2 yuva422p9be a951eafb62c092c63f7566b6803f60df yuva422p9le 00b39cfca78666e057ee527f5e174a04 yuva444p da5d64f2b2bd2013c186456f595fad65 -yuva444p10be 09375aa0c3a60436fc65ca0da76ca542 -yuva444p10le a4baf701134c7ff33f806ad00501d8f5 +yuva444p10be 00e74a9c0c7818a9bbd9fee95b961ee8 +yuva444p10le cbe30f44b63cf7ed27fc2dde40315b5e yuva444p16be 7e9b799b057e1446dabbf0f738480cfb yuva444p16le 556d58b91a617fe4a83af99a4aea1c2e yuva444p9be b5a31de4fac408eeecaf3aff11f40e55