From patchwork Mon Nov 14 07:46:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "tanwei (D)" X-Patchwork-Id: 39266 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a21:999a:b0:a4:2148:650a with SMTP id ve26csp2275036pzb; Sun, 13 Nov 2022 23:46:46 -0800 (PST) X-Google-Smtp-Source: AA0mqf43oH23qBoVmiQjEyf07gvEDap9LWf9sb6bcoe1pkgKKkzkxJ162qRfnHm2MGuRsqfDsbTS X-Received: by 2002:a50:8acc:0:b0:461:c563:defa with SMTP id k12-20020a508acc000000b00461c563defamr10001916edk.72.1668412006379; Sun, 13 Nov 2022 23:46:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1668412006; cv=none; d=google.com; s=arc-20160816; b=0OZ6znJkbpAoxazZM74+43KfccbdrofukkBgGJEhUmr9BPzy3U5xacw+ieHfQYgrku 9rMWYXPAT5YttMswS3B6KsnQzzXOpDr7OjjUsqei+/IzZWhldQ95VSoZpZzvoQezUIQb Q4mRW0YeTNDsy6Hli7opLBMuWDMicLYhIVr0lEVpQomtOfTf7kFFT9TJGNd26kD4xb1c gydWNFG/PIYEPqLbF7mJGCCcRsdD77mIh0WRjvfA5hT15Rb9EmK+I+MXWCg1P4igNfy1 wFVSiUc+73+pFFQiFVN+/zYkd7DRRqXw9BPbB6v4rK8Sc5Bme8S2mAjP+ZlX2oJkh5Ve EGZg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:content-language :accept-language:message-id:date:thread-index:thread-topic:to:from :delivered-to; bh=lORSHwWDRsPsyNqVmsi4ZTR1DeAPHJ2Dg21PfUK0vcc=; b=Ruo7NZ0aDQuxnKAEhSoQ62owluIfduT6WzSXdNzSkxxCTNGAcZu6VRvGILKMsUoGIS g33FKu3XdRAXJ3icXv2qF1ZBG/ByVy7W6yPFlEHBaxhzyb2hK63JUjzHyPzGyyX+rXuN JePc90osWJCp9qqAyixGzoTcyf9YX1N9EOi+A6HIPZdGN0UnNlwDtKmyUBVpCP8+snDQ 9UIE74GFqg2JY0/2dcwv0ynWBFrmZTrLPtz5kTvrre5rE4VhdYYRnFZHfzfPRdTX6BxS Quotyl93KooIYdRnENp2RJrtu8UbbgTn027OHRdc3CVojHCqf6bQ3lhIA1XkZQjTqFQI fHiA== 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; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=hisilicon.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id g18-20020a50d5d2000000b00461891a8138si7311001edj.446.2022.11.13.23.46.45; Sun, 13 Nov 2022 23:46:46 -0800 (PST) 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; dmarc=fail (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=hisilicon.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D9E5068BD32; Mon, 14 Nov 2022 09:46:41 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from szxga08-in.huawei.com (szxga08-in.huawei.com [45.249.212.255]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B97D468BC63 for ; Mon, 14 Nov 2022 09:46:35 +0200 (EET) Received: from kwepemi500003.china.huawei.com (unknown [172.30.72.54]) by szxga08-in.huawei.com (SkyGuard) with ESMTP id 4N9hFc4LPQz15Md4 for ; Mon, 14 Nov 2022 15:46:12 +0800 (CST) Received: from kwepemi500016.china.huawei.com (7.221.188.220) by kwepemi500003.china.huawei.com (7.221.188.51) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.31; Mon, 14 Nov 2022 15:46:31 +0800 Received: from kwepemi500016.china.huawei.com ([7.221.188.220]) by kwepemi500016.china.huawei.com ([7.221.188.220]) with mapi id 15.01.2375.031; Mon, 14 Nov 2022 15:46:31 +0800 From: "tanwei (D)" To: "ffmpeg-devel@ffmpeg.org" Thread-Topic: [PATCH] libavformat/rtspdec.c:flush pes buffer while rtsp seek Thread-Index: Adj3/SsQMTXdKw9dSDK3HuEyRbzZdg== Date: Mon, 14 Nov 2022 07:46:31 +0000 Message-ID: <97ef8d3987a842a7b9fc13773cdfca04@hisilicon.com> Accept-Language: zh-CN, en-US Content-Language: zh-CN X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.159.220.100] MIME-Version: 1.0 X-CFilter-Loop: Reflected Subject: [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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: kb5xem+IRVkt 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) +{ + 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; }