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 1DEB8491EB for ; Mon, 5 Feb 2024 17:10:09 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A2B3068D14E; Mon, 5 Feb 2024 19:10:07 +0200 (EET) Received: from mail1.khirnov.net (quelana.khirnov.net [94.230.150.81]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3EF8968C7C2 for ; Mon, 5 Feb 2024 19:10:01 +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=ja7DXrIR; dkim-atps=neutral Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id CA0CD19B9 for ; Mon, 5 Feb 2024 18:10:00 +0100 (CET) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id G-f67CnmGKLY for ; Mon, 5 Feb 2024 18:10:00 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=khirnov.net; s=mail; t=1707153000; bh=x2qSEyXdCi76dpEeFaCzet/heJxFx53IamZA2g53Hog=; h=From:To:Subject:Date:From; b=ja7DXrIRZkDuHPwpiPMVJdTaK0ZyDq6T8b+BGz+1EyL3mrhT/vqgYzUo1SRHN+Oh6 R42FhZP86hP0YnIToBT73SGmTXqH7WG3gSS056okKEA06oUqXJERLvgS2R0yuE6z91 HzZRtV1tfPqZVfKISzJ9qsSwR/xf/pzVhrk+7YRcSKoScqbLoVmIj1VGNVuN7nobMG nUhCiORan2szUdneyBOinye5A8MhVQ5rctcNTZksgRZDQ+aZhZHIX6m4zx1YYsoZOv 8n+WirgzCcwcv4PZOUN2g1gUrSfml3jzLknKQu0IzG7uepmBlR712spnPrDlo2gJOA ckzu+AluX2Gkw== 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 55F2458B for ; Mon, 5 Feb 2024 18:10:00 +0100 (CET) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 308F13A0435 for ; Mon, 5 Feb 2024 18:10:00 +0100 (CET) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Mon, 5 Feb 2024 18:09:59 +0100 Message-ID: <20240205170959.11000-1-anton@khirnov.net> X-Mailer: git-send-email 2.42.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] fftools/ffmpeg_demux: set stream index right before sending packet to scheduler 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: This avoids assuming that it survives unchanged through bitstream filters, if present. --- fftools/ffmpeg_demux.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/fftools/ffmpeg_demux.c b/fftools/ffmpeg_demux.c index 60dc9620c2..3bf95e2c3f 100644 --- a/fftools/ffmpeg_demux.c +++ b/fftools/ffmpeg_demux.c @@ -475,8 +475,6 @@ static int input_packet_process(Demuxer *d, AVPacket *pkt, unsigned *send_flags) av_ts2str(f->ts_offset), av_ts2timestr(f->ts_offset, &AV_TIME_BASE_Q)); } - pkt->stream_index = ds->sch_idx_stream; - return 0; } @@ -505,6 +503,8 @@ static int do_send(Demuxer *d, DemuxStream *ds, AVPacket *pkt, unsigned flags, { int ret; + pkt->stream_index = ds->sch_idx_stream; + ret = sch_demux_send(d->sch, d->f.index, pkt, flags); if (ret == AVERROR_EOF) { av_packet_unref(pkt); @@ -546,7 +546,6 @@ static int demux_send(Demuxer *d, DemuxThreadContext *dt, DemuxStream *ds, d->pkt_heartbeat->pts = pkt->pts; d->pkt_heartbeat->time_base = pkt->time_base; - d->pkt_heartbeat->stream_index = ds1->sch_idx_stream; d->pkt_heartbeat->opaque = (void*)(intptr_t)PKT_OPAQUE_SUB_HEARTBEAT; ret = do_send(d, ds1, d->pkt_heartbeat, 0, "heartbeat"); -- 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".