[FFmpeg-devel] [PATCH] pixdesc: fix broken yuva definitions

Paul B Mahol onemda at gmail.com
Wed Dec 5 01:49:10 CET 2012


Signed-off-by: Paul B Mahol <onemda at gmail.com>
---
 libavutil/pixdesc.c                 | 40 ++++++++++++++++++-------------------
 tests/ref/lavfi/field               | 10 +++++-----
 tests/ref/lavfi/pixfmts_copy        | 10 +++++-----
 tests/ref/lavfi/pixfmts_null        | 10 +++++-----
 tests/ref/lavfi/pixfmts_pixdesctest | 10 +++++-----
 tests/ref/lavfi/pixfmts_scale       | 10 +++++-----
 tests/ref/lavfi/pixfmts_vflip       | 10 +++++-----
 7 files changed, 50 insertions(+), 50 deletions(-)

diff --git a/libavutil/pixdesc.c b/libavutil/pixdesc.c
index 0be8ae4..1f2aa58 100644
--- a/libavutil/pixdesc.c
+++ b/libavutil/pixdesc.c
@@ -706,10 +706,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,
     },
@@ -719,10 +719,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,
     },
@@ -732,10 +732,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,
     },
@@ -745,10 +745,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,
     },
@@ -758,10 +758,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/field b/tests/ref/lavfi/field
index ec50dc1..2d4a6b0 100644
--- a/tests/ref/lavfi/field
+++ b/tests/ref/lavfi/field
@@ -75,21 +75,21 @@ yuv444p9be          f47357cdd775fc399aeab3ae58712fb9
 yuv444p9le          e29799ecb6fac9f5b6d85bc34d248d4b
 yuva420p            82ab09bb7a3a24bf95aeb3fa9d939847
 yuva420p10be        f4559039e99ecf74a58e7063b1e7c5d3
-yuva420p10le        b1eb7df29134936450c2c312ae23a1a4
+yuva420p10le        32b3858b01be5bfe2579dadd1be3ab12
 yuva420p16be        c580495d34c6ac6e3e3b81772a0f3070
 yuva420p16le        1c49deeafb8f81e9186f3906c9b1a670
 yuva420p9be         a788d7cc6ad67ad52619a08da126569a
 yuva420p9le         c1579a5c015908f26b76480d82f6a648
 yuva422p            c162b37ce05360c47b2a2224ea0748ad
-yuva422p10be        6df70d1018e8c0c9fa377f72f49bf81b
-yuva422p10le        2eb54f20d3e5f180c539d92a75fe66e9
+yuva422p10be        b7c0adc12a8602ab8b40b611785cc18c
+yuva422p10le        97f91d820f8ba642a3f9ae0901d03826
 yuva422p16be        1c61492076be33404894c1d3ec578d87
 yuva422p16le        1c085c9479a57eea35e74c264c947d73
 yuva422p9be         271c6cc091052731373ef5313bc76435
 yuva422p9le         b8c2e963ac35371e8aa6a05d5c252b37
 yuva444p            4a85f1f17e95829cd53c9a28928fd8eb
-yuva444p10be        d312f0d30a88fdd18e992362ea3b5f81
-yuva444p10le        d12aed62a367bc7735e59503a3cf8cc6
+yuva444p10be        04c1026f4328ebf24bd7906291b33464
+yuva444p10le        3e8ea3b211bd7ac99cb96ebf71d0e75a
 yuva444p16be        ac5c17adeb0ef6730a0de1dbd1d14a1a
 yuva444p16le        41f1a82eb686d7191bdb00206f723247
 yuva444p9be         413d01385a8b008031b2ab3ef0b9eff4
diff --git a/tests/ref/lavfi/pixfmts_copy b/tests/ref/lavfi/pixfmts_copy
index 1171546..340b3a9 100644
--- a/tests/ref/lavfi/pixfmts_copy
+++ b/tests/ref/lavfi/pixfmts_copy
@@ -75,21 +75,21 @@ yuv444p9be          07727e5c9040b7f0a17d591288ac330d
 yuv444p9le          4d12d20a68dc28618594c96c2ade4ff4
 yuva420p            3a8c5c142e051367c196f95696e0e2c3
 yuva420p10be        1b7c5ec6691498e24676ce6ed97f62f8
-yuva420p10le        ad2d0424033e7acbafa6d58f59b4487e
+yuva420p10le        4c13322bca914df2727da91cca85ca1a
 yuva420p16be        6afcf758f4b66c0b4173c942d42212d7
 yuva420p16le        13e195aa96329eb49921b6f9f07b875c
 yuva420p9be         05a78390de312dfd21ac666a9da05fbd
 yuva420p9le         78f5593bf51a31841ef83df41d0316eb
 yuva422p            45ae66d6f69fd5b77e6831e98d228bf4
-yuva422p10be        90ce250a517843b3e8a1ac0f4fdad733
-yuva422p10le        c74cfda8934e3bf86940b7a08c809b35
+yuva422p10be        18284c58b926fe2389605c692a703145
+yuva422p10le        b934d28b615729a24bebf0381c465e37
 yuva422p16be        c3f7354b6013b43439e02aa02be5fe69
 yuva422p16le        a7ccc43820683ab15061d14cf8efce6c
 yuva422p9be         14c55a16d19499b54b4341f135d3e558
 yuva422p9le         a8bf168e5d2709222192d0aff46b1373
 yuva444p            86b05da54db8c7e8cf5b6638e19c6fc5
-yuva444p10be        bea827ff82f229145a016954120b731f
-yuva444p10le        c51b0554cfba0fabacf979683dceee95
+yuva444p10be        8c417158165c00fbd42def60cbc27d69
+yuva444p10le        5f303ef3fb56faed69b4cc1c760ac6ae
 yuva444p16be        52a9591ec0d5059e49b1b2803f8582aa
 yuva444p16le        a9272ac197e4a4195662ce90f533976c
 yuva444p9be         f72f646ef07cdab613420585aba041ac
diff --git a/tests/ref/lavfi/pixfmts_null b/tests/ref/lavfi/pixfmts_null
index 1171546..340b3a9 100644
--- a/tests/ref/lavfi/pixfmts_null
+++ b/tests/ref/lavfi/pixfmts_null
@@ -75,21 +75,21 @@ yuv444p9be          07727e5c9040b7f0a17d591288ac330d
 yuv444p9le          4d12d20a68dc28618594c96c2ade4ff4
 yuva420p            3a8c5c142e051367c196f95696e0e2c3
 yuva420p10be        1b7c5ec6691498e24676ce6ed97f62f8
-yuva420p10le        ad2d0424033e7acbafa6d58f59b4487e
+yuva420p10le        4c13322bca914df2727da91cca85ca1a
 yuva420p16be        6afcf758f4b66c0b4173c942d42212d7
 yuva420p16le        13e195aa96329eb49921b6f9f07b875c
 yuva420p9be         05a78390de312dfd21ac666a9da05fbd
 yuva420p9le         78f5593bf51a31841ef83df41d0316eb
 yuva422p            45ae66d6f69fd5b77e6831e98d228bf4
-yuva422p10be        90ce250a517843b3e8a1ac0f4fdad733
-yuva422p10le        c74cfda8934e3bf86940b7a08c809b35
+yuva422p10be        18284c58b926fe2389605c692a703145
+yuva422p10le        b934d28b615729a24bebf0381c465e37
 yuva422p16be        c3f7354b6013b43439e02aa02be5fe69
 yuva422p16le        a7ccc43820683ab15061d14cf8efce6c
 yuva422p9be         14c55a16d19499b54b4341f135d3e558
 yuva422p9le         a8bf168e5d2709222192d0aff46b1373
 yuva444p            86b05da54db8c7e8cf5b6638e19c6fc5
-yuva444p10be        bea827ff82f229145a016954120b731f
-yuva444p10le        c51b0554cfba0fabacf979683dceee95
+yuva444p10be        8c417158165c00fbd42def60cbc27d69
+yuva444p10le        5f303ef3fb56faed69b4cc1c760ac6ae
 yuva444p16be        52a9591ec0d5059e49b1b2803f8582aa
 yuva444p16le        a9272ac197e4a4195662ce90f533976c
 yuva444p9be         f72f646ef07cdab613420585aba041ac
diff --git a/tests/ref/lavfi/pixfmts_pixdesctest b/tests/ref/lavfi/pixfmts_pixdesctest
index 1057c41..95db3de 100644
--- a/tests/ref/lavfi/pixfmts_pixdesctest
+++ b/tests/ref/lavfi/pixfmts_pixdesctest
@@ -75,21 +75,21 @@ yuv444p9be          07727e5c9040b7f0a17d591288ac330d
 yuv444p9le          4d12d20a68dc28618594c96c2ade4ff4
 yuva420p            3a8c5c142e051367c196f95696e0e2c3
 yuva420p10be        1b7c5ec6691498e24676ce6ed97f62f8
-yuva420p10le        ad2d0424033e7acbafa6d58f59b4487e
+yuva420p10le        4c13322bca914df2727da91cca85ca1a
 yuva420p16be        6afcf758f4b66c0b4173c942d42212d7
 yuva420p16le        13e195aa96329eb49921b6f9f07b875c
 yuva420p9be         05a78390de312dfd21ac666a9da05fbd
 yuva420p9le         78f5593bf51a31841ef83df41d0316eb
 yuva422p            45ae66d6f69fd5b77e6831e98d228bf4
-yuva422p10be        90ce250a517843b3e8a1ac0f4fdad733
-yuva422p10le        c74cfda8934e3bf86940b7a08c809b35
+yuva422p10be        18284c58b926fe2389605c692a703145
+yuva422p10le        b934d28b615729a24bebf0381c465e37
 yuva422p16be        c3f7354b6013b43439e02aa02be5fe69
 yuva422p16le        a7ccc43820683ab15061d14cf8efce6c
 yuva422p9be         14c55a16d19499b54b4341f135d3e558
 yuva422p9le         a8bf168e5d2709222192d0aff46b1373
 yuva444p            86b05da54db8c7e8cf5b6638e19c6fc5
-yuva444p10be        bea827ff82f229145a016954120b731f
-yuva444p10le        c51b0554cfba0fabacf979683dceee95
+yuva444p10be        8c417158165c00fbd42def60cbc27d69
+yuva444p10le        5f303ef3fb56faed69b4cc1c760ac6ae
 yuva444p16be        52a9591ec0d5059e49b1b2803f8582aa
 yuva444p16le        a9272ac197e4a4195662ce90f533976c
 yuva444p9be         f72f646ef07cdab613420585aba041ac
diff --git a/tests/ref/lavfi/pixfmts_scale b/tests/ref/lavfi/pixfmts_scale
index 825dc3a..a85fbdd 100644
--- a/tests/ref/lavfi/pixfmts_scale
+++ b/tests/ref/lavfi/pixfmts_scale
@@ -75,21 +75,21 @@ yuv444p9be          db739906e3ae3b8792cdc5a0c3387565
 yuv444p9le          693b8d30958ef1a37296b1690b4b36d2
 yuva420p            df46b738bdaf30d3a7f880b5ae45b092
 yuva420p10be        8e5f3b069fdf2f0c14f49ad827991092
-yuva420p10le        e6915376ad7d0f2be9d50099e5ee33ef
+yuva420p10le        ce4ac1961e0466c40448353cf76b3282
 yuva420p16be        aa8ca29a93936c62ef038ca8a57f47d7
 yuva420p16le        ee0cbb31f9cdb897c1982df0caa8ffa0
 yuva420p9be         b8ca5603123aeb953b9d4fc8ec8e35e1
 yuva420p9le         220212a81cda0f2d112f7ae96d532ff9
 yuva422p            650755270debb03d2c03b2e93b64c576
-yuva422p10be        fe0d8c2509d2d23f856093f9aea83cba
-yuva422p10le        c641064c6306c6eaf95b387e5ae08d67
+yuva422p10be        8d077362542a73c72aadb885510ea0c7
+yuva422p10le        80f729d9f8f438d2ab87909797c27873
 yuva422p16be        0b8f9385498d2449b18fb15237b0a448
 yuva422p16le        ce22b20deb93b4846a5043aa104f22d1
 yuva422p9be         822df465d12916d8852340d6b56247c8
 yuva422p9le         f69c09e872838fe392dfe1825263d3f1
 yuva444p            72083e0941cc45af9f97b89d3cd16112
-yuva444p10be        d8b6fe8cfb60c6e516563c0a4f5c75a8
-yuva444p10le        4a85b717f21975216144efc11e2f2cda
+yuva444p10be        42e159c62771239fa14d06a2db3b357d
+yuva444p10le        ee9786aee055c39da2dfbdb91ab834b5
 yuva444p16be        36a8797545163c24fc0d73f669c3108c
 yuva444p16le        c017c229aacb832a12c2297fb080a7a0
 yuva444p9be         8bfb5decfc8b71478b090a5b48c316c3
diff --git a/tests/ref/lavfi/pixfmts_vflip b/tests/ref/lavfi/pixfmts_vflip
index 1d5d1bd..89ce078 100644
--- a/tests/ref/lavfi/pixfmts_vflip
+++ b/tests/ref/lavfi/pixfmts_vflip
@@ -75,21 +75,21 @@ yuv444p9be          6143c321929ade9e0bc93ddea926e936
 yuv444p9le          e43ba2026848ec803fabf74d77c10125
 yuva420p            dc8fd115eaf203a3eac351b92a7d8f18
 yuva420p10be        b3aaa8a5c9b9c3c9d66053159af3ec99
-yuva420p10le        f43a991e8b5fe7e192cf4e0dfee2b6cb
+yuva420p10le        f7a8ae85fcac45db1f1689a1ab7cc63e
 yuva420p16be        b5c54895e87521f65a298d33bab5eb08
 yuva420p16le        95e208bc6644e23a2126ac5fca085f06
 yuva420p9be         1ba55d16f060bf54698dd7200523b44f
 yuva420p9le         4b57b8bd1534743f6740502c74bef385
 yuva422p            6091f9c62a121c09eadb02e9173b2da2
-yuva422p10be        93b6afb2b1d1538b1c87caa040c43f4e
-yuva422p10le        1c9359025ab8d257f0f5296e6b5a5787
+yuva422p10be        a6e8352978f263ea89e63ad06a9339b1
+yuva422p10le        ee39cfa1d29c294dc096f739bf454478
 yuva422p16be        3fa019b3d5e6dcb7c8e338837b9cffe1
 yuva422p16le        871f244989e14f5d3eda45abb6b3dfd1
 yuva422p9be         923c816778f782ff8a56bcd1b14ef08d
 yuva422p9le         bd882d40af0369d9ef7891c8e7891024
 yuva444p            9a55e83047abcc7a709f20805070135e
-yuva444p10be        7ae88f488969b527c1348383c0d06ade
-yuva444p10le        79a8dab388eb4d6cd12949b456ef5975
+yuva444p10be        6258901ef2ddfdb526a1038d92e8b63c
+yuva444p10le        24b8ef0f63e60f0f0a4d47a5870ad773
 yuva444p16be        4699a802e8ea3e74e968122980c0b0b0
 yuva444p16le        6f54a8cff38c54a235b92a0f1314e0aa
 yuva444p9be         7472bb4b0c774d5d741035086d5e4330
-- 
1.7.11.4



More information about the ffmpeg-devel mailing list