From patchwork Fri Jan 14 09:00:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 33588 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp142526iog; Fri, 14 Jan 2022 01:01:12 -0800 (PST) X-Google-Smtp-Source: ABdhPJzXia0C3Czb7Cw0IMBvoGVx6aI6ftsjFzYG78g/SwwerHKTJelLKbb5iVroxGSt91OwwreG X-Received: by 2002:a17:906:bc97:: with SMTP id lv23mr6437066ejb.506.1642150871867; Fri, 14 Jan 2022 01:01:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642150871; cv=none; d=google.com; s=arc-20160816; b=sb3YCicZCJAj6BMPta1dLmyvL4h8Y7EhHX4b07zfv4Nzj2ytaPFFkjKrnkhFIsZR7h 4U45N/Ign2xj8FGZ8GdajEOcMHrqgPhBnL7i8qOI8smvtrDmg8N8G0tGjc4iBzXqiqQ4 lT0VqOMZ/IzsJ5sM9v4pIAxspZCMdVcI1KnQufbm/zUN2cI9KNPvVs+6WQzco7nnjzXQ 9DfXOBm6abzAN7t0mk8lVaugvDAFv31jMO/Yxf71kGfUMSuuvVU7LOttodgI3DDTbPKR C2+ueBsPSpJ+y0uON8ufucqSW3UOlTk1iHBSasKobEZ0vd/etqmXxHChKsgcMeABkHhn oazQ== 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=iMVd93bg+0Tu6cMyodiwbRce5af1rovXQOqXVJoDWE4=; b=uKCsq+QY1wDM+x2GZRYaTbtfuP6Fwlv8T+Y9p7vNyr2ErIfK1UlgC9Z/+KpMzyPDMu mVJEttzeU367rqNz2iRt03oJNuN0fi/KkA23FM0pyjTQ7U+6j9GxnBg8K/9OFS7ZRtto dQv7i+OsIX/gmC/tnZVym4urWeB++3fEKMuRgKiEIsBkRUl8vcvnx5rQBgnQSwihh+Z4 TmMLRvdE4nwyFe9J+Yk1tdN/MSFzgF5yoFZS2krKYcL4XUIfGkLZrj2rY34npsIGAOcn jWaOsAxQBD/Fa/ZM4zDRMsvi6E64M3ekm41GRu8Sc61rP7R4p7qCPlJPKM4+z5MsV+G6 oKdQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=hEIUZB+d; 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 hg5si3019932ejc.551.2022.01.14.01.01.11; Fri, 14 Jan 2022 01:01:11 -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=hEIUZB+d; 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 B671568B4A7; Fri, 14 Jan 2022 11:00:55 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4E27268B469 for ; Fri, 14 Jan 2022 11:00:48 +0200 (EET) Received: by mail-pl1-f181.google.com with SMTP id h1so12713643pls.11 for ; Fri, 14 Jan 2022 01:00:48 -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=MWGi9JWGGD1rCjenejSDwhOvgk0VGb36nEJF433o0wA=; b=hEIUZB+dBokGgcC3EJXtrXxOHNbWWqGjfbx3IK3fGPakA2Cn8z5jTSHDONl+lGzb5b te66TtfNhnuLHPpTxTKCkuko97f0OaK7k9Nt4p55urtxtWRDmHjd7OmRg3T2nOE7wEla QgAfcE5iWPwcazpnkEmoAQGG62E2A7ExNvR0AO1grFqowDVtIiXspemtF729txSlApbP 3p2+WkyWjZrq1McbjDW2Wlty/apG36TiqjrRjwa+S//XZtKt5W64b39/nbvOUSlQlrqv LFPNzBotN5gNzhYyaw18Ug3igLh3+23viifocjVFWklyL782SiVCAQDDglxSjIrzzq6u VrVw== 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=MWGi9JWGGD1rCjenejSDwhOvgk0VGb36nEJF433o0wA=; b=Adz1z/ssJuhUle3n1Uc+r7fdO78diXbQUoGtQHSjbCpgppRxe2yRezc37f3thDALdi U0G+Ch8ZxqdAOf0PvbGcQ25o5ZShMNBDm9a6TAztBydArpLzUmJ3cWuCSfqQ9y7agdA7 Qh5hs5iyjsnHrhfIZd59XiwFUj12Q5EyfUUVZIxDb8fyGpjX0mTVy0JRrcwCTIwykRBX uXnfMWpx4RP0Vmr1jVLv4BJU9sOmHwq00LPiisLg300+gDwwNV9VecEB5iwzs9ucTQrX N6RuJE0za3mdRQjM0XwuzKgUBXDHqEx6GDqJBknKhdgH46nFTy135cVfBMe/au426vHc yCdA== X-Gm-Message-State: AOAM532slUqViOBgk8knum/d0ZXQ17itxN9ZZarzuyqDkAFYwMG3ouSh xOTzwji7s+hhjkZzdxrfO1pHAOGMtCE= X-Received: by 2002:a17:902:a9c9:b0:14a:180a:63c0 with SMTP id b9-20020a170902a9c900b0014a180a63c0mr8784655plr.89.1642150846679; Fri, 14 Jan 2022 01:00:46 -0800 (PST) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id n15sm10555434pjj.12.2022.01.14.01.00.45 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 14 Jan 2022 01:00:46 -0800 (PST) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Fri, 14 Jan 2022 17:00:36 +0800 Message-Id: <1642150837-22960-2-git-send-email-lance.lmwang@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1642150837-22960-1-git-send-email-lance.lmwang@gmail.com> References: <1642070709-3104-1-git-send-email-lance.lmwang@gmail.com> <1642150837-22960-1-git-send-email-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v2 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: 2zGzKrUmy0ww From: Limin Wang d3a7bdd4ac54349aea9150a234478635d50ebd87 was based on incorrect conclusions because we had missed to set uiProfileIdc. 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 | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/libavcodec/libopenh264enc.c b/libavcodec/libopenh264enc.c index 5b5914c..8e27edb 100644 --- a/libavcodec/libopenh264enc.c +++ b/libavcodec/libopenh264enc.c @@ -220,19 +220,16 @@ 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: param.iEntropyCodingModeFlag = 0; @@ -251,6 +248,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) {