diff options
author | Zhao Zhili <zhilizhao@tencent.com> | 2023-12-29 21:22:57 +0800 |
---|---|---|
committer | Zhao Zhili <zhilizhao@tencent.com> | 2024-01-04 17:31:49 +0800 |
commit | 5d255ba95ad260146b27422b76e8d1c34a77af36 (patch) | |
tree | 94f51970ebab68fd5ae4c626eb96b3a408f98d4f /libavutil | |
parent | 0f824d792d20783fda64279ab94e16676e48c2e6 (diff) |
avutil/hwcontext_videotoolbox: add frame hwctx to specify color range
VideoToolbox use different identifiers for the same pixel format
with different color range, like
kCVPixelFormatType_420YpCbCr8BiPlanarVideoRange
kCVPixelFormatType_420YpCbCr8BiPlanarFullRange.
Before the patch, vt_pool_alloc() always use limited range, and it
will fail for pixel format AV_PIX_FMT_BGRA since there is no limited
range kCVPixelFormatType_32BGRA.
Signed-off-by: Zhao Zhili <zhilizhao@tencent.com>
Diffstat (limited to 'libavutil')
-rw-r--r-- | libavutil/hwcontext_videotoolbox.c | 30 | ||||
-rw-r--r-- | libavutil/hwcontext_videotoolbox.h | 7 | ||||
-rw-r--r-- | libavutil/version.h | 2 |
3 files changed, 29 insertions, 10 deletions
diff --git a/libavutil/hwcontext_videotoolbox.c b/libavutil/hwcontext_videotoolbox.c index b8e6bb407f..bb5b7e2764 100644 --- a/libavutil/hwcontext_videotoolbox.c +++ b/libavutil/hwcontext_videotoolbox.c @@ -144,6 +144,25 @@ enum AVPixelFormat av_map_videotoolbox_format_to_pixfmt(uint32_t cv_fmt) return AV_PIX_FMT_NONE; } +static uint32_t vt_format_from_pixfmt(enum AVPixelFormat pix_fmt, + enum AVColorRange range) +{ + for (int i = 0; i < FF_ARRAY_ELEMS(cv_pix_fmts); i++) { + if (cv_pix_fmts[i].pix_fmt == pix_fmt) { + int full_range = (range == AVCOL_RANGE_JPEG); + + // Don't care if unspecified + if (range == AVCOL_RANGE_UNSPECIFIED) + return cv_pix_fmts[i].cv_fmt; + + if (cv_pix_fmts[i].full_range == full_range) + return cv_pix_fmts[i].cv_fmt; + } + } + + return 0; +} + uint32_t av_map_videotoolbox_format_from_pixfmt(enum AVPixelFormat pix_fmt) { return av_map_videotoolbox_format_from_pixfmt2(pix_fmt, false); @@ -151,12 +170,7 @@ uint32_t av_map_videotoolbox_format_from_pixfmt(enum AVPixelFormat pix_fmt) uint32_t av_map_videotoolbox_format_from_pixfmt2(enum AVPixelFormat pix_fmt, bool full_range) { - int i; - for (i = 0; i < FF_ARRAY_ELEMS(cv_pix_fmts); i++) { - if (cv_pix_fmts[i].pix_fmt == pix_fmt && cv_pix_fmts[i].full_range == full_range) - return cv_pix_fmts[i].cv_fmt; - } - return 0; + return vt_format_from_pixfmt(pix_fmt, full_range ? AVCOL_RANGE_JPEG : AVCOL_RANGE_MPEG); } static int vt_pool_alloc(AVHWFramesContext *ctx) @@ -166,6 +180,7 @@ static int vt_pool_alloc(AVHWFramesContext *ctx) CFNumberRef w, h, pixfmt; uint32_t cv_pixfmt; CFMutableDictionaryRef attributes, iosurface_properties; + AVVTFramesContext *hw_ctx = ctx->hwctx; attributes = CFDictionaryCreateMutable( NULL, @@ -173,7 +188,7 @@ static int vt_pool_alloc(AVHWFramesContext *ctx) &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks); - cv_pixfmt = av_map_videotoolbox_format_from_pixfmt(ctx->sw_format); + cv_pixfmt = vt_format_from_pixfmt(ctx->sw_format, hw_ctx->color_range); pixfmt = CFNumberCreate(NULL, kCFNumberSInt32Type, &cv_pixfmt); CFDictionarySetValue( attributes, @@ -750,6 +765,7 @@ const HWContextType ff_hwcontext_type_videotoolbox = { .frames_priv_size = sizeof(VTFramesContext), .device_create = vt_device_create, + .frames_hwctx_size = sizeof(AVVTFramesContext), .frames_init = vt_frames_init, .frames_get_buffer = vt_get_buffer, .frames_get_constraints = vt_frames_get_constraints, diff --git a/libavutil/hwcontext_videotoolbox.h b/libavutil/hwcontext_videotoolbox.h index 25dde85df5..600e9f2c8d 100644 --- a/libavutil/hwcontext_videotoolbox.h +++ b/libavutil/hwcontext_videotoolbox.h @@ -39,10 +39,13 @@ * depending on application usage, so it is preferable to let CoreVideo manage * the pool using the default implementation. * - * Currently AVHWDeviceContext.hwctx and AVHWFramesContext.hwctx are always - * NULL. + * Currently AVHWDeviceContext.hwctx are always NULL. */ +typedef struct AVVTFramesContext { + enum AVColorRange color_range; +} AVVTFramesContext; + /** * Convert a VideoToolbox (actually CoreVideo) format to AVPixelFormat. * Returns AV_PIX_FMT_NONE if no known equivalent was found. diff --git a/libavutil/version.h b/libavutil/version.h index 3b4c50e9a9..772c4e209c 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -80,7 +80,7 @@ #define LIBAVUTIL_VERSION_MAJOR 58 #define LIBAVUTIL_VERSION_MINOR 36 -#define LIBAVUTIL_VERSION_MICRO 100 +#define LIBAVUTIL_VERSION_MICRO 101 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ LIBAVUTIL_VERSION_MINOR, \ |