har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

swscale: add P010 input support

Browse Source 
Signed-off-by: Anton Khirnov <anton@khirnov.net>
This commit is contained in:
Hendrik Leppkes 2015-12-08 11:53:54 +01:00 committed by Anton Khirnov
parent b7c5f88523
commit e78e5b735f
3 changed files with 55 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
libswscale/input.c
View File

@ -496,6 +496,44 @@ static void nv21ToUV_c(uint8_t *dstU, uint8_t *dstV,
nvXXtoUV_c(dstV, dstU, src1, width); 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)) #define input_pixel(pos) (isBE(origin) ? AV_RB16(pos) : AV_RL16(pos))
static void bgr24ToY_c(uint8_t *dst, const uint8_t *src, 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; c->chrToYV12 = bswap16UV_c;
break; break;
#endif #endif
case AV_PIX_FMT_P010LE:
c->chrToYV12 = p010LEToUV_c;
break;
case AV_PIX_FMT_P010BE:
c->chrToYV12 = p010BEToUV_c;
break;
} }
if (c->chrSrcHSubSample) { if (c->chrSrcHSubSample) {
switch (srcFormat) { switch (srcFormat) {
@ -1128,6 +1172,12 @@ av_cold void ff_sws_init_input_funcs(SwsContext *c)
case AV_PIX_FMT_BGR48LE: case AV_PIX_FMT_BGR48LE:
c->lumToYV12 = bgr48LEToY_c; c->lumToYV12 = bgr48LEToY_c;
break; break;
case AV_PIX_FMT_P010LE:
c->lumToYV12 = p010LEToY_c;
break;
case AV_PIX_FMT_P010BE:
c->lumToYV12 = p010BEToY_c;
break;
} }
if (c->alpPixBuf) { if (c->alpPixBuf) {
switch (srcFormat) { switch (srcFormat) {

4
libswscale/swscale_unscaled.c
View File

@ -1156,7 +1156,9 @@ void ff_get_unscaled_swscale(SwsContext *c)
c->chrDstHSubSample == c->chrSrcHSubSample && c->chrDstHSubSample == c->chrSrcHSubSample &&
c->chrDstVSubSample == c->chrSrcVSubSample && c->chrDstVSubSample == c->chrSrcVSubSample &&
dstFormat != AV_PIX_FMT_NV12 && dstFormat != AV_PIX_FMT_NV21 && 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)) if (isPacked(c->srcFormat))
c->swscale = packedCopyWrapper; c->swscale = packedCopyWrapper;

2
libswscale/utils.c
View File

@ -185,6 +185,8 @@ static const FormatEntry format_entries[AV_PIX_FMT_NB] = {
[AV_PIX_FMT_GBRAP16BE] = { 1, 0 }, [AV_PIX_FMT_GBRAP16BE] = { 1, 0 },
[AV_PIX_FMT_XYZ12BE] = { 0, 0, 1 }, [AV_PIX_FMT_XYZ12BE] = { 0, 0, 1 },
[AV_PIX_FMT_XYZ12LE] = { 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) int sws_isSupportedInput(enum AVPixelFormat pix_fmt)