Browse code

swscale: ayuv64le output support

Signed-off-by: Paul B Mahol <onemda@gmail.com>

Paul B Mahol authored on 2015/07/04 01:13:11
Showing 12 changed files
... ...
@@ -2008,6 +2008,51 @@ yuv2ya8_X_c(SwsContext *c, const int16_t *lumFilter,
2008 2008
     }
2009 2009
 }
2010 2010
 
2011
+static void
2012
+yuv2ayuv64le_X_c(SwsContext *c, const int16_t *lumFilter,
2013
+                 const int32_t **lumSrc, int lumFilterSize,
2014
+                 const int16_t *chrFilter, const int32_t **chrUSrc,
2015
+                 const int32_t **chrVSrc, int chrFilterSize,
2016
+                 const int32_t **alpSrc, uint8_t *dest, int dstW, int y)
2017
+{
2018
+    int hasAlpha = !!alpSrc;
2019
+    int i;
2020
+
2021
+    for (i = 0; i < dstW; i++) {
2022
+        int Y = 1 << 14, U = 1 << 14;
2023
+        int V = 1 << 14, A = 1 << 14;
2024
+        int j;
2025
+
2026
+        Y -= 0x40000000;
2027
+        U -= 0x40000000;
2028
+        V -= 0x40000000;
2029
+        A -= 0x40000000;
2030
+
2031
+        for (j = 0; j < lumFilterSize; j++)
2032
+            Y += lumSrc[j][i] * (unsigned)lumFilter[j];
2033
+
2034
+        for (j = 0; j < chrFilterSize; j++)
2035
+            U += chrUSrc[j][i] * (unsigned)chrFilter[j];
2036
+
2037
+        for (j = 0; j < chrFilterSize; j++)
2038
+            V += chrVSrc[j][i] * (unsigned)chrFilter[j];
2039
+
2040
+        if (hasAlpha)
2041
+            for (j = 0; j < lumFilterSize; j++)
2042
+                A += alpSrc[j][i] * (unsigned)lumFilter[j];
2043
+
2044
+        Y = 0x8000 + av_clip_int16(Y >> 15);
2045
+        U = 0x8000 + av_clip_int16(U >> 15);
2046
+        V = 0x8000 + av_clip_int16(V >> 15);
2047
+        A = 0x8000 + av_clip_int16(A >> 15);
2048
+
2049
+        AV_WL16(dest + 8 * i, hasAlpha ? A : 65535);
2050
+        AV_WL16(dest + 8 * i + 2, Y);
2051
+        AV_WL16(dest + 8 * i + 4, U);
2052
+        AV_WL16(dest + 8 * i + 6, V);
2053
+    }
2054
+}
2055
+
2011 2056
 av_cold void ff_sws_init_output_funcs(SwsContext *c,
2012 2057
                                       yuv2planar1_fn *yuv2plane1,
2013 2058
                                       yuv2planarX_fn *yuv2planeX,
... ...
@@ -2457,5 +2502,8 @@ av_cold void ff_sws_init_output_funcs(SwsContext *c,
2457 2457
         *yuv2packed2 = yuv2ya8_2_c;
2458 2458
         *yuv2packedX = yuv2ya8_X_c;
2459 2459
         break;
2460
+    case AV_PIX_FMT_AYUV64LE:
2461
+        *yuv2packedX = yuv2ayuv64le_X_c;
2462
+        break;
2460 2463
     }
2461 2464
 }
... ...
@@ -225,7 +225,7 @@ static const FormatEntry format_entries[AV_PIX_FMT_NB] = {
225 225
     [AV_PIX_FMT_BAYER_GRBG16BE] = { 1, 0 },
226 226
     [AV_PIX_FMT_XYZ12BE]     = { 1, 1, 1 },
227 227
     [AV_PIX_FMT_XYZ12LE]     = { 1, 1, 1 },
228
-    [AV_PIX_FMT_AYUV64LE]    = { 1, 0},
228
+    [AV_PIX_FMT_AYUV64LE]    = { 1, 1},
229 229
 };
230 230
 
231 231
 int sws_isSupportedInput(enum AVPixelFormat pix_fmt)
232 232
new file mode 100644
... ...
@@ -0,0 +1 @@
0
+pixdesc-ayuv64le    2269279a2df156931021793927876e84
... ...
@@ -2,6 +2,7 @@
2 2
 0rgb                527ef3d164c8fd0700493733959689c2
3 3
 abgr                023ecf6396d324edb113e4a483b79ba2
4 4
 argb                f003b555ef429222005d33844cca9325
5
+ayuv64le            07b9c969dfbe4add4c0626773b151d4f
5 6
 bgr0                6fcd67c8e6cec723dab21c70cf53dc16
6 7
 bgr24               4cff3814819f02ecf5824edfd768d2b1
7 8
 bgr444be            1cd47c1555f947dfcba99192e3429d20
... ...
@@ -2,6 +2,7 @@
2 2
 0rgb                974833c777e6abe6d84dc59af2ca5625
3 3
 abgr                1d21f5b8a20186ac9dd54459c986a2a7
4 4
 argb                8b822972049a1e207000763f2564d6e0
5
+ayuv64le            ab2f7bc8f150af47c42c778e3ea28bce
5 6
 bgr0                38a84849a9198667c348c686802e3b52
6 7
 bgr24               1dacd8e04bf0eff163e82250d01a9cc7
7 8
 bgr444be            e2d2b864dfa528e77684ddc117f2d974
... ...
@@ -2,6 +2,7 @@
2 2
 0rgb                e2c35753a2271d1f9455b1809bc0e907
3 3
 abgr                c0eb95959edf5d40ff8af315e62d0f8a
4 4
 argb                6dca4f2987b49b7d63f702d17bace630
5
+ayuv64le            d9836decca6323ba88b3b3d02257c0b6
5 6
 bgr0                1da3fdbac616b3b410d081e39ed7a1f6
6 7
 bgr24               573c76d77b1cbe6534ea7c0267dc1b13
7 8
 bgr444be            064887b4ca8f49cfb7c776057bc75c74
... ...
@@ -2,6 +2,7 @@
2 2
 0rgb                2b0f066cfa0bef378a492875d541de8f
3 3
 abgr                832924b5351361db68dbdbb96c60ae55
4 4
 argb                80d08e68cb91bc8f2f817516e65f0bd0
5
+ayuv64le            84ef6260fe02427da946d4a2207fb54c
5 6
 bgr0                d2c676224ea80ac3ce01afde325ea1a0
6 7
 bgr24               b7fdbcd10f20e6ea2d40aae0f329f80d
7 8
 bgr444be            ca5acc0d5315d6d9f4422337c6f20842
... ...
@@ -2,6 +2,7 @@
2 2
 0rgb                ada57572ee2b35f86edac9b911ce8523
3 3
 abgr                d2da6c3ee72e4a89a7cd011dd08566b2
4 4
 argb                36cf791c52c5463bfc52a070de54337e
5
+ayuv64le            4cedbc38b3d4dcb26cdab170ce6d667b
5 6
 bgr0                66e9fda4e658d73bfe4fc9d792542271
6 7
 bgr24               db074979bd684ca4547e28681ad3f6ab
7 8
 bgr444be            63ad2fe7b4e44b11c5ca03b545a941ca
... ...
@@ -2,6 +2,7 @@
2 2
 0rgb                53efe0182723cd1dedfdbf56357c76f5
3 3
 abgr                97603869e6248a8e5d8501563a11b114
4 4
 argb                9e50e6ef02c83f28e97865a1f46ddfcd
5
+ayuv64le            6f45f683e99ddf4180c7c7f47719efcc
5 6
 bgr0                590dcd1297d1dd4541eea217381db604
6 7
 bgr24               73afe7b447b083a7c2d682abe8dd451a
7 8
 bgr444be            4fa078adc981fd07440a7b657c98c4c1
... ...
@@ -2,6 +2,7 @@
2 2
 0rgb                527ef3d164c8fd0700493733959689c2
3 3
 abgr                023ecf6396d324edb113e4a483b79ba2
4 4
 argb                f003b555ef429222005d33844cca9325
5
+ayuv64le            07b9c969dfbe4add4c0626773b151d4f
5 6
 bgr0                6fcd67c8e6cec723dab21c70cf53dc16
6 7
 bgr24               4cff3814819f02ecf5824edfd768d2b1
7 8
 bgr444be            1cd47c1555f947dfcba99192e3429d20
... ...
@@ -2,6 +2,7 @@
2 2
 0rgb                80a58af8c639743307207ab4b69ca863
3 3
 abgr                63f2eaa8712ea6108985f4a0b83587c9
4 4
 argb                f0e17c71a40643c33a5bcfb481f6d8f8
5
+ayuv64le            59fb016f9874062d0be77cb3920ffed2
5 6
 bgr0                243d58ca64f97b2f415b4c63cb79f0e1
6 7
 bgr24               18744aaab4b8bce065a7144dc0ccf921
7 8
 bgr444be            920760bee08c4fa161bf060e21ebba92
... ...
@@ -2,6 +2,7 @@
2 2
 0rgb                76b792f8ce8a72925e04294dc2f25b36
3 3
 abgr                8b94f489e68802d76f1e2844688a4911
4 4
 argb                3fd6af7ef2364d8aa845d45db289a04a
5
+ayuv64le            558671dd31d0754cfa6344eaf441df78
5 6
 bgr0                7117438cf000254610f23625265769b5
6 7
 bgr24               52b2c21cbc166978a38a646c354b6858
7 8
 bgr444be            6c6cb3f5a26d5fd00bd04467bb0bbcca