From patchwork Tue Jul 18 04:08:05 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 4348 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.1.76 with SMTP id 73csp995575vsb; Mon, 17 Jul 2017 21:08:20 -0700 (PDT) X-Received: by 10.223.170.219 with SMTP id i27mr484746wrc.49.1500350900777; Mon, 17 Jul 2017 21:08:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500350900; cv=none; d=google.com; s=arc-20160816; b=jHg7yghTJhy1eqP8VxCNAe6KGQYeSglWdK9Xnz3dGuXTZCAhNE8hqV04ysuZW10qhT zJs3e37+jQ+H7qAwBJ6MbkAPgUj3nAuXaDyTh7PCp/hgYPRX6pHNUB+rDQ9wVfpQgXiH vCnrrC8sNuGpl9k4nJNz/DJ2mBpmtPk9DL2eAfGdya0cjEJnukgRggdMMAEm+U8rRpKx yhGnp38YaZxfjdrHTNjU1Dz6NhE9fQZ/PJTH7eOF4dLbprgh1fQ60xaZnHdR+YxBC4xw X3UcEUQPF0L/yD4OoFIceVvxhYVrAOYQp9JKMZ/uu2yjn7aocsF4AnpWCTzVdSYoSPl+ ngzg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:content-disposition:content-language :mime-version:user-agent:date:message-id:from:to:dkim-signature :delivered-to:arc-authentication-results; bh=/am9aoykCP2OFvGEY84/OFTty/qstVhVMmZwxNjlRoA=; b=VsKXwQeV7L6xDfHeY3qRaXwvejOrVeYMou4V9J511MYWz2eSTf16/bqxVTdiM5AAK2 2YHe7Tcy02mD8+rVsi5k8mgePhyx1oJnS/kREBzu2986/vIfbRr5esckGTiFxmJtYaQA 7ATfcLlCg9aimv55HhduYMfS2gloFi2nQWTt0dXDBO/boi6uTWaf9h/sdF4A7leVnRUh IxvYB9vrxzh3TobWboGGu2VBvooxloyFJw6fjEUo8mDlISx+OD7r3VCEL39+67wMKaaz jt/018wmdPQffHLIRr9g54oq1937av0s7FraI1sNGbjpxj4+ObuE3HwWu3WxPCge+osY cpuw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.b=jGyaOL7N; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id t206si1215039wmg.119.2017.07.17.21.08.19; Mon, 17 Jul 2017 21:08:20 -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; dkim=neutral (body hash did not verify) header.i=@gmail.com header.b=jGyaOL7N; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 067AF688360; Tue, 18 Jul 2017 07:08:10 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg0-f41.google.com (mail-pg0-f41.google.com [74.125.83.41]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id EE48F680A8F for ; Tue, 18 Jul 2017 07:08:03 +0300 (EEST) Received: by mail-pg0-f41.google.com with SMTP id u5so5239159pgq.3 for ; Mon, 17 Jul 2017 21:08:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=to:from:subject:message-id:date:user-agent:mime-version :content-language; bh=a2XnRRMhNJ105BuI0Eq22DPu0FMtBshopl+ZIKEqbLk=; b=jGyaOL7N84uV1yD4AIKN+1vITPZNyM4ixrXThr3jCSs0rE5rctynUIcMcQLd43XBKr /+9NqvvXaFoijnvaxbG+XRkdDa7EBgfj7N2StmcLQTn4jeDYWo5797vkGq+MwG1UCwA2 kw5yNlMx2IFSFhgFE50SKXTRU+64Nko63xkoMwj+M/BMlbfXdcnB/U628RZZEgTpRCiU VJaxVX3oTzAOCo8MEqVLypO6DSw8VMDUkdEjlBVO5U73NZ/Y9n+jLO34RQubaFvYGEDc NhhHfrAe4OU74Ek8GMaJ2bRwfLgAVieCg4d5muRdNGPIVg9vdu57Euh5gBZcHoB45nku 4YwA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:to:from:subject:message-id:date:user-agent :mime-version:content-language; bh=a2XnRRMhNJ105BuI0Eq22DPu0FMtBshopl+ZIKEqbLk=; b=XN4fW95GD19wjQ0d4YgoxUHa+fkj1N+GcFBNn1W0d/KFDvKWhBEeybMvyeaftnE5Mt irPzaS1CFERnvgEhs/7fm/jRQFZIEZGUIEngqlaQsEGts4cQxfXq4wdzSr15DY/HyBeT 8hNio4VwwZ5Y2StfkXu8fombkKJNY+xf3DRcuf3TTspxWotrdIhwr3ybzJZX7xYSxTrm wfEzg8E0Pp29dVWkqVDAScQgAJjrAJVFElfVwz7jAPMn/HyDVL9Qst2OzoCrBhRrYknl YFbLMD9osVoUg9lNXCfqQl1VNWeWhZb8S3iw/UeYKSwzqJRZaex20e4IdlR/GobijdjU eCAA== X-Gm-Message-State: AIVw111cuaK5oDnJENf498ZxZpRcCS2emdkFTftVgtGPJdfNJJgupcI3 0fk/0+dEFOlnBw== X-Received: by 10.99.105.70 with SMTP id e67mr952191pgc.77.1500350889293; Mon, 17 Jul 2017 21:08:09 -0700 (PDT) Received: from [10.67.68.84] (fmdmzpr04-ext.fm.intel.com. [192.55.54.39]) by smtp.gmail.com with ESMTPSA id v62sm1377563pfa.6.2017.07.17.21.08.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 17 Jul 2017 21:08:07 -0700 (PDT) To: FFmpeg development discussions and patches , Mark Thompson From: Jun Zhao Message-ID: <7129e7ea-87cc-1b58-99cf-a820e71aef7e@gmail.com> Date: Tue, 18 Jul 2017 12:08:05 +0800 User-Agent: Mozilla/5.0 (Windows NT 6.3; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.2.1 MIME-Version: 1.0 Content-Language: en-US Content-Disposition: attachment; filename*0="0001-lavc-vaapi_encode_h265-Remove-duplicate-slice_segmen.pa"; filename*1="tch" X-Content-Filtered-By: Mailman/MimeDel 2.1.20 Subject: [FFmpeg-devel] [PATCH] lavc/vaapi_encode_h265: Remove duplicate slice_segment_address. 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From ee094ddd0fedecc81ee0107df58fc0ec80369c13 Mon Sep 17 00:00:00 2001 From: Jun Zhao Date: Tue, 18 Jul 2017 00:01:09 -0400 Subject: [PATCH] lavc/vaapi_encode_h265: Remove duplicate slice_segment_address. the VAEncSliceParameterBufferHEVC in libva have support this field, so remove the duplicate field in VAAPIEncodeH265MiscSliceParams. Signed-off-by: Jun Zhao --- libavcodec/vaapi_encode_h265.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libavcodec/vaapi_encode_h265.c b/libavcodec/vaapi_encode_h265.c index 1d648a6d87..cf6b9388d1 100644 --- a/libavcodec/vaapi_encode_h265.c +++ b/libavcodec/vaapi_encode_h265.c @@ -149,7 +149,6 @@ typedef struct VAAPIEncodeH265MiscSequenceParams { typedef struct VAAPIEncodeH265MiscSliceParams { // Slice segments. char first_slice_segment_in_pic_flag; - unsigned int slice_segment_address; // Short-term reference picture sets. char short_term_ref_pic_set_sps_flag; @@ -586,7 +585,7 @@ static void vaapi_encode_h265_write_slice_header2(PutBitContext *pbc, if (vpic->pic_fields.bits.dependent_slice_segments_enabled_flag) u(1, vslice_field(dependent_slice_segment_flag)); u(av_log2((priv->ctu_width * priv->ctu_height) - 1) + 1, - mslice_var(slice_segment_address)); + vslice_var(slice_segment_address)); } if (!vslice->slice_fields.bits.dependent_slice_segment_flag) { for (i = 0; i < mseq->num_extra_slice_header_bits; i++)