From patchwork Wed Aug 2 05:53:52 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 4582 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.46.211 with SMTP id u202csp807153vsu; Tue, 1 Aug 2017 22:54:08 -0700 (PDT) X-Received: by 10.28.222.70 with SMTP id v67mr2744702wmg.156.1501653248906; Tue, 01 Aug 2017 22:54:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1501653248; cv=none; d=google.com; s=arc-20160816; b=UumJw9uLJabmiiAWuLfmeYntNwKav+2B5Drjbj2WtWCgTOb7GfI4QMcneh6URl9mrf 8FzRGY8myNFUjRHnwhYIueyXt6wakgBi+FkG0lOOj1KlcvAY6UMgjEbuV65BUdu8Cyg/ wrYGOy6wd0Tgddpx2B/7jImbts/PQd7Oro53YrwobzRhWt+9Hyx+Z4zB4g+XT0mCd2Jl Zy8YnGCb9S0NfX6clGfmn35zZj9hsckkIE5wsD5655o3ZgC5U1ah/9Ro+lvdapQEW6wn a4PQ5N/72thGb5PfJKDGgmoQ0Rqkj3F/+4Ur6/k9HzqsWTsczEkEoPlclz7I4PHaD45f a7oQ== 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=ESFK12yc9ON+/pRivCXAKdEo73ldha6sHwFP69dw5nU=; b=nBJ3AThELGvyF0i2tzwwto4ODmk9M8GgUp1E5w2uYPlGCy5Wg6DHCNtxkn6fuAY8U/ LdqVLe0vN997VuPCDERaoThKSyYG/34Z0nZtQ2LTxvLnbjpyVlevtuzidW6r4Bvn79iR GIxjycgEvG7qTwHGJ/n7eBhRio1JwchPxSsc/DXbiuxdgS2AeTTACNiW8RZ+fa21Eiqz lLk0iRzRYg1ngFFGGRyPo+re3P8/dbvsg6MmSPWAvFQC8OVhWmvkdnfspe3Yva/nj6kb /txQqRGrk+golVHM0hFDqSRyL3gLj48/VTse2oajdft298TNJOZ+b+pXhHRc7xgD1+CI lKYQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.b=p6f2ooDK; 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 c34si27379157wra.336.2017.08.01.22.54.08; Tue, 01 Aug 2017 22:54:08 -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=p6f2ooDK; 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 549366802BA; Wed, 2 Aug 2017 08:54:02 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf0-f173.google.com (mail-pf0-f173.google.com [209.85.192.173]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1E9B268A2C6 for ; Wed, 2 Aug 2017 08:53:55 +0300 (EEST) Received: by mail-pf0-f173.google.com with SMTP id t86so16939683pfe.2 for ; Tue, 01 Aug 2017 22:53:58 -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=vHEIqnqR/WEbLZrY1AFRRPBiyXTnGiK3E9c407J5Bzg=; b=p6f2ooDKPfmae63RKJ0kfVejLrP1vg4+yMO5v3MwfEumTN8gSnDShJH6E+Su79Sd2s q3ULy3s0eiiWdfchOP7Uxi11Zt++Pp+rfzNLF0giFdh8RbvrQ2I4XkIX0vY8HdzseGpp 066yQYBfYImjQY2IE1XIjkn7OKTlTqiCXH/VFjc4maM40xdVJ90fJW9DMxt2u3l5xkbq aMx9z2bjXKeZO0ezRD5hBmcYjHt+fAdkbyW7dSoT4oavqW66IIq9Vh99F5UbZjETu01M 4bwved54dK9Dpe1Hgbar1iA/JoSoEYuopvAyJapDUC8cIMng8i30R1IVNc6PXk4bW1bc H0Lw== 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=vHEIqnqR/WEbLZrY1AFRRPBiyXTnGiK3E9c407J5Bzg=; b=NwrWA10t1QmPFKaF1OykwjEv3mDJCgKDwtfnxdjbkmnaC7ReFCzYpMIWTmpB1kJpe4 LbChoSJhC0Px30v2Pb9C2u9LX1+qJsXaK7kacvyQQ9tFcswwhzssSCBbzHai2J0s9cK/ m+YPSH7Zb+qM08tDTDl4jyvSIC50vm0f7XIdAgzQmCVvS3MxwOUMYBJxCtHUyOmVvqVi ajUF4AM+TS1wrmqt/31iK+W06biZDaNPZusfEJuwQT2zJtsMqOCTO6V1Qy3j6AeCElMQ 5oKjyen3KYCVKebQnYUsofvh5NPqWKakCbjxEf7kLPKbhMgRgZnZYtjTzok2Km2TxNkl XYCQ== X-Gm-Message-State: AIVw113+qmj0ygXqdbmjuk2s93nBQMpptAmLdetVjSsvxlo0DUllkLuT L1Ki60zC2bTILA== X-Received: by 10.84.217.84 with SMTP id e20mr24139701plj.143.1501653236557; Tue, 01 Aug 2017 22:53:56 -0700 (PDT) Received: from [10.67.68.50] ([192.55.54.40]) by smtp.gmail.com with ESMTPSA id m76sm21983540pfk.11.2017.08.01.22.53.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 01 Aug 2017 22:53:55 -0700 (PDT) To: FFmpeg development discussions and patches , Mark Thompson From: Jun Zhao Message-ID: <745e04d6-a3d2-5d50-922a-55d8bae9d288@gmail.com> Date: Wed, 2 Aug 2017 13:53:52 +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 Subject: [FFmpeg-devel] [PATCH V2 1/4] lavc/vaapi_encode: Change the slice/parameter buffers to dynamic alloc. 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" V2: Change the slice/parameter buffers to dynamic alloc and split the mutil-slice support for AVC/HEVC. From 39fd7852df0c96217310c525107da06a7ec0a062 Mon Sep 17 00:00:00 2001 From: Jun Zhao Date: Mon, 31 Jul 2017 22:46:23 -0400 Subject: [PATCH V2 1/4] lavc/vaapi_encode: Change the slice/parameter buffers to dynamic alloc. Change the slice/parameter buffers to be allocated dynamically. Signed-off-by: Wang, Yi A Signed-off-by: Jun Zhao --- libavcodec/vaapi_encode.c | 27 ++++++++++++++++++++++++--- libavcodec/vaapi_encode.h | 6 ++---- 2 files changed, 26 insertions(+), 7 deletions(-) diff --git a/libavcodec/vaapi_encode.c b/libavcodec/vaapi_encode.c index 2de5f76cab..11d9803b5d 100644 --- a/libavcodec/vaapi_encode.c +++ b/libavcodec/vaapi_encode.c @@ -36,13 +36,19 @@ static int vaapi_encode_make_packed_header(AVCodecContext *avctx, VAAPIEncodeContext *ctx = avctx->priv_data; VAStatus vas; VABufferID param_buffer, data_buffer; + VABufferID *tmp; VAEncPackedHeaderParameterBuffer params = { .type = type, .bit_length = bit_len, .has_emulation_bytes = 1, }; - av_assert0(pic->nb_param_buffers + 2 <= MAX_PARAM_BUFFERS); + tmp = av_realloc_array(pic->param_buffers, sizeof(*tmp), (pic->nb_param_buffers + 2)); + if (!tmp) { + av_freep(&pic->param_buffers); + return AVERROR(ENOMEM); + } + pic->param_buffers = tmp; vas = vaCreateBuffer(ctx->hwctx->display, ctx->va_context, VAEncPackedHeaderParameterBufferType, @@ -77,9 +83,15 @@ static int vaapi_encode_make_param_buffer(AVCodecContext *avctx, { VAAPIEncodeContext *ctx = avctx->priv_data; VAStatus vas; + VABufferID *tmp; VABufferID buffer; - av_assert0(pic->nb_param_buffers + 1 <= MAX_PARAM_BUFFERS); + tmp = av_realloc_array(pic->param_buffers, sizeof(*tmp), (pic->nb_param_buffers + 1)); + if (!tmp) { + av_freep(&pic->param_buffers); + return AVERROR(ENOMEM); + } + pic->param_buffers = tmp; vas = vaCreateBuffer(ctx->hwctx->display, ctx->va_context, type, len, 1, data, &buffer); @@ -122,6 +134,8 @@ static int vaapi_encode_wait(AVCodecContext *avctx, // Input is definitely finished with now. av_frame_free(&pic->input_image); + av_freep(&pic->param_buffers); + pic->encode_complete = 1; return 0; } @@ -313,7 +327,10 @@ static int vaapi_encode_issue(AVCodecContext *avctx, } } - av_assert0(pic->nb_slices <= MAX_PICTURE_SLICES); + pic->slices = (VAAPIEncodeSlice **)av_malloc(sizeof(VAAPIEncodeSlice *) * pic->nb_slices); + if (pic->slices == NULL) + goto fail; + for (i = 0; i < pic->nb_slices; i++) { slice = av_mallocz(sizeof(*slice)); if (!slice) { @@ -427,6 +444,8 @@ fail: vaDestroyBuffer(ctx->hwctx->display, pic->param_buffers[i]); fail_at_end: av_freep(&pic->codec_picture_params); + av_freep(&pic->param_buffers); + av_freep(&pic->slices); av_frame_free(&pic->recon_image); av_buffer_unref(&pic->output_buffer_ref); pic->output_buffer = VA_INVALID_ID; @@ -544,6 +563,8 @@ static int vaapi_encode_free(AVCodecContext *avctx, av_frame_free(&pic->input_image); av_frame_free(&pic->recon_image); + av_freep(&pic->param_buffers); + av_freep(&pic->slices); // Output buffer should already be destroyed. av_assert0(pic->output_buffer == VA_INVALID_ID); diff --git a/libavcodec/vaapi_encode.h b/libavcodec/vaapi_encode.h index 0edf27e4cb..b542772aed 100644 --- a/libavcodec/vaapi_encode.h +++ b/libavcodec/vaapi_encode.h @@ -35,8 +35,6 @@ enum { MAX_CONFIG_ATTRIBUTES = 4, MAX_GLOBAL_PARAMS = 4, MAX_PICTURE_REFERENCES = 2, - MAX_PICTURE_SLICES = 112, - MAX_PARAM_BUFFERS = 128, MAX_REORDER_DELAY = 16, MAX_PARAM_BUFFER_SIZE = 1024, }; @@ -73,7 +71,7 @@ typedef struct VAAPIEncodePicture { VASurfaceID recon_surface; int nb_param_buffers; - VABufferID param_buffers[MAX_PARAM_BUFFERS]; + VABufferID *param_buffers; AVBufferRef *output_buffer_ref; VABufferID output_buffer; @@ -85,7 +83,7 @@ typedef struct VAAPIEncodePicture { struct VAAPIEncodePicture *refs[MAX_PICTURE_REFERENCES]; int nb_slices; - VAAPIEncodeSlice *slices[MAX_PICTURE_SLICES]; + VAAPIEncodeSlice **slices; } VAAPIEncodePicture; typedef struct VAAPIEncodeContext {