From: Hendrik Leppkes <h.lepp...@gmail.com>
Signed-off-by: Anton Khirnov <an...@khirnov.net>
---
Now with fixed function signatures
---
libswscale/input.c | 50 +++++++++++++++++++++++++++++++++++++++++++
libswscale/swscale_unscaled.c | 4 +++-
libswscale/utils.c | 2 ++
3 files changed, 55 insertions(+), 1 deletion(-)
diff --git a/libswscale/input.c b/libswscale/input.c
index e806bce..9a4fd77 100644
--- a/libswscale/input.c
+++ b/libswscale/input.c
@@ -496,6 +496,44 @@ static void nv21ToUV_c(uint8_t *dstU, uint8_t *dstV,
nvXXtoUV_c(dstV, dstU, src1, width);
}
+static void p010LEToY_c(uint8_t *dst, const uint8_t *src, int width, uint32_t
*unused)
+{
+ int i;
+ for (i = 0; i < width; i++) {
+ AV_WN16(dst + i * 2, AV_RL16(src + i * 2) >> 6);
+ }
+}
+
+static void p010BEToY_c(uint8_t *dst, const uint8_t *src, int width, uint32_t
*unused)
+{
+ int i;
+ for (i = 0; i < width; i++) {
+ AV_WN16(dst + i * 2, AV_RB16(src + i * 2) >> 6);
+ }
+}
+
+static void p010LEToUV_c(uint8_t *dstU, uint8_t *dstV,
+ const uint8_t *src1, const uint8_t *src2,
+ int width, uint32_t *unused)
+{
+ int i;
+ for (i = 0; i < width; i++) {
+ AV_WN16(dstU + i * 2, AV_RL16(src1 + i * 4 + 0) >> 6);
+ AV_WN16(dstV + i * 2, AV_RL16(src1 + i * 4 + 2) >> 6);
+ }
+}
+
+static void p010BEToUV_c(uint8_t *dstU, uint8_t *dstV,
+ const uint8_t *src1, const uint8_t *src2,
+ int width, uint32_t *unused)
+{
+ int i;
+ for (i = 0; i < width; i++) {
+ AV_WN16(dstU + i * 2, AV_RB16(src1 + i * 4 + 0) >> 6);
+ AV_WN16(dstV + i * 2, AV_RB16(src1 + i * 4 + 2) >> 6);
+ }
+}
+
#define input_pixel(pos) (isBE(origin) ? AV_RB16(pos) : AV_RL16(pos))
static void bgr24ToY_c(uint8_t *dst, const uint8_t *src,
@@ -813,6 +851,12 @@ av_cold void ff_sws_init_input_funcs(SwsContext *c)
c->chrToYV12 = bswap16UV_c;
break;
#endif
+ case AV_PIX_FMT_P010LE:
+ c->chrToYV12 = p010LEToUV_c;
+ break;
+ case AV_PIX_FMT_P010BE:
+ c->chrToYV12 = p010BEToUV_c;
+ break;
}
if (c->chrSrcHSubSample) {
switch (srcFormat) {
@@ -1128,6 +1172,12 @@ av_cold void ff_sws_init_input_funcs(SwsContext *c)
case AV_PIX_FMT_BGR48LE:
c->lumToYV12 = bgr48LEToY_c;
break;
+ case AV_PIX_FMT_P010LE:
+ c->lumToYV12 = p010LEToY_c;
+ break;
+ case AV_PIX_FMT_P010BE:
+ c->lumToYV12 = p010BEToY_c;
+ break;
}
if (c->alpPixBuf) {
switch (srcFormat) {
diff --git a/libswscale/swscale_unscaled.c b/libswscale/swscale_unscaled.c
index ba0b2ba..0e6be51 100644
--- a/libswscale/swscale_unscaled.c
+++ b/libswscale/swscale_unscaled.c
@@ -1156,7 +1156,9 @@ void ff_get_unscaled_swscale(SwsContext *c)
c->chrDstHSubSample == c->chrSrcHSubSample &&
c->chrDstVSubSample == c->chrSrcVSubSample &&
dstFormat != AV_PIX_FMT_NV12 && dstFormat != AV_PIX_FMT_NV21 &&
- srcFormat != AV_PIX_FMT_NV12 && srcFormat != AV_PIX_FMT_NV21))
+ dstFormat != AV_PIX_FMT_P010LE && dstFormat != AV_PIX_FMT_P010BE &&
+ srcFormat != AV_PIX_FMT_NV12 && srcFormat != AV_PIX_FMT_NV21 &&
+ srcFormat != AV_PIX_FMT_P010LE && srcFormat != AV_PIX_FMT_P010BE))
{
if (isPacked(c->srcFormat))
c->swscale = packedCopyWrapper;
diff --git a/libswscale/utils.c b/libswscale/utils.c
index ee309bc..129643a 100644
--- a/libswscale/utils.c
+++ b/libswscale/utils.c
@@ -185,6 +185,8 @@ static const FormatEntry format_entries[AV_PIX_FMT_NB] = {
[AV_PIX_FMT_GBRAP16BE] = { 1, 0 },
[AV_PIX_FMT_XYZ12BE] = { 0, 0, 1 },
[AV_PIX_FMT_XYZ12LE] = { 0, 0, 1 },
+ [AV_PIX_FMT_P010LE] = { 1, 0 },
+ [AV_PIX_FMT_P010BE] = { 1, 0 },
};
int sws_isSupportedInput(enum AVPixelFormat pix_fmt)
--
2.0.0
_______________________________________________
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel
