From patchwork Thu Feb 16 05:46:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wang, Fei W" X-Patchwork-Id: 40408 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:5494:b0:bf:7b3a:fd32 with SMTP id i20csp244164pzk; Wed, 15 Feb 2023 21:49:21 -0800 (PST) X-Google-Smtp-Source: AK7set/6mIb6hkcUAum43ErtK5SkOG/goOeXwd/f2x0ReJ41KP17NkGHLKA/5POPTKaXkWcBaoa7 X-Received: by 2002:a17:907:8024:b0:8b1:d5c:94ec with SMTP id ft36-20020a170907802400b008b10d5c94ecmr4336855ejc.22.1676526560895; Wed, 15 Feb 2023 21:49:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676526560; cv=none; d=google.com; s=arc-20160816; b=xbRlB2DMJkd7WkSDVkOpl+HwWiUsnrZ0ZItYkHMEawfQwSuWwrLyBgcpwjjvba7RhC yhkkeZyVz9GxRiF4ccAkdd+eRhFP5kfrEXq+1BywHGoo/n9SWrIBcNNkfonCh2W6sj7g ga4FJcdEfc5NHK3ulPjtBQ/Am4fKlTXS1nZ+7PuDtzmGEedaNeQFOfRBS4+cfmco3IHq ksaQ+IDcqtAv18AO3ktR3erkCUN7/YRpswwiCdQIeRZUmHhJn/XkfQ/zL7ImVNt5z5rk oPQCog+fQtVA3qUyYwhCefmtVtKRLXUo0d9UbbkhgFQaI42n292Nw0A+2ZQObnehr2Wx Io1w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=PNQIXF2erGElEBqd4VcpE1PWG/DtAfwBXRdaPlCkdBY=; b=Mib4mC99tkq2NnzAKtFe1iGt7KcUJRy2kVNOq4YZULu3eeZUou7tv2C/JPrPrJZSyO PMywDxYY90B4wCw9OaVRHkSFpe/iKQsV1q3yGxGkuT0znc01dyQHm17RRhZyju+4zDvI /YpBwsmiZDv6klQYlJsPnKiaXDIFE5u4M6b9o52Kb0C33di/pgoQDnBtmCk8AClVM1KR PbamvahtLubyNPVpHqO0pk05MxdnqQFyISC2yYhtS/dpXiyuhkK031TSwuuMviGVgKLp TWRPbzLLDToedu2YV7TMdIvRreH6NiUwiHCcaes/wpKnfv7yygE656zbgWQ3IkTxwMEZ 9v7g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=SkY6y2IL; 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 om15-20020a170907a18f00b0088f1ecec549si851385ejc.995.2023.02.15.21.49.20; Wed, 15 Feb 2023 21:49:20 -0800 (PST) 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=SkY6y2IL; 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 674A068BF09; Thu, 16 Feb 2023 07:49:15 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C829D68BD73 for ; Thu, 16 Feb 2023 07:49:07 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1676526553; x=1708062553; h=from:to:subject:date:message-id:mime-version: content-transfer-encoding; bh=v3q+E7PFA7IGtjYT2PVJg6pusUJiiDJoud0+Y2OjfNQ=; b=SkY6y2ILV4IVR7wW5O8yOsmUAS9mdSkIu8dMvD8uaaEwvE/kttZ64Sww AXzWYiboPhPVgZtmhGE5fLfwdDWfxfcwuLVDYP9kN5A0+s4oK30ELJnUv eEz3XTdtsV2KKmdvFUHd5BNoAh8d9Bfn1HSZXAlJtwZztEWWUdd8MvLOz s8OGJRpsJkYAH4zV33zPMiml8Xl7NUbvw6ADNtMJJIe66o1qaxMQPe+6R fvsjlr7StAreLqpQJlkYiac8dwBZMFZ9ycNWRgCg7fPBnYbauw95JbN1Q KmChf0vK9vtcQPfc/5nZwL6R+1SZuS4p3xC5AQ9CN3hVT+NQcNX4maXcd A==; X-IronPort-AV: E=McAfee;i="6500,9779,10622"; a="331633175" X-IronPort-AV: E=Sophos;i="5.97,301,1669104000"; d="scan'208";a="331633175" Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Feb 2023 21:49:02 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10622"; a="915547490" X-IronPort-AV: E=Sophos;i="5.97,301,1669104000"; d="scan'208";a="915547490" Received: from t.sh.intel.com ([10.239.159.159]) by fmsmga006.fm.intel.com with ESMTP; 15 Feb 2023 21:49:01 -0800 From: Fei Wang To: ffmpeg-devel@ffmpeg.org Date: Thu, 16 Feb 2023 13:46:28 +0800 Message-Id: <20230216054637.159397-1-fei.w.wang@intel.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v7 01/10] lavc/avcodec: Add HEVC Screen Content Coding Extensions profile 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: x1qGkdP8blDV From: Linjie Fu Described in HEVC spec A.3.7. Bump minor version and add APIchanges entry for new added profile. Signed-off-by: Linjie Fu Signed-off-by: Fei Wang --- 1. fix warning of patchwork report for V6. doc/APIchanges | 3 +++ libavcodec/avcodec.h | 1 + libavcodec/hevc_ps.c | 2 ++ libavcodec/profiles.c | 1 + libavcodec/version.h | 2 +- 5 files changed, 8 insertions(+), 1 deletion(-) diff --git a/doc/APIchanges b/doc/APIchanges index 29161e30bf..196f681730 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -2,6 +2,9 @@ The last version increases of all libraries were on 2023-02-09 API changes, most recent first: +2023-02-16 - xxxxxxxxxx - lavc 60.3.100 - avcodec.h + Add FF_PROFILE_HEVC_SCC. + 2023-02-16 - xxxxxxxxxx - lavf 60.2.100 - avformat.h Deprecate AVFormatContext io_close callback. The superior io_close2 callback should be used instead. diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 39881a1d2b..9a0fe97cad 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -1654,6 +1654,7 @@ typedef struct AVCodecContext { #define FF_PROFILE_HEVC_MAIN_10 2 #define FF_PROFILE_HEVC_MAIN_STILL_PICTURE 3 #define FF_PROFILE_HEVC_REXT 4 +#define FF_PROFILE_HEVC_SCC 9 #define FF_PROFILE_VVC_MAIN_10 1 #define FF_PROFILE_VVC_MAIN_10_444 33 diff --git a/libavcodec/hevc_ps.c b/libavcodec/hevc_ps.c index 5fe62ec35b..4aa5b76d5f 100644 --- a/libavcodec/hevc_ps.c +++ b/libavcodec/hevc_ps.c @@ -259,6 +259,8 @@ static int decode_profile_tier_level(GetBitContext *gb, AVCodecContext *avctx, av_log(avctx, AV_LOG_DEBUG, "Main Still Picture profile bitstream\n"); else if (ptl->profile_idc == FF_PROFILE_HEVC_REXT) av_log(avctx, AV_LOG_DEBUG, "Range Extension profile bitstream\n"); + else if (ptl->profile_idc == FF_PROFILE_HEVC_SCC) + av_log(avctx, AV_LOG_DEBUG, "Screen Content Coding Extension profile bitstream\n"); else av_log(avctx, AV_LOG_WARNING, "Unknown HEVC profile: %d\n", ptl->profile_idc); diff --git a/libavcodec/profiles.c b/libavcodec/profiles.c index 7af7fbeb13..2230fc5415 100644 --- a/libavcodec/profiles.c +++ b/libavcodec/profiles.c @@ -85,6 +85,7 @@ const AVProfile ff_hevc_profiles[] = { { FF_PROFILE_HEVC_MAIN_10, "Main 10" }, { FF_PROFILE_HEVC_MAIN_STILL_PICTURE, "Main Still Picture" }, { FF_PROFILE_HEVC_REXT, "Rext" }, + { FF_PROFILE_HEVC_SCC, "Scc" }, { FF_PROFILE_UNKNOWN }, }; diff --git a/libavcodec/version.h b/libavcodec/version.h index 0550d7b0d8..43794ea588 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -29,7 +29,7 @@ #include "version_major.h" -#define LIBAVCODEC_VERSION_MINOR 2 +#define LIBAVCODEC_VERSION_MINOR 3 #define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \