From patchwork Thu Jan 13 10:45:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 33552 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp335249iog; Thu, 13 Jan 2022 02:45:44 -0800 (PST) X-Google-Smtp-Source: ABdhPJyvmYMVJLoJMXdcOeWPr+b2+/VWHPUSo2eELuAEz5cyPP7/PTKeZjdUpsIf2STF5TsjDj9J X-Received: by 2002:a05:6402:2696:: with SMTP id w22mr3706361edd.296.1642070744224; Thu, 13 Jan 2022 02:45:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642070744; cv=none; d=google.com; s=arc-20160816; b=Fb8VhR2WSoPBOyTfM97bLngybkAya3eEcA0tLCSSnEd1YGNdLwnpzOv1MZe7dupKNo WL3Pb7VeXu0InNTsuo22NY/Skw3R7blFh59syFT+dAvj0eHcJWTZ94OgVrb+vNO+mI94 SbDJXCk2nnux0v6QANGn7ETfuCEZGmFkQ1Mz3+tTpoyMAOFwk6eO5bPorxI9ocUQTIrL Y1GSA2KddxzwsMJEJyTYQoZd3AUK8nSnJCGNbf37qmPEiFc0/lGRV5cCDHe9vot6Wtro JYePoMKYOqPsFpu4z3hWMZbJbtBXJsyfr9Zhbx29+Jy/BkbRh//C3lRy2skCTgLuwC5t 5+RQ== 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:dkim-signature:delivered-to; bh=HXqQu0MM3gHXra5TWO7Iki27uyfS5UB4z1Ed1VW3OIo=; b=goQREEaUTqSSddSGBLreCknI0G/CA83GDcYbw7fDV130GsPbgB45tSVlCE+bRnDKs4 DYXu8D8ATUI5wMcOWlCCYHGdZnjtCM1Vii/aWzHVUt47CAA0UOZ0EcoHvNORUTacPN68 W4NiGkpJ5AG56YfLqwKa16tEc5bNn7joPnIjeVFay7qHosJSr4YPGHf8yKhvWeKKESZh cOYvIymPn1odCghCm1d5yRSwVvTkH9Z8al8hpbIke0g6w1vFCPzJLE9BL7FCJANUyQAj OI9YAfLKYZQRMcgTFvDqybrHYsrBiNY7vwaE9CvE52ztBMA1G/I28RIsg0zC59z0eWoX v6Pw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=QExYki2+; 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 sc22si1406125ejc.615.2022.01.13.02.45.43; Thu, 13 Jan 2022 02:45:44 -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=QExYki2+; 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 AB34468B76F; Thu, 13 Jan 2022 12:45:27 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f51.google.com (mail-pj1-f51.google.com [209.85.216.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B30C568B700 for ; Thu, 13 Jan 2022 12:45:20 +0200 (EET) Received: by mail-pj1-f51.google.com with SMTP id l10-20020a17090a384a00b001b22190e075so18256450pjf.3 for ; Thu, 13 Jan 2022 02:45:20 -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; bh=C+RJAOGyXHUXxlQQSrtIIke+Xk1Tb8EEaElybhtFsNs=; b=QExYki2+OKQ/sHdfh8uBRyeNHTMI629dZMr8pTGH0u3zTcdRWyLBO8HPUIrgsDdXeH bzyavrXy5OOrVufWNheF+D16VK3dGhKfBVkm0gsYzBuT6qEdXH25zq6nKLvn0UUBYymg +py593tpoQ0er2VyBW4PvjA9D0rEfecyIyiro/RbuqmSMJMf5sheQgH03R7O7h3rQP66 iVxA/AVKm+9fF81tiBEaJ3WvJqyl7dqWYZyvWVBL0SSFdWnB7KWMkFb7X3RGid24Jgtl 6SVoBOLrpNk19G4s3GwcY8tuIq2/c2RleGo3cm57HsPIB8h+7Ra+N0y3UA+ORHCYn1St tsLA== 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; bh=C+RJAOGyXHUXxlQQSrtIIke+Xk1Tb8EEaElybhtFsNs=; b=1CDCb2RELQ5lnrBSSmlDGBpLMWTp7sQLtNavN8+pSl+cfSEPSVa85+b/nbrrAMmKbf EI6AeymbwT+JztDZA1xhzpQQ1pMqqH/mznZf2+g9syKlvBXP+G9JuRFiQHMN+1G8VerO jga3p21L9wcAZ7jFUKHHhIUfdWZlgBoNvEn9xaWNU4eYaE4CMPQBm0hmoaWvgziWWm7u s+bX+V7E7wlTkrCbgxbBAYQwvBj4zuCqr8wrXlZ4FHEG4kfbMIoUiOIQZZXa2O3ERQCm yxsuUoESDwv+NYeUL3CwC0li+UFrBsJt5GXt2CGYQMzHG7ZySLUSHiUOhD5TSnF0MW5S zhWw== X-Gm-Message-State: AOAM530zdLJPu/u8ZKdnizRUt76muSpH4Nfh/VjMH0DqEhIZyoCTL0KC fHXdKmod0Kb6wyxoUsVEaMxtizyOSl7XSg== X-Received: by 2002:a17:902:b484:b0:14a:4743:41ce with SMTP id y4-20020a170902b48400b0014a474341cemr4064001plr.52.1642070718525; Thu, 13 Jan 2022 02:45:18 -0800 (PST) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id q9sm9091451pjg.1.2022.01.13.02.45.17 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 13 Jan 2022 02:45:18 -0800 (PST) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Thu, 13 Jan 2022 18:45:08 +0800 Message-Id: <1642070709-3104-2-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1642070709-3104-1-git-send-email-lance.lmwang@gmail.com> References: <1642070709-3104-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH 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 MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: qcOzoYs1C0la From: Limin Wang If the version of libopenh264 >= 1.8, we can't configured main profile as expected, below is the testing cli: ffmpeg -y -f lavfi -i testsrc -c:v libopenh264 -profile:v main -frames:v 1 test.ts It'll report: [libopenh264 @ 0x5638300] Unsupported profile, select EProfileIdc PRO_BASELINE in libopenh264. Signed-off-by: Limin Wang --- libavcodec/libopenh264enc.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/libavcodec/libopenh264enc.c b/libavcodec/libopenh264enc.c index a55bef8..995ee37 100644 --- a/libavcodec/libopenh264enc.c +++ b/libavcodec/libopenh264enc.c @@ -220,26 +220,27 @@ 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: + s->profile = PRO_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: + s->profile = PRO_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 = PRO_BASELINE; param.iEntropyCodingModeFlag = 0; av_log(avctx, AV_LOG_VERBOSE, "Using CAVLC, " "select EProfileIdc PRO_BASELINE in libopenh264.\n"); break; default: + s->profile = PRO_BASELINE; param.iEntropyCodingModeFlag = 0; av_log(avctx, AV_LOG_WARNING, "Unsupported profile, " "select EProfileIdc PRO_BASELINE in libopenh264.\n"); @@ -251,6 +252,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) {