From patchwork Tue Apr 18 15:33:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 41245 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:4645:b0:e3:3194:9d20 with SMTP id eb5csp3256435pzb; Tue, 18 Apr 2023 08:40:03 -0700 (PDT) X-Google-Smtp-Source: AKy350bD7fO4nnS1YRLftUD41qWLbKgpQu9CW91yaqw1/KvBkzSmrPxt9s2KDbzw+W6baiQ7+g/B X-Received: by 2002:a17:906:739b:b0:951:756d:6542 with SMTP id f27-20020a170906739b00b00951756d6542mr3113197ejl.32.1681832402982; Tue, 18 Apr 2023 08:40:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681832402; cv=none; d=google.com; s=arc-20160816; b=Mk1swV5d3pXhzEJDb4ln3MMZU/Wdh5+ILowi4E18114zfXsvogBD2Tr0WM3RIEUZXM bl9l8Cl6wtKmhWeX4PUDh9gKq2rAIWRrbV67JxCvAIRSqydmKqOoSCQaDPlfCJ3X/fHl RHqbtsWc26Z5KWWIs2sXg8OqANS7+XzySKmo4ZbB3iF1RisZsWjFc24ul98FMVQZ+cbF G4DT3CeHeDk2LJ73urwg4UqHVSUY3+MyBy6zAcO2eg9lUip34gKXMdO+/aobbK9xFGm/ BVXXoNKSibC1Rw9b/3lMwxJy3ByLbn0pDIpnhEm7Vu1W9M2WqKuLGx4mcTOwbZrX0ARg ZH/g== 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=QU3tKrJ7quYesJoCDudguFMABD0xSsbq3wy27hKeRrQ=; b=NxXU7Zb/ZsAvdbYVunZ+z3AAD+0kVUqpCzWsh6swriiwCNua8zUGhnrrofo+vVbfOw pvLvEwewJ+rwr60W6IfuGdFkfutiTkcdWGO6NN/+GQ/FBfdG38LCcHP8l2NEq+LzGzQE 14rTXK9yI/XHJIQcU2LBRkNLiCDMCUVw3n4okE//JkzS0CzBYNG2HpGEcpvljrPTJkhn zfrh34yz4HMAKWXPK0hgEuPyRj/3gVxhexkGt9bPYr5LyyjoAhC1a8QV3JUa9uRimFT8 PoAA6dF60rBmZ5MHKqzQ70besRjMlU9FUu0krCwVsq9JyLK6G0Zjb4ozdkO1uocNcNpQ zBbQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=lP2rOoMz; 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 w21-20020a056402129500b0050277665b9bsi12665125edv.407.2023.04.18.08.40.02; Tue, 18 Apr 2023 08:40:02 -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; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=lP2rOoMz; 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 B332568BE9F; Tue, 18 Apr 2023 18:39:53 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6A91668BE99 for ; Tue, 18 Apr 2023 18:39:47 +0300 (EEST) Received: by mail-wm1-f53.google.com with SMTP id d8-20020a05600c3ac800b003ee6e324b19so68961wms.1 for ; Tue, 18 Apr 2023 08:39:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1681832386; x=1684424386; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ZWjNaBJEl1becWXJo+guNZr3eb7QmCeMppl7iR3O2A4=; b=lP2rOoMzdTg2517uKMKfGHFoU0WkAz+5dD2JSeW48XQTdSDtcYzh3qY4euszKLLENe yqa0XoZCdFCo0ur5qV44c7FkL3j1b/8GxtpJmgZTmt22BgSuOK5980d5RSTaHprfjCQc ANeOkJNpE/6uXtaQCVT3eo+SDsn8IZyd45LJu8mjbhVZsz2dMKoY89JmX0ciXQxSmwBH lVUObmaE6P9Jx2MeOrXAlgpbpbfK36jHeMteIXqRTBKSrOoEMCHf6TdqznxNtGr+GBud 212TV1vjL651fXqF2YPfnYhlHNmyUM7ZGS8eUgmhnwXpp6ig1c5huMBcqlChQAR0j2pC EkXg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1681832386; x=1684424386; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ZWjNaBJEl1becWXJo+guNZr3eb7QmCeMppl7iR3O2A4=; b=B1BaWA3Cx5MNlw/lbTMSzc0O1uCP5PyCkkDe5W1HIwYmhqljb36p0gTd+jp/JouoMn GRl1TFwJW2h/M+0LexsDn+aUrCgNMv9aI7o5xyfOHEsm7H65xrlD0WCqbD117K4Sf/w7 Bj4MRo9A3tvEgGG+1DTgs1Yu05H9Qbdg79Fjui/St9/+mzMLFm82qMEBxc2fcPzyRJU0 WFlgsr6QoKpqtG/U1K6J9WOQMjrCfSTu+R9a30uqFCtZ6SxiYFgcPASM15SBkbjABSSe +zZhx46/LtFEy2nuZENCTwgzlps6EkC3N5oXX1THjdjJU4x8zd0tbHZ5f0l/gt3FnwEE CITg== X-Gm-Message-State: AAQBX9eNq3vp1hXDrq5nOLdsx77OzQm3wtyHVQ9TwClE3+Ri6vNB6IQr QbU3hHk0aqM4TG71Htl5gjQydK0S0U7WpYl9 X-Received: by 2002:a1c:7312:0:b0:3f0:9f9b:1665 with SMTP id d18-20020a1c7312000000b003f09f9b1665mr14877021wmb.3.1681832386453; Tue, 18 Apr 2023 08:39:46 -0700 (PDT) Received: from localhost.localdomain ([49.51.162.193]) by smtp.gmail.com with ESMTPSA id b11-20020a5d4d8b000000b002c7066a6f77sm13348540wru.31.2023.04.18.08.39.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 18 Apr 2023 08:39:45 -0700 (PDT) From: Jun Zhao To: ffmpeg-devel@ffmpeg.org Date: Tue, 18 Apr 2023 23:33:51 +0800 Message-Id: <20230418153351.2350679-2-mypopydev@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230418153351.2350679-1-mypopydev@gmail.com> References: <20230418153351.2350679-1-mypopydev@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] lavc/libopenh264: refine the code 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: Jun Zhao , Jun Zhao Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: /ca/vDUNZBPx refine the code Signed-off-by: Jun Zhao --- libavcodec/libopenh264enc.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libavcodec/libopenh264enc.c b/libavcodec/libopenh264enc.c index cccc11fbb7..3c605fe8ea 100644 --- a/libavcodec/libopenh264enc.c +++ b/libavcodec/libopenh264enc.c @@ -313,7 +313,6 @@ static av_cold int svc_encode_init(AVCodecContext *avctx) 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); } else if (avctx->pix_fmt == AV_PIX_FMT_YUVJ420P) param.sSpatialLayers[0].bFullRange = 1; @@ -321,7 +320,6 @@ static av_cold int svc_encode_init(AVCodecContext *avctx) 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; } @@ -331,6 +329,9 @@ static av_cold int svc_encode_init(AVCodecContext *avctx) param.sSpatialLayers[0].uiColorPrimaries = avctx->color_primaries; if (avctx->color_trc != AVCOL_TRC_UNSPECIFIED) param.sSpatialLayers[0].uiTransferCharacteristics = avctx->color_trc; + + param.sSpatialLayers[0].bVideoSignalTypePresent = + (param.sSpatialLayers[0].bFullRange || param.sSpatialLayers[0].bColorDescriptionPresent); #endif if ((*s->encoder)->InitializeExt(s->encoder, ¶m) != cmResultSuccess) {