From patchwork Mon May 15 21:18:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul B Mahol X-Patchwork-Id: 41637 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:ba91:b0:105:feb:71f2 with SMTP id fb17csp1909310pzb; Mon, 15 May 2023 14:19:15 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7i3cqnXQvcIJ9nz7RwJw9g288z6FnsUNC3e+bDvzeaAVAfbCp0Wjshcp3H0fJ7cRcz/qXQ X-Received: by 2002:a05:6402:1255:b0:505:745:a271 with SMTP id l21-20020a056402125500b005050745a271mr29902813edw.23.1684185555462; Mon, 15 May 2023 14:19:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684185555; cv=none; d=google.com; s=arc-20160816; b=AyqYGUhTU5qJBeyg1BWdFsxLC8VEkMY+jMVB0l2c3YNj90INgqtQvdnW1cD96ebGTf fksOzf+3jUII7Z9PnjgV+vuntBAa5D/pmXLwhqOiue3WPpZ0rbHbbhd6ytdy+/wEOXxj +uKZMDF5fEV1LE2dggCGzrqVWJBB9kc1mDofTuac0Z+MgHX4AXvk28nId1kqjqesgspS H3FZ9DwF1lpbA8YS1Pgv6sCIhfGorAox16Sh7O5drPe02ivblhMz8K6g3ucuyjrsaL/t uY2ptn44QU/MJBmyQ5BCqo+zvMAs5V/OKNOB39xq3bNJ/TIOk/6y0eOMEDDCXFmlYyhb Uj0A== 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:to :message-id:date:from:mime-version:dkim-signature:delivered-to; bh=4bLYGmT4yDZ4sC02PR5iNdnS7Y1PotZClsrw0IgSwrw=; b=xcq91N7pO7GAUHYQ64s2t9LMT7WozQAN48xiowiBv2+KwF1F/cITQGEdIjD9ItarA2 pdqcN8Ri9Y0dtC6KWNPVvk+yQBy7M0xc0TYJOVb0+9lBlvcUaPOgMvCfDTFjOGgNWcbO OqTa4qL/bDKeJ5NR3KwCe8EepJXzCzIiKKdv4Wbffgs/ChU1CkgUDaaNqBrleDzdS+H/ f5FTYOh5BzvcGLkH33x7rhVhSviLULIzb5nZWk/knnTxmbRUeu9hLgZv0NG/XMeE5sO3 trc8hsoL0XI7RQkOUXeovKeRQNDUK0YFIgO2UTXwqUnAVqobDPyxDrgQnoqSN9uncLaM M7wg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=LXeeNh05; 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 e26-20020a50fb9a000000b00509e78d52d2si13312717edq.71.2023.05.15.14.19.15; Mon, 15 May 2023 14:19:15 -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=20221208 header.b=LXeeNh05; 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 2E92A68BFA0; Tue, 16 May 2023 00:19:12 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-vk1-f178.google.com (mail-vk1-f178.google.com [209.85.221.178]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0209D68BE3B for ; Tue, 16 May 2023 00:19:05 +0300 (EEST) Received: by mail-vk1-f178.google.com with SMTP id 71dfb90a1353d-4518d3a9b12so3507899e0c.2 for ; Mon, 15 May 2023 14:19:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1684185544; x=1686777544; h=to:subject:message-id:date:from:mime-version:from:to:cc:subject :date:message-id:reply-to; bh=KwHpUFcr9TpN3ygvULVwgBFKMYWbs8oItHpxlhEsqcc=; b=LXeeNh05aN5Em9LdpePrsa0luc+J1C2T732bkiTg9/d7usi48KvRwjdKm73Z+BYQCA h0TiQUtyrEvxMshpqwxJWZ0SowAmWbyqAeIoGN95+/av94FFetEE0SFu9mUo1DFEPYe/ 2NaiCWXuCO6O83j+nz3iwDFa0gxa6TA6jq/M+9FJiXIQfSNd5/Yta2v8wA8rGHSoDcsi jgiBZwAMzUi2lDlR9kB5mgOmNrf1ym9T7/sJKMCNrIhWQekr/wGnsr3NRCG3YvOPW8wP HpdrASObM+HbxAowwNDtkUfygKWy1FarkFuwwfbJV9soYDJHaJIZ9da0zriFOmlPRyl4 MMsA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684185544; x=1686777544; h=to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=KwHpUFcr9TpN3ygvULVwgBFKMYWbs8oItHpxlhEsqcc=; b=aWLLwy65Y5M2iqsi/TXCeGOrCQPxgKssIfoOyGBj5sYU/VtAr7pbS6Bls2er3j68Lk WuguEbgRVZPRpl0RekzeA5BLSKqYcjHlV5X9BHMYOXj36yrom7CQ787ar4yhjG7o/nEm 57K9Qt2ou0suZrV3c8MamY5SY1mibmsKMLyvQfEOnvkkfPKqnaNWZT6UslbIwwrijecH z9Vp1gRqJyQaBoDkbRFMZokp5EAskcIxfwf1NFwS8N8kIm9M8GLupc0dOWXM+cCCocsv QqNoRM8MpAG65PGT4UTAA1mZLqAjpLQRN8VA5meI7VliaKfdWJr70ZjnxXFbtRZ2WCvQ B8aA== X-Gm-Message-State: AC+VfDxT3ek0b/EFV9rSbX23W2QKJpYklCCqpk4BfbEqrBEErmuIfumV pzzl36gwwmf1phDp1pWt6GH9BxauYJewnJwaTCm0zSrn X-Received: by 2002:a67:f44b:0:b0:434:8401:beae with SMTP id r11-20020a67f44b000000b004348401beaemr14076117vsn.34.1684185544687; Mon, 15 May 2023 14:19:04 -0700 (PDT) MIME-Version: 1.0 From: Paul B Mahol Date: Mon, 15 May 2023 23:18:28 +0200 Message-ID: To: FFmpeg development discussions and patches X-Content-Filtered-By: Mailman/MimeDel 2.1.29 Subject: [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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: Eb0J2p7TRHwY Attached. From 6fddad6ea2abf91a7378fb367a439441ef8f32b4 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 | 32 ++++++++++++++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-) diff --git a/libavfilter/src_movie.c b/libavfilter/src_movie.c index a7d7c188e6..0629030f91 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,31 @@ static AVStream *find_stream(void *log, AVFormatContext *avf, const char *spec) return found; } +static int get_buffer(AVCodecContext *avctx, AVFrame *frame, int flags) +{ + AVFrame *new; + + if (flags & AV_GET_BUFFER_FLAG_REF) + return avcodec_default_get_buffer2(avctx, frame, flags); + + switch (avctx->codec_type) { + case AVMEDIA_TYPE_VIDEO: + new = ff_get_video_buffer(frame->opaque, frame->width, frame->height); + break; + case AVMEDIA_TYPE_AUDIO: + new = ff_get_audio_buffer(frame->opaque, frame->nb_samples); + break; + default: + return -1; + } + + av_frame_unref(frame); + av_frame_move_ref(frame, new); + av_frame_free(&new); + + return 0; +} + static int open_stream(AVFilterContext *ctx, MovieStream *st, int dec_threads) { const AVCodec *codec; @@ -173,6 +197,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 +506,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