From patchwork Wed Mar 15 14:18:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 40683 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:d046:b0:cd:afd7:272c with SMTP id hv6csp3463600pzb; Wed, 15 Mar 2023 07:19:49 -0700 (PDT) X-Google-Smtp-Source: AK7set/3L740CkNVchhCPOIdkenR+M1b/iBuIG2/sIazDSR8rgZraRPQUb6+bjB4yaZj6QNlrTuc X-Received: by 2002:aa7:d051:0:b0:4af:69b8:52af with SMTP id n17-20020aa7d051000000b004af69b852afmr2816359edo.24.1678889989364; Wed, 15 Mar 2023 07:19:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678889989; cv=none; d=google.com; s=arc-20160816; b=F6jv1LVemhPxsijiuiECXnOSb6EsnvS/Qo3QGBZ6zJVwvbQkn9Q1fOHHt5jfJrfiUq VJUbXz/+NnvZAF/uTk6DbLkwNIyEV/uJTEyxILCAy3d6JUFQ3fHNXmPKeiffVqOPxCHY ICBIFS7US8N6xu6tCGLXvLXZ/9KjMPqIGVUuvP1+v1jRUBgvAoYmXgvoo7UTZ3g+iGe2 gz9/0yCAzTQ7ezyjGVIcPxVuHmd6SrErMlgnybLik1G4HMZNrNzCN8xMZym5EziZsnVT FBaoL7+swoGIrzSqPFUa/FKHSrdbF3LkNzul6WceZFgGakd7ich8u8SfIvVg1B7dX/yp X84Q== 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:mime-version:references:in-reply-to:message-id :date:to:from:delivered-to; bh=c+uXGozuRCprwzK+lQSXqX9Lsl+25gP5Ls0DDKDVqZo=; b=g3PQRXpJCStnMkafcsBGD0HW3ShUVTr40IruIQeRMw1/QCFYZ2//qHeY8K4Mlf3c7/ oH1W8LvScvCcWBm02kSoZpK3EIh/7IkyT8Z4WtMNm/kCOAGhZNLTYpUAOviAw9a5M4jX TnbILLVCwYtrHMEADjnoCNpUzlujWNASCeVwFJRw03BC1a4Ia0714zZvKAq71QBWI650 GjRmjf+FxsKHKbrSQmY15vcIZ+Pv1ADKys01HuwQKpHqBAa2MvwTC3mVOVCU45s9+pZP HUc5H329wjFYtn2zD4EZvrHRj1YBsXOoWF7UGnzaq/flXdS2XcKMQOPpRd6AvvtNbwxq 4IiQ== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id l5-20020a056402344500b004ab0f51244csi6002778edc.622.2023.03.15.07.19.48; Wed, 15 Mar 2023 07:19:49 -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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 57AA568BE73; Wed, 15 Mar 2023 16:19:45 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 11824680BC0 for ; Wed, 15 Mar 2023 16:19:39 +0200 (EET) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id BAAFB2404EA for ; Wed, 15 Mar 2023 15:19:38 +0100 (CET) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id j1C24_FCEUmh for ; Wed, 15 Mar 2023 15:19:38 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id D5439240178 for ; Wed, 15 Mar 2023 15:19:37 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 86E113A00B6 for ; Wed, 15 Mar 2023 15:19:37 +0100 (CET) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Wed, 15 Mar 2023 15:18:51 +0100 Message-Id: <20230315141851.24868-1-anton@khirnov.net> X-Mailer: git-send-email 2.39.1 In-Reply-To: <3a6aa366-95f8-e89-6227-b954fbd02586@passwd.hu> References: <3a6aa366-95f8-e89-6227-b954fbd02586@passwd.hu> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 4/5] fftools/ffplay: stop using AVFrame.pkt_pos 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: qiLWQhZwULWt This field is ad-hoc and will be deprecated. Use the recently-added AV_CODEC_FLAG_COPY_OPAQUE to pass arbitrary user data from packets to frames. --- fftools/ffplay.c | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/fftools/ffplay.c b/fftools/ffplay.c index 0a96511475..15fd644974 100644 --- a/fftools/ffplay.c +++ b/fftools/ffplay.c @@ -146,6 +146,10 @@ typedef struct Clock { int *queue_serial; /* pointer to the current packet queue serial, used for obsolete clock detection */ } Clock; +typedef struct FrameData { + int64_t pkt_pos; +} FrameData; + /* Common struct for handling all types of decoded data and allocated render buffers. */ typedef struct Frame { AVFrame *frame; @@ -640,6 +644,16 @@ static int decoder_decode_frame(Decoder *d, AVFrame *frame, AVSubtitle *sub) { } av_packet_unref(d->pkt); } else { + if (d->pkt->buf && !d->pkt->opaque_ref) { + FrameData *fd; + + d->pkt->opaque_ref = av_buffer_allocz(sizeof(*fd)); + if (!d->pkt->opaque_ref) + return AVERROR(ENOMEM); + fd = (FrameData*)d->pkt->opaque_ref->data; + fd->pkt_pos = d->pkt->pos; + } + if (avcodec_send_packet(d->avctx, d->pkt) == AVERROR(EAGAIN)) { av_log(d->avctx, AV_LOG_ERROR, "Receive_frame and send_packet both returned EAGAIN, which is an API violation.\n"); d->packet_pending = 1; @@ -2041,12 +2055,13 @@ static int audio_thread(void *arg) goto the_end; while ((ret = av_buffersink_get_frame_flags(is->out_audio_filter, frame, 0)) >= 0) { + FrameData *fd = frame->opaque_ref ? (FrameData*)frame->opaque_ref->data : NULL; tb = av_buffersink_get_time_base(is->out_audio_filter); if (!(af = frame_queue_peek_writable(&is->sampq))) goto the_end; af->pts = (frame->pts == AV_NOPTS_VALUE) ? NAN : frame->pts * av_q2d(tb); - af->pos = frame->pkt_pos; + af->pos = fd ? fd->pkt_pos : -1; af->serial = is->auddec.pkt_serial; af->duration = av_q2d((AVRational){frame->nb_samples, frame->sample_rate}); @@ -2145,6 +2160,8 @@ static int video_thread(void *arg) goto the_end; while (ret >= 0) { + FrameData *fd; + is->frame_last_returned_time = av_gettime_relative() / 1000000.0; ret = av_buffersink_get_frame_flags(filt_out, frame, 0); @@ -2155,13 +2172,15 @@ static int video_thread(void *arg) break; } + fd = frame->opaque_ref ? (FrameData*)frame->opaque_ref->data : NULL; + is->frame_last_filter_delay = av_gettime_relative() / 1000000.0 - is->frame_last_returned_time; if (fabs(is->frame_last_filter_delay) > AV_NOSYNC_THRESHOLD / 10.0) is->frame_last_filter_delay = 0; tb = av_buffersink_get_time_base(filt_out); duration = (frame_rate.num && frame_rate.den ? av_q2d((AVRational){frame_rate.den, frame_rate.num}) : 0); pts = (frame->pts == AV_NOPTS_VALUE) ? NAN : frame->pts * av_q2d(tb); - ret = queue_picture(is, frame, pts, duration, frame->pkt_pos, is->viddec.pkt_serial); + ret = queue_picture(is, frame, pts, duration, fd ? fd->pkt_pos : -1, is->viddec.pkt_serial); av_frame_unref(frame); if (is->videoq.serial != is->viddec.pkt_serial) break; @@ -2567,6 +2586,9 @@ static int stream_component_open(VideoState *is, int stream_index) av_dict_set(&opts, "threads", "auto", 0); if (stream_lowres) av_dict_set_int(&opts, "lowres", stream_lowres, 0); + + av_dict_set(&opts, "flags", "+copy_opaque", AV_DICT_MULTIKEY); + if ((ret = avcodec_open2(avctx, codec, &opts)) < 0) { goto fail; }