From patchwork Wed Apr 15 04:53:45 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Fu, Linjie" X-Patchwork-Id: 18974 Delivered-To: andriy.gelman@gmail.com Received: by 2002:ad4:45d0:0:0:0:0:0 with SMTP id v16csp512019qvt; Tue, 14 Apr 2020 22:03:19 -0700 (PDT) X-Google-Smtp-Source: APiQypIplAxXFq+1VupfMgtXJSLUP3mAaG1QT0q0qH1OI3TLu0kaAz6h0xT1P7ejzdyExmQxJ85L X-Received: by 2002:adf:e88d:: with SMTP id d13mr737004wrm.375.1586926999305; Tue, 14 Apr 2020 22:03:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1586926999; cv=none; d=google.com; s=arc-20160816; b=CCoBZpsusfguudwCwvJo0q69ZuRS4t62qxjFbE91llucdOJUBpJ1PNy/l17xGNyR7f M6ZNtr+5hz94Yl6EJOQhyrZcfKFKsdpsgvvAYQ3OloOtVYkTBkkMhVvEbSsZlkO508uI Rx/n8d5S4LoioNIu4llrxsjzEjHHRQS4MFY0TTcI10dort3KU3ouoP+MQjgM4gEVbYP4 sJkSdgRZTFkUwtCWJpOjZlzjzrA82qfQp7sNKtJ+5KNVfJdTk9Y1Qd9tbNwTnTU6C8nd 3PpMCX9GI6PfGPMQD7wGDhgbSwiNBE9w0XutH89TrDHv5/jRisUsl+o3z1C8MiW1Uy70 Zw+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:ironport-sdr:ironport-sdr:delivered-to; bh=jqPk7QtNEszNn4jesBXD3Cee+Vwj9QKqLE0vzWt0QZ0=; b=Ad7nzVM0Q2a+Jo04lyDAxJD6HugfQ98gOnPuNoNI0MWn9vaz2knb2dCLTMdOEk/m/b l6xsBh2WhIa6Kse0IbRrrPG8tmgJYrdh/iLpCZA7OQa09t4wmkRuhpQKQGhFViAgWFKd iHAjWs4mHqA2uNxxbSQzvVT6fr4Mbb7AYhKdNqWLB3DHBgkXOEG8BflaZNzhuN2xwiPL 7uncLw9w2Dt2to9lmYbupe2uPddHWVTSe9DU/JpyLePpOnvDVxvW8xYHabg4467++9pf 6HauNeZrGWWwM+ldH2e1WphxIzly8cRXibQk9iAFn75r6IN+1shL1E9uO+5EW6nNftA4 +dnw== ARC-Authentication-Results: i=1; mx.google.com; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 21si14820891wmf.166.2020.04.14.22.03.18; Tue, 14 Apr 2020 22:03:19 -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; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E91CE68BAF2; Wed, 15 Apr 2020 08:02:02 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9C74568BA35 for ; Wed, 15 Apr 2020 08:01:53 +0300 (EEST) IronPort-SDR: qn72hIJHnWOuMUHGA29RPLEN1OSnRsbT2PllxbdYg5VffiNIuoamOP3BOPrRx9PIN6MtqKhpTL y3HjPmrmZvzQ== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga107.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Apr 2020 22:01:50 -0700 IronPort-SDR: SouDEo7P+0fs+Ue2jLVFNIgznC7yufA4HOuTQ9OBMk5kKkrH51+jlb7M1DgOEbLgXXR5EgJGaU +2ApXkA05e7w== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.72,385,1580803200"; d="scan'208";a="288439570" Received: from icl-dev.sh.intel.com ([10.239.158.73]) by fmsmga002.fm.intel.com with ESMTP; 14 Apr 2020 22:01:49 -0700 From: Linjie Fu To: ffmpeg-devel@ffmpeg.org Date: Wed, 15 Apr 2020 12:53:45 +0800 Message-Id: <1586926427-20170-8-git-send-email-linjie.fu@intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1586926427-20170-1-git-send-email-linjie.fu@intel.com> References: <1586926427-20170-1-git-send-email-linjie.fu@intel.com> Subject: [FFmpeg-devel] [PATCH v4 7/9] lavc/libopenh264enc: add profile high option support 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: Linjie Fu MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 04CihQD5q4me Content-Length: 4511 Add support for PRO_HIGH/PRO_BASELINE in SVC Encoding extention mode, which determined by iEntropyCodingModeFlag in ParamTranscode(). Signed-off-by: Linjie Fu --- libavcodec/libopenh264enc.c | 32 ++++++++++++++++++++++++++------ 1 file changed, 26 insertions(+), 6 deletions(-) diff --git a/libavcodec/libopenh264enc.c b/libavcodec/libopenh264enc.c index a7c389e..0fe8cf4 100644 --- a/libavcodec/libopenh264enc.c +++ b/libavcodec/libopenh264enc.c @@ -42,7 +42,7 @@ typedef struct SVCContext { ISVCEncoder *encoder; int slice_mode; int loopfilter; - char *profile; + int profile; int max_nal_size; int skip_frames; int skipped; @@ -73,7 +73,11 @@ static const AVOption options[] = { #endif #endif { "loopfilter", "enable loop filter", OFFSET(loopfilter), AV_OPT_TYPE_INT, { .i64 = 1 }, 0, 1, VE }, - { "profile", "set profile restrictions", OFFSET(profile), AV_OPT_TYPE_STRING, { .str = NULL }, 0, 0, VE }, + { "profile", "Set profile restrictions", OFFSET(profile), AV_OPT_TYPE_INT, { .i64 = FF_PROFILE_UNKNOWN }, FF_PROFILE_UNKNOWN, 0xffff, VE, "profile" }, +#define PROFILE(name, value) name, NULL, 0, AV_OPT_TYPE_CONST, { .i64 = value }, 0, 0, VE, "profile" + { PROFILE("constrained_baseline", FF_PROFILE_H264_CONSTRAINED_BASELINE) }, + { PROFILE("high", FF_PROFILE_H264_HIGH) }, +#undef PROFILE { "max_nal_size", "set maximum NAL size in bytes", OFFSET(max_nal_size), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, VE }, { "allow_skip_frames", "allow skipping frames to hit the target bitrate", OFFSET(skip_frames), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE }, { "cabac", "Enable cabac", OFFSET(cabac), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, VE }, @@ -109,12 +113,28 @@ static av_cold int svc_encode_init_profile(AVCodecContext *avctx, SEncParamExt * { SVCContext *s = avctx->priv_data; - if (s->profile && !strcmp(s->profile, "main")) - param->iEntropyCodingModeFlag = 1; //< 0:CAVLC 1:CABAC - else if (!s->profile && s->cabac) + if (s->profile == FF_PROFILE_UNKNOWN) + s->profile = s->cabac ? FF_PROFILE_H264_HIGH : + FF_PROFILE_H264_CONSTRAINED_BASELINE; + + switch (s->profile) { + case FF_PROFILE_H264_HIGH: param->iEntropyCodingModeFlag = 1; - else + av_log(avctx, AV_LOG_VERBOSE, "Using CABAC, " + "select EProfileIdc PRO_HIGH in libopenh264.\n"); + break; + case FF_PROFILE_H264_CONSTRAINED_BASELINE: + case FF_PROFILE_UNKNOWN: + param->iEntropyCodingModeFlag = 0; + av_log(avctx, AV_LOG_VERBOSE, "Using CAVLC, " + "select EProfileIdc PRO_BASELINE in libopenh264.\n"); + break; + default: param->iEntropyCodingModeFlag = 0; + av_log(avctx, AV_LOG_WARNING, "Unsupported profile, " + "select EProfileIdc PRO_BASELINE in libopenh264.\n"); + break; + } return 0; }