diff options
| author | Janne Grunau <janne-libav@jannau.net> | 2013-04-26 14:47:08 +0200 |
|---|---|---|
| committer | Janne Grunau <janne-libav@jannau.net> | 2013-05-06 18:55:58 +0200 |
| commit | c1eb3e7fecdc270e03a700d61ef941600a6af491 (patch) | |
| tree | 2a280b28311debfd7f8dc9812280473cd3eb0706 /libswscale | |
| parent | 74652af821d7e526a6541876a637fbf81261fa8e (diff) | |
swscale: add support for endianness only conversion
Use bitfields in FormatEntry array to avoid wasting an int for each flag.
Diffstat (limited to 'libswscale')
| -rw-r--r-- | libswscale/swscale.h | 7 | ||||
| -rw-r--r-- | libswscale/utils.c | 13 | ||||
| -rw-r--r-- | libswscale/version.h | 2 |
3 files changed, 20 insertions, 2 deletions
diff --git a/libswscale/swscale.h b/libswscale/swscale.h index 8ba09e6960..e69a69461b 100644 --- a/libswscale/swscale.h +++ b/libswscale/swscale.h @@ -141,6 +141,13 @@ int sws_isSupportedInput(enum AVPixelFormat pix_fmt); int sws_isSupportedOutput(enum AVPixelFormat pix_fmt); /** + * @param[in] pix_fmt the pixel format + * @return a positive value if an endianness conversion for pix_fmt is + * supported, 0 otherwise. + */ +int sws_isSupportedEndiannessConversion(enum AVPixelFormat pix_fmt); + +/** * Allocate an empty SwsContext. This must be filled and passed to * sws_init_context(). For filling see AVOptions, options.c and * sws_setColorspaceDetails(). diff --git a/libswscale/utils.c b/libswscale/utils.c index 93cb60fdf1..538a3df665 100644 --- a/libswscale/utils.c +++ b/libswscale/utils.c @@ -70,7 +70,9 @@ const char *swscale_license(void) #define RET 0xC3 // near return opcode for x86 typedef struct FormatEntry { - int is_supported_in, is_supported_out; + uint8_t is_supported_in :1; + uint8_t is_supported_out :1; + uint8_t is_supported_endianness :1; } FormatEntry; static const FormatEntry format_entries[AV_PIX_FMT_NB] = { @@ -184,6 +186,12 @@ int sws_isSupportedOutput(enum AVPixelFormat pix_fmt) format_entries[pix_fmt].is_supported_out : 0; } +int sws_isSupportedEndiannessConversion(enum AVPixelFormat pix_fmt) +{ + return (unsigned)pix_fmt < AV_PIX_FMT_NB ? + format_entries[pix_fmt].is_supported_endianness : 0; +} + extern const int32_t ff_yuv2rgb_coeffs[8][4]; const char *sws_format_name(enum AVPixelFormat format) @@ -880,6 +888,8 @@ av_cold int sws_init_context(SwsContext *c, SwsFilter *srcFilter, unscaled = (srcW == dstW && srcH == dstH); + if (!(unscaled && sws_isSupportedEndiannessConversion(srcFormat) && + av_pix_fmt_swap_endianness(srcFormat) == dstFormat)) { if (!sws_isSupportedInput(srcFormat)) { av_log(c, AV_LOG_ERROR, "%s is not supported as input pixel format\n", sws_format_name(srcFormat)); @@ -890,6 +900,7 @@ av_cold int sws_init_context(SwsContext *c, SwsFilter *srcFilter, sws_format_name(dstFormat)); return AVERROR(EINVAL); } + } i = flags & (SWS_POINT | SWS_AREA | diff --git a/libswscale/version.h b/libswscale/version.h index acbdf6b012..54836739c0 100644 --- a/libswscale/version.h +++ b/libswscale/version.h @@ -28,7 +28,7 @@ #define LIBSWSCALE_VERSION_MAJOR 2 #define LIBSWSCALE_VERSION_MINOR 1 -#define LIBSWSCALE_VERSION_MICRO 1 +#define LIBSWSCALE_VERSION_MICRO 2 #define LIBSWSCALE_VERSION_INT AV_VERSION_INT(LIBSWSCALE_VERSION_MAJOR, \ LIBSWSCALE_VERSION_MINOR, \ |