From patchwork Mon Nov 13 09:29:58 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhong Li X-Patchwork-Id: 6027 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.94 with SMTP id m30csp1879670jah; Mon, 13 Nov 2017 01:30:12 -0800 (PST) X-Google-Smtp-Source: AGs4zMZZ9sucLvUwLeCZfcW58+zeF3TO0CNLJxXnmuckjFienHDlyStQ9YmAEtBl5gJOLvXzTIIC X-Received: by 10.223.167.76 with SMTP id e12mr6034585wrd.259.1510565412750; Mon, 13 Nov 2017 01:30:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1510565412; cv=none; d=google.com; s=arc-20160816; b=daJYZJAYBo9Ge+swXv9iHGMwGsl/AFyEeT7D5/F/vAO5OQwUgW8qJfC103kOtzqBLK 66IW/SnrlC/oeZPjbCpsxgQWDp7E1iA0Ug5FN6zT28vgQMf6nmysk6oNBgK5ezgtvQbs U3homEuB9sp6mVpLjGF9ALUJt+thkQuDxyoJoCAjWU2r9UpU23KSaSdm2DnCQWw7JzaC KzOm54eq9NROcoLL+B4ZXFTIqI0KNZ8T3+PhDIQgDZ/ozR0pFEKMU401MWrN+dWMEszy J2LdsE1PtAngr1ZFo/q/PJZrjMzp/uw4GJj5okFbKhTMHs5tcB4gFVTdZoaQOKHMeJVE Js0Q== 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=g0nmDEmPn4/h+zXberddiLBi9SUSk/7ZzENAtyWauOU=; b=fOgIqUfLWbH8+SjY3VfIuOqUxp+4ct775h8O5NFT+yJPjZT4U8vjxTCaxcLHkhkGWD UlhXySyuk3kRvhq0lmAFRAWbos8kbfIz0l9RBnEY+3+/ZuI5IsB/6PIC/WD0e3RAyXh4 9xvbBOOIbCNuU5uqJSItTJfsVNqikJPVe1264hT6sIQ6Je6ZE/IQ+18bedX30SoJZ9Jr EK1DOvNC5ESSpoMdYv7KG09q7ydAh0+ANrT8dz/IhU9luJ/HsrWtAQajlnv346vtaIRE kvlAAAiHc96IDHjeiLkd62C8IRk1d1ng+jkJMkqtfElfsE/NqDChNqPzNhwksncaPFe/ oEzQ== 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 s5si12526007wra.178.2017.11.13.01.30.11; Mon, 13 Nov 2017 01:30:12 -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 A715068A539; Mon, 13 Nov 2017 11:29:55 +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 9D69968A48D for ; Mon, 13 Nov 2017 11:29:48 +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:29:59 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.44,388,1505804400"; d="scan'208";a="6989531" 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:58 -0800 From: Zhong Li To: ffmpeg-devel@ffmpeg.org Date: Mon, 13 Nov 2017 04:29:58 -0500 Message-Id: <1510565400-15509-1-git-send-email-zhong.li@intel.com> X-Mailer: git-send-email 1.8.3.1 Subject: [FFmpeg-devel] [PATCH 1/3] qsvenc: move cavlc out of common option 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" CAVLC option is only available for h264 encoding. CABAC is the only entropy coding way for hevc. Signed-off-by: Zhong Li --- libavcodec/qsvenc.h | 3 +-- libavcodec/qsvenc_h264.c | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libavcodec/qsvenc.h b/libavcodec/qsvenc.h index 12e3444..20bafc8 100644 --- a/libavcodec/qsvenc.h +++ b/libavcodec/qsvenc.h @@ -69,8 +69,7 @@ { "extbrc", "Extended bitrate control", OFFSET(qsv.extbrc), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, 1, VE }, \ { "adaptive_i", "Adaptive I-frame placement", OFFSET(qsv.adaptive_i), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, 1, VE }, \ { "adaptive_b", "Adaptive B-frame placement", OFFSET(qsv.adaptive_b), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, 1, VE }, \ -{ "b_strategy", "Strategy to choose between I/P/B-frames", OFFSET(qsv.b_strategy), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, 1, VE }, \ -{ "cavlc", "Enable CAVLC", OFFSET(qsv.cavlc), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, VE }, \ +{ "b_strategy", "Strategy to choose between I/P/B-frames", OFFSET(qsv.b_strategy), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, 1, VE }, typedef int SetEncodeCtrlCB (AVCodecContext *avctx, const AVFrame *frame, mfxEncodeCtrl* enc_ctrl); diff --git a/libavcodec/qsvenc_h264.c b/libavcodec/qsvenc_h264.c index 389335f..0aaf672 100644 --- a/libavcodec/qsvenc_h264.c +++ b/libavcodec/qsvenc_h264.c @@ -102,6 +102,7 @@ static av_cold int qsv_enc_close(AVCodecContext *avctx) static const AVOption options[] = { QSV_COMMON_OPTS + { "cavlc", "Enable CAVLC", OFFSET(qsv.cavlc), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, VE }, { "idr_interval", "Distance (in I-frames) between IDR frames", OFFSET(qsv.idr_interval), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, VE }, { "pic_timing_sei", "Insert picture timing SEI with pic_struct_syntax element", OFFSET(qsv.pic_timing_sei), AV_OPT_TYPE_INT, { .i64 = 1 }, 0, 1, VE }, { "single_sei_nal_unit", "Put all the SEI messages into one NALU", OFFSET(qsv.single_sei_nal_unit), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, 1, VE },