From patchwork Thu May 3 05:51:48 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xiang, Haihao" X-Patchwork-Id: 8760 Delivered-To: ffmpegpatchwork@gmail.com Received: by 2002:a02:155:0:0:0:0:0 with SMTP id c82-v6csp1419268jad; Wed, 2 May 2018 22:52:19 -0700 (PDT) X-Google-Smtp-Source: AB8JxZoAw62LJubxudtC3iSkNeSKaJsHwEtO88/dBBjYPz8jIyjrucjbQlb3eQT4BhLH7U5tesf8 X-Received: by 2002:adf:a108:: with SMTP id o8-v6mr17157829wro.106.1525326738966; Wed, 02 May 2018 22:52:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1525326738; cv=none; d=google.com; s=arc-20160816; b=kqCUzhi+V+yGiIg2YQHrNg6LUU+/qF6HMhYOdfzz2TUCImj1xzyGpoppCdIAuaqc9u xxSckzt99KdXKWF6xnW97wDddusd1ST/hCefk1gsQDNfFfAVBZr8Bs/xlINfhFTzkt/S Vwmsmv8KOBYRViisNufHnWkafKsHLfFv610BL1+sEBZFR/GByU5MDQ+kzSuMQlAKRtYc x9zmQR5XPjItELmdeb7pCSo0czEvr4y6PRJqhOPHh1d/VXiBcVEJ93AvJzjo7RlaTCv2 W+DcuutY6R7uyAemUgXaPm73shkMl1DqIbHOlSCnmAnQaeErJ1r+etUxmpDPatSbgsz9 0Ufg== 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:message-id:date:to:from:delivered-to :arc-authentication-results; bh=KaN59zVJOcsB/8cuFRvL+D+B7xVOXh1Vq+6DMnls9J8=; b=Q1lc2GmFTSXvT47PM8EMRw4lNytjwBHrJpaGrg8WBIir6LETpX0Jn7ce6OzaMNymqO Yw2krk6UMKQHZ7XaqzoccJxTv9pMDEt4kssQr3bcreGIsngItHExKVgGmGAheik91579 vBKfDIH1/P/FE0UdRiyIE0KKpo+2MHy0CpHcX+pDtTia0DbgSVSxqyOqc1RF0vgWoHwD 1urGkrJSw32v1AdrsZI1c+YLBuOsr/NuKvr0qOJSyY2BRcyxYeMAMsYLjgepzPoS/MM/ WGg5u/mjhyFwS72hdv/Y16DoxcbtZS3w+uCyvHRftOnkTvv7QJuYtdcr9VO8G+lt8D6V G9JQ== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 1-v6si11140331wrl.258.2018.05.02.22.52.18; Wed, 02 May 2018 22:52:18 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1DA2568A570; Thu, 3 May 2018 08:51:43 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AA83668A44A for ; Thu, 3 May 2018 08:51:36 +0300 (EEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga106.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 02 May 2018 22:52:06 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.49,356,1520924400"; d="scan'208";a="47923996" Received: from xhh-skl64.sh.intel.com ([10.239.159.70]) by orsmga003.jf.intel.com with ESMTP; 02 May 2018 22:52:05 -0700 From: Haihao Xiang To: ffmpeg-devel@ffmpeg.org Date: Thu, 3 May 2018 13:51:48 +0800 Message-Id: <20180503055148.5847-1-haihao.xiang@intel.com> X-Mailer: git-send-email 2.17.0 Subject: [FFmpeg-devel] [PATCH] vaapi_encode_h264: Take VAAPIEncodeH264Context::sei_needed as an ORed value X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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: Haihao Xiang , Mark Thompson MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" We may check priv->sei_needed only when writing SEI messages. Signed-off-by: Haihao Xiang --- libavcodec/vaapi_encode_h264.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/libavcodec/vaapi_encode_h264.c b/libavcodec/vaapi_encode_h264.c index 56ad217b4a..905c50760e 100644 --- a/libavcodec/vaapi_encode_h264.c +++ b/libavcodec/vaapi_encode_h264.c @@ -208,7 +208,6 @@ static int vaapi_encode_h264_write_extra_header(AVCodecContext *avctx, { VAAPIEncodeContext *ctx = avctx->priv_data; VAAPIEncodeH264Context *priv = ctx->priv_data; - VAAPIEncodeH264Options *opt = ctx->codec_options; CodedBitstreamFragment *au = &priv->current_access_unit; int err, i; @@ -224,12 +223,12 @@ static int vaapi_encode_h264_write_extra_header(AVCodecContext *avctx, priv->sei.nal_unit_header.nal_unit_type = H264_NAL_SEI; i = 0; - if (pic->encode_order == 0 && opt->sei & SEI_IDENTIFIER) { + if (priv->sei_needed & SEI_IDENTIFIER) { priv->sei.payload[i].payload_type = H264_SEI_TYPE_USER_DATA_UNREGISTERED; priv->sei.payload[i].payload.user_data_unregistered = priv->identifier; ++i; } - if (opt->sei & SEI_TIMING) { + if (priv->sei_needed & SEI_TIMING) { if (pic->type == PICTURE_TYPE_IDR) { priv->sei.payload[i].payload_type = H264_SEI_TYPE_BUFFERING_PERIOD; priv->sei.payload[i].payload.buffering_period = priv->buffering_period; @@ -239,7 +238,7 @@ static int vaapi_encode_h264_write_extra_header(AVCodecContext *avctx, priv->sei.payload[i].payload.pic_timing = priv->pic_timing; ++i; } - if (opt->sei & SEI_RECOVERY_POINT && pic->type == PICTURE_TYPE_I) { + if (priv->sei_needed & SEI_RECOVERY_POINT) { priv->sei.payload[i].payload_type = H264_SEI_TYPE_RECOVERY_POINT; priv->sei.payload[i].payload.recovery_point = priv->recovery_point; ++i; @@ -628,8 +627,10 @@ static int vaapi_encode_h264_init_picture_params(AVCodecContext *avctx, priv->aud_needed = 0; } + priv->sei_needed = 0; + if (opt->sei & SEI_IDENTIFIER && pic->encode_order == 0) - priv->sei_needed = 1; + priv->sei_needed |= SEI_IDENTIFIER; #if !CONFIG_VAAPI_1 if (ctx->va_rc_mode == VA_RC_CBR) priv->sei_cbr_workaround_needed = 1; @@ -641,7 +642,7 @@ static int vaapi_encode_h264_init_picture_params(AVCodecContext *avctx, priv->pic_timing.cpb_removal_delay = 2 * priv->cpb_delay; priv->pic_timing.dpb_output_delay = 2 * priv->dpb_delay; - priv->sei_needed = 1; + priv->sei_needed |= SEI_TIMING; } if (opt->sei & SEI_RECOVERY_POINT && pic->type == PICTURE_TYPE_I) { @@ -649,7 +650,7 @@ static int vaapi_encode_h264_init_picture_params(AVCodecContext *avctx, priv->recovery_point.exact_match_flag = 1; priv->recovery_point.broken_link_flag = ctx->b_per_p > 0; - priv->sei_needed = 1; + priv->sei_needed |= SEI_RECOVERY_POINT; } vpic->CurrPic = (VAPictureH264) {