From patchwork Fri Jan 14 09:55:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 33592 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp177629iog; Fri, 14 Jan 2022 01:55:43 -0800 (PST) X-Google-Smtp-Source: ABdhPJxK1qkHFgsZUQzffxG/tlh/AQj3kWAdekHKB8JC9hnzAwq0QrwphL5jw9MDMMVm49t1YUSD X-Received: by 2002:a17:906:f2c8:: with SMTP id gz8mr5379478ejb.220.1642154143387; Fri, 14 Jan 2022 01:55:43 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642154143; cv=none; d=google.com; s=arc-20160816; b=wys1h+fUwYWnnnBXGTlS6DCBoTH9QJargMjc7/pBw0kmiB/Fk9j1RbD1KRjhcp7Thn 9hJAVHKDCa7D13cjQNZdSardAbOD2ihHITkFmxhYJNN7mcHXCWuAWYcpy7nP/UBbKhWg u9IpXBqYS+AZJkjwzugoaIjIdn/noKM+kaWaRDvFslCT8JoTHyrWyb+n6XZCkcZSPjzl Vta5zpVSIKE1/IggXS49dzBFf3zyqhX/yyTCUzg0E/ohEAKOF5pWB9fKIU3QfkU8gulL YuQO4jcRvHOckZuoeKw1+NaDsA/dcCsvUoqTiZEhLnEBhzWknMnEQXjVvr27pjgtQJHC Yhgw== 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=pxyz+HsEcyixBO0UD8d+qRJB2AhzB+5LHTV+0eiwMbY=; b=P+mVXx36Ek655a54WdDKV3HEGkTTkIIwKUoPzg1Il4ku+pmuTDXLQY125KZsUbl+7F nJ85vU62gfxtGakHyVerEvqC92rvCmfPqJQh/BmMVqU9vUQmCINs9x3oQmuR98rPmacQ zdf6cvvtO+tp1ZdUkt7DqrEDnOIVSuvaIl+kJ5IZMwVsdbBsTq3MLvBimwGHPq67j7pF cgSi8KX/MIKatbKFOilgAQK+ZJ2QzhEDoqaAA4I2/UtIKlKlB1eIMTrwmvL+mS3AnCDw b6YGT5txPBg4kT+gASHu5PrVHmmnruLETI+KlykmxmdgLwuqKhTz35G9J2oouUIdBhT8 bFPQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=eRlv3NRi; 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=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id a17si2717591edu.311.2022.01.14.01.55.43; Fri, 14 Jan 2022 01:55:43 -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=@gmail.com header.s=20210112 header.b=eRlv3NRi; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7C07E68B504; Fri, 14 Jan 2022 11:55:33 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f49.google.com (mail-pj1-f49.google.com [209.85.216.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A388368B366 for ; Fri, 14 Jan 2022 11:55:26 +0200 (EET) Received: by mail-pj1-f49.google.com with SMTP id ie23-20020a17090b401700b001b38a5318easo13659545pjb.2 for ; Fri, 14 Jan 2022 01:55:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=oHMKE5FTh65UKWhBMwygamlODY/qfCG9kWRNNJ0v0sQ=; b=eRlv3NRiMQlNpFXncV+SxBM04ghfh4jdgZM9iD6aPBXOgBsC16c4XyBqS1v4s/Oj2L zyccIfLAdL3iqO+zQQcpS5zAHZCp+ytpPZ9tQZEtPKyFN+EI/5woatQrEBDsBfUzrSvL DK3kqSOvwvCqC7RLL1WKR5Mkcgs+ZE5VeGz2/WWuzPR6eaGs1tThNHDQ7TEa9/yIDrPS Qas+037kTpUnkDJhvWXNN1kc9xDTwYVL42WrgSodmKbb5XeOB3ZxokWja6HWATs2Ydt4 pPNeAt+whJQ8VeLiJSnLg9Ub9jdeXzfMhG3kLEzpLRQiD1SyOpUm4yF6aOG+CqeijAZk 7h7w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=oHMKE5FTh65UKWhBMwygamlODY/qfCG9kWRNNJ0v0sQ=; b=ln+XfZn28O3v75p22aCUIHOCQYq78gMjC0L/lN7lEL8lUAxLd4RTlytZRWnDD3Npew hIHwDUMKr3XG4Panf3wDRju0zyjuel/Me9EiQepFJt0MPoMzLy8aaAK25vbyf+cCovxC e3VoVHy10SE8i6jiiHmU4rNxtSg3wpnaspcJPeLHSPAUsNOq/YpCexs3WnKbGZC1syFJ 6D8s2kwjf2nThQqyJDPKB4/lsegU7hkim7fE+/HZATlRkrHQih3HBGRyMiadSjs+gsCP 3nXjsgN6FR62ipK6+7zGCpoFcNC/tFK086j3tMg8NwgzsikWwnWLlkrQDJnxWmZRMUrX 8P6w== X-Gm-Message-State: AOAM530Nejc4mrdLF7c+IcO0E+A9WkLVExv/3lFOcd9jFCdYJWXDkVBt UwbQwjSu5M3z9iU/LA9soMpbn+cxmOA= X-Received: by 2002:a17:90b:1bc9:: with SMTP id oa9mr19254637pjb.241.1642154124740; Fri, 14 Jan 2022 01:55:24 -0800 (PST) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id l12sm5535400pfc.181.2022.01.14.01.55.23 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 14 Jan 2022 01:55:24 -0800 (PST) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Fri, 14 Jan 2022 17:55:16 +0800 Message-Id: <1642154117-24138-2-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1642154117-24138-1-git-send-email-lance.lmwang@gmail.com> References: <1642070709-3104-1-git-send-email-lance.lmwang@gmail.com> <1642154117-24138-1-git-send-email-lance.lmwang@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3 2/3] avcodec/libopenh264enc: make the profile configuablable correctly 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: Limin Wang Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: /1yuY8uOynd0 From: Limin Wang due to the limitations set in d3a7bdd4ac54349aea9150a234478635d50ebd87, you weren't able to use main profile with OpenH264 1.8, or high profile with older versions Reviewed-by: Martin Storsjö Signed-off-by: Limin Wang --- libavcodec/libopenh264enc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavcodec/libopenh264enc.c b/libavcodec/libopenh264enc.c index 5b5914c..1bad233 100644 --- a/libavcodec/libopenh264enc.c +++ b/libavcodec/libopenh264enc.c @@ -220,26 +220,25 @@ static av_cold int svc_encode_init(AVCodecContext *avctx) #endif switch (s->profile) { -#if OPENH264_VER_AT_LEAST(1, 8) case FF_PROFILE_H264_HIGH: param.iEntropyCodingModeFlag = 1; av_log(avctx, AV_LOG_VERBOSE, "Using CABAC, " "select EProfileIdc PRO_HIGH in libopenh264.\n"); break; -#else case FF_PROFILE_H264_MAIN: param.iEntropyCodingModeFlag = 1; av_log(avctx, AV_LOG_VERBOSE, "Using CABAC, " "select EProfileIdc PRO_MAIN in libopenh264.\n"); break; -#endif - case FF_PROFILE_H264_CONSTRAINED_BASELINE: case FF_PROFILE_UNKNOWN: + s->profile = FF_PROFILE_H264_CONSTRAINED_BASELINE; + case FF_PROFILE_H264_CONSTRAINED_BASELINE: param.iEntropyCodingModeFlag = 0; av_log(avctx, AV_LOG_VERBOSE, "Using CAVLC, " "select EProfileIdc PRO_BASELINE in libopenh264.\n"); break; default: + s->profile = FF_PROFILE_H264_CONSTRAINED_BASELINE; param.iEntropyCodingModeFlag = 0; av_log(avctx, AV_LOG_WARNING, "Unsupported profile, " "select EProfileIdc PRO_BASELINE in libopenh264.\n"); @@ -251,6 +250,7 @@ static av_cold int svc_encode_init(AVCodecContext *avctx) param.sSpatialLayers[0].fFrameRate = param.fMaxFrameRate; param.sSpatialLayers[0].iSpatialBitrate = param.iTargetBitrate; param.sSpatialLayers[0].iMaxSpatialBitrate = param.iMaxBitrate; + param.sSpatialLayers[0].uiProfileIdc = s->profile; #if OPENH264_VER_AT_LEAST(1, 7) if (avctx->sample_aspect_ratio.num && avctx->sample_aspect_ratio.den) {