From patchwork Thu May 18 10:22:07 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: 41711 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:ba91:b0:105:feb:71f2 with SMTP id fb17csp371333pzb; Thu, 18 May 2023 03:22:57 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6zWwM1OI3XKQKPKPOhbncU0bCmXWfQqCf6d6gR+buCRuG4UXXUs/wm2V4BU8zt2fvZieCi X-Received: by 2002:a17:907:3fa5:b0:966:180f:d10c with SMTP id hr37-20020a1709073fa500b00966180fd10cmr43075448ejc.33.1684405376898; Thu, 18 May 2023 03:22:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684405376; cv=none; d=google.com; s=arc-20160816; b=J8fwbPTwqPH4NceLZ5X9yESnKxkHJ/xO8lqPmVJ+17vUp3DEV8FLlDFOgty5pRxflX Arj0YVBjuY2Kmn17H/pRUOxFmmga57DPtZc/pdt7KZmgp8yfz2FZntc+ecd1NpSXoRKO +jX6fSPOsLmqkA7vMA4NFzDq4dK0DxdAvhFY7j1JSyyPJ0TIKC+EPGqJxRqwzQLqgmF0 2Kyrn0rOi+LPsfDYA2HAEHzb7HjIyUYtKdxjK28GuM74++N4mrVg3KTWMLIUap9WlxxY /S8T+2ergH/DUuGwf/t6/d6PmpcNTwuUesQzxbLLQqtalmmYqkvTsU2Ud48DTGLD7fli eyyA== 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=HkVOee25TF8NVdfNIDK0Qo4oeiUOdEOVM0Rj3NFvX0I=; b=Y8o2HHcHQdeOM6t38kTD1VL6DnPGut1STz79Boqu/i/RKaU1s9nbwdCNq16kbZusXX i1li46HKGo5ZbAAcGX+4i7TK3norX94UPKlCeEVBSZtSzDoTeaxHcxEEv3MXIRbxjcU+ VkFEEnnLWCs04mEnhNdFJJNVZt/pjhMOzwnxMupONWXJHkbFU/kNXSEtaAakLiNjKL+c Ip58vpowieEfEoqkXdWa2RhsGO5lnsrLQwhnAv22kK0k/YjAvw69f7PGJt1PeAU/fTvN ZtrQGp1j764jFWqycqu+EZqxIhezeo9Ll45GVrWVBYoB5vbaOKo5oEr/v1Q2jlVoxIcT I8gA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=Ca+TIoLq; 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 og51-20020a1709071df300b0096a16e4c6c9si1107185ejc.138.2023.05.18.03.22.56; Thu, 18 May 2023 03:22:56 -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=Ca+TIoLq; 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 E6E5368C155; Thu, 18 May 2023 13:22:52 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-vs1-f46.google.com (mail-vs1-f46.google.com [209.85.217.46]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A3F4668C081 for ; Thu, 18 May 2023 13:22:46 +0300 (EEST) Received: by mail-vs1-f46.google.com with SMTP id ada2fe7eead31-4345365ffe3so536540137.0 for ; Thu, 18 May 2023 03:22:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1684405365; x=1686997365; h=to:subject:message-id:date:from:mime-version:from:to:cc:subject :date:message-id:reply-to; bh=fB7tix2+B8AnYOAzwcuZG7CVMUvKiq2ZvGUocPSFjho=; b=Ca+TIoLqMIU7QZI+uyfi70q87koQo0sKp2sh9bkw66jNExtIvK4uiWj3IRJDkZrP2a 1hbEHZgd5N5eLyWo7DETDl0lSLUQVSQHdTNRuLskTi0CxNghJCQot8nPxRKSez2YgBN6 cpS6MHbZhuiPaNfVholv+HpPDiRl57jIGuKtTO4OCjIAokxS+bu7438xHn18hXmbR1B/ P4jgEpfj8PFh7fnWYg2crr+RunZkkApZk42JoUXtEa4QD12En/7ltDRR/Gr4fYTCKGTy Buqb2wt6DshgD8/arUzy3y+OtnHqn2UPDYB0rBckGvw4ZHUH5peL8M3meHkVBvJdsXCZ +f5A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684405365; x=1686997365; h=to:subject:message-id:date:from:mime-version:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=fB7tix2+B8AnYOAzwcuZG7CVMUvKiq2ZvGUocPSFjho=; b=CvVetHxFQ4oTcYR73qNNmy29nYLZx6m60IRlGDRQmLC4KxpRVNWW23NPQT/0AjkkMf 8rdRyQJzXDTm1TaYE+4ZlofQS/YGXe6ZtP4YBkM1AqL3zrHDYrE7QN10t0JT2904pqgr YdI23a6nMowpSnPApTFekUOpipT5X5+/H3LyNuDr59wpaIvep1B6TtU3zdysud6wPMF/ ahNACVTj6i1CCP/OStH8x7choIZv975LqxG09fG7JRxnaKUzkFpdQrRgaIfnoFfnSAKz vlnWxjm+rGUy0wKiOOA1elE6qhNTw49xBMc+sshvBYpQjO9c92tpofDmGU0b/M2jnXjD A7CA== X-Gm-Message-State: AC+VfDwgVNRBurzvrILd71+Wo974Zs6f/CuOAl2LSqF4Avt7t01sWb2k mlF/QtXD6mKksjLz65LsxFGU+Lps7B9mO2TcasryYTAP X-Received: by 2002:a67:e319:0:b0:437:d98c:858 with SMTP id j25-20020a67e319000000b00437d98c0858mr333003vsf.28.1684405365281; Thu, 18 May 2023 03:22:45 -0700 (PDT) MIME-Version: 1.0 From: Paul B Mahol Date: Thu, 18 May 2023 12:22:07 +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: activate & dr 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: +bSBehOrB8CJ Attached. From af73b69a0be9033fddf222b6e9ac60799de85691 Mon Sep 17 00:00:00 2001 From: Paul B Mahol Date: Mon, 15 May 2023 21:54:25 +0200 Subject: [PATCH 26/27] avfilter/src_movie: dr support Signed-off-by: Paul B Mahol --- libavfilter/src_movie.c | 44 +++++++++++++++++++++++++++++++++++++++-- 1 file changed, 42 insertions(+), 2 deletions(-) diff --git a/libavfilter/src_movie.c b/libavfilter/src_movie.c index 5937613d13..a2ecc5a625 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 */ @@ -156,6 +155,43 @@ static AVStream *find_stream(void *log, AVFormatContext *avf, const char *spec) return found; } +static int get_buffer(AVCodecContext *avctx, AVFrame *frame, int flags) +{ + int linesize_align[AV_NUM_DATA_POINTERS]; + AVFilterLink *outlink = frame->opaque; + int w, h, ow, oh; + AVFrame *new; + + h = oh = frame->height; + w = ow = frame->width; + + 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_copy_props(new, frame); + av_frame_unref(frame); + av_frame_move_ref(frame, new); + av_frame_free(&new); + + frame->opaque = outlink; + frame->width = ow; + frame->height = oh; + + return 0; +} + static int open_stream(AVFilterContext *ctx, MovieStream *st, int dec_threads) { const AVCodec *codec; @@ -171,6 +207,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; @@ -479,8 +517,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