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 C0C6348CAE for ; Wed, 24 Jan 2024 08:21:49 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B351E68D20D; Wed, 24 Jan 2024 10:18:01 +0200 (EET) Received: from mail1.khirnov.net (quelana.khirnov.net [94.230.150.81]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9596868D14D for ; Wed, 24 Jan 2024 10:17:26 +0200 (EET) Authentication-Results: mail1.khirnov.net; dkim=pass (2048-bit key; unprotected) header.d=khirnov.net header.i=@khirnov.net header.a=rsa-sha256 header.s=mail header.b=mO6xyuJz; dkim-atps=neutral Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id 581581A2F for ; Wed, 24 Jan 2024 09:17:22 +0100 (CET) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id y7g77cbRfgwt for ; Wed, 24 Jan 2024 09:17:22 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=khirnov.net; s=mail; t=1706084239; bh=/hKZfUSMEFC6uferWAD9erm6ImTtP/4t4JqHSHKIaVs=; h=From:To:Subject:Date:In-Reply-To:References:From; b=mO6xyuJzRcXgFkQvKUKA4vXalAKvQTj1ojMLR0MUdUxQtTNXTwDA/YisFmXnyHq/G PB25r8ZZajGdSpCPiFWlHbdi6ChyGbYkOYeVfXx5sOPgPrVWjrZQu82qwWy/j2k3hy RsgFkWt9VM2+air7+qPPqikxgC2xSJTN1gfxUkxU2kQidv+Cg1MRWXAFymYLxWUWIT FrHQ6JJJggxAW+kRLBZ2flALL1LbDzeL8ANVUMu5u1LEWfa8/f19nGW770YPljRK5n rahW98zDOKLgDD/o306G6xe66wJ87ER7Z5wSfNAqTBwugdMbrn5P+Nujlf191M6SfL 6S6XBlIJmdgjg== 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 mail1.khirnov.net (Postfix) with ESMTPS id B223E1A35 for ; Wed, 24 Jan 2024 09:17:19 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id A57883A0534 for ; Wed, 24 Jan 2024 09:17:19 +0100 (CET) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Wed, 24 Jan 2024 09:16:42 +0100 Message-ID: <20240124081702.4759-12-anton@khirnov.net> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20240124081702.4759-1-anton@khirnov.net> References: <20240124081702.4759-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 12/31] fftools/ffmpeg_dec: stop accesing InputStream.fix_sub_duration 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: Pass this information to dec_open() instead. This is a step towards decoupling Decoder and InputStream. --- fftools/ffmpeg.h | 6 +++++- fftools/ffmpeg_dec.c | 13 +++++++++---- fftools/ffmpeg_demux.c | 3 ++- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/fftools/ffmpeg.h b/fftools/ffmpeg.h index db9bd8cc7a..8b7560b359 100644 --- a/fftools/ffmpeg.h +++ b/fftools/ffmpeg.h @@ -280,6 +280,10 @@ typedef struct FilterGraph { int nb_outputs; } FilterGraph; +enum DecoderFlags { + DECODER_FLAG_FIX_SUB_DURATION = (1 << 0), +}; + typedef struct Decoder { const AVClass *class; @@ -735,7 +739,7 @@ int hwaccel_retrieve_data(AVCodecContext *avctx, AVFrame *input); * is transferred to the decoder. */ int dec_open(InputStream *ist, Scheduler *sch, unsigned sch_idx, - AVDictionary **dec_opts); + AVDictionary **dec_opts, int flags); void dec_free(Decoder **pdec); int dec_add_filter(Decoder *dec, InputFilter *ifilter); diff --git a/fftools/ffmpeg_dec.c b/fftools/ffmpeg_dec.c index b5a0ce9080..7037175a48 100644 --- a/fftools/ffmpeg_dec.c +++ b/fftools/ffmpeg_dec.c @@ -45,6 +45,9 @@ typedef struct DecoderPriv { // override output video sample aspect ratio with this value AVRational sar_override; + // a combination of DECODER_FLAG_*, provided to dec_open() + int flags; + enum AVPixelFormat hwaccel_pix_fmt; // pts/estimated duration of the last decoded frame @@ -326,7 +329,7 @@ static int process_subtitle(InputStream *ist, AVFrame *frame) const AVSubtitle *subtitle = (AVSubtitle*)frame->buf[0]->data; int ret = 0; - if (ist->fix_sub_duration) { + if (dp->flags & DECODER_FLAG_FIX_SUB_DURATION) { AVSubtitle *sub_prev = dp->sub_prev[0]->buf[0] ? (AVSubtitle*)dp->sub_prev[0]->buf[0]->data : NULL; int end = 1; @@ -372,7 +375,7 @@ static int fix_sub_duration_heartbeat(InputStream *ist, int64_t signal_pts) (AVSubtitle*)dp->sub_prev[0]->buf[0]->data : NULL; AVSubtitle *subtitle; - if (!ist->fix_sub_duration || !prev_subtitle || + if (!(dp->flags & DECODER_FLAG_FIX_SUB_DURATION) || !prev_subtitle || !prev_subtitle->num_rects || signal_pts <= prev_subtitle->pts) return 0; @@ -895,7 +898,7 @@ static const AVClass dec_class = { }; int dec_open(InputStream *ist, Scheduler *sch, unsigned sch_idx, - AVDictionary **dec_opts) + AVDictionary **dec_opts, int flags) { DecoderPriv *dp; const AVCodec *codec = ist->dec; @@ -909,12 +912,14 @@ int dec_open(InputStream *ist, Scheduler *sch, unsigned sch_idx, dp->sch = sch; dp->sch_idx = sch_idx; + dp->flags = flags; dp->dec.class = &dec_class; dp->log_parent = ist; snprintf(dp->log_name, sizeof(dp->log_name), "dec:%s", codec->name); - if (codec->type == AVMEDIA_TYPE_SUBTITLE && ist->fix_sub_duration) { + if (codec->type == AVMEDIA_TYPE_SUBTITLE && + (dp->flags & DECODER_FLAG_FIX_SUB_DURATION)) { for (int i = 0; i < FF_ARRAY_ELEMS(dp->sub_prev); i++) { dp->sub_prev[i] = av_frame_alloc(); if (!dp->sub_prev[i]) diff --git a/fftools/ffmpeg_demux.c b/fftools/ffmpeg_demux.c index a58217223b..02add669a0 100644 --- a/fftools/ffmpeg_demux.c +++ b/fftools/ffmpeg_demux.c @@ -891,6 +891,7 @@ static int ist_use(InputStream *ist, int decoding_needed) if (decoding_needed && ds->sch_idx_dec < 0) { int is_audio = ist->st->codecpar->codec_type == AVMEDIA_TYPE_AUDIO; + int dec_flags = !!ist->fix_sub_duration * DECODER_FLAG_FIX_SUB_DURATION; ret = sch_add_dec(d->sch, decoder_thread, ist, d->loop && is_audio); if (ret < 0) @@ -903,7 +904,7 @@ static int ist_use(InputStream *ist, int decoding_needed) return ret; ret = dec_open(ist, d->sch, ds->sch_idx_dec, - &ist->decoder_opts); + &ist->decoder_opts, dec_flags); if (ret < 0) return ret; -- 2.42.0 _______________________________________________ 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".