diff options
| author | Vittorio Giovara <vittorio.giovara@gmail.com> | 2014-07-20 01:05:35 -0400 |
|---|---|---|
| committer | Vittorio Giovara <vittorio.giovara@gmail.com> | 2014-08-04 12:56:05 +0100 |
| commit | f84a1b597c29dc035b8d5529ef88c2d7ff057820 (patch) | |
| tree | bf2504960b962a10cfdb869caecaaad613ccb818 | |
| parent | e9abafca278f87e1ecc6d50091d99b73ff63c9a6 (diff) | |
| download | ffmpeg-f84a1b597c29dc035b8d5529ef88c2d7ff057820.tar.gz | |
swscale: support AV_PIX_FMT_YA16 as input
Based on a long debug session with Kostya.
| -rw-r--r-- | libswscale/input.c | 40 | ||||
| -rw-r--r-- | libswscale/swscale-test.c | 4 | ||||
| -rw-r--r-- | libswscale/swscale_internal.h | 4 | ||||
| -rw-r--r-- | libswscale/swscale_unscaled.c | 1 | ||||
| -rw-r--r-- | libswscale/utils.c | 2 |
5 files changed, 49 insertions, 2 deletions
diff --git a/libswscale/input.c b/libswscale/input.c index 1ffdfe534b..f583b3f214 100644 --- a/libswscale/input.c +++ b/libswscale/input.c @@ -419,6 +419,38 @@ static void bswap16UV_c(uint8_t *_dstU, uint8_t *_dstV, const uint8_t *_src1, } } +static void read_ya16le_gray_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 * 4)); +} + +static void read_ya16le_alpha_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 * 4 + 2)); +} + +static void read_ya16be_gray_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 * 4)); +} + +static void read_ya16be_alpha_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 * 4 + 2)); +} + /* This is almost identical to the previous, end exists only because * yuy2ToY/UV)(dst, src + 1, ...) would have 100% unaligned accesses. */ static void uyvyToY_c(uint8_t *dst, const uint8_t *src, int width, @@ -987,6 +1019,14 @@ av_cold void ff_sws_init_input_funcs(SwsContext *c) c->alpToYV12 = bswap16Y_c; break; #endif + case AV_PIX_FMT_YA16LE: + c->lumToYV12 = read_ya16le_gray_c; + c->alpToYV12 = read_ya16le_alpha_c; + break; + case AV_PIX_FMT_YA16BE: + c->lumToYV12 = read_ya16be_gray_c; + c->alpToYV12 = read_ya16be_alpha_c; + break; case AV_PIX_FMT_YUYV422: case AV_PIX_FMT_YVYU422: case AV_PIX_FMT_YA8: diff --git a/libswscale/swscale-test.c b/libswscale/swscale-test.c index 7cf2dc06af..8063519be1 100644 --- a/libswscale/swscale-test.c +++ b/libswscale/swscale-test.c @@ -39,7 +39,9 @@ ((x) == AV_PIX_FMT_GRAY8 || \ (x) == AV_PIX_FMT_YA8 || \ (x) == AV_PIX_FMT_GRAY16BE || \ - (x) == AV_PIX_FMT_GRAY16LE) + (x) == AV_PIX_FMT_GRAY16LE || \ + (x) == AV_PIX_FMT_YA16BE || \ + (x) == AV_PIX_FMT_YA16LE) #define hasChroma(x) \ (!(isGray(x) || \ (x) == AV_PIX_FMT_MONOBLACK || \ diff --git a/libswscale/swscale_internal.h b/libswscale/swscale_internal.h index 4aef9617dd..a0daa071e9 100644 --- a/libswscale/swscale_internal.h +++ b/libswscale/swscale_internal.h @@ -608,7 +608,9 @@ static av_always_inline int isRGB(enum AVPixelFormat pix_fmt) ((x) == AV_PIX_FMT_GRAY8 || \ (x) == AV_PIX_FMT_YA8 || \ (x) == AV_PIX_FMT_GRAY16BE || \ - (x) == AV_PIX_FMT_GRAY16LE) + (x) == AV_PIX_FMT_GRAY16LE || \ + (x) == AV_PIX_FMT_YA16BE || \ + (x) == AV_PIX_FMT_YA16LE) #endif #define isRGBinInt(x) \ diff --git a/libswscale/swscale_unscaled.c b/libswscale/swscale_unscaled.c index 21762a72ae..ffc813e1ec 100644 --- a/libswscale/swscale_unscaled.c +++ b/libswscale/swscale_unscaled.c @@ -1053,6 +1053,7 @@ void ff_get_unscaled_swscale(SwsContext *c) IS_DIFFERENT_ENDIANESS(srcFormat, dstFormat, AV_PIX_FMT_BGR565) || IS_DIFFERENT_ENDIANESS(srcFormat, dstFormat, AV_PIX_FMT_BGRA64) || IS_DIFFERENT_ENDIANESS(srcFormat, dstFormat, AV_PIX_FMT_GRAY16) || + IS_DIFFERENT_ENDIANESS(srcFormat, dstFormat, AV_PIX_FMT_YA16) || IS_DIFFERENT_ENDIANESS(srcFormat, dstFormat, AV_PIX_FMT_RGB444) || IS_DIFFERENT_ENDIANESS(srcFormat, dstFormat, AV_PIX_FMT_RGB48) || IS_DIFFERENT_ENDIANESS(srcFormat, dstFormat, AV_PIX_FMT_RGB555) || diff --git a/libswscale/utils.c b/libswscale/utils.c index ae121f8529..3a8531d0f0 100644 --- a/libswscale/utils.c +++ b/libswscale/utils.c @@ -155,6 +155,8 @@ static const FormatEntry format_entries[AV_PIX_FMT_NB] = { [AV_PIX_FMT_BGR444LE] = { 1, 1 }, [AV_PIX_FMT_BGR444BE] = { 1, 1 }, [AV_PIX_FMT_YA8] = { 1, 0 }, + [AV_PIX_FMT_YA16BE] = { 1, 0 }, + [AV_PIX_FMT_YA16LE] = { 1, 0 }, [AV_PIX_FMT_BGR48BE] = { 1, 1 }, [AV_PIX_FMT_BGR48LE] = { 1, 1 }, [AV_PIX_FMT_BGRA64BE] = { 0, 0, 1 }, |