From patchwork Wed Aug 23 10:34:10 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jun Zhao X-Patchwork-Id: 4804 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.137.29 with SMTP id o29csp1808715jaj; Wed, 23 Aug 2017 03:34:26 -0700 (PDT) X-Received: by 10.28.21.76 with SMTP id 73mr1555227wmv.73.1503484466220; Wed, 23 Aug 2017 03:34:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1503484466; cv=none; d=google.com; s=arc-20160816; b=SPtLPJvnVXqgTTHar8uR0cR4zSeC71k8EFc1AUl3dQEOd2h7I0Yh3F8KkPV5j2VSnr bH+vtF6pkz2gZ/QhMphpzWmGKeYFn0dZ2wp4Tr/bOYpo+Hkeyf/B1epFwRHnPGSRHqwM pTatclCdTgoJuQqH5agOzPBSwRWrRow9NlM00igmnLB2/vZJMYXFU4vCUHnJGbRjtcE0 uXicQErjicvP4iIggGO0K0i7PkMkeyzJ1tWaeO5MbjJ9iaqcjqqnfkXPsu2NzHpwU0SN xCr4IoXu91FB2nseZZj0DWockfelXECIpjMLpqWe7dwNo65x392RKh5AYXQbNeGyKUud Djeg== 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=MFwf9IMi/mBOxXXPyIMEGxQQ+3+heu2yvb9lCInIvrQ=; b=V0g8z6ONadDeEYPMxlwZE0f9MPavI+/3dQDGVqYWw1ykfcfi2zRO0J317FSvCtn+Z4 nc7myCrOjGG65apY12DABKgDu7HDAov0PTlgCdrVeqcr6rRdVf/WYxmoXsgJ3qUcJdJJ xwoG0dVreFfOBeGG1OoQlIcPTBllZqusdRRvuZOOMliErpHIJ5kNC3b1K0KG4ClU5U8Q e0NWdGd1zCvDFGGUWd4m5NwWUem6bgWatI8YpNLSI78LDKkDOhT4iTJS4mWUdvEhWQKg Vq6qd8QJPGKRiYenzjM7ZvPvHCG8W/cZkrYXv2paq9LHcH8KrJX+cmTCcSD0TrrFR/5V Nwkg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=rlsPwfoW; 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 p194si355533wmd.139.2017.08.23.03.34.24; Wed, 23 Aug 2017 03:34:26 -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=rlsPwfoW; 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 6D80C689DB1; Wed, 23 Aug 2017 13:34:15 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf0-f180.google.com (mail-pf0-f180.google.com [209.85.192.180]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 99850689AFC for ; Wed, 23 Aug 2017 13:34:08 +0300 (EEST) Received: by mail-pf0-f180.google.com with SMTP id x137so5294408pfd.2 for ; Wed, 23 Aug 2017 03:34:16 -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=+NwLzqiCStw6uhHv6mOXEmb8FH0+OtbykBvb4MDXyCs=; b=rlsPwfoWOrGR6Ts2F9k7KSd22FPaRd4+QRmG4wqotDV1FW1d/Sg/nBtovqO1rHETAM bSk84R8Y/YEZkQQu1uvZ5mmVkCsJGNvadyB0/fuX2xNCsFht9B0E+i+IV7+/mTO4JZU+ dAUBogbiSPed4F7QvFe3INQveVbJGBz+Dod8Nwzzg+QrhY/AvcC32l/Kb7S9ttVVvD9u 2XJ2/N7w5IxkBLlWciajI6/+mIalIfycFa5gwoysIddLFQ5WDeXbe3Q+O4FCDhV6WMHT G2P04GA6D5KmF3LHIKDuO/GBPBbDkO71IZHOql1v2yhnnmj0st2msA/j0S87UWBEg+tV jmwg== 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=+NwLzqiCStw6uhHv6mOXEmb8FH0+OtbykBvb4MDXyCs=; b=Lvk6eBAn6nIzX1HCccsgN4Xq6XMKYElxGSzBho21/wErfc2pAt3FHhtFNcz0dPo/Hx Izvba5rOcuYWq4j8FIaDVX7TVZQGXQ1edpsax2utu232J51eFGXDLEKpRk8hF7PauQ96 7Ovior0MyrfEUwvDI2++xl+3ahK4hMoJWPdKtDbszAp20ROU0VjuWG6CGqbd4FRIRfoI s4GpBniQfe6TWvpyJNdd0MEUCSU6N0epBnz3MbmebIf+ObS+/xV0S93tmwm2ojDs7NVd I8K4AUXJW+JjDDKe9pIhrX3jL5YQbc5Kn0u/WjDLUeYbXUilLgUT4biiKqN4IQxpXtHI W6Og== X-Gm-Message-State: AHYfb5hmTZtTu2dtXEsJM8C4APChqrtCpxFgXUO5SjvqDLCELnsuCRWd 34Bwcq/g18JGpx2DHs8= X-Received: by 10.98.196.211 with SMTP id h80mr2253580pfk.75.1503484454862; Wed, 23 Aug 2017 03:34:14 -0700 (PDT) Received: from [10.67.68.67] (fmdmzpr03-ext.fm.intel.com. [192.55.54.38]) by smtp.gmail.com with ESMTPSA id v9sm2598526pgo.39.2017.08.23.03.34.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 23 Aug 2017 03:34:13 -0700 (PDT) To: FFmpeg development discussions and patches , Mark Thompson From: Jun Zhao Message-ID: <90957d5c-d8bd-1a5c-b672-a47d47d5fab5@gmail.com> Date: Wed, 23 Aug 2017 18:34:10 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.3.0 MIME-Version: 1.0 Content-Language: en-US Subject: [FFmpeg-devel] [PATCH V4 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" V4: - Change the array malloc function.     - Clean the pointless condition check when free the memory.       Patch 2/4, 3/4, 4/4 same as V3.  V3: - Making pic->slices be VAAPIEncodeSlice* instead of VAAPIEncodeSlice**. - Fix resource (vaBuffer) lead when realloc pic->param_buffers fail. - Adjust max_slices location in VAAPIEncodeContext. - Re-work distributing the macro-blocks for multi-slices function. V2: Change the slice/parameter buffers to dynamic alloc and split the mutil-slice support for AVC/HEVC. From a1078385915d53ec94559ed897eb253e537d1f65 Mon Sep 17 00:00:00 2001 From: Jun Zhao Date: Mon, 31 Jul 2017 22:46:23 -0400 Subject: [PATCH V4 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 | 44 ++++++++++++++++++++++++++++++++------------ libavcodec/vaapi_encode.h | 6 ++---- 2 files changed, 34 insertions(+), 16 deletions(-) diff --git a/libavcodec/vaapi_encode.c b/libavcodec/vaapi_encode.c index 22114bedbe..f49e0e3b91 100644 --- a/libavcodec/vaapi_encode.c +++ b/libavcodec/vaapi_encode.c @@ -36,13 +36,18 @@ 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) { + return AVERROR(ENOMEM); + } + pic->param_buffers = tmp; vas = vaCreateBuffer(ctx->hwctx->display, ctx->va_context, VAEncPackedHeaderParameterBufferType, @@ -77,9 +82,14 @@ 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) { + return AVERROR(ENOMEM); + } + pic->param_buffers = tmp; vas = vaCreateBuffer(ctx->hwctx->display, ctx->va_context, type, len, 1, data, &buffer); @@ -313,15 +323,14 @@ static int vaapi_encode_issue(AVCodecContext *avctx, } } - av_assert0(pic->nb_slices <= MAX_PICTURE_SLICES); + pic->slices = av_mallocz_array(pic->nb_slices, sizeof(*pic->slices)); + if (!pic->slices) { + err = AVERROR(ENOMEM); + goto fail; + } for (i = 0; i < pic->nb_slices; i++) { - slice = av_mallocz(sizeof(*slice)); - if (!slice) { - err = AVERROR(ENOMEM); - goto fail; - } + slice = &pic->slices[i]; slice->index = i; - pic->slices[i] = slice; if (ctx->codec->slice_params_size > 0) { slice->codec_slice_params = av_mallocz(ctx->codec->slice_params_size); @@ -425,8 +434,16 @@ fail_with_picture: fail: for(i = 0; i < pic->nb_param_buffers; i++) vaDestroyBuffer(ctx->hwctx->display, pic->param_buffers[i]); + for (i = 0; i < pic->nb_slices; i++) { + if (pic->slices) { + av_freep(&pic->slices[i].priv_data); + av_freep(&pic->slices[i].codec_slice_params); + } + } 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; @@ -535,15 +552,18 @@ static int vaapi_encode_free(AVCodecContext *avctx, vaapi_encode_discard(avctx, pic); for (i = 0; i < pic->nb_slices; i++) { - av_freep(&pic->slices[i]->priv_data); - av_freep(&pic->slices[i]->codec_slice_params); - av_freep(&pic->slices[i]); + if (pic->slices) { + av_freep(&pic->slices[i].priv_data); + av_freep(&pic->slices[i].codec_slice_params); + } } av_freep(&pic->codec_picture_params); 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 3bf0cc87c7..364b5b8028 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 {