From patchwork Sat Apr 13 14:36:01 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: der richter X-Patchwork-Id: 12724 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 5B3C0446F57 for ; Sat, 13 Apr 2019 17:36:17 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3B14F68A38D; Sat, 13 Apr 2019 17:36:17 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mout.gmx.net (mout.gmx.net [212.227.17.20]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D21016891CE for ; Sat, 13 Apr 2019 17:36:10 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1555166170; bh=VDlOg47ZNFX2YNMngS0xbXkV12NFXO9eWJU0p6eQfyk=; h=X-UI-Sender-Class:From:To:Cc:Subject:Date:In-Reply-To:References; b=a0OHqNLYs2iWIgYSTXQTIAmguG8ArtpszK287NcUTL74orzartmzF6eQyGINEl3B3 X5sCfd0XznMFjjjonvDo5NJDd/Zb1B85alIhSeCDoFgl49fnm1gAn8PYiUhaypt98B V3zbc15NI4XkZDIYNPhhrwl0lCqxqsZhIJE38zc4= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from Akemis-iMac.speedport.ip ([79.222.69.43]) by mail.gmx.com (mrgmx101 [212.227.17.168]) with ESMTPSA (Nemesis) id 0M8ZtH-1gtMnC3q8h-00wFZB; Sat, 13 Apr 2019 16:36:09 +0200 From: der richter To: ffmpeg-devel@ffmpeg.org Date: Sat, 13 Apr 2019 16:36:01 +0200 Message-Id: <20190413143601.74858-2-der.richter@gmx.de> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190413143601.74858-1-der.richter@gmx.de> References: <20190413143601.74858-1-der.richter@gmx.de> MIME-Version: 1.0 X-Provags-ID: V03:K1:Q4a4WR0RpMsd0A8SIGAVhSyMOagP/DEGOXsqj8rFhmux/1+Tseu ey4ud/FslgeuWZeeahz8aMo26v0s9SQI1ZKdcOxqw0dzGbOKJPLHHKorjIfgDXGOotiBigM 5q9NqoCVhMPZeakk0C/CBUfzG5DzKSwrHewCTmz6aBTVcpOPblS1S7FeTpPyG5hQXIRcr9a TzFb4ryUtEW6WM9fadRag== X-Spam-Flag: NO X-UI-Out-Filterresults: notjunk:1; V03:K0:eDEy42gEm7k=:yzYM5bXtKVqxGWndiduarg Qc5Opbsx8hJnvRo0lvp87ijEYP2gGBvBTccH5m8r9skRcMSJt6VFJ2UhQOLcXyfsYBNnHxL8p +tyk95C+Jm8YiFiB7rIASSHK4yxrS8bLiZInHtydsiA5bK1POF8aMouT4+a60BD8Ls7mzOxp/ Iw/GlTCgS4Rjusv1XeIf2C0zoITvMPfTAJVDmnWN4UlV8kk2ayOXii9vUNt8eanjZW0oKuCbw jdTn5fQ9SbKoEdzo9PK4W6lTS9YdHzpF6m11rkhpVw9g7tqjwXuVBhaQPSU2riZM8aGKHvi8K DztFXSyvqZ6AUh/tCzuSr5d6CKEV7fcU9R0OE9lL9TAdZ0mJ1SGhUsblVck4oDwpR4TIXZPMx Lbde8oaQXbbMPKq4yztAV96r1MS9wPoSQKydJ/HImOUyL3uxhTojfxu4iD54Cmj5weN0OdErK 47iNwrB+e8Wz6GhyTI9uWsJMf8MVYQFYw20PkhYMC+5aploF6SZ84vHxY8a+QAc2BKXfI8jwi 6FXKbdFCQk1JAHIZS7A6TxgqIq0kWzrMNkcYESt2OEPOC9X5oFfd/PcLtpWbykWGPNd1DSe+V j+fvfDv4p8yqf1TpLwVBH2Mo6LmVLprDqjU8kYIYtfD9As9fS44MYRbUDTvWrGFOGEBubKqrU si+R5pnz2NEgcV7ooWd6EO3PM4bO5kY5uRRReYb2XnepOMT1+JC7c8NNrb5hSffy88kvvIfZS FP4x5XPxN9e9v+ChJqgaDPLnS3B6LEefGn7Faumk4vZGx7WxDlPYhP4Y8IiWIPerwWrGIxAR6 r7/irkEa2iiXK9AzJwSW+u2rNdSa2XifVgTFpJmMk/HRmXRfw3HfkmxVbIpUunyWrrF6n8T9q fQbxH7j1gv+dsSA9ZnZp0zsyLvmwtMDGeFoJHkDf/ewGnqzgz72xXosDa1zWI0 Subject: [FFmpeg-devel] [PATCH v3 2/2] avcodec/videotoolbox: add support for full range pixel formats X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Akemi Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Akemi --- fftools/ffmpeg_videotoolbox.c | 6 ++++-- libavcodec/videotoolbox.c | 14 +++++++++----- libavutil/hwcontext_videotoolbox.c | 20 ++++++++++++++------ libavutil/hwcontext_videotoolbox.h | 6 ++++++ 4 files changed, 33 insertions(+), 13 deletions(-) -- 2.21.0 diff --git a/fftools/ffmpeg_videotoolbox.c b/fftools/ffmpeg_videotoolbox.c index ad6174d3c7..628fb5e32c 100644 --- a/fftools/ffmpeg_videotoolbox.c +++ b/fftools/ffmpeg_videotoolbox.c @@ -51,10 +51,12 @@ static int videotoolbox_retrieve_data(AVCodecContext *s, AVFrame *frame) case kCVPixelFormatType_422YpCbCr8: vt->tmp_frame->format = AV_PIX_FMT_UYVY422; break; case kCVPixelFormatType_32BGRA: vt->tmp_frame->format = AV_PIX_FMT_BGRA; break; #ifdef kCFCoreFoundationVersionNumber10_7 - case kCVPixelFormatType_420YpCbCr8BiPlanarVideoRange: vt->tmp_frame->format = AV_PIX_FMT_NV12; break; + case kCVPixelFormatType_420YpCbCr8BiPlanarVideoRange: + case kCVPixelFormatType_420YpCbCr8BiPlanarFullRange: vt->tmp_frame->format = AV_PIX_FMT_NV12; break; #endif #if HAVE_KCVPIXELFORMATTYPE_420YPCBCR10BIPLANARVIDEORANGE - case kCVPixelFormatType_420YpCbCr10BiPlanarVideoRange: vt->tmp_frame->format = AV_PIX_FMT_P010; break; + case kCVPixelFormatType_420YpCbCr10BiPlanarVideoRange: + case kCVPixelFormatType_420YpCbCr10BiPlanarFullRange: vt->tmp_frame->format = AV_PIX_FMT_P010; break; #endif default: av_log(NULL, AV_LOG_ERROR, diff --git a/libavcodec/videotoolbox.c b/libavcodec/videotoolbox.c index c718e82cc5..b3b38dbde3 100644 --- a/libavcodec/videotoolbox.c +++ b/libavcodec/videotoolbox.c @@ -1084,8 +1084,9 @@ static int videotoolbox_common_init(AVCodecContext *avctx) goto fail; } + bool full_range = avctx->color_range == AVCOL_RANGE_JPEG; vtctx->vt_ctx->cv_pix_fmt_type = - av_map_videotoolbox_format_from_pixfmt(hw_frames->sw_format); + av_map_videotoolbox_format_from_pixfmt2(hw_frames->sw_format, full_range); if (!vtctx->vt_ctx->cv_pix_fmt_type) { av_log(avctx, AV_LOG_ERROR, "Unknown sw_format.\n"); err = AVERROR(EINVAL); @@ -1208,14 +1209,15 @@ const AVHWAccel ff_mpeg4_videotoolbox_hwaccel = { .priv_data_size = sizeof(VTContext), }; -static AVVideotoolboxContext *av_videotoolbox_alloc_context_with_pix_fmt(enum AVPixelFormat pix_fmt) +static AVVideotoolboxContext *av_videotoolbox_alloc_context_with_pix_fmt(enum AVPixelFormat pix_fmt, + bool full_range) { AVVideotoolboxContext *ret = av_mallocz(sizeof(*ret)); if (ret) { ret->output_callback = videotoolbox_decoder_callback; - OSType cv_pix_fmt_type = av_map_videotoolbox_format_from_pixfmt(pix_fmt); + OSType cv_pix_fmt_type = av_map_videotoolbox_format_from_pixfmt2(pix_fmt, full_range); if (cv_pix_fmt_type == 0) { cv_pix_fmt_type = kCVPixelFormatType_420YpCbCr8BiPlanarVideoRange; } @@ -1227,7 +1229,7 @@ static AVVideotoolboxContext *av_videotoolbox_alloc_context_with_pix_fmt(enum AV AVVideotoolboxContext *av_videotoolbox_alloc_context(void) { - return av_videotoolbox_alloc_context_with_pix_fmt(AV_PIX_FMT_NONE); + return av_videotoolbox_alloc_context_with_pix_fmt(AV_PIX_FMT_NONE, false); } int av_videotoolbox_default_init(AVCodecContext *avctx) @@ -1237,7 +1239,9 @@ int av_videotoolbox_default_init(AVCodecContext *avctx) int av_videotoolbox_default_init2(AVCodecContext *avctx, AVVideotoolboxContext *vtctx) { - avctx->hwaccel_context = vtctx ?: av_videotoolbox_alloc_context_with_pix_fmt(videotoolbox_best_pixel_format(avctx)); + enum AVPixelFormat pix_fmt = videotoolbox_best_pixel_format(avctx); + bool full_range = avctx->color_range == AVCOL_RANGE_JPEG; + avctx->hwaccel_context = vtctx ?: av_videotoolbox_alloc_context_with_pix_fmt(pix_fmt, full_range); if (!avctx->hwaccel_context) return AVERROR(ENOMEM); return videotoolbox_start(avctx); diff --git a/libavutil/hwcontext_videotoolbox.c b/libavutil/hwcontext_videotoolbox.c index 6eac2c0774..bded9873fe 100644 --- a/libavutil/hwcontext_videotoolbox.c +++ b/libavutil/hwcontext_videotoolbox.c @@ -34,16 +34,19 @@ static const struct { uint32_t cv_fmt; + bool full_range; enum AVPixelFormat pix_fmt; } cv_pix_fmts[] = { - { kCVPixelFormatType_420YpCbCr8Planar, AV_PIX_FMT_YUV420P }, - { kCVPixelFormatType_422YpCbCr8, AV_PIX_FMT_UYVY422 }, - { kCVPixelFormatType_32BGRA, AV_PIX_FMT_BGRA }, + { kCVPixelFormatType_420YpCbCr8Planar, false, AV_PIX_FMT_YUV420P }, + { kCVPixelFormatType_422YpCbCr8, false, AV_PIX_FMT_UYVY422 }, + { kCVPixelFormatType_32BGRA, false, AV_PIX_FMT_BGRA }, #ifdef kCFCoreFoundationVersionNumber10_7 - { kCVPixelFormatType_420YpCbCr8BiPlanarVideoRange, AV_PIX_FMT_NV12 }, + { kCVPixelFormatType_420YpCbCr8BiPlanarVideoRange, false, AV_PIX_FMT_NV12 }, + { kCVPixelFormatType_420YpCbCr8BiPlanarFullRange, true, AV_PIX_FMT_NV12 }, #endif #if HAVE_KCVPIXELFORMATTYPE_420YPCBCR10BIPLANARVIDEORANGE - { kCVPixelFormatType_420YpCbCr10BiPlanarVideoRange, AV_PIX_FMT_P010 }, + { kCVPixelFormatType_420YpCbCr10BiPlanarVideoRange, false, AV_PIX_FMT_P010 }, + { kCVPixelFormatType_420YpCbCr10BiPlanarFullRange, true, AV_PIX_FMT_P010 }, #endif }; @@ -58,10 +61,15 @@ enum AVPixelFormat av_map_videotoolbox_format_to_pixfmt(uint32_t cv_fmt) } uint32_t av_map_videotoolbox_format_from_pixfmt(enum AVPixelFormat pix_fmt) +{ + return av_map_videotoolbox_format_from_pixfmt2(pix_fmt, false); +} + +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) + 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; diff --git a/libavutil/hwcontext_videotoolbox.h b/libavutil/hwcontext_videotoolbox.h index 380918d92e..5074d79e68 100644 --- a/libavutil/hwcontext_videotoolbox.h +++ b/libavutil/hwcontext_videotoolbox.h @@ -51,4 +51,10 @@ enum AVPixelFormat av_map_videotoolbox_format_to_pixfmt(uint32_t cv_fmt); */ uint32_t av_map_videotoolbox_format_from_pixfmt(enum AVPixelFormat pix_fmt); +/** + * Same as av_map_videotoolbox_format_from_pixfmt function, but can map and + * return full range pixel formats via a flag. + */ +uint32_t av_map_videotoolbox_format_from_pixfmt2(enum AVPixelFormat pix_fmt, bool full_range); + #endif /* AVUTIL_HWCONTEXT_VIDEOTOOLBOX_H */