From patchwork Tue Oct 24 06:02:32 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 5667 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.161.90 with SMTP id m26csp260304jah; Mon, 23 Oct 2017 23:02:45 -0700 (PDT) X-Received: by 10.28.129.197 with SMTP id c188mr6640303wmd.58.1508824965009; Mon, 23 Oct 2017 23:02:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1508824964; cv=none; d=google.com; s=arc-20160816; b=VjgdXWnLzaTOQbDpKcynEFXr7aT92gQaO2SrBGOW4WNHqywWbEf9MhsXA0o/EbwInP hWdEmhgE+hovLGtgqCGU7SM9V2h75pUJvZ8dsgv6j9pX8iu0B3Srz2bECzOw62Gk5/mH PgaBdbKUWvRDtI/ep6JngZzkUGdZ6bXo2VLvfJrGtlvedLYXsWgTNMhNAbjG4v5JNZfE nvxHG7RG7Ol2UYzR3MaQBcp3ACdqpm3C5w3v/ISpyGgItfsgUTyqkYPCZbt471IOF5y7 1ltH0kuDeTb0yIEoXiIQYJekzWDmlyVKEaO0jK97qHILv+A9YbjRukRALW22peFx/mTH +QsA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject :content-language:mime-version:user-agent:date:message-id:from:to :dkim-signature:delivered-to:arc-authentication-results; bh=L8TC5zIAVsyMjz80l0Uh26WdDaY1AG4o1GFJtqSsIRU=; b=m6S2sK2VQJynm3AmIHweN7+MBTRix/nLInTHRNyQkxTJRSU03XOrL7KZGE0tPBzMxn HZDFYE8O/ULfRO+IFa5dtRR7JPiVJwSC37Ep+x2AkLSMN+t8oZXyLUCkZnKtEAm+Whx6 fsEkmI3qIS05HburFVnaN+TxFhdSEcl9B88HbyZ0w7pjBgLlqejE1fIy+TdeDg4yxkNt 8I/dtshv9Xn9CHhQlKQJ92ml3sKWA3435ZMrXw/jd4pBxulCDIFCidRlJJPYsFo1p95U 2gM3HHHVbLs5VxMV5hEwC4adp7yixD5Pkt+66lEssPcCymMBsx4c0XQfn81SkOS99/oa 7rZA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=NHhfiyFd; 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 j15si522008wme.18.2017.10.23.23.02.44; Mon, 23 Oct 2017 23:02:44 -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.s=20161025 header.b=NHhfiyFd; 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 A4B6A68A246; Tue, 24 Oct 2017 09:02:36 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg0-f45.google.com (mail-pg0-f45.google.com [74.125.83.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1B66C68A220 for ; Tue, 24 Oct 2017 09:02:30 +0300 (EEST) Received: by mail-pg0-f45.google.com with SMTP id p9so13676957pgc.8 for ; Mon, 23 Oct 2017 23:02:37 -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=LQkGPum9agcTYHTY8VjM5xfZj9jOME+o909zCU0pAqc=; b=NHhfiyFdvhCWEUZZcZMA4/Wm/XN5OMq0p6WskrPzkdVBQDdF4OArfarj18tD9LyHri sd1wUwncSeUuAjIm1PxRUYbOcCbwxZ5V0Zw14UaWqIK3G6cKDSE+AgH9EeWbzDxSbEis Jqeoz6CyY/3Pov3n8pZGmoos3fPQVsrmIYKuAJfMfp4HWR3mMb2VSlSYudbz1Ry7iFlH HnCDXBLe7drvBaq0oFHCkGhOJ5F/7pK/9b4FKqaSr+KTOFIDk40ah29CZxuj48hhS/W1 r8+mVRoLJDVNzrdFxJ52oZvfkPhwz2ULKIms9B9yyPjm2DjGvgPlLEuxENhj3yo8gH4b gQGA== 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=LQkGPum9agcTYHTY8VjM5xfZj9jOME+o909zCU0pAqc=; b=F8F1HXpOmlN2fMJyDnKJkvvYlJWUVPGgk5rtz2Q6ez5pcnYveEWVx7pB+TZMUImyEj O9DUpG/X822L86weZptR4HQ0TcUx3d5wzHy0dJP5SY10KEMr5EmTIWqhWjZj21FYcmw1 klAo9On6AobPeG/ZXwQP6rUUDj/vfbbqIbU9EvCUA57OWGTmubROTv63ZqqskhpKurwo my56OK93tdf/ykdNuba03UQGzkNkQCDvp91zUslci2F9KOZ/AhliLPNd5y/vszz7yzr/ UO3zFRIkbDNQJg3F/9s/rFpbMpOGO/GMGNZ3zNMqmSGa1xr/nR1dnpUzSCCfj0WTbTv9 xePQ== X-Gm-Message-State: AMCzsaWU9A/WrzT2eY1/KRcxJI+KWh/EVf06rqWxXKk6zB0J6MaEMD50 6LGF3m1zhjsv13/H7kaGRCk= X-Google-Smtp-Source: ABhQp+Tj7JYxF91h8q1bfOUC6ZaQo0L+EWwInuaqZ+GrpRAtgqQAQlQludS4H4Ty+Kt6MdP6kJAGXA== X-Received: by 10.101.88.70 with SMTP id s6mr13986921pgr.216.1508824955740; Mon, 23 Oct 2017 23:02:35 -0700 (PDT) Received: from [10.67.68.23] (fmdmzpr01-ext.fm.intel.com. [192.55.54.36]) by smtp.gmail.com with ESMTPSA id c26sm16481361pfl.115.2017.10.23.23.02.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 23 Oct 2017 23:02:35 -0700 (PDT) To: FFmpeg development discussions and patches , Mark Thompson From: Jun Zhao Message-ID: <204e3653-8e02-a603-690a-5b69dec37d6c@gmail.com> Date: Tue, 24 Oct 2017 14:02:32 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.4.0 MIME-Version: 1.0 Content-Language: en-US Subject: [FFmpeg-devel] [PATCH V2] lavc/vaapi_encode_h264: correct VUI max_dec_frame_buffering setting. 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 24b8e1c70fd4bf4eb76404fd9e2020fe3bbd90cb Mon Sep 17 00:00:00 2001 From: Jun Zhao Date: Tue, 24 Oct 2017 13:25:21 +0800 Subject: [PATCH V2] lavc/vaapi_encode_h264: correct VUI max_dec_frame_buffering setting. vseq.max_num_ref_frames not init before the VUI max_dec_frame_buffering setting, so use sps.max_num_ref_frames in this case. Signed-off-by: Jun Zhao Signed-off-by: Wang, Yi A --- libavcodec/vaapi_encode_h264.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/vaapi_encode_h264.c b/libavcodec/vaapi_encode_h264.c index 9a4bd53da1..1d43e934ef 100644 --- a/libavcodec/vaapi_encode_h264.c +++ b/libavcodec/vaapi_encode_h264.c @@ -441,7 +441,7 @@ static int vaapi_encode_h264_init_sequence_params(AVCodecContext *avctx) sps->vui.log2_max_mv_length_horizontal = 16; sps->vui.log2_max_mv_length_vertical = 16; sps->vui.max_num_reorder_frames = (ctx->b_per_p > 0); - sps->vui.max_dec_frame_buffering = vseq->max_num_ref_frames; + sps->vui.max_dec_frame_buffering = sps->max_num_ref_frames; pps->nal_unit_header.nal_ref_idc = 3; pps->nal_unit_header.nal_unit_type = H264_NAL_PPS;