From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 8130540FB9 for ; Sat, 12 Feb 2022 00:14:20 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E6F1668B1BA; Sat, 12 Feb 2022 02:14:06 +0200 (EET) Received: from mail-oi1-f178.google.com (mail-oi1-f178.google.com [209.85.167.178]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 297A068A628 for ; Sat, 12 Feb 2022 02:13:59 +0200 (EET) Received: by mail-oi1-f178.google.com with SMTP id s185so11383273oie.3 for ; Fri, 11 Feb 2022 16:13:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=bLzGoIGgvD6bk4+74a3p/pR1ah6jfUnODmWupeBQmDQ=; b=Bjmn9TIirKJDVzi2y3VuW0FCd30kV9F0+NyYuH32LpCswjmaHSIGg3tuCVXXPzErAS dCRA2NSXoRRwUd3tbr5GjxRChPrq15jNynHz8s43eGrpHFLDT+DLGqMB4ZYkdR/+5Qo/ MMVn/0lcpV38w8q1FQ9r9mR0kQci4eFhf3JzUn2vhYapGaEo6xhdjDBen5z8HZlw9H7w QlAFAKMx90Jzzq4m3LhaRqjAbcfGzIqvnlRRdDz1YJ/ZEfABgeGrAqoark2KYKsTl7Ck ukFVLPs+2mOGdU+6egUsSTp5QDkIsDuNljuoH7/QiADZXrH2VS9KgaI5hZZJPZSRaXbC Oyrw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=bLzGoIGgvD6bk4+74a3p/pR1ah6jfUnODmWupeBQmDQ=; b=e5hMUlae/rYRp1sMjJaIm5kUwmAZlFbanELzwo9H0BhlHZs6+VPbQ/7+UD9gY/fUyV P+wLzD+V7hWd0kCuYBiaIZWHnN4GauKf4VGpB8sm6AfzEYFSSbD4zGHHwbvYsjYX2CT4 xKzbi4/gChTI0ABnE7szZMHOe+JnvFVtnrnGXWBzz5gypDPBTcOMLWgFFSQ8QMJKWyNI 1Jdqd4x1jXtDLJOCDVRbukhoqCBXgK6jbLe6HnKwh3ORpU4R/eyR/N1v59VypDiOAxjU tLwA6L/VZGp9t/N4B3MUfUaHB0mvwtiVEqpvCrHB/neRVd3A3rKuEBhAZ6mrCWmF9XMj K9RQ== X-Gm-Message-State: AOAM532idd+Zj70ZKDz873KuaLnRMHNhX5lAOfaO9rP1SFHSsXJk9rvx BxDC8bS0vh7RPvbW9VGaPzaLcX9IZcs= X-Google-Smtp-Source: ABdhPJyreUP6lBDjLr8tOaOyq8pez2hXGnmiU/QVDoLdLaWRY9HUjfI0F/19im4hkDdTpDA7uFToSg== X-Received: by 2002:a05:6808:1914:: with SMTP id bf20mr1395012oib.42.1644624837242; Fri, 11 Feb 2022 16:13:57 -0800 (PST) Received: from localhost.localdomain ([191.83.214.101]) by smtp.gmail.com with ESMTPSA id k19sm9777448oot.41.2022.02.11.16.13.56 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Feb 2022 16:13:56 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Fri, 11 Feb 2022 21:12:59 -0300 Message-Id: <20220212001301.4090-2-jamrial@gmail.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220212001301.4090-1-jamrial@gmail.com> References: <20220212001301.4090-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/4] avcodec/wrapped_avframe: don't allocate an AVFrame twice X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Signed-off-by: James Almer --- libavcodec/wrapped_avframe.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/libavcodec/wrapped_avframe.c b/libavcodec/wrapped_avframe.c index a7834b86e8..004bd5e0e7 100644 --- a/libavcodec/wrapped_avframe.c +++ b/libavcodec/wrapped_avframe.c @@ -43,33 +43,32 @@ static void wrapped_avframe_release_buffer(void *unused, uint8_t *data) static int wrapped_avframe_encode(AVCodecContext *avctx, AVPacket *pkt, const AVFrame *frame, int *got_packet) { - AVFrame *wrapped = av_frame_clone(frame); uint8_t *data; - int size = sizeof(*wrapped) + AV_INPUT_BUFFER_PADDING_SIZE; - - if (!wrapped) - return AVERROR(ENOMEM); + int ret, size = sizeof(*frame) + AV_INPUT_BUFFER_PADDING_SIZE; data = av_mallocz(size); if (!data) { - av_frame_free(&wrapped); return AVERROR(ENOMEM); } + // Set frame defaults + av_frame_unref((AVFrame *)data); pkt->buf = av_buffer_create(data, size, wrapped_avframe_release_buffer, NULL, AV_BUFFER_FLAG_READONLY); if (!pkt->buf) { - av_frame_free(&wrapped); av_freep(&data); return AVERROR(ENOMEM); } - av_frame_move_ref((AVFrame*)data, wrapped); - av_frame_free(&wrapped); + ret = av_frame_ref((AVFrame*)data, frame); + if (ret < 0) { + av_buffer_unref(&pkt->buf); + return ret; + } pkt->data = data; - pkt->size = sizeof(*wrapped); + pkt->size = sizeof(*frame); pkt->flags |= AV_PKT_FLAG_KEY; *got_packet = 1; -- 2.35.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".