From patchwork Tue Jul 18 06:21:30 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Liu X-Patchwork-Id: 4349 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.1.76 with SMTP id 73csp1124117vsb; Mon, 17 Jul 2017 23:28:02 -0700 (PDT) X-Received: by 10.28.71.133 with SMTP id m5mr831335wmi.97.1500359281991; Mon, 17 Jul 2017 23:28:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500359281; cv=none; d=google.com; s=arc-20160816; b=S86+xbAUklo6HGFma/pxKUWX1PqBUd/hfTqG7iCasgQSk3nkoO7ux+tRywL1cDGuJa OBA+Ae852hfdmGhVCj7kXowkKVkO6LKxyxvE8I4SowfUgRMbnBdmAjfakWW0WBXvjgmI c/CJXvyu4cDDUrf7WcXCmmKmah7d/MSuYOjxc046M1FLyk4Zdy+1ViuPx8KfXss9oi+U zR0YlYJCdM6SEwR/cRxqqF2LtU5o4fRe8ZpThwMwvsW7GfysRr2EigcXlFPNFCJNUmCR hxoO6uapMyn+O+Zh8BibikMj2pOtEHkwaXhTk6d5QL3pbpY5Wb5PLe0V9Jz0ptWMKVC/ 5gUg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:to:message-id:date:from:references :in-reply-to:mime-version:dkim-signature:delivered-to :arc-authentication-results; bh=B25DCqIm08u5Fpfq5KrEpChSqk0MBanxRR1hmagH11Y=; b=ezgDpmgz7+w7VYE5tGHY2mnFZg31XhJqmr9EUn924Y02t0vvg1zY8O7BBh7Ma2vws/ ufKby/JZT1uuskHtMOq9SKjJqChBqHphRTCk/w1Grq0NBcH8pT8wMp9EQb/6m8THTn/B oo/FaUmcJ8nlZkdlfPegZV65PQ9V/a7/0SRlkEJhUh4+7HFfvoBQGx9X+agYf2u//xLZ gR0OZJcKS2FrlON5GxIZPJg9zv+cZigJBbAo/xV+szY61tnV220XGvAynl0PaUZCPxFv WaFqUoFNba7W53nHXt9nEP/W3NQ+NpVYLjhNzn9fiMUZO4HNb6ZtQPaYJ4Kbh/9GucYc Frqg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.b=AzjL413M; 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 c17si956161wre.387.2017.07.17.23.28.00; Mon, 17 Jul 2017 23:28:01 -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=AzjL413M; 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 1DDE8680A8F; Tue, 18 Jul 2017 09:27:50 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-yw0-f193.google.com (mail-yw0-f193.google.com [209.85.161.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5046D68060C for ; Tue, 18 Jul 2017 09:27:44 +0300 (EEST) Received: by mail-yw0-f193.google.com with SMTP id z21so569105ywz.2 for ; Mon, 17 Jul 2017 23:27:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=SpoicX9wJVe9Ztmy3H6yC6i3AWkCd8o7wy8hpntzfvU=; b=AzjL413MftbHt51sgeb4hr1kjIoGDJhcqSu7CUVXLPfwDw5knrIspF5N7xzEWbziII cQ3ungRmg2LuqZd5Z+pJw+QqAigBTliGA/W6YjADWLenepzbVerXVMH0KJtTFZk4b+3m njfbfl210aaSz8LbyVTcZt0mGuxc64bzqBmyWrVw1LFpI/A3gPZr8yG4vRrrwcK7RaLT qe7gLa8+pr9tLesf4OrdD2Fm5SlW4DIX2vkcNuAem/5BgSSc4mm9B8h6tEgNsJqSSD1c Ep7l2bF0E2CIj1/acKVMgilHbyMjMCVlA9upTvYAa6LKAyiKDqvAm+//nwcE+sfluZMC /vSg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=SpoicX9wJVe9Ztmy3H6yC6i3AWkCd8o7wy8hpntzfvU=; b=FO+jLwadv++Vjtc1rrx52qAn6BVmjYJg/sl6FWjSFed2AKkMvsjHD5JuU4P2tVcv52 NkcAesi5rrbFpRscAecCuwFbwuYx2IYknvmb/m37EDx2hex3Vclb/UoWpLB8jbKTjueQ 3tgqnB+g43m46Eg3lYFo++UgCj6dCofaiWXjJBYcQ/Pr2RLkRX/bazPMEuac+vJ/ntTb n52mEJpMdhc4EdB1OPVsvq0ZD+wBRU/2HIa9vPK1C9vQknzlKy3orvDjQNEz9/mgKbVb QsSjX0KbZtOaAFRAYWTKyU1EPHMNHDPycNA3K4e/5BzzEsADGkEGV4AxiYMn3nVvi/le i++A== X-Gm-Message-State: AIVw112WeOa3JHG8GPiipWadHay4eoavKjKMLLosFlaFmdcGFcw0o6Nq CZBJ1OTDHzLJ62lK8CMKn/5tHw9I1K/f X-Received: by 10.129.202.71 with SMTP id y7mr77710ywk.74.1500358890809; Mon, 17 Jul 2017 23:21:30 -0700 (PDT) MIME-Version: 1.0 Received: by 10.13.203.149 with HTTP; Mon, 17 Jul 2017 23:21:30 -0700 (PDT) In-Reply-To: <7129e7ea-87cc-1b58-99cf-a820e71aef7e@gmail.com> References: <7129e7ea-87cc-1b58-99cf-a820e71aef7e@gmail.com> From: Steven Liu Date: Tue, 18 Jul 2017 14:21:30 +0800 Message-ID: To: FFmpeg development discussions and patches Subject: Re: [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 Cc: Mark Thompson Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" 2017-07-18 12:08 GMT+08:00 Jun Zhao : > 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(-) for (i = 0; i < mseq->num_extra_slice_header_bits; i++) 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) {