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 7C267463C8 for ; Tue, 16 May 2023 16:59:49 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 898B568C009; Tue, 16 May 2023 19:59:46 +0300 (EEST) Received: from mail-ot1-f53.google.com (mail-ot1-f53.google.com [209.85.210.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4B6A468BFFE for ; Tue, 16 May 2023 19:59:40 +0300 (EEST) Received: by mail-ot1-f53.google.com with SMTP id 46e09a7af769-6adca3c484cso1791594a34.3 for ; Tue, 16 May 2023 09:59:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1684256377; x=1686848377; h=content-transfer-encoding:in-reply-to:from:content-language :references:to:subject:user-agent:mime-version:date:message-id:from :to:cc:subject:date:message-id:reply-to; bh=AQDVbUPu5wv6dou8qhYd1p9XJmq3kGgutrV6JxLts1k=; b=e9Rr4Zw1Y6M/ZDm5e5cgDAhOMOyYcxOGt1CY7SBYpx1F2wsTd1gy7y9DfAFG8RViY9 /XgcuSgmHuMMKFFkDcKbHuTzqYUEkbVXHf/sf1AiyJQPUmAx1tWcsh98nefVhgBm40aN ipk2PpRyCovj5xQXyXCsmwQHSMUvlVU8fSr8Gfe3lNiC+FJpc/GzTRsUe6bqxRv3JeBy 1njpjvP4qF+1QPQDvSIM4O66tpqfcmcJp6/uUnDQWA8IGy7UTnSL4JKn8zSY8x1UhKrE H4xahogq/pOcJxXHcq1zQMNg3NDBqRwWpcOFLdCeYNz/k4VC5qgwn4af1Nkt8giDLlM2 wNfA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684256377; x=1686848377; h=content-transfer-encoding:in-reply-to:from:content-language :references:to:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=AQDVbUPu5wv6dou8qhYd1p9XJmq3kGgutrV6JxLts1k=; b=hxOlRCR9WQJjzzE2C+7r62xUsSFqM4nyIXvA09rOqB0mfXdwzsghv5mFPZzdjUn2ih Iixcz7VY5TlrZdj38B4qDZFZkCrsjunkpT4PnuGRuZGtvE0P/RxDL127W9Ac0tRzEYcv Foz7b7BkXoffURc4VKsjVl1DOpoZf6A+UZkT1GMZksgywzXGFadWENg1d0Rhk9CGsf/o O4A/qSCTCOwKHAmdZ4+EyExEQe+DoqWw3b8u5adI3FGUo0D3wPcpyPdhoCd7PyODx4qq ubDGZKKtxKXpmi+dpp+GyViOH7D9ciI4fRv9TfgM01PV+hdW9VuQBlFGlXw95VCNZYwG OGoA== X-Gm-Message-State: AC+VfDxoEqgmrithCOLsNan1yuN1C3RaLgQTZlveeQmoBvOcYe+fsQrA p/KdiaaZPMqGF37ZXRVfnR2jR/G2h9c= X-Google-Smtp-Source: ACHHUZ4LYK6tSGTc/s3NQRdxO34IIp8wbCHTmz06t8ZlUo0GIjJi/H0gJ60pLRLn7oAcTvU9Vfuq9w== X-Received: by 2002:a05:6808:4cf:b0:389:1e16:7aad with SMTP id a15-20020a05680804cf00b003891e167aadmr12711751oie.41.1684256377531; Tue, 16 May 2023 09:59:37 -0700 (PDT) Received: from [192.168.0.12] (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id f2-20020a4abb02000000b0054f5b9290ffsm9720248oop.34.2023.05.16.09.59.36 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 16 May 2023 09:59:37 -0700 (PDT) Message-ID: <32d282ae-6241-d75b-1568-c4c44f536972@gmail.com> Date: Tue, 16 May 2023 13:59:44 -0300 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Thunderbird/102.10.1 To: ffmpeg-devel@ffmpeg.org References: Content-Language: en-US From: James Almer In-Reply-To: Subject: Re: [FFmpeg-devel] [PATCH] avfilter/src_movie: dr support 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-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: > From beaaca4147e4d0510393a2dc802fdaee60769f0f Mon Sep 17 00:00:00 2001 > From: Paul B Mahol > Date: Mon, 15 May 2023 21:54:25 +0200 > Subject: [PATCH 2/3] avfilter/src_movie: dr support > > Signed-off-by: Paul B Mahol > --- > libavfilter/src_movie.c | 39 +++++++++++++++++++++++++++++++++++++-- > 1 file changed, 37 insertions(+), 2 deletions(-) > > diff --git a/libavfilter/src_movie.c b/libavfilter/src_movie.c > index a7d7c188e6..22b8cbbd11 100644 > --- a/libavfilter/src_movie.c > +++ b/libavfilter/src_movie.c > @@ -23,7 +23,6 @@ > * @file > * movie video source > * > - * @todo use direct rendering (no allocation of a new frame) > * @todo support a PTS correction mechanism > */ > > @@ -158,6 +157,38 @@ static AVStream *find_stream(void *log, AVFormatContext *avf, const char *spec) > return found; > } > > +static int get_buffer(AVCodecContext *avctx, AVFrame *frame, int flags) > +{ > + AVFilterLink *outlink = frame->opaque; > + int h = frame->height; > + int w = frame->width; > + int linesize_align[AV_NUM_DATA_POINTERS]; > + AVFrame *new; > + > + if (!(avctx->codec->capabilities & AV_CODEC_CAP_DR1)) > + return avcodec_default_get_buffer2(avctx, frame, flags); > + > + switch (avctx->codec_type) { > + case AVMEDIA_TYPE_VIDEO: > + avcodec_align_dimensions2(avctx, &w, &h, linesize_align); > + new = ff_default_get_video_buffer(outlink, w, h); > + break; > + case AVMEDIA_TYPE_AUDIO: > + new = ff_default_get_audio_buffer(outlink, frame->nb_samples); > + break; > + default: > + return -1; > + } > + > + av_frame_move_ref(frame, new); This may result in leaks as lavc calls ff_decode_frame_props() before avctx->get_buffer2(), which may add side data to the frame. You should do: av_frame_copy_props(new, frame); av_frame_unref(frame); av_frame_move_ref(frame, new); > + av_frame_free(&new); > + > + frame->width = outlink->w; > + frame->height = outlink->h; > + > + return 0; > +} > + > static int open_stream(AVFilterContext *ctx, MovieStream *st, int dec_threads) > { > const AVCodec *codec; > @@ -173,6 +204,8 @@ static int open_stream(AVFilterContext *ctx, MovieStream *st, int dec_threads) > if (!st->codec_ctx) > return AVERROR(ENOMEM); > > + st->codec_ctx->flags |= AV_CODEC_FLAG_COPY_OPAQUE; > + st->codec_ctx->get_buffer2 = get_buffer; > ret = avcodec_parameters_to_context(st->codec_ctx, st->st->codecpar); > if (ret < 0) > return ret; > @@ -480,8 +513,10 @@ static int movie_decode_packet(AVFilterContext *ctx) > /* send the packet to its decoder, if any */ > pkt_out_id = pkt.stream_index > movie->max_stream_index ? -1 : > movie->out_index[pkt.stream_index]; > - if (pkt_out_id >= 0) > + if (pkt_out_id >= 0) { > + pkt.opaque = ctx->outputs[pkt_out_id]; > ret = avcodec_send_packet(movie->st[pkt_out_id].codec_ctx, &pkt); > + } > av_packet_unref(&pkt); > > return ret; > -- > 2.39.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".