From patchwork Mon Nov 13 09:30:00 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhong Li X-Patchwork-Id: 6026 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp1879999jah; Mon, 13 Nov 2017 01:30:33 -0800 (PST) X-Google-Smtp-Source: AGs4zMbM6SdI07DtvG29uOy9cy9Lzgra3ZCgKoiUlKvmYLN1uwLft6BvlL/ec33uKtcevEVJxIK/ X-Received: by 10.223.170.150 with SMTP id h22mr17658wrc.26.1510565432907; Mon, 13 Nov 2017 01:30:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1510565432; cv=none; d=google.com; s=arc-20160816; b=ztH9Asjy1kALB2/oO/BIYKxGS4P36jA3rJI1hUZX6540LT6QyePLYlxOcY8s88kHv3 kmfFnxk/c25eVq1+JcC/N2V28ZDe+uy3xd25L5kXz0nLtb86NHnb6qapKzNfHP2aChQt Dj2geRjFPJd6EP5cTd0XzR/UMO3esDf3MwtkaVrry4tPDUmJWTChmK8DQDKgMurtfovt XrK660ZJ1zmXfCoON56htXjWy4GZmwFW2ZYX81dEDAWfXPzn5rwbfSZZ1X/Nljjl3VOv 7WW9R3+hY4ShC8nhnY8uLxLsGTgOG3ZpzSqMNPB//k1MDBYVlyAOhZsPFN8Ix+U85Llf GokQ== 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:delivered-to:arc-authentication-results; bh=ZsjC6YM+rBz/7Hz5BAkNun77yBxsDsCwfRfEhso/+X0=; b=YFZIObegkaPGgTtUDtogn+Hi95AzJhl2anVb7TyB/v2SQoUIx5NYWLUJR4r2BZDEVr O7A4nc6auNfpsFqA35x3jtouGX1x4kM7gWbKVrroFjBLszt04AK6Hcg7tHtVtV3VWB2/ 4m409PmrGhfWP2Aj6SUA7siBq5Qj6HqIJmu6hf3hgmVjqym4PCkgwMngeTwgZvMZzACd Bqfk1hnOWCU84k/pikE9hsjeLW9J9gh6m62ojdLk/WefohuDZsYeVFNnTkCcWfrAdpZ5 CUb5ldpf/QbF9gPgEwRy0/CU0aLLGRbZ6mXmemBemnT2+KJ71hcqeJvYTATr0GGKJLQz WDJg== 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 w6si12471908wra.4.2017.11.13.01.30.32; Mon, 13 Nov 2017 01:30:32 -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; 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 7FFE968A552; Mon, 13 Nov 2017 11:30:02 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E814F68A540 for ; Mon, 13 Nov 2017 11:29:55 +0200 (EET) Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga105.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 13 Nov 2017 01:30:01 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.44,388,1505804400"; d="scan'208";a="6989553" Received: from unknown (HELO localhost.localdomain.sh.intel.com) ([10.239.13.23]) by orsmga002.jf.intel.com with ESMTP; 13 Nov 2017 01:30:00 -0800 From: Zhong Li To: ffmpeg-devel@ffmpeg.org Date: Mon, 13 Nov 2017 04:30:00 -0500 Message-Id: <1510565400-15509-3-git-send-email-zhong.li@intel.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1510565400-15509-1-git-send-email-zhong.li@intel.com> References: <1510565400-15509-1-git-send-email-zhong.li@intel.com> Subject: [FFmpeg-devel] [PATCH 3/3] qsvenc: cavlc and pic_timing_sei are only available for h264 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: Zhong Li MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Zhong Li --- libavcodec/qsvenc.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c index 2259a79..c45b2a6 100644 --- a/libavcodec/qsvenc.c +++ b/libavcodec/qsvenc.c @@ -532,22 +532,22 @@ static int init_video_param(AVCodecContext *avctx, QSVEncContext *q) if (avctx->codec_id != AV_CODEC_ID_HEVC) { q->extco.Header.BufferId = MFX_EXTBUFF_CODING_OPTION; q->extco.Header.BufferSz = sizeof(q->extco); + if (q->rdo >= 0) + q->extco.RateDistortionOpt = q->rdo > 0 ? MFX_CODINGOPTION_ON : MFX_CODINGOPTION_OFF; + + if (avctx->codec_id == AV_CODEC_ID_H264) { #if FF_API_CODER_TYPE FF_DISABLE_DEPRECATION_WARNINGS - if (avctx->coder_type >= 0) - q->cavlc = avctx->coder_type == FF_CODER_TYPE_VLC; + if (avctx->coder_type >= 0) + q->cavlc = avctx->coder_type == FF_CODER_TYPE_VLC; FF_ENABLE_DEPRECATION_WARNINGS #endif - q->extco.CAVLC = q->cavlc ? MFX_CODINGOPTION_ON - : MFX_CODINGOPTION_UNKNOWN; + q->extco.CAVLC = q->cavlc ? MFX_CODINGOPTION_ON + : MFX_CODINGOPTION_UNKNOWN; - q->extco.PicTimingSEI = q->pic_timing_sei ? - MFX_CODINGOPTION_ON : MFX_CODINGOPTION_UNKNOWN; + q->extco.PicTimingSEI = q->pic_timing_sei ? + MFX_CODINGOPTION_ON : MFX_CODINGOPTION_UNKNOWN; - if (q->rdo >= 0) - q->extco.RateDistortionOpt = q->rdo > 0 ? MFX_CODINGOPTION_ON : MFX_CODINGOPTION_OFF; - - if (avctx->codec_id == AV_CODEC_ID_H264) { if (avctx->strict_std_compliance != FF_COMPLIANCE_NORMAL) q->extco.NalHrdConformance = avctx->strict_std_compliance > FF_COMPLIANCE_NORMAL ? MFX_CODINGOPTION_ON : MFX_CODINGOPTION_OFF;