From patchwork Mon Mar 26 22:51:09 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Kravchenko X-Patchwork-Id: 8184 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.1.70 with SMTP id c67csp4077834jad; Mon, 26 Mar 2018 15:51:19 -0700 (PDT) X-Google-Smtp-Source: AIpwx49f8HbxxZwTt93yldBoTR0PzUiAi5vzu1AoD4jtzVHuoTxCw3CFAdmGB8HvA2eZhskyuagM X-Received: by 10.28.40.4 with SMTP id o4mr13680365wmo.44.1522104679104; Mon, 26 Mar 2018 15:51:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1522104679; cv=none; d=google.com; s=arc-20160816; b=yFHM3Z9BaVN2M4u33BJ3rSMALMHSbTjT6Haljum3Q1ce7I9TjLeJvf91DEujaJw9nk zmKCvDqjOZa7GJavN7kRvlOOHfEo+stcl5OD//aJVQxSAnUrYZ9WeHqCOhLpq34p3qvA SNwMQv/mvAWt4TTL5MpppuU2WYfXl0ud20jp0kn7OPG8N4VfMnFMRhCX6m3o3EkrlAOV Yw5wKsfKuc4Rsk95x1pelggGvIN0gO/JKRjv/+N3eGRgrvk8GgZgj1hAdLW1mMBmEa0H pJJKLsacEw3OtrTMI1+c9J+zDH8lSeybKS3J4PCzGicz7tRR40/l27J/Z37Qx+WZ2vJ4 vrGA== 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-language:thread-index:mime-version :message-id:date:in-reply-to:references:to:from:dkim-signature :delivered-to:arc-authentication-results; bh=X/PzIlNQ83x9jmGvE708sxiSp4xdcJFXFAqfxkibICc=; b=K/QxIceMa1ijCz4wnojjS6Vxb6I0LUVhZyx3M+eX3bgLoSG1pUV20vpwjsg8pZgNeY UlTcxdmRX+W7GmG2V5NatR435JvTAkI5F8vbNOUsriEmIM9+ZBbTKZsaFGMIh9cO1+rg JUwAk6FNbfdwk2J82hRoSBCDbhCj1wmGdLrNYgvcKUiO8ywm9FlLFbvGOjzjinDgE4N4 YzxJsMV+ThQ/hsucUhKSM3Z3e0V7n/YxDHQDQFJeG4mRDnJbLWCutEA1ZNqLFIk8+4TD WtJ3tYBnvop56ZR8M4RiHbIwnRa9eCNaNtGGV3TbnynLkOdLpwm0nCQCjlBRP7COCO/g VVTg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=d4EEO6YN; 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=QUARANTINE 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 c129si57515wmh.277.2018.03.26.15.51.18; Mon, 26 Mar 2018 15:51:19 -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=d4EEO6YN; 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=QUARANTINE 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 58BC9689811; Tue, 27 Mar 2018 01:50:59 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lf0-f52.google.com (mail-lf0-f52.google.com [209.85.215.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 39768680710 for ; Tue, 27 Mar 2018 01:50:53 +0300 (EEST) Received: by mail-lf0-f52.google.com with SMTP id g203-v6so30474757lfg.11 for ; Mon, 26 Mar 2018 15:51:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:references:in-reply-to:subject:date:message-id:mime-version :content-transfer-encoding:thread-index:content-language; bh=VWEnkvsv7EwpYst8qELqsHER59+YqdQL2kCgEtLk+Z8=; b=d4EEO6YNCIq/62wRi39mK8Hoo9cU9OH8WAmRP4V6XMPeAvJEM6KoNKdlT9jLx8SQ5k i6td32tWfbkYEmBMPO0Dfp7O9PQoxNokz4izGO/LfYS1nZwcmaeGcO/BLG5WNYBTSfSg tM5kaRCwOuxG1Ns/D8WlcgeAVXTGR56RjGJP8krwT6N4ufZDLqgfeNCcCfkDOQdKmUD5 ESz4o2gFQsN9NVt7CE2AJStM/nSkZb+5bCEVTgIta1724KYqkQmONKQoroSqllNxy68G JCrvWrgfiSM7efrLrErILXPEFSYgjA7i3mwzj+tNKF8AG5y9qaI1WgpClMtSOLgo0JvF 8TVg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:references:in-reply-to:subject:date :message-id:mime-version:content-transfer-encoding:thread-index :content-language; bh=VWEnkvsv7EwpYst8qELqsHER59+YqdQL2kCgEtLk+Z8=; b=CT2If0+2U4TJVZ7qTblLtvGFcnPsAJc4JKX9wtP91KcLEOLuEKi7JhCltAzOFLgVYu CN5+EWvcYYin5s/VxTJjJNpQseVCPBlQh4hM9L4774+XWDkMnNjw+Y7Wo6eG3/SQ8HI0 10ICxucKfd9swKynIapQx2GQJCG0ZBErO7os3ab/119h2sZy1EudrQG+ApZSQyLMe+h7 uIu8sj6KtNhWAIgr/HDHrhcwGJFn9SKLaG8X2CdQPgozca10vTnPJc4hcdtkjDj5UqIC 747CyXW8Wy36b+0juomOLB0ZwySaOgVasudQFlGXUU1l24FhPtaf/URCe5QAYAD4IX3r 34Vg== X-Gm-Message-State: AElRT7GMEvM0qcG6Aa/EULJ2D8bu6GPEPSiXRtnZ0WyGRTuzAqD5E7M5 GqZRdpeuIjIY+8h7xySQ0m1YW02Q X-Received: by 10.46.9.65 with SMTP id 62mr9184842ljj.33.1522104669719; Mon, 26 Mar 2018 15:51:09 -0700 (PDT) Received: from KAAMBWin10 ([188.227.65.188]) by smtp.gmail.com with ESMTPSA id p22sm3488483ljg.39.2018.03.26.15.51.08 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 26 Mar 2018 15:51:08 -0700 (PDT) From: "Alexander Kravchenko" To: "'FFmpeg development discussions and patches'" References: <1006FD0F0FE06E479CEE8E19981AE0703680AA52@ORO-MBOX-05.luxoft.com> <002401d3c4ee$fada2fe0$f08e8fa0$@gmail.com> <03314621-c380-cce6-021f-1e90b2074507@jkqxz.net> <1006FD0F0FE06E479CEE8E19981AE0703680BA0F@ORO-MBOX-05.luxoft.com> In-Reply-To: <1006FD0F0FE06E479CEE8E19981AE0703680BA0F@ORO-MBOX-05.luxoft.com> Date: Tue, 27 Mar 2018 01:51:09 +0300 Message-ID: <002c01d3c554$eedd94a0$cc98bde0$@gmail.com> MIME-Version: 1.0 X-Mailer: Microsoft Outlook 15.0 Thread-Index: AQEOIRNY0HgZF/j9DGUWfZUmLoStCgIQX00SAmPqzekB0KqT/gKHIymPpSgFukA= Content-Language: en-us Subject: [FFmpeg-devel] [PATCH] lavc/amfenc: Reference to input AVFrame (hwaccel) is retained during the encoding process 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" Fixed issues of previous patch --- libavcodec/amfenc.c | 82 ++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 78 insertions(+), 4 deletions(-) diff --git a/libavcodec/amfenc.c b/libavcodec/amfenc.c index 89a10ff253..5f3440a9f3 100644 --- a/libavcodec/amfenc.c +++ b/libavcodec/amfenc.c @@ -443,6 +443,48 @@ int ff_amf_encode_init(AVCodecContext *avctx) return ret; } +#define AMF_AV_QUERY_INTERFACE(res, from, InterfaceTypeTo, to) \ + { \ + AMFGuid guid_##InterfaceTypeTo = IID_##InterfaceTypeTo(); \ + res = from->pVtbl->QueryInterface(from, &guid_##InterfaceTypeTo, (void**)&to); \ + } + +#define AMF_AV_ASSIGN_PROPERTY_INTERFACE(res, pThis, name, val) \ + { \ + AMFInterface *amf_interface; \ + AMFVariantStruct var; \ + res = AMFVariantInit(&var); \ + if (res != AMF_OK) \ + return res; \ + if (res == AMF_OK) { \ + AMF_AV_QUERY_INTERFACE(res, val, AMFInterface, amf_interface)\ + } \ + if (res == AMF_OK) { \ + res = AMFVariantAssignInterface(&var, amf_interface); \ + amf_interface->pVtbl->Release(amf_interface); \ + } \ + if (res == AMF_OK) { \ + res = pThis->pVtbl->SetProperty(pThis, name, var); \ + } \ + res = AMFVariantClear(&var); \ + } + +#define AMF_AV_GET_PROPERTY_INTERFACE(res, pThis, name, TargetType, val) \ + { \ + AMFVariantStruct var; \ + res = AMFVariantInit(&var); \ + if (res != AMF_OK) \ + return res; \ + res = pThis->pVtbl->GetProperty(pThis, name, &var); \ + if (res == AMF_OK) { \ + if (var.type == AMF_VARIANT_INTERFACE && AMFVariantInterface(&var)) { \ + AMF_AV_QUERY_INTERFACE(res, AMFVariantInterface(&var), TargetType, val); \ + } else { \ + res = AMF_INVALID_DATA_TYPE; \ + } \ + } \ + AMFVariantClear(&var); \ + } int ff_amf_send_frame(AVCodecContext *avctx, const AVFrame *frame) { @@ -484,6 +526,8 @@ int ff_amf_send_frame(AVCodecContext *avctx, const AVFrame *frame) (ctx->hw_device_ctx && ((AVHWFramesContext*)frame->hw_frames_ctx->data)->device_ctx == (AVHWDeviceContext*)ctx->hw_device_ctx->data) )) { + AVFrame *frame_ref; + AMFBuffer *frame_ref_storage_buffer; #if CONFIG_D3D11VA static const GUID AMFTextureArrayIndexGUID = { 0x28115527, 0xe7c3, 0x4b66, { 0x99, 0xd3, 0x4f, 0x2a, 0xe6, 0xb4, 0x7f, 0xaf } }; ID3D11Texture2D *texture = (ID3D11Texture2D*)frame->data[0]; // actual texture @@ -496,6 +540,21 @@ int ff_amf_send_frame(AVCodecContext *avctx, const AVFrame *frame) // input HW surfaces can be vertically aligned by 16; tell AMF the real size surface->pVtbl->SetCrop(surface, 0, 0, frame->width, frame->height); #endif + res = ctx->context->pVtbl->AllocBuffer(ctx->context, AMF_MEMORY_HOST, sizeof(frame_ref), &frame_ref_storage_buffer); + AMF_RETURN_IF_FALSE(ctx, res == AMF_OK, AVERROR(ENOMEM), "AllocBuffer() failed with error %d\n", res); + frame_ref = av_frame_clone(frame); + AMF_RETURN_IF_FALSE(ctx, frame_ref != NULL, AVERROR(ENOMEM), "av_frame_clone() returned NULL\n"); + memcpy(frame_ref_storage_buffer->pVtbl->GetNative(frame_ref_storage_buffer), &frame_ref, sizeof(frame_ref)); + AMF_AV_ASSIGN_PROPERTY_INTERFACE(res, surface, L"av_frame_ref", frame_ref_storage_buffer); + if (res != AMF_OK) + { + av_frame_free(&frame_ref); + surface->pVtbl->Release(surface); + av_log(avctx, AV_LOG_WARNING, "failed to attach av_frame_ref to surface\n"); + return AVERROR(ENOMEM); + } + frame_ref_storage_buffer->pVtbl->Release(frame_ref_storage_buffer); + AMF_RETURN_IF_FALSE(ctx, res == AMF_OK, AVERROR(ENOMEM), "SetProperty failed for \"frame_ref\" with error %d\n", res); } else { res = ctx->context->pVtbl->AllocSurface(ctx->context, AMF_MEMORY_HOST, ctx->format, avctx->width, avctx->height, &surface); AMF_RETURN_IF_FALSE(ctx, res == AMF_OK, AVERROR(ENOMEM), "AllocSurface() failed with error %d\n", res); @@ -554,12 +613,27 @@ int ff_amf_receive_packet(AVCodecContext *avctx, AVPacket *avpkt) res_query = ctx->encoder->pVtbl->QueryOutput(ctx->encoder, &data); if (data) { // copy data to packet - AMFBuffer* buffer; - AMFGuid guid = IID_AMFBuffer(); - data->pVtbl->QueryInterface(data, &guid, (void**)&buffer); // query for buffer interface + AMFBuffer *buffer; + AMF_AV_QUERY_INTERFACE(res, data, AMFBuffer, buffer); + AMF_RETURN_IF_FALSE(ctx, res == AMF_OK, AVERROR_UNKNOWN, "Invalid data type from encoder->QueryOutput, should be AMFBuffer, error %d\n", res); ret = amf_copy_buffer(avctx, avpkt, buffer); - buffer->pVtbl->Release(buffer); + + //try to get attached av_frame_ref and unref + if (data->pVtbl->HasProperty(data, L"av_frame_ref")) { + AMFBuffer *frame_ref_storage_buffer = NULL; + AVFrame *av_frame_ref; + + AMF_AV_GET_PROPERTY_INTERFACE(res, data, L"av_frame_ref", AMFBuffer, frame_ref_storage_buffer); + if (res == AMF_OK) { + memcpy(&av_frame_ref, frame_ref_storage_buffer->pVtbl->GetNative(frame_ref_storage_buffer), sizeof(av_frame_ref)); + av_frame_free(&av_frame_ref); + frame_ref_storage_buffer->pVtbl->Release(frame_ref_storage_buffer); + } else { + av_log(avctx, AV_LOG_WARNING, "av_frame_ref data attached to frame is corrupted\n"); + } + } + data->pVtbl->Release(data); AMF_RETURN_IF_FALSE(ctx, ret >= 0, ret, "amf_copy_buffer() failed with error %d\n", ret);