From patchwork Fri Apr 29 07:59:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wang, Fei W" X-Patchwork-Id: 35500 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a885:b0:7f:4be2:bd17 with SMTP id ca5csp153209pzb; Fri, 29 Apr 2022 01:06:24 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxxgkcAYqbPiWz+z/UAVwhLFvFbVuJE87mHw7m6q22MMnWjRSCp1un1gM1ObeQj11eBunB1 X-Received: by 2002:a17:907:3e16:b0:6df:b4f0:5cc2 with SMTP id hp22-20020a1709073e1600b006dfb4f05cc2mr35151712ejc.285.1651219584412; Fri, 29 Apr 2022 01:06:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1651219584; cv=none; d=google.com; s=arc-20160816; b=vVAurKO87jhkViY9IiSrM6NDcvjbEuEm/qUdwlu7wtePZ8jOsFbgG2SyDouYLJu6bQ fxrU+uKneBggUY8UXYdQX6rQrDGHExB3H0mU2Ud/U4kVjtXhc8DFwzsRNmt3cD1eiESN u5vK53l3c55dnwXI9SDmedweIGefLBd/B61Ozsu5Tegif+CED6IaeV0Y31XLEYViu3nB 2FRm2iuzcOxVLqSVLDszkVpFEzYXo10/6qBGAQFxSTNy5ZFq2XTrRFQxzF+Jy/RDLRcQ vGTV880kDhjHfvM95FkC6K88I0ZzRiSQ1AKp6lnhaymx/tk6z+RDxf8HtxNxMUYqUSEo M5TQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:delivered-to; bh=e1/P9ZVmzCZhK6s0Pde5MrjlJsQbbY3JTD/09nv8sGY=; b=O/OIEs/+VzlZkNKfx5Tqo18cH4+lwG/0ldLieZFblqFIlpGAaEVkTD+gY7Z8iH43K+ jQRJq84ofrrju7ePgmYPGtawK7et+YxMqDueVLQ5QAu3RRWPwBbVBENRWbFTKoIAK7g4 FiDXo+AMYQaYtG+W1p2kYOP0zl27iu3XwYTmzFvdUH7CT5Ou6nJodDcpzL92JHnppkD1 WDgno4RlWGNIi5tXuOTs34+Ss7A05kbTyZDo5nFDh+jzA6QXgnKuUm1UsvUCJVrYJKio bJ1wp0munJt/eTMZwE/1QO5SEWLmlU1DVqkGO2uGgluYLR71UKFTefB8TC3VMsoONPSu 2SKQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b="C/epBBZH"; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id m20-20020a1709061ed400b006f388fc0a23si5233341ejj.909.2022.04.29.01.06.23; Fri, 29 Apr 2022 01:06:24 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b="C/epBBZH"; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0314068B2B6; Fri, 29 Apr 2022 11:06:12 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga06.intel.com (mga06b.intel.com [134.134.136.31]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9AE0B68A380 for ; Fri, 29 Apr 2022 11:06:04 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1651219569; x=1682755569; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=5AvOIm5poBNgPupYH8qxj+GJOFgRhtqpvxcQzD3EeC0=; b=C/epBBZHd3cmQHjJUb7pnoO4Kcvo7/3uT/vFmDZ4Ri4x+qXLwl93yeve FC99Kuj6Om7RVHq/clHTcBOly1OHfB+RxnbkvLitI8xj/9oZ3/YujOuMp U9Hb9TVE/ulqBLIgF3CAr14eVvFc9xhc2Qj1n6CZfNA0qx1xM7maxUAnP PSzRqWPe+1w0P87FckYVD+45WHw63aDmuhMNkremYA9wBnIteu+bNQroA T43p3Q+ZelqfVeID2VOYRRihSMT7jJsL4eT3WDF0iaGVkUpll4yaQJg4s g1Ea+nCwNtPJhTSWdJ6g/o8IGNycLfRpgvPWMnnE906asnqUQidny1rex A==; X-IronPort-AV: E=McAfee;i="6400,9594,10331"; a="327065234" X-IronPort-AV: E=Sophos;i="5.91,297,1647327600"; d="scan'208";a="327065234" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 Apr 2022 01:06:01 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.91,297,1647327600"; d="scan'208";a="581977660" Received: from t.sh.intel.com ([10.239.159.147]) by orsmga008.jf.intel.com with ESMTP; 29 Apr 2022 01:06:00 -0700 From: Fei Wang To: ffmpeg-devel@ffmpeg.org Date: Fri, 29 Apr 2022 15:59:39 +0800 Message-Id: <20220429075941.1844370-2-fei.w.wang@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220429075941.1844370-1-fei.w.wang@intel.com> References: <20220429075941.1844370-1-fei.w.wang@intel.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v1 2/4] lavc: add sub frame options and flag X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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: Fei Wang Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: cuhFVNoAFi4u Signed-off-by: Fei Wang --- doc/codecs.texi | 9 +++++++++ libavcodec/avcodec.h | 15 +++++++++++++++ libavcodec/options_table.h | 2 ++ libavcodec/version.h | 2 +- 4 files changed, 27 insertions(+), 1 deletion(-) diff --git a/doc/codecs.texi b/doc/codecs.texi index 5e10020900..d74678a5eb 100644 --- a/doc/codecs.texi +++ b/doc/codecs.texi @@ -662,6 +662,9 @@ for codecs that support it. At present, those are H.264 and VP9. @item film_grain Export film grain parameters through frame side data (see @code{AV_FRAME_DATA_FILM_GRAIN_PARAMS}). Supported at present by AV1 decoders. +@item sub_frame +Export sub frame through frame side data (see @code{AV_FRAME_DATA_SUB_FRAME}). +Supported at present by hevc VAAPI decoder. @end table @item threads @var{integer} (@emph{decoding/encoding,video}) @@ -1018,6 +1021,12 @@ Note: The required alignment depends on if @code{AV_CODEC_FLAG_UNALIGNED} is set CPU. @code{AV_CODEC_FLAG_UNALIGNED} cannot be changed from the command line. Also hardware decoders will not apply left/top Cropping. +@item sub_frame_opts @var{dict} (@emph{decoding,video}) +Sub frames parameters, like width/height/format etc. +@example +-sub_frame_opts "width=640:height=480:format=nv12" +@end example + @end table diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 4dae23d06e..3b1ab39f0c 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -361,6 +361,12 @@ typedef struct RcOverride{ */ #define AV_CODEC_EXPORT_DATA_FILM_GRAIN (1 << 3) +/** + * Decoding only. + * export sub frame through frame side data. + */ +#define AV_CODEC_EXPORT_DATA_SUB_FRAME (1 << 4) + /** * The decoder will keep a reference to the frame and may reuse it later. */ @@ -2055,6 +2061,15 @@ typedef struct AVCodecContext { * The decoder can then override during decoding as needed. */ AVChannelLayout ch_layout; + + + /** + * Set sub frame's parameters like: width/height/format etc. + * + * - decoding: set by user + * - encoding: unused + */ + AVDictionary *sub_frame_opts; } AVCodecContext; /** diff --git a/libavcodec/options_table.h b/libavcodec/options_table.h index e72b4d12b6..b6bcbd251e 100644 --- a/libavcodec/options_table.h +++ b/libavcodec/options_table.h @@ -88,6 +88,7 @@ static const AVOption avcodec_options[] = { {"prft", "export Producer Reference Time through packet side data", 0, AV_OPT_TYPE_CONST, {.i64 = AV_CODEC_EXPORT_DATA_PRFT}, INT_MIN, INT_MAX, A|V|S|E, "export_side_data"}, {"venc_params", "export video encoding parameters through frame side data", 0, AV_OPT_TYPE_CONST, {.i64 = AV_CODEC_EXPORT_DATA_VIDEO_ENC_PARAMS}, INT_MIN, INT_MAX, V|D, "export_side_data"}, {"film_grain", "export film grain parameters through frame side data", 0, AV_OPT_TYPE_CONST, {.i64 = AV_CODEC_EXPORT_DATA_FILM_GRAIN}, INT_MIN, INT_MAX, V|D, "export_side_data"}, +{"sub_frame", "export sub frame through frame side data", 0, AV_OPT_TYPE_CONST, {.i64 = AV_CODEC_EXPORT_DATA_SUB_FRAME}, INT_MIN, INT_MAX, V|D, "export_side_data"}, {"time_base", NULL, OFFSET(time_base), AV_OPT_TYPE_RATIONAL, {.dbl = 0}, 0, INT_MAX}, {"g", "set the group of picture (GOP) size", OFFSET(gop_size), AV_OPT_TYPE_INT, {.i64 = 12 }, INT_MIN, INT_MAX, V|E}, {"ar", "set audio sampling rate (in Hz)", OFFSET(sample_rate), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, 0, INT_MAX, A|D|E}, @@ -399,6 +400,7 @@ static const AVOption avcodec_options[] = { {"allow_profile_mismatch", "attempt to decode anyway if HW accelerated decoder's supported profiles do not exactly match the stream", 0, AV_OPT_TYPE_CONST, {.i64 = AV_HWACCEL_FLAG_ALLOW_PROFILE_MISMATCH }, INT_MIN, INT_MAX, V | D, "hwaccel_flags"}, {"extra_hw_frames", "Number of extra hardware frames to allocate for the user", OFFSET(extra_hw_frames), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, INT_MAX, V|D }, {"discard_damaged_percentage", "Percentage of damaged samples to discard a frame", OFFSET(discard_damaged_percentage), AV_OPT_TYPE_INT, {.i64 = 95 }, 0, 100, V|D }, +{"sub_frame_opts", "set sub frame opts", OFFSET(sub_frame_opts), AV_OPT_TYPE_DICT, {.str = NULL}, -1, INT_MAX, V|D}, {NULL}, }; diff --git a/libavcodec/version.h b/libavcodec/version.h index 735c8b813c..87b7284a95 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -29,7 +29,7 @@ #include "version_major.h" -#define LIBAVCODEC_VERSION_MINOR 27 +#define LIBAVCODEC_VERSION_MINOR 28 #define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \