[FFmpeg-cvslog] swscale: ayuv64le output support
Paul B Mahol
git at videolan.org
Fri Jul 24 16:09:13 CEST 2015
ffmpeg | branch: master | Paul B Mahol <onemda at gmail.com> | Fri Jul 3 16:13:11 2015 +0000| [3cb8eee6f7bff275081e640b7529f90c52fb3224] | committer: Paul B Mahol
swscale: ayuv64le output support
Signed-off-by: Paul B Mahol <onemda at gmail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3cb8eee6f7bff275081e640b7529f90c52fb3224
---
libswscale/output.c | 48 ++++++++++++++++++++++++++++++
libswscale/utils.c | 2 +-
tests/ref/fate/filter-pixdesc-ayuv64le | 1 +
tests/ref/fate/filter-pixfmts-copy | 1 +
tests/ref/fate/filter-pixfmts-crop | 1 +
tests/ref/fate/filter-pixfmts-field | 1 +
tests/ref/fate/filter-pixfmts-fieldorder | 1 +
tests/ref/fate/filter-pixfmts-hflip | 1 +
tests/ref/fate/filter-pixfmts-il | 1 +
tests/ref/fate/filter-pixfmts-null | 1 +
tests/ref/fate/filter-pixfmts-scale | 1 +
tests/ref/fate/filter-pixfmts-vflip | 1 +
12 files changed, 59 insertions(+), 1 deletion(-)
diff --git a/libswscale/output.c b/libswscale/output.c
index 1db0a51..ca60bf2 100644
--- a/libswscale/output.c
+++ b/libswscale/output.c
@@ -2008,6 +2008,51 @@ yuv2ya8_X_c(SwsContext *c, const int16_t *lumFilter,
}
}
+static void
+yuv2ayuv64le_X_c(SwsContext *c, const int16_t *lumFilter,
+ const int32_t **lumSrc, int lumFilterSize,
+ const int16_t *chrFilter, const int32_t **chrUSrc,
+ const int32_t **chrVSrc, int chrFilterSize,
+ const int32_t **alpSrc, uint8_t *dest, int dstW, int y)
+{
+ int hasAlpha = !!alpSrc;
+ int i;
+
+ for (i = 0; i < dstW; i++) {
+ int Y = 1 << 14, U = 1 << 14;
+ int V = 1 << 14, A = 1 << 14;
+ int j;
+
+ Y -= 0x40000000;
+ U -= 0x40000000;
+ V -= 0x40000000;
+ A -= 0x40000000;
+
+ for (j = 0; j < lumFilterSize; j++)
+ Y += lumSrc[j][i] * (unsigned)lumFilter[j];
+
+ for (j = 0; j < chrFilterSize; j++)
+ U += chrUSrc[j][i] * (unsigned)chrFilter[j];
+
+ for (j = 0; j < chrFilterSize; j++)
+ V += chrVSrc[j][i] * (unsigned)chrFilter[j];
+
+ if (hasAlpha)
+ for (j = 0; j < lumFilterSize; j++)
+ A += alpSrc[j][i] * (unsigned)lumFilter[j];
+
+ Y = 0x8000 + av_clip_int16(Y >> 15);
+ U = 0x8000 + av_clip_int16(U >> 15);
+ V = 0x8000 + av_clip_int16(V >> 15);
+ A = 0x8000 + av_clip_int16(A >> 15);
+
+ AV_WL16(dest + 8 * i, hasAlpha ? A : 65535);
+ AV_WL16(dest + 8 * i + 2, Y);
+ AV_WL16(dest + 8 * i + 4, U);
+ AV_WL16(dest + 8 * i + 6, V);
+ }
+}
+
av_cold void ff_sws_init_output_funcs(SwsContext *c,
yuv2planar1_fn *yuv2plane1,
yuv2planarX_fn *yuv2planeX,
@@ -2457,5 +2502,8 @@ av_cold void ff_sws_init_output_funcs(SwsContext *c,
*yuv2packed2 = yuv2ya8_2_c;
*yuv2packedX = yuv2ya8_X_c;
break;
+ case AV_PIX_FMT_AYUV64LE:
+ *yuv2packedX = yuv2ayuv64le_X_c;
+ break;
}
}
diff --git a/libswscale/utils.c b/libswscale/utils.c
index 7dfd43b..565c904 100644
--- a/libswscale/utils.c
+++ b/libswscale/utils.c
@@ -225,7 +225,7 @@ static const FormatEntry format_entries[AV_PIX_FMT_NB] = {
[AV_PIX_FMT_BAYER_GRBG16BE] = { 1, 0 },
[AV_PIX_FMT_XYZ12BE] = { 1, 1, 1 },
[AV_PIX_FMT_XYZ12LE] = { 1, 1, 1 },
- [AV_PIX_FMT_AYUV64LE] = { 1, 0},
+ [AV_PIX_FMT_AYUV64LE] = { 1, 1},
};
int sws_isSupportedInput(enum AVPixelFormat pix_fmt)
diff --git a/tests/ref/fate/filter-pixdesc-ayuv64le b/tests/ref/fate/filter-pixdesc-ayuv64le
new file mode 100644
index 0000000..385ce13
--- /dev/null
+++ b/tests/ref/fate/filter-pixdesc-ayuv64le
@@ -0,0 +1 @@
+pixdesc-ayuv64le 2269279a2df156931021793927876e84
diff --git a/tests/ref/fate/filter-pixfmts-copy b/tests/ref/fate/filter-pixfmts-copy
index defdb19..bb6fac9 100644
--- a/tests/ref/fate/filter-pixfmts-copy
+++ b/tests/ref/fate/filter-pixfmts-copy
@@ -2,6 +2,7 @@
0rgb 527ef3d164c8fd0700493733959689c2
abgr 023ecf6396d324edb113e4a483b79ba2
argb f003b555ef429222005d33844cca9325
+ayuv64le 07b9c969dfbe4add4c0626773b151d4f
bgr0 6fcd67c8e6cec723dab21c70cf53dc16
bgr24 4cff3814819f02ecf5824edfd768d2b1
bgr444be 1cd47c1555f947dfcba99192e3429d20
diff --git a/tests/ref/fate/filter-pixfmts-crop b/tests/ref/fate/filter-pixfmts-crop
index b9e117b..f3ec651 100644
--- a/tests/ref/fate/filter-pixfmts-crop
+++ b/tests/ref/fate/filter-pixfmts-crop
@@ -2,6 +2,7 @@
0rgb 974833c777e6abe6d84dc59af2ca5625
abgr 1d21f5b8a20186ac9dd54459c986a2a7
argb 8b822972049a1e207000763f2564d6e0
+ayuv64le ab2f7bc8f150af47c42c778e3ea28bce
bgr0 38a84849a9198667c348c686802e3b52
bgr24 1dacd8e04bf0eff163e82250d01a9cc7
bgr444be e2d2b864dfa528e77684ddc117f2d974
diff --git a/tests/ref/fate/filter-pixfmts-field b/tests/ref/fate/filter-pixfmts-field
index 5bec7f8..f5d6a3d 100644
--- a/tests/ref/fate/filter-pixfmts-field
+++ b/tests/ref/fate/filter-pixfmts-field
@@ -2,6 +2,7 @@
0rgb e2c35753a2271d1f9455b1809bc0e907
abgr c0eb95959edf5d40ff8af315e62d0f8a
argb 6dca4f2987b49b7d63f702d17bace630
+ayuv64le d9836decca6323ba88b3b3d02257c0b6
bgr0 1da3fdbac616b3b410d081e39ed7a1f6
bgr24 573c76d77b1cbe6534ea7c0267dc1b13
bgr444be 064887b4ca8f49cfb7c776057bc75c74
diff --git a/tests/ref/fate/filter-pixfmts-fieldorder b/tests/ref/fate/filter-pixfmts-fieldorder
index 832e51d..93086ca 100644
--- a/tests/ref/fate/filter-pixfmts-fieldorder
+++ b/tests/ref/fate/filter-pixfmts-fieldorder
@@ -2,6 +2,7 @@
0rgb 2b0f066cfa0bef378a492875d541de8f
abgr 832924b5351361db68dbdbb96c60ae55
argb 80d08e68cb91bc8f2f817516e65f0bd0
+ayuv64le 84ef6260fe02427da946d4a2207fb54c
bgr0 d2c676224ea80ac3ce01afde325ea1a0
bgr24 b7fdbcd10f20e6ea2d40aae0f329f80d
bgr444be ca5acc0d5315d6d9f4422337c6f20842
diff --git a/tests/ref/fate/filter-pixfmts-hflip b/tests/ref/fate/filter-pixfmts-hflip
index 8f41f12..ae23cb3 100644
--- a/tests/ref/fate/filter-pixfmts-hflip
+++ b/tests/ref/fate/filter-pixfmts-hflip
@@ -2,6 +2,7 @@
0rgb ada57572ee2b35f86edac9b911ce8523
abgr d2da6c3ee72e4a89a7cd011dd08566b2
argb 36cf791c52c5463bfc52a070de54337e
+ayuv64le 4cedbc38b3d4dcb26cdab170ce6d667b
bgr0 66e9fda4e658d73bfe4fc9d792542271
bgr24 db074979bd684ca4547e28681ad3f6ab
bgr444be 63ad2fe7b4e44b11c5ca03b545a941ca
diff --git a/tests/ref/fate/filter-pixfmts-il b/tests/ref/fate/filter-pixfmts-il
index 87538c5..621a45b 100644
--- a/tests/ref/fate/filter-pixfmts-il
+++ b/tests/ref/fate/filter-pixfmts-il
@@ -2,6 +2,7 @@
0rgb 53efe0182723cd1dedfdbf56357c76f5
abgr 97603869e6248a8e5d8501563a11b114
argb 9e50e6ef02c83f28e97865a1f46ddfcd
+ayuv64le 6f45f683e99ddf4180c7c7f47719efcc
bgr0 590dcd1297d1dd4541eea217381db604
bgr24 73afe7b447b083a7c2d682abe8dd451a
bgr444be 4fa078adc981fd07440a7b657c98c4c1
diff --git a/tests/ref/fate/filter-pixfmts-null b/tests/ref/fate/filter-pixfmts-null
index defdb19..bb6fac9 100644
--- a/tests/ref/fate/filter-pixfmts-null
+++ b/tests/ref/fate/filter-pixfmts-null
@@ -2,6 +2,7 @@
0rgb 527ef3d164c8fd0700493733959689c2
abgr 023ecf6396d324edb113e4a483b79ba2
argb f003b555ef429222005d33844cca9325
+ayuv64le 07b9c969dfbe4add4c0626773b151d4f
bgr0 6fcd67c8e6cec723dab21c70cf53dc16
bgr24 4cff3814819f02ecf5824edfd768d2b1
bgr444be 1cd47c1555f947dfcba99192e3429d20
diff --git a/tests/ref/fate/filter-pixfmts-scale b/tests/ref/fate/filter-pixfmts-scale
index 18a6800..27e6e81 100644
--- a/tests/ref/fate/filter-pixfmts-scale
+++ b/tests/ref/fate/filter-pixfmts-scale
@@ -2,6 +2,7 @@
0rgb 80a58af8c639743307207ab4b69ca863
abgr 63f2eaa8712ea6108985f4a0b83587c9
argb f0e17c71a40643c33a5bcfb481f6d8f8
+ayuv64le 59fb016f9874062d0be77cb3920ffed2
bgr0 243d58ca64f97b2f415b4c63cb79f0e1
bgr24 18744aaab4b8bce065a7144dc0ccf921
bgr444be 920760bee08c4fa161bf060e21ebba92
diff --git a/tests/ref/fate/filter-pixfmts-vflip b/tests/ref/fate/filter-pixfmts-vflip
index 732bb63..bd5e11d 100644
--- a/tests/ref/fate/filter-pixfmts-vflip
+++ b/tests/ref/fate/filter-pixfmts-vflip
@@ -2,6 +2,7 @@
0rgb 76b792f8ce8a72925e04294dc2f25b36
abgr 8b94f489e68802d76f1e2844688a4911
argb 3fd6af7ef2364d8aa845d45db289a04a
+ayuv64le 558671dd31d0754cfa6344eaf441df78
bgr0 7117438cf000254610f23625265769b5
bgr24 52b2c21cbc166978a38a646c354b6858
bgr444be 6c6cb3f5a26d5fd00bd04467bb0bbcca
More information about the ffmpeg-cvslog
mailing list