From patchwork Fri Jan 14 09:00:35 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 33589 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp142637iog; Fri, 14 Jan 2022 01:01:20 -0800 (PST) X-Google-Smtp-Source: ABdhPJw5rwRb9LxKAlYYlrmBE3yJvhignLxsIWzbodw2FfHVLFveUV64CcEQvTBkUu2FbBnx8ovO X-Received: by 2002:aa7:d785:: with SMTP id s5mr7756700edq.215.1642150880132; Fri, 14 Jan 2022 01:01:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642150880; cv=none; d=google.com; s=arc-20160816; b=qogkG86U1N6CQchXLdCb+R2eyB1m3HgYWt9pjWvBJ14rkMfw/M4biDhBYUj7s5DwrM HiQXSxJozwp8hSxflY19VjyyH6wjcMExSEyXksLQRyZVcmlkU8TM4echwNtQZI82uv9F CEOc6dm4l2qyC18WXGX6xXXEKolEyXeccoaK4RBbmp3Dm4xRvBUn4HcxkaHX1GjYs07M w8j4eaPikWQ5F6huIq0IHUc5IlwOGmfvAkZi63wKTy47dcwTkVkxtn7AnmBZIYnCvi/k huBgb0rZcB6E52ZnnHXEDij5kV/5iBVWD+4fq/zwmvqzIrbp62T2AmhYdeP91AF9Gfx0 gDeg== 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=1fy6Xy/z3JNCj4KjBfd1q1vHWZROFV/WjFyvV0H3+Ng=; b=eFFuXtV5Vd5Q8xuQrkBfmjEHPeem27mljSe/fEKydMZxIB2vVdsUz6T8LL6dmxKYrl N9wA4CNgCGJ2Xq9bpT19FKlR81F+K9/pw4WiOPwZXJ1pLuOYItf5EPmO0RtJkC6YSTIb sVYjxNft/b66aYFgBulOLiTV1szObujB9aeWwciHavaCbZcOPViBPW2a2iaPVWKmtTKu yZG5kJX1yHZjzS+Jl4xRHc9TitAQyofR5Ba0OSzSfsWn74Ro9JQsCiYawKp5kDcV2wSP 8YiZV7YOB+g6ThM3o0Xfem1dsbr5pn1EHTygH6jsT8RMbxvSHVRX09U04HDXnXiuifIK +N6g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=IBRJsd44; 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 p15si2047307eds.352.2022.01.14.01.00.59; Fri, 14 Jan 2022 01:01: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=@gmail.com header.s=20210112 header.b=IBRJsd44; 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 AE42D68B47B; Fri, 14 Jan 2022 11:00:54 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 423A568B15E for ; Fri, 14 Jan 2022 11:00:47 +0200 (EET) Received: by mail-pl1-f172.google.com with SMTP id h1so12713599pls.11 for ; Fri, 14 Jan 2022 01:00:47 -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=wcAGN4jdWlDIRNuZnndPqdxXwQW3oD0z7Ipdfd295Yc=; b=IBRJsd44Tv2TLF1iNyj/iugKsRu3BOPIkGbf/zIZSR9o514C9XUCZQJMHSsnAxDQaV dRyrDjHOJeP+ntT6ZvIU+6GHAkLHZJnUzEor7Uxzhxk6Zx9noi/rBGdIbzgMM5YoiYxz bkkvNS1bx3+2yK8wAM5ym8PWkKgqcUJPWRwMmaRqIZLV8zwmD7pICudfq/IWEg9e/cxc 1FhcEeKDuqbbcRWN7KqEVeJcVvMA/X1Ru3GWuIiAwSSJbnLeXJzBUl8ohmc/okc2SOeC jH9aua36eRFJnFSEBzbuca/BaiN2ZVRRPkm2BgElE181aiWJyl/4YIELp3MbFgWN6Vkl JdGA== 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=wcAGN4jdWlDIRNuZnndPqdxXwQW3oD0z7Ipdfd295Yc=; b=AubTV6d5oG8JGz9x3YgbgdqP3NIkB2/SEgSdLbPyWPxDRO82kf/jq5Wn1bYicOu8+a hBmjooewrEbuU4o22ePF6a+ms0gSoIxiNkZDpj6b4+9ixuvFhFGPb3Cte3NtNE9ZDVOt xv4WAmKInetjH3p2XbR7DIYKL7LPmr8pfDv/CmnIog6jMLG78InW6xPgz0zWhjA2GB7v n+vEDGZrUPwAmqHJ1kbGCQQpcH9fOlPY4z75zCNrExHpiySYPqgPI1Ikg+B/+KZss3y5 Krnq44g44cjMgnEBDQYza7HaW5Lmv0rLtslBOsHPIqyVvuZrlP9GV28v1mCqElQVCIzY BH8A== X-Gm-Message-State: AOAM533MkgvYHWwRwNEyKWsedvxiAvJ4LLaPJ1P+DYt14P8hqIqhPgxG e1LkN7GK+YxwbxSCHtFPH3h++kJG+7A= X-Received: by 2002:a17:902:ab8e:b0:14a:2fef:2cf3 with SMTP id f14-20020a170902ab8e00b0014a2fef2cf3mr8802313plr.52.1642150845359; Fri, 14 Jan 2022 01:00:45 -0800 (PST) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id n15sm10555434pjj.12.2022.01.14.01.00.44 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 14 Jan 2022 01:00:44 -0800 (PST) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Fri, 14 Jan 2022 17:00:35 +0800 Message-Id: <1642150837-22960-1-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 v2 1/3] avcodec/libopenh264enc: support for colorspace and range information 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: 5A/Rg7/NNS16 From: Limin Wang Signed-off-by: Limin Wang --- libavcodec/libopenh264enc.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/libavcodec/libopenh264enc.c b/libavcodec/libopenh264enc.c index de4b85c..5b5914c 100644 --- a/libavcodec/libopenh264enc.c +++ b/libavcodec/libopenh264enc.c @@ -330,6 +330,28 @@ static av_cold int svc_encode_init(AVCodecContext *avctx) } } +#if OPENH264_VER_AT_LEAST(1, 6) + param.sSpatialLayers[0].uiVideoFormat = VF_UNDEF; + if (avctx->color_range != AVCOL_RANGE_UNSPECIFIED) { + param.sSpatialLayers[0].bVideoSignalTypePresent = true; + param.sSpatialLayers[0].bFullRange = (avctx->color_range == AVCOL_RANGE_JPEG); + } + + if (avctx->colorspace != AVCOL_SPC_UNSPECIFIED || + avctx->color_primaries != AVCOL_PRI_UNSPECIFIED || + avctx->color_trc != AVCOL_TRC_UNSPECIFIED) { + param.sSpatialLayers[0].bVideoSignalTypePresent = true; + param.sSpatialLayers[0].bColorDescriptionPresent = true; + } + + if (avctx->colorspace != AVCOL_SPC_UNSPECIFIED) + param.sSpatialLayers[0].uiColorMatrix = avctx->colorspace; + if (avctx->color_primaries != AVCOL_PRI_UNSPECIFIED) + param.sSpatialLayers[0].uiColorPrimaries = avctx->color_primaries; + if (avctx->color_trc != AVCOL_TRC_UNSPECIFIED) + param.sSpatialLayers[0].uiTransferCharacteristics = avctx->color_trc; +#endif + if ((*s->encoder)->InitializeExt(s->encoder, ¶m) != cmResultSuccess) { av_log(avctx, AV_LOG_ERROR, "Initialize failed\n"); return AVERROR_UNKNOWN; 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) { From patchwork Fri Jan 14 09:00:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 33590 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp142692iog; Fri, 14 Jan 2022 01:01:24 -0800 (PST) X-Google-Smtp-Source: ABdhPJyMj4PQNAC2h+q3VmJZsVlCkD77Jmxhse7+bJ2qd2N/oxDl4r+uM9yJ7mmiAUHpgafJNpHu X-Received: by 2002:a17:906:7945:: with SMTP id l5mr6568435ejo.82.1642150884742; Fri, 14 Jan 2022 01:01:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642150884; cv=none; d=google.com; s=arc-20160816; b=qLm8f4UqA6yFUhouZKwhCix+8XJrw2A17LZuNSQzahzY3DK7gyBW4SYLDcgJDlP/Fj jDu8Dk9QZr2NG10f+0AKFWBeHJMBPQQvCWaSxrbQyeSUxOH1/i2cfLSweCfL+bbqvEPV Dq4ch8z3p/EOviJwT/5RHp1SP34XBI5FM++8Fm0OJF7Upa4Q9nx6e7/mz4bOM82uw9EG 5Huv/EAKSPkWc6NX97hcHKC3ztiV+PQJFLpwe9QF5Rv2bhzdQA0/8IxmiO7gYpDGZ9Ke jyyhGlII6fGjHWSd8TBYfFo8lCWm+qUu+y+fl/oM6MyqU8qrrpcbfpN6iKjf5O2NwyAz iIig== 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=ilXN0d7PWR/JBp/XdcY2LFvljhdr7kIEHnD29DOsXgY=; b=ABbnxRp+Ng/kRv5g7S/UYRAzB+7cbQL8IGggnWIPqm4IwHfJSCr9SuUpsVtyLPuxmA JczuUjNmH9paaS4REwqzIRNrY2hKPeUC415LJdecFIVFYxUuS8u/0D6iFF9RN28omCGp dQXiLE9L1p9uqVrw4ZtEEeV+43aTlezfFQLncNml8K0f6l2HVJkREw/gLNXSSfk0MxWs k+zpaOeK8eEhCuaDVjTxYTVEAuMorlVt94z/uS0vU0BPMutJB7ovL90vLXdrLJIw+GSD 5aS0sQNDwraBkekPa1yffNS8HfW4C5ypsmrdoo9O+nXIcwslXiWSLf2vqCQyrhbPLU3m 2MIg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=PewGttrb; 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 rs26si2595387ejb.492.2022.01.14.01.01.23; Fri, 14 Jan 2022 01:01:24 -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=PewGttrb; 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 B054C68B4B8; Fri, 14 Jan 2022 11:00:57 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f173.google.com (mail-pf1-f173.google.com [209.85.210.173]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BEBA068B47C for ; Fri, 14 Jan 2022 11:00:49 +0200 (EET) Received: by mail-pf1-f173.google.com with SMTP id w204so2205483pfc.7 for ; Fri, 14 Jan 2022 01:00:49 -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=3CJZjYwD8EA1U1o9cbRrj9hJas5EYaJJaiBN4mBbspc=; b=PewGttrbCL9+kbOeGB+bBoB4hUwyTcTuXMDbvV895+tIy5ervkKmr83+pSE0I9x7AK kEKerClREE5KKg4tL3Ko3R9IUvhD+kdUs3frvlaxZpOzhoyNuFvn96c4OXW2zxyGbNz4 c+TSntdLAWEiIia0P6aFFyBVdeKcO/gWiBT8nX4vZTKHRC58VAX3bF98XdjT1u/ZXg01 2HNLJjVYff47tXeQRt/BjQpKSjn+YkUCxy5nk9STVmo3ulCPOn+PYHizSfSQOtJJm+Jn C63p1K8yZk2xI8tZSKMBHP0CqrQmo5owgRKd02YepE6ScF2SOusq279obuel75scrvRX FoYA== 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=3CJZjYwD8EA1U1o9cbRrj9hJas5EYaJJaiBN4mBbspc=; b=Lm/AtbfXtVfPYOwLtmIeRSe5oiv8YC8oVoFa/jUXEnW0zVvElncuh3X1C6jeHD+8TH aKLUaANUVBAuACYzhswq224118Xw29eKaR7PD7XePGHJn3HhyWcV5zNq1LtshB/y+HV9 iSxQMpTKGep8g9IUbzgPjc/XRga9DUivST9kfSqRPHVQOcK6U8u4vjT5N6r3t1736bdO QZOArFX1s+NEWJ7dFUpUnuzXQJDTsRn0cn8Ps2drVY2BBRncfbPt3is1imgn2Fs0iZaq 9RBs05BZNmU9XFZE5XXIUT2TBTHhRlzCMN6TWoqmHLl5R/bmUEGjiTg5z/FXLudtk/lW TcFw== X-Gm-Message-State: AOAM530Gu8SF4PEAxei5udaAgS98ViE+YU3eIDKCeCIDImt10UIvRbAW BmwMwYKSa2ZtoPZPTL1MJ/guccR174M= X-Received: by 2002:a05:6a00:10cd:b0:4bc:a950:41e2 with SMTP id d13-20020a056a0010cd00b004bca95041e2mr8174308pfu.30.1642150847900; Fri, 14 Jan 2022 01:00:47 -0800 (PST) Received: from vpn2.localdomain ([161.117.202.209]) by smtp.gmail.com with ESMTPSA id n15sm10555434pjj.12.2022.01.14.01.00.46 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 14 Jan 2022 01:00:47 -0800 (PST) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Fri, 14 Jan 2022 17:00:37 +0800 Message-Id: <1642150837-22960-3-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 3/3] avcodec/libopenh264enc: set iEntropyCodingModeFlag by coder option 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: 6bimn3D4qnx5 From: Limin Wang For high/main profile, user can choose to use cavlc by specify "-coder cavlc", for default, it'll will use cabac, if it's baseline, we'll use cavlc by specs anyway. ffmpeg -y -f lavfi -i testsrc -c:v libopenh264 -profile:v main -coder cavlc -frames:v 1 -bsf trace_headers -f null - before the patch: entropy_coding_mode_flag 0 = 1 after the patch: entropy_coding_mode_flag 0 = 0 Signed-off-by: Limin Wang --- libavcodec/libopenh264enc.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/libavcodec/libopenh264enc.c b/libavcodec/libopenh264enc.c index 8e27edb..4c0997b 100644 --- a/libavcodec/libopenh264enc.c +++ b/libavcodec/libopenh264enc.c @@ -193,7 +193,7 @@ static av_cold int svc_encode_init(AVCodecContext *avctx) #endif param.bPrefixNalAddingCtrl = 0; param.iLoopFilterDisableIdc = !s->loopfilter; - param.iEntropyCodingModeFlag = 0; + param.iEntropyCodingModeFlag = s->coder >= 0 ? s->coder : 1; param.iMultipleThreadIdc = avctx->thread_count; /* Allow specifying the libopenh264 profile through AVCodecContext. */ @@ -221,14 +221,14 @@ static av_cold int svc_encode_init(AVCodecContext *avctx) switch (s->profile) { case FF_PROFILE_H264_HIGH: - param.iEntropyCodingModeFlag = 1; - av_log(avctx, AV_LOG_VERBOSE, "Using CABAC, " - "select EProfileIdc PRO_HIGH in libopenh264.\n"); + av_log(avctx, AV_LOG_VERBOSE, "Using %s, " + "select EProfileIdc PRO_HIGH in libopenh264.\n", + param.iEntropyCodingModeFlag ? "CABAC" : "CAVLC"); break; case FF_PROFILE_H264_MAIN: - param.iEntropyCodingModeFlag = 1; - av_log(avctx, AV_LOG_VERBOSE, "Using CABAC, " - "select EProfileIdc PRO_MAIN in libopenh264.\n"); + av_log(avctx, AV_LOG_VERBOSE, "Using %s, " + "select EProfileIdc PRO_MAIN in libopenh264.\n", + param.iEntropyCodingModeFlag ? "CABAC" : "CAVLC"); break; case FF_PROFILE_H264_CONSTRAINED_BASELINE: case FF_PROFILE_UNKNOWN: