From patchwork Fri Mar 16 05:53:12 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhong Li X-Patchwork-Id: 8003 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.1.70 with SMTP id c67csp362752jad; Thu, 15 Mar 2018 22:55:49 -0700 (PDT) X-Google-Smtp-Source: AG47ELtEt/qQS5tjgxEilK2dn+aVy7VX+Bt6Y6ek2pDVhOeHA62Rgl/HWwBXI+04Tq4UJZRTUu7n X-Received: by 10.223.176.144 with SMTP id i16mr422447wra.70.1521179749329; Thu, 15 Mar 2018 22:55:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521179749; cv=none; d=google.com; s=arc-20160816; b=v3RQyPdULVvjnDjwdTXWdnYt5vTVsWg0NGp/J50qfT/i935h/54iVailR03Z6iG/NN MFz+zfxTTAjLefZ4/Zmv9U1CyjqELmZgPnQBv9esKFaCkFl9OTc8/XpxJE1ckA5KSv0A dM1D6yEhK0Oze1o/BTlaeuWMhNqt+fPHqEa1f9/TiXg3cAOltUaI1XU8NsQ9m3gc/PwB ZKGthG+jntYHE1IxyTv/ObpUQtedI7h0bUZjAkMblMtw1QCDKIsxknMBa65kk3U/Ddze TIsCo0fceZwatSTdF4SWfyeyf/jcKSmCrWoBGDk2kGVJpQANPDyCk+fVBLCV8FhHhGk3 8seg== 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=X4Nz+Js1qc7gWB2EzYAGNhRkanYG+kQm5eXNH0HmO4U=; b=Er5yFcypqFmU1GoKxHfyoZNAjQtd4Tp/SX9BZKEeaKVMQQXqJPh9iFhq5TqBJp1Zsu 04m6EF9jcW4c+X0gcEhkB/lQKZbBxc8/+ytnJr5XE+1p/LVBO4dEBJzNAVowcKOjLkIo mKvSa02p7522NK2RYg887npEeryz399FSgJIf3usoWrwaHDCjodbDBq+dZyUv/jkZCq/ YOVWtp0hRSm5DjNOyZhLpbo9yaYRlmUbazqZU54uHeMNsfbWOJ+RlY1U6TLfYqTzCD44 ojadjlboZGXtR89YPm8u+CcuytBLdT4yvHmkdiph8h1AvXZLnbPjyFyImBf5dcXBaFlz pKUw== 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 v189si3688065wmf.182.2018.03.15.22.55.48; Thu, 15 Mar 2018 22:55:49 -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 EBFBA68A051; Fri, 16 Mar 2018 07:55:32 +0200 (EET) 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 19DEA6899A8 for ; Fri, 16 Mar 2018 07:55:23 +0200 (EET) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by orsmga106.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 15 Mar 2018 22:55:27 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.48,313,1517904000"; d="scan'208";a="24983492" Received: from unknown (HELO localhost.localdomain.sh.intel.com) ([10.239.13.18]) by fmsmga008.fm.intel.com with ESMTP; 15 Mar 2018 22:55:27 -0700 From: Zhong Li To: ffmpeg-devel@ffmpeg.org Date: Fri, 16 Mar 2018 13:53:12 +0800 Message-Id: <1521179592-11861-2-git-send-email-zhong.li@intel.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1521179592-11861-1-git-send-email-zhong.li@intel.com> References: <1521179592-11861-1-git-send-email-zhong.li@intel.com> Subject: [FFmpeg-devel] [PATCH 2/2] lavc/qsvenc: add the Access Unit Delimiter NAL Unit support 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 | 1 + libavcodec/qsvenc.h | 2 ++ libavcodec/qsvenc_h264.c | 2 ++ 3 files changed, 5 insertions(+) diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c index 0d2e223..afb953e 100644 --- a/libavcodec/qsvenc.c +++ b/libavcodec/qsvenc.c @@ -595,6 +595,7 @@ FF_ENABLE_DEPRECATION_WARNINGS if (q->recovery_point_sei >= 0) q->extco.RecoveryPointSEI = q->recovery_point_sei ? MFX_CODINGOPTION_ON : MFX_CODINGOPTION_OFF; q->extco.MaxDecFrameBuffering = q->max_dec_frame_buffering; + q->extco.AUDelimiter = q->aud ? MFX_CODINGOPTION_ON : MFX_CODINGOPTION_OFF; } q->extparam_internal[q->nb_extparam_internal++] = (mfxExtBuffer *)&q->extco; diff --git a/libavcodec/qsvenc.h b/libavcodec/qsvenc.h index fb5fd68..080f6f0 100644 --- a/libavcodec/qsvenc.h +++ b/libavcodec/qsvenc.h @@ -138,6 +138,8 @@ typedef struct QSVEncContext { int max_frame_size; int max_slice_size; + int aud; + int single_sei_nal_unit; int max_dec_frame_buffering; int trellis; diff --git a/libavcodec/qsvenc_h264.c b/libavcodec/qsvenc_h264.c index e01a2a3..3f090ce 100644 --- a/libavcodec/qsvenc_h264.c +++ b/libavcodec/qsvenc_h264.c @@ -141,6 +141,8 @@ static const AVOption options[] = { { "main" , NULL, 0, AV_OPT_TYPE_CONST, { .i64 = MFX_PROFILE_AVC_MAIN }, INT_MIN, INT_MAX, VE, "profile" }, { "high" , NULL, 0, AV_OPT_TYPE_CONST, { .i64 = MFX_PROFILE_AVC_HIGH }, INT_MIN, INT_MAX, VE, "profile" }, + { "aud", "Insert the Access Unit Delimiter NAL", OFFSET(qsv.aud), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, VE}, + { "a53cc" , "Use A53 Closed Captions (if available)", OFFSET(qsv.a53_cc), AV_OPT_TYPE_INT, {.i64 = 1}, 0, 1, VE}, { NULL }, };