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 3603044C2F for ; Mon, 14 Nov 2022 08:18:00 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4D9F868BD45; Mon, 14 Nov 2022 10:17:57 +0200 (EET) Received: from out162-62-57-137.mail.qq.com (out162-62-57-137.mail.qq.com [162.62.57.137]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0CE3C68BC71 for ; Mon, 14 Nov 2022 10:17:49 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1668413860; bh=DIQ9mE2s7HI0cNipHCc8VYd/Nu07FnH7wORkGlZj6Mw=; h=Subject:From:In-Reply-To:Date:Cc:References:To; b=jO+9K6cMTaehca3dOsDy1WU4tLnyhttzLnC0Cd5/913WcrI5DBxUZ0BC2qBMfHc8Q iwwgcgCXlGqSn8qGPNRLYy4mFV8RmsmmjBWLgCqneniTstU4W0WdYWM7evO0ly2m5P fb6hp/O3oiRNdHQzHmxEiAQUEJTcBnvcE6qvDqdI= Received: from smtpclient.apple ([113.108.77.52]) by newxmesmtplogicsvrsza12-0.qq.com (NewEsmtp) with SMTP id 46711480; Mon, 14 Nov 2022 16:17:39 +0800 X-QQ-mid: xmsmtpt1668413859tmg5fovyv Message-ID: X-QQ-XMAILINFO: OOPJ7pYMv25t19v9pnPs4WpHI7zjjDh97C0ln36afLE26E6HL5ThvMfNks0o0Q m6esfnbTDewU648ClFL0d+NT/jo7HFaPm9XpGgFAKQU+uFBn0EXHA4Vl0MzDDjsV0RY2HvDky6ms R75JQ8KxyGMcM3SbRLOT5V/+kl2L18PrevgsjBNmnRY3HnKJCsoZiRQfhZlo9NV4aFpvHo9L/CBq Xik+ZERF71rOQFw8sFxqIwXZWtVM36gi1nLQmEoU6Fe37JJd5wctQiav7LHw/1UHhZYk7o9s/DpX HY4a6b3nV3p4KRVFWg64JVYugrKC/SjQY7erf+KfT0+HQ0JepDeIVA7SM0Nqjf1S9FUd1v4kRUGb ja3IkjMTFYKXdPVeUiyv1zviLoXXdfzeRF8vrSjdq9ioTafhvpFyvD+sxb/3l9lYABelrV8DKxFp 9fmCZqUEmRsRkmx12Dw/Aa7861fvU8sKsIlReS9G8YiZiauzOzOl7lFPMsMEl0F8dtKrb0plQacY 3GzyCYN8cjYXSbSKhU48naXeucHBbHMCAYZexN7e43OqsnsMMnGdohfw0OGxeNBOW2FnYNfqNKN3 L23sby1OxmGIyokUQxqjpmnwelVZTdBJWC9uPYMCWaRYkd3S8tKaxR5yRajBl6ACCr/ZsJJa6zgD 7io2iZZvL7xa5TQ4oY7d/b9ZKpxI4r1PHcwE1h6UahwI2M9WdkOjx/ilTKcPjKEIMSunpDNPE3Qt AkB44W/1wvc/+M+Uq7hgyGixOm6aUK5Cjjf7YkRbOzMgnQdD0Bg5KMnSjSLq5XGgD1oyY4vyNyAJ h7JCQLu44YNLmUiP/1B4xR7FVXtFUzCLKM+D1XMxADRCexWXqWxTLrBkzutlTwZlnduzlluyo6RJ 0Dihw1L52/EZZ28CtJdBqbUMuGHvFiCx/muz7lAQn2w/+d+FNSeQTWyfhdZny4dWT2C4WOtwYxgE EWq+veFwMuIwlqdqQlL2434sF6QEDviaGSbZEZc+zqKu22+kjgOg== Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3696.120.41.1.1\)) From: =?utf-8?B?InpoaWxpemhhbyjotbXlv5fnq4spIg==?= In-Reply-To: <97ef8d3987a842a7b9fc13773cdfca04@hisilicon.com> Date: Mon, 14 Nov 2022 16:17:38 +0800 X-OQ-MSGID: References: <97ef8d3987a842a7b9fc13773cdfca04@hisilicon.com> To: FFmpeg development discussions and patches X-Mailer: Apple Mail (2.3696.120.41.1.1) Subject: Re: [FFmpeg-devel] [PATCH] libavformat/rtspdec.c:flush pes buffer while rtsp seek 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 Cc: "Wujian\(Chin\)" , Lingzezhi 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: > On Nov 14, 2022, at 15:46, tanwei (D) wrote: > > Fixes ticket #9949. > > Signed-off-by: tanwei123 > --- > libavformat/mpegts.c | 20 ++++++++++++++++++++ > libavformat/mpegts.h | 1 + > libavformat/rtpdec.c | 7 +++++++ > libavformat/rtpdec.h | 2 ++ > libavformat/rtpdec_mpegts.c | 11 +++++++++++ > libavformat/rtspdec.c | 11 +++++++++++ > 6 files changed, 52 insertions(+) > > diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c > index d97702fcd7..c5472bb464 100644 > --- a/libavformat/mpegts.c > +++ b/libavformat/mpegts.c > @@ -3419,6 +3419,26 @@ int avpriv_mpegts_parse_packet(MpegTSContext *ts, AVPacket *pkt, > return len1 - len; > } > > +void avpriv_mpegts_seek_flush(MpegTSContext *ts) avpriv_ is meant to be exported symbols which can be called from other libs. ff_ prefix should be fine. > +{ > + int i; > + /* flush pes buffer */ > + for (i = 0; i < NB_PID_MAX; i++) { > + if (ts->pids[i]) { > + if (ts->pids[i]->type == MPEGTS_PES) { > + PESContext *pes = ts->pids[i]->u.pes_filter.opaque; > + av_buffer_unref(&pes->buffer); > + pes->data_index = 0; > + pes->state = MPEGTS_SKIP; /* skip until pes header */ > + } else if (ts->pids[i]->type == MPEGTS_SECTION) { > + ts->pids[i]->u.section_filter.last_ver = -1; > + } > + ts->pids[i]->last_cc = -1; > + ts->pids[i]->last_pcr = -1; > + } > + } > +} > + > void avpriv_mpegts_parse_close(MpegTSContext *ts) > { > mpegts_free(ts); > diff --git a/libavformat/mpegts.h b/libavformat/mpegts.h > index a48f14e768..b6f19e96bb 100644 > --- a/libavformat/mpegts.h > +++ b/libavformat/mpegts.h > @@ -170,6 +170,7 @@ MpegTSContext *avpriv_mpegts_parse_open(AVFormatContext *s); > int avpriv_mpegts_parse_packet(MpegTSContext *ts, AVPacket *pkt, > const uint8_t *buf, int len); > void avpriv_mpegts_parse_close(MpegTSContext *ts); > +void avpriv_mpegts_seek_flush(MpegTSContext *ts); > > typedef struct SLConfigDescr { > int use_au_start; > diff --git a/libavformat/rtpdec.c b/libavformat/rtpdec.c > index fa7544cc07..d688afd1c1 100644 > --- a/libavformat/rtpdec.c > +++ b/libavformat/rtpdec.c > @@ -954,6 +954,13 @@ int ff_rtp_parse_packet(RTPDemuxContext *s, AVPacket *pkt, > return rv ? rv : has_next_packet(s); > } > > +void ff_rtp_seek_flush(RTPDemuxContext *s) > +{ > + ff_rtp_reset_packet_queue(s); > + if (s->handler && s->handler->seek_flush) > + s->handler->seek_flush(s->dynamic_protocol_context); > +} > + > void ff_rtp_parse_close(RTPDemuxContext *s) > { > ff_rtp_reset_packet_queue(s); > diff --git a/libavformat/rtpdec.h b/libavformat/rtpdec.h > index 5a02e72dc2..8d6d857e28 100644 > --- a/libavformat/rtpdec.h > +++ b/libavformat/rtpdec.h > @@ -52,6 +52,7 @@ int ff_rtp_parse_packet(RTPDemuxContext *s, AVPacket *pkt, > void ff_rtp_parse_close(RTPDemuxContext *s); > int64_t ff_rtp_queued_packet_time(RTPDemuxContext *s); > void ff_rtp_reset_packet_queue(RTPDemuxContext *s); > +void ff_rtp_seek_flush(RTPDemuxContext *s); > > /** > * Send a dummy packet on both port pairs to set up the connection > @@ -135,6 +136,7 @@ struct RTPDynamicProtocolHandler { > /** Parse handler for this dynamic packet */ > DynamicPayloadPacketHandlerProc parse_packet; > int (*need_keyframe)(PayloadContext *context); > + void (*seek_flush)(PayloadContext *protocol_data); > }; > > typedef struct RTPPacket { > diff --git a/libavformat/rtpdec_mpegts.c b/libavformat/rtpdec_mpegts.c > index 405271f744..6e9abcae08 100644 > --- a/libavformat/rtpdec_mpegts.c > +++ b/libavformat/rtpdec_mpegts.c > @@ -47,6 +47,16 @@ static av_cold int mpegts_init(AVFormatContext *ctx, int st_index, > return 0; > } > > +static void mpegts_seek_flush(PayloadContext *data) > +{ > + if (!data) > + return; > + memset(data->buf, 0, data->read_buf_size); > + data->read_buf_size = 0; > + if (data->ts) > + avpriv_mpegts_seek_flush(data->ts); > +} > + > static int mpegts_handle_packet(AVFormatContext *ctx, PayloadContext *data, > AVStream *st, AVPacket *pkt, uint32_t *timestamp, > const uint8_t *buf, int len, uint16_t seq, > @@ -94,6 +104,7 @@ const RTPDynamicProtocolHandler ff_mpegts_dynamic_handler = { > .priv_data_size = sizeof(PayloadContext), > .parse_packet = mpegts_handle_packet, > .init = mpegts_init, > + .seek_flush = mpegts_seek_flush, > .close = mpegts_close_context, > .static_payload_id = 33, > }; > diff --git a/libavformat/rtspdec.c b/libavformat/rtspdec.c > index bbabec7db8..f743fac2ee 100644 > --- a/libavformat/rtspdec.c > +++ b/libavformat/rtspdec.c > @@ -36,6 +36,7 @@ > #include "rdt.h" > #include "tls.h" > #include "url.h" > +#include "mpegts.h" > #include "version.h" > > static const struct RTSPStatusMessage { > @@ -982,6 +983,16 @@ static int rtsp_read_seek(AVFormatContext *s, int stream_index, > rt->state = RTSP_STATE_IDLE; > break; > } > + > + if (rt->cur_transport_priv && rt->transport == RTSP_TRANSPORT_RTP) { > + ff_rtp_seek_flush(rt->cur_transport_priv); > + } else if (CONFIG_RTPDEC && rt->ts) { > + av_freep(&rt->recvbuf); > + rt->recvbuf_pos = 0; > + rt->recvbuf_len = 0; > + avpriv_mpegts_seek_flush(rt->ts); > + } > + > return 0; > } > > -- > 2.17.1 > > > _______________________________________________ > 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". _______________________________________________ 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".