From patchwork Mon Nov 13 09:29:59 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhong Li X-Patchwork-Id: 6025 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp1879847jah; Mon, 13 Nov 2017 01:30:23 -0800 (PST) X-Google-Smtp-Source: AGs4zMagDgmCmUDKVBS45+GdrEj4kpQxTdjEmaDcrsQrMrCX1o+iPdyped6QoRCEv48ZONJgs2kD X-Received: by 10.223.165.67 with SMTP id j3mr987426wrb.181.1510565423237; Mon, 13 Nov 2017 01:30:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1510565423; cv=none; d=google.com; s=arc-20160816; b=UndCtoKCfb0tJid/xb6Xg0wR23NNJlerCwSufMzBPYNPd9T36L4dyWl7ABioZxeFX7 btp5vP6N4LdFepoLA0IhjoDGKYMJada5zzDleLgrhyBAZEujHnjmUfjStzQAiBJIKCIL Ocy96MsXMZnI2Jso/H8xk3ipgCgX+vgz1b43xsFqWvgph7O+KTJsKbIg5F94rNo35UWy Y474osaknvlvHQsXPCsDOSXmhzHMPvzsMHuvzW7Drvry1kxzZdUWKw6eO/JI8kTpvH1u QnVjTyjVe/H7jGgU6lnx6x/l/1Wg5TJOpO6W0sKCqrEXc9EZ4NA8/Uu9ILr/4qfK5B9y TSMQ== 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=qAYKcslRnAMLXust6MpNdvJ+RY2nakKq4ZHGSY5wb8Q=; b=0WaOgKvvQITvaAjQ6pvPHr6JcMEiAGwdS6BuyA7iwMmU6tKxYhlXNgoHFc/c2RVbfI NNDRM4CiL9Y4Sevlibt347enp9pcrZGLkFEr0s+TlSzEeokZodiKu+B4ICo4GApLM7B9 1KeEsWxkhYjF8aGzTkAZwRr7O5Uht0Zovqd0l6kxNG++z7eQtg4wa672+AEg4TFow8Zq GxFhYh4kx7aFZ8axN7qRSearWjkRZzDQBiT8ers6vU/bMixhxDPxKC9CiNpBInfC0jQV NiRK2hCWmtriipGqkdS9VT7amPH9WyM1tEmHb1QAE0a30cyXylbqQ9EC1L2+8oodVzF0 95qQ== 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 d1si13277175wrf.65.2017.11.13.01.30.22; Mon, 13 Nov 2017 01:30:23 -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 1F70868A54A; Mon, 13 Nov 2017 11:30:01 +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 A43CF68A538 for ; Mon, 13 Nov 2017 11:29:54 +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:00 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.44,388,1505804400"; d="scan'208";a="6989540" Received: from unknown (HELO localhost.localdomain.sh.intel.com) ([10.239.13.23]) by orsmga002.jf.intel.com with ESMTP; 13 Nov 2017 01:29:59 -0800 From: Zhong Li To: ffmpeg-devel@ffmpeg.org Date: Mon, 13 Nov 2017 04:29:59 -0500 Message-Id: <1510565400-15509-2-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 2/3] qsv/h264enc: fix cavlc option setting useless issue 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" No matter cavlc option is set to 0 or 1, the output bitstream is always cabac mode. Reproduce: -y -s widthxheight -i widthxheight.yuv -vcodec h264_qsv -b:v 2000k -maxrate 2000k -look_ahead 0 -cavlc 1 test.h264 Then check the entropy_coding_mode_flag of the encoded bitstream It is due to the dulicate option "coder" (which should be deprecated) is set to cabac Signed-off-by: Zhong Li --- libavcodec/qsvenc.c | 2 +- libavcodec/qsvenc_h264.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c index 2bc19f5..2259a79 100644 --- a/libavcodec/qsvenc.c +++ b/libavcodec/qsvenc.c @@ -534,7 +534,7 @@ static int init_video_param(AVCodecContext *avctx, QSVEncContext *q) q->extco.Header.BufferSz = sizeof(q->extco); #if FF_API_CODER_TYPE FF_DISABLE_DEPRECATION_WARNINGS - if (avctx->coder_type != 0) + if (avctx->coder_type >= 0) q->cavlc = avctx->coder_type == FF_CODER_TYPE_VLC; FF_ENABLE_DEPRECATION_WARNINGS #endif diff --git a/libavcodec/qsvenc_h264.c b/libavcodec/qsvenc_h264.c index 0aaf672..3242062 100644 --- a/libavcodec/qsvenc_h264.c +++ b/libavcodec/qsvenc_h264.c @@ -155,7 +155,9 @@ static const AVCodecDefault qsv_enc_defaults[] = { // same as the x264 default { "g", "250" }, { "bf", "3" }, - { "coder", "ac" }, +#if FF_API_CODER_TYPE + { "coder", "-1" }, +#endif { "flags", "+cgop" }, #if FF_API_PRIVATE_OPT