Re: [FFmpeg-devel] [PATCH] avformat/mpegts: Check the next sync byte to avoid incorrectt detected raw packet size
On Tue, 19 May 2020, lance.lmw...@gmail.com wrote: On Sun, May 17, 2020 at 02:41:18PM +0200, Marton Balint wrote: On Sun, 17 May 2020, lance.lmw...@gmail.com wrote: > On Sat, May 16, 2020 at 07:36:45PM +0200, Marton Balint wrote: > > > > > > On Sat, 16 May 2020, lance.lmw...@gmail.com wrote: > > > > > On Sat, May 16, 2020 at 11:44:01AM +0200, Marton Balint wrote: > > > > > > > > On Sat, 16 May 2020, lance.lmw...@gmail.com wrote: > > > > > > I suggest you capture the input, so this issue can be > > properly reproduced > > > > and share it. It may even make sense to create a fate test from it. > > > > Have tried, the issue can't be reproduced by capture offset > > file. I guess it's > > > caused by live stream seek isn't same as off line file. > > > > If that is the case then you can override the seekability of files by using > > -seekable 0 option. Alternatively you might find some other means to replay > > the recorded ts, anyhow this should be reproduced, because I have a feeling > > we don't have the whole picture of what is going on. > > I have spend more time to investigate it, I have try to capture a pcap file to > reproduce the issue, with tcprelay, it can be reproduced every time, however > if export to ts, I failed to reproduce it. Great. Can you share the pcap file? You can may send it to me privately if you don't want it to be made public. I have send it the sample to you privately, if you haven't got it, please let me know. Thanks, got it, and reproduced it, I will reply to your patch. Regards, Marton ___ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
Re: [FFmpeg-devel] [PATCH] avformat/mpegts: Check the next sync byte to avoid incorrectt detected raw packet size
On Sun, May 17, 2020 at 02:41:18PM +0200, Marton Balint wrote: > > > On Sun, 17 May 2020, lance.lmw...@gmail.com wrote: > > > On Sat, May 16, 2020 at 07:36:45PM +0200, Marton Balint wrote: > > > > > > > > > On Sat, 16 May 2020, lance.lmw...@gmail.com wrote: > > > > > > > On Sat, May 16, 2020 at 11:44:01AM +0200, Marton Balint wrote: > > > > > > > > > On Sat, 16 May 2020, lance.lmw...@gmail.com wrote: > > > > > > > I suggest you capture the input, so this issue can be > > > properly reproduced > > > > > and share it. It may even make sense to create a fate test from it. > > > > > Have tried, the issue can't be reproduced by capture offset > > > file. I guess it's > > > > caused by live stream seek isn't same as off line file. > > > > > > If that is the case then you can override the seekability of files by > > > using > > > -seekable 0 option. Alternatively you might find some other means to > > > replay > > > the recorded ts, anyhow this should be reproduced, because I have a > > > feeling > > > we don't have the whole picture of what is going on. > > > > I have spend more time to investigate it, I have try to capture a pcap file > > to > > reproduce the issue, with tcprelay, it can be reproduced every time, however > > if export to ts, I failed to reproduce it. > > Great. Can you share the pcap file? You can may send it to me privately if > you don't want it to be made public. I have send it the sample to you privately, if you haven't got it, please let me know. > > [...] > > > Thanks for the advices, I spend more time to investigate and try to fix it > > in the > > resync logic, with more debug info, I notice the old reanalyze() has one > > drawback, > > the pos isn't one of 188/192/204, so it'll cause the stat will reset all > > stats > > ahead of one of stats[i] which cause normal 188 failed to detected anymore. > > I > > think it's better to return if pos isn't one of 188/192/204, it'll fix my > > issue > > by testing, please help to review whether it's reasonable or not. > > I am not sure yet. You can tried with my pcap sample, please update the pcap mac info and use tcpreplay to get the udp stream. > > > the log which explain why it failed to detect back to 188: > > > > [mpegts @ 0x3ef0180] reanalyze: stat: 1, stat[0]: 1, stat[1]: 0, stat[2]: > > 0, raw_packet_size: 192, pos: 188 > > [mpegts @ 0x3ef0180] reanalyze: stat: 2, stat[0]: 2, stat[1]: 0, stat[2]: > > 0, raw_packet_size: 192, pos: 188 > > [mpegts @ 0x3ef0180] reanalyze: stat: 3, stat[0]: 3, stat[1]: 0, stat[2]: > > 0, raw_packet_size: 192, pos: 188 > > [mpegts @ 0x3ef0180] reanalyze: stat: 4, stat[0]: 4, stat[1]: 0, stat[2]: > > 0, raw_packet_size: 192, pos: 188 > > [mpegts @ 0x3ef0180] reanalyze: stat: 5, stat[0]: 4, stat[1]: 0, stat[2]: > > 0, raw_packet_size: 192, pos: 564 > > [mpegts @ 0x3ef0180] reanalyze: stat: 6, stat[0]: 5, stat[1]: 0, stat[2]: > > 0, raw_packet_size: 192, pos: 188 > > [mpegts @ 0x3ef0180] reanalyze: stat: 7, stat[0]: 6, stat[1]: 0, stat[2]: > > 0, raw_packet_size: 192, pos: 188 > > [mpegts @ 0x3ef0180] reanalyze: stat: 8, stat[0]: 6, stat[1]: 0, stat[2]: > > 0, raw_packet_size: 192, pos: 376 > > [mpegts @ 0x3ef0180] reanalyze: stat: 9, stat[0]: 7, stat[1]: 0, stat[2]: > > 0, raw_packet_size: 192, pos: 188 > > [mpegts @ 0x3ef0180] reanalyze: stat: 10, stat[0]: 7, stat[1]: 0, stat[2]: > > 0, raw_packet_size: 192, pos: 474 > > [mpegts @ 0x3ef0180] reanalyze: stat: 0, stat[0]: 0, stat[1]: 0, stat[2]: > > 0, raw_packet_size: 192, pos: 752 > > pos as a multiple of 188 and not 188 is very suspicious, and it might be > because pos47_full is only updated if the packet has a payload. Can you try > the attached patch and see if it makes a difference? Sorry, I'm miss it before. I have tried with the patch, you can reproduce with my sample with offline file, below is the log: [mpegts @ 0x49a9940] reanalyze: stat: 4, stat[0]: 0, stat[1]: 1, stat[2]: 0, pos: 192 [mpegts @ 0x49a9940] reanalyze: stat: 5, stat[0]: 0, stat[1]: 2, stat[2]: 0, pos: 192 [mpegts @ 0x49a9940] reanalyze: stat: 6, stat[0]: 0, stat[1]: 3, stat[2]: 0, pos: 192 [mpegts @ 0x49a9940] reanalyze: stat: 7, stat[0]: 0, stat[1]: 3, stat[2]: 0, pos: 240 [mpegts @ 0x49a9940] reanalyze: stat: 8, stat[0]: 0, stat[1]: 3, stat[2]: 0, pos: 195 [mpegts @ 0x49a9940] reanalyze: stat: 9, stat[0]: 0, stat[1]: 3, stat[2]: 0, pos: 195 [mpegts @ 0x49a9940] reanalyze: stat: 10, stat[0]: 0, stat[1]: 3, stat[2]: 0, pos: 298 [mpegts @ 0x49a9940] Packet corrupt (stream = 0, dts = 446069). [mpegts @ 0x49a9940] reanalyze: stat: 11, stat[0]: 0, stat[1]: 4, stat[2]: 0, pos: 192 [mpegts @ 0x49a9940] reanalyze: stat: 1, stat[0]: 0, stat[1]: 1, stat[2]: 0, pos: 192 [mpegts @ 0x49a9940] reanalyze: stat: 2, stat[0]: 0, stat[1]: 2, stat[2]: 0, pos: 192 [mpegts @ 0x49a9940] reanalyze: stat: 3, stat[0]: 0, stat[1]: 2, stat[2]: 0, pos: 240 [mpegts @ 0x49a9940] reanalyze: stat: 4, stat[0]: 0, stat[1]: 2, stat[2]: 0, pos: 312 > > Thanks, >
Re: [FFmpeg-devel] [PATCH] avformat/mpegts: Check the next sync byte to avoid incorrectt detected raw packet size
On Sun, 17 May 2020, lance.lmw...@gmail.com wrote:
On Sat, May 16, 2020 at 07:36:45PM +0200, Marton Balint wrote:
On Sat, 16 May 2020, lance.lmw...@gmail.com wrote:
> On Sat, May 16, 2020 at 11:44:01AM +0200, Marton Balint wrote:
> >
> >
> > On Sat, 16 May 2020, lance.lmw...@gmail.com wrote:
> >
> > I suggest you capture the input, so this issue can be properly reproduced
> > and share it. It may even make sense to create a fate test from it.
>
> Have tried, the issue can't be reproduced by capture offset file. I guess it's
> caused by live stream seek isn't same as off line file.
If that is the case then you can override the seekability of files by using
-seekable 0 option. Alternatively you might find some other means to replay
the recorded ts, anyhow this should be reproduced, because I have a feeling
we don't have the whole picture of what is going on.
I have spend more time to investigate it, I have try to capture a pcap file to
reproduce the issue, with tcprelay, it can be reproduced every time, however
if export to ts, I failed to reproduce it.
Great. Can you share the pcap file? You can may send it to me privately if
you don't want it to be made public.
[...]
Thanks for the advices, I spend more time to investigate and try to fix it in
the
resync logic, with more debug info, I notice the old reanalyze() has one
drawback,
the pos isn't one of 188/192/204, so it'll cause the stat will reset all stats
ahead of one of stats[i] which cause normal 188 failed to detected anymore. I
think it's better to return if pos isn't one of 188/192/204, it'll fix my issue
by testing, please help to review whether it's reasonable or not.
I am not sure yet.
the log which explain why it failed to detect back to 188:
[mpegts @ 0x3ef0180] reanalyze: stat: 1, stat[0]: 1, stat[1]: 0, stat[2]: 0,
raw_packet_size: 192, pos: 188
[mpegts @ 0x3ef0180] reanalyze: stat: 2, stat[0]: 2, stat[1]: 0, stat[2]: 0,
raw_packet_size: 192, pos: 188
[mpegts @ 0x3ef0180] reanalyze: stat: 3, stat[0]: 3, stat[1]: 0, stat[2]: 0,
raw_packet_size: 192, pos: 188
[mpegts @ 0x3ef0180] reanalyze: stat: 4, stat[0]: 4, stat[1]: 0, stat[2]: 0,
raw_packet_size: 192, pos: 188
[mpegts @ 0x3ef0180] reanalyze: stat: 5, stat[0]: 4, stat[1]: 0, stat[2]: 0,
raw_packet_size: 192, pos: 564
[mpegts @ 0x3ef0180] reanalyze: stat: 6, stat[0]: 5, stat[1]: 0, stat[2]: 0,
raw_packet_size: 192, pos: 188
[mpegts @ 0x3ef0180] reanalyze: stat: 7, stat[0]: 6, stat[1]: 0, stat[2]: 0,
raw_packet_size: 192, pos: 188
[mpegts @ 0x3ef0180] reanalyze: stat: 8, stat[0]: 6, stat[1]: 0, stat[2]: 0,
raw_packet_size: 192, pos: 376
[mpegts @ 0x3ef0180] reanalyze: stat: 9, stat[0]: 7, stat[1]: 0, stat[2]: 0,
raw_packet_size: 192, pos: 188
[mpegts @ 0x3ef0180] reanalyze: stat: 10, stat[0]: 7, stat[1]: 0, stat[2]: 0,
raw_packet_size: 192, pos: 474
[mpegts @ 0x3ef0180] reanalyze: stat: 0, stat[0]: 0, stat[1]: 0, stat[2]: 0,
raw_packet_size: 192, pos: 752
pos as a multiple of 188 and not 188 is very suspicious, and it might be
because pos47_full is only updated if the packet has a payload. Can you
try the attached patch and see if it makes a difference?
Thanks,
Martondiff --git a/libavformat/mpegts.c b/libavformat/mpegts.c
index 0833d62ea5..921a7ae2db 100644
--- a/libavformat/mpegts.c
+++ b/libavformat/mpegts.c
@@ -2774,11 +2774,6 @@ static int handle_packet(MpegTSContext *ts, const uint8_t *packet, int64_t pos)
if (p >= p_end || !has_payload)
return 0;
-if (pos >= 0) {
-av_assert0(pos >= TS_PACKET_SIZE);
-ts->pos47_full = pos - TS_PACKET_SIZE;
-}
-
if (tss->type == MPEGTS_SECTION) {
if (is_start) {
/* pointer field present */
@@ -2926,6 +2921,8 @@ static int read_packet(AVFormatContext *s, uint8_t *buf, int raw_packet_size,
else
continue;
} else {
+MpegTSContext *ts = s->priv_data;
+ts->pos47_full = avio_tell(pb) - TS_PACKET_SIZE;
break;
}
}
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
Re: [FFmpeg-devel] [PATCH] avformat/mpegts: Check the next sync byte to avoid incorrectt detected raw packet size
On Sat, May 16, 2020 at 07:36:45PM +0200, Marton Balint wrote:
>
>
> On Sat, 16 May 2020, lance.lmw...@gmail.com wrote:
>
> > On Sat, May 16, 2020 at 11:44:01AM +0200, Marton Balint wrote:
> > >
> > >
> > > On Sat, 16 May 2020, lance.lmw...@gmail.com wrote:
> > >
> > > > On Fri, May 15, 2020 at 06:52:55PM +0200, Marton Balint wrote:
> > > > > > > > > On Fri, 15 May 2020, lance.lmw...@gmail.com wrote:
> > > > > > > > On Fri, May 15, 2020 at 08:02:44PM +0800, myp...@gmail.com
> > > wrote:
> > > > > > > On Fri, May 15, 2020 at 6:23 PM wrote:
> > > > > > > >
> > > > > > > > From: Limin Wang
> > > > > > > >
> > > > > > > > reanalyze() may misdetect the new packet size as 204, but it's
> > > > > > > > 188 still actualy,
> > > > > > > > it'll cause many cc errors report and cannot be recovered. So
> > > > > > > > it's better to check
> > > > > > > > the next sync byte before skip the extra unused bytes.
> > > > > > > >
> > > > > > > > Also, it is best to change SIZE_STAT_THRESHOLD from 10 to 100?
> > > > > > > > If the input stream has
> > > > > > > > a master/slave switch serveral times, the raw size can be
> > > > > > > > easily detected by mistake.
> > > > > > > >
> > > > > > > > Signed-off-by: Limin Wang
> > > > > > > > ---
> > > > > > > > libavformat/mpegts.c | 13 +++--
> > > > > > > > 1 file changed, 7 insertions(+), 6 deletions(-)
> > > > > > > >
> > > > > > > > diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c
> > > > > > > > index 0833d62..049555c 100644
> > > > > > > > --- a/libavformat/mpegts.c
> > > > > > > > +++ b/libavformat/mpegts.c
> > > > > > > > @@ -2932,11 +2932,12 @@ static int read_packet(AVFormatContext
> > > > > > > > *s, uint8_t *buf, int raw_packet_size,
> > > > > > > > return 0;
> > > > > > > > }
> > > > > > > >
> > > > > > > > -static void finished_reading_packet(AVFormatContext *s, int
> > > > > > > > raw_packet_size)
> > > > > > > > +static void finished_reading_packet(AVFormatContext *s, const
> > > > > > > > uint8_t *data, int raw_packet_size)
> > > > > > > > {
> > > > > > > > AVIOContext *pb = s->pb;
> > > > > > > > int skip = raw_packet_size - TS_PACKET_SIZE;
> > > > > > > > -if (skip > 0)
> > > > > > > > +/* Check the next sync byte to avoid incorrectt detected
> > > > > > > > raw packet size */
> > > > > > > > +if (skip > 0 && data[TS_PACKET_SIZE] != 0x47)
> > > > > > > > avio_skip(pb, skip);
> > > > > > > > }
> > > > > > > >
> > > > > > > > @@ -2985,7 +2986,7 @@ static int handle_packets(MpegTSContext
> > > > > > > > *ts, int64_t nb_packets)
> > > > > > > > if (ret != 0)
> > > > > > > > break;
> > > > > > > > ret = handle_packet(ts, data, avio_tell(s->pb));
> > > > > > > > -finished_reading_packet(s, ts->raw_packet_size);
> > > > > > > > +finished_reading_packet(s, data, ts->raw_packet_size);
> > > > > > > > if (ret != 0)
> > > > > > > > break;
> > > > > > > > }
> > > > > > > > @@ -3137,7 +3138,7 @@ static int
> > > > > > > > mpegts_read_header(AVFormatContext *s)
> > > > > > > > pid = AV_RB16(data + 1) & 0x1fff;
> > > > > > > > if ((pcr_pid == -1 || pcr_pid == pid) &&
> > > > > > > > parse_pcr(_h, _l, data) == 0) {
> > > > > > > > -finished_reading_packet(s,
> > > > > > > > ts->raw_packet_size);
> > > > > > > > +finished_reading_packet(s, data,
> > > > > > > > ts->raw_packet_size);
> > > > > > > > pcr_pid = pid;
> > > > > > > > packet_count[nb_pcrs] = nb_packets;
> > > > > > > > pcrs[nb_pcrs] = pcr_h * 300 + pcr_l;
> > > > > > > > @@ -3154,7 +3155,7 @@ static int
> > > > > > > > mpegts_read_header(AVFormatContext *s)
> > > > > > > > }
> > > > > > > > }
> > > > > > > > } else {
> > > > > > > > -finished_reading_packet(s,
> > > > > > > > ts->raw_packet_size);
> > > > > > > > +finished_reading_packet(s, data,
> > > > > > > > ts->raw_packet_size);
> > > > > > > > }
> > > > > > > > nb_packets++;
> > > > > > > > }
> > > > > > > > @@ -3194,7 +3195,7 @@ static int
> > > > > > > > mpegts_raw_read_packet(AVFormatContext *s, AVPacket *pkt)
> > > > > > > > }
> > > > > > > > if (data != pkt->data)
> > > > > > > > memcpy(pkt->data, data, ts->raw_packet_size);
> > > > > > > > -finished_reading_packet(s, ts->raw_packet_size);
> > > > > > > > +finished_reading_packet(s, data, ts->raw_packet_size);
> > > > > > > > if (ts->mpeg2ts_compute_pcr) {
> > > > > > > > /* compute exact PCR for each packet */
> > > > > > > > if (parse_pcr(_h, _l, pkt->data) == 0) {
> > > > > > > > --
> > > > > > > > 1.8.3.1
> > > > > > > >
> > > > > > > Do you have a case to reproduce the cc errors report?
> > > > > > > Yes, it's real case which can be reproduced in lab.
> > > >
Re: [FFmpeg-devel] [PATCH] avformat/mpegts: Check the next sync byte to avoid incorrectt detected raw packet size
On Sat, 16 May 2020, lance.lmw...@gmail.com wrote:
On Sat, May 16, 2020 at 11:44:01AM +0200, Marton Balint wrote:
On Sat, 16 May 2020, lance.lmw...@gmail.com wrote:
> On Fri, May 15, 2020 at 06:52:55PM +0200, Marton Balint wrote:
> >
> >
> > On Fri, 15 May 2020, lance.lmw...@gmail.com wrote:
> >
> > > On Fri, May 15, 2020 at 08:02:44PM +0800, myp...@gmail.com wrote:
> > > > On Fri, May 15, 2020 at 6:23 PM wrote:
> > > > >
> > > > > From: Limin Wang
> > > > >
> > > > > reanalyze() may misdetect the new packet size as 204, but it's 188
still actualy,
> > > > > it'll cause many cc errors report and cannot be recovered. So it's
better to check
> > > > > the next sync byte before skip the extra unused bytes.
> > > > >
> > > > > Also, it is best to change SIZE_STAT_THRESHOLD from 10 to 100? If the
input stream has
> > > > > a master/slave switch serveral times, the raw size can be easily
detected by mistake.
> > > > >
> > > > > Signed-off-by: Limin Wang
> > > > > ---
> > > > > libavformat/mpegts.c | 13 +++--
> > > > > 1 file changed, 7 insertions(+), 6 deletions(-)
> > > > >
> > > > > diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c
> > > > > index 0833d62..049555c 100644
> > > > > --- a/libavformat/mpegts.c
> > > > > +++ b/libavformat/mpegts.c
> > > > > @@ -2932,11 +2932,12 @@ static int read_packet(AVFormatContext *s,
uint8_t *buf, int raw_packet_size,
> > > > > return 0;
> > > > > }
> > > > >
> > > > > -static void finished_reading_packet(AVFormatContext *s, int
raw_packet_size)
> > > > > +static void finished_reading_packet(AVFormatContext *s, const
uint8_t *data, int raw_packet_size)
> > > > > {
> > > > > AVIOContext *pb = s->pb;
> > > > > int skip = raw_packet_size - TS_PACKET_SIZE;
> > > > > -if (skip > 0)
> > > > > +/* Check the next sync byte to avoid incorrectt detected raw
packet size */
> > > > > +if (skip > 0 && data[TS_PACKET_SIZE] != 0x47)
> > > > > avio_skip(pb, skip);
> > > > > }
> > > > >
> > > > > @@ -2985,7 +2986,7 @@ static int handle_packets(MpegTSContext *ts,
int64_t nb_packets)
> > > > > if (ret != 0)
> > > > > break;
> > > > > ret = handle_packet(ts, data, avio_tell(s->pb));
> > > > > -finished_reading_packet(s, ts->raw_packet_size);
> > > > > +finished_reading_packet(s, data, ts->raw_packet_size);
> > > > > if (ret != 0)
> > > > > break;
> > > > > }
> > > > > @@ -3137,7 +3138,7 @@ static int mpegts_read_header(AVFormatContext
*s)
> > > > > pid = AV_RB16(data + 1) & 0x1fff;
> > > > > if ((pcr_pid == -1 || pcr_pid == pid) &&
> > > > > parse_pcr(_h, _l, data) == 0) {
> > > > > -finished_reading_packet(s, ts->raw_packet_size);
> > > > > +finished_reading_packet(s, data,
ts->raw_packet_size);
> > > > > pcr_pid = pid;
> > > > > packet_count[nb_pcrs] = nb_packets;
> > > > > pcrs[nb_pcrs] = pcr_h * 300 + pcr_l;
> > > > > @@ -3154,7 +3155,7 @@ static int mpegts_read_header(AVFormatContext
*s)
> > > > > }
> > > > > }
> > > > > } else {
> > > > > -finished_reading_packet(s, ts->raw_packet_size);
> > > > > +finished_reading_packet(s, data,
ts->raw_packet_size);
> > > > > }
> > > > > nb_packets++;
> > > > > }
> > > > > @@ -3194,7 +3195,7 @@ static int
mpegts_raw_read_packet(AVFormatContext *s, AVPacket *pkt)
> > > > > }
> > > > > if (data != pkt->data)
> > > > > memcpy(pkt->data, data, ts->raw_packet_size);
> > > > > -finished_reading_packet(s, ts->raw_packet_size);
> > > > > +finished_reading_packet(s, data, ts->raw_packet_size);
> > > > > if (ts->mpeg2ts_compute_pcr) {
> > > > > /* compute exact PCR for each packet */
> > > > > if (parse_pcr(_h, _l, pkt->data) == 0) {
> > > > > --
> > > > > 1.8.3.1
> > > > >
> > > > Do you have a case to reproduce the cc errors report?
> > > > Yes, it's real case which can be reproduced in lab.
> >
> > Can you share the sample?
>
> No, tested with master and slave udp ts stream which switch between the master and slave stream
> more than five times, it'll cause tons of cc error report and can't be
recovered.
I suggest you capture the input, so this issue can be properly reproduced
and share it. It may even make sense to create a fate test from it.
Have tried, the issue can't be reproduced by capture offset file. I guess it's
caused by live stream seek isn't same as off line file.
If that is the case then you can override the seekability of files by
using -seekable 0 option. Alternatively you might find some other means to
replay the recorded ts, anyhow this should be reproduced, because I have a
feeling we don't have the whole picture of what is going on.
Anyway, your patch does not seem right,
Re: [FFmpeg-devel] [PATCH] avformat/mpegts: Check the next sync byte to avoid incorrectt detected raw packet size
On Sat, May 16, 2020 at 11:44:01AM +0200, Marton Balint wrote:
>
>
> On Sat, 16 May 2020, lance.lmw...@gmail.com wrote:
>
> > On Fri, May 15, 2020 at 06:52:55PM +0200, Marton Balint wrote:
> > >
> > >
> > > On Fri, 15 May 2020, lance.lmw...@gmail.com wrote:
> > >
> > > > On Fri, May 15, 2020 at 08:02:44PM +0800, myp...@gmail.com wrote:
> > > > > On Fri, May 15, 2020 at 6:23 PM wrote:
> > > > > >
> > > > > > From: Limin Wang
> > > > > >
> > > > > > reanalyze() may misdetect the new packet size as 204, but it's 188
> > > > > > still actualy,
> > > > > > it'll cause many cc errors report and cannot be recovered. So it's
> > > > > > better to check
> > > > > > the next sync byte before skip the extra unused bytes.
> > > > > >
> > > > > > Also, it is best to change SIZE_STAT_THRESHOLD from 10 to 100? If
> > > > > > the input stream has
> > > > > > a master/slave switch serveral times, the raw size can be easily
> > > > > > detected by mistake.
> > > > > >
> > > > > > Signed-off-by: Limin Wang
> > > > > > ---
> > > > > > libavformat/mpegts.c | 13 +++--
> > > > > > 1 file changed, 7 insertions(+), 6 deletions(-)
> > > > > >
> > > > > > diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c
> > > > > > index 0833d62..049555c 100644
> > > > > > --- a/libavformat/mpegts.c
> > > > > > +++ b/libavformat/mpegts.c
> > > > > > @@ -2932,11 +2932,12 @@ static int read_packet(AVFormatContext *s,
> > > > > > uint8_t *buf, int raw_packet_size,
> > > > > > return 0;
> > > > > > }
> > > > > >
> > > > > > -static void finished_reading_packet(AVFormatContext *s, int
> > > > > > raw_packet_size)
> > > > > > +static void finished_reading_packet(AVFormatContext *s, const
> > > > > > uint8_t *data, int raw_packet_size)
> > > > > > {
> > > > > > AVIOContext *pb = s->pb;
> > > > > > int skip = raw_packet_size - TS_PACKET_SIZE;
> > > > > > -if (skip > 0)
> > > > > > +/* Check the next sync byte to avoid incorrectt detected raw
> > > > > > packet size */
> > > > > > +if (skip > 0 && data[TS_PACKET_SIZE] != 0x47)
> > > > > > avio_skip(pb, skip);
> > > > > > }
> > > > > >
> > > > > > @@ -2985,7 +2986,7 @@ static int handle_packets(MpegTSContext *ts,
> > > > > > int64_t nb_packets)
> > > > > > if (ret != 0)
> > > > > > break;
> > > > > > ret = handle_packet(ts, data, avio_tell(s->pb));
> > > > > > -finished_reading_packet(s, ts->raw_packet_size);
> > > > > > +finished_reading_packet(s, data, ts->raw_packet_size);
> > > > > > if (ret != 0)
> > > > > > break;
> > > > > > }
> > > > > > @@ -3137,7 +3138,7 @@ static int mpegts_read_header(AVFormatContext
> > > > > > *s)
> > > > > > pid = AV_RB16(data + 1) & 0x1fff;
> > > > > > if ((pcr_pid == -1 || pcr_pid == pid) &&
> > > > > > parse_pcr(_h, _l, data) == 0) {
> > > > > > -finished_reading_packet(s, ts->raw_packet_size);
> > > > > > +finished_reading_packet(s, data,
> > > > > > ts->raw_packet_size);
> > > > > > pcr_pid = pid;
> > > > > > packet_count[nb_pcrs] = nb_packets;
> > > > > > pcrs[nb_pcrs] = pcr_h * 300 + pcr_l;
> > > > > > @@ -3154,7 +3155,7 @@ static int mpegts_read_header(AVFormatContext
> > > > > > *s)
> > > > > > }
> > > > > > }
> > > > > > } else {
> > > > > > -finished_reading_packet(s, ts->raw_packet_size);
> > > > > > +finished_reading_packet(s, data,
> > > > > > ts->raw_packet_size);
> > > > > > }
> > > > > > nb_packets++;
> > > > > > }
> > > > > > @@ -3194,7 +3195,7 @@ static int
> > > > > > mpegts_raw_read_packet(AVFormatContext *s, AVPacket *pkt)
> > > > > > }
> > > > > > if (data != pkt->data)
> > > > > > memcpy(pkt->data, data, ts->raw_packet_size);
> > > > > > -finished_reading_packet(s, ts->raw_packet_size);
> > > > > > +finished_reading_packet(s, data, ts->raw_packet_size);
> > > > > > if (ts->mpeg2ts_compute_pcr) {
> > > > > > /* compute exact PCR for each packet */
> > > > > > if (parse_pcr(_h, _l, pkt->data) == 0) {
> > > > > > --
> > > > > > 1.8.3.1
> > > > > >
> > > > > Do you have a case to reproduce the cc errors report?
> > > > > Yes, it's real case which can be reproduced in lab.
> > >
> > > Can you share the sample?
> >
> > No, tested with master and slave udp ts stream which switch between the
> > master and slave stream
> > more than five times, it'll cause tons of cc error report and can't be
> > recovered.
>
> I suggest you capture the input, so this issue can be properly reproduced
> and share it. It may even make sense to create a fate test from it.
Have tried, the issue can't be reproduced by capture offset file. I guess it's
caused by live stream seek isn't same as off line file.
>
> Anyway, your patch does
Re: [FFmpeg-devel] [PATCH] avformat/mpegts: Check the next sync byte to avoid incorrectt detected raw packet size
On Sat, 16 May 2020, lance.lmw...@gmail.com wrote:
On Fri, May 15, 2020 at 06:52:55PM +0200, Marton Balint wrote:
On Fri, 15 May 2020, lance.lmw...@gmail.com wrote:
> On Fri, May 15, 2020 at 08:02:44PM +0800, myp...@gmail.com wrote:
> > On Fri, May 15, 2020 at 6:23 PM wrote:
> > >
> > > From: Limin Wang
> > >
> > > reanalyze() may misdetect the new packet size as 204, but it's 188 still
actualy,
> > > it'll cause many cc errors report and cannot be recovered. So it's better
to check
> > > the next sync byte before skip the extra unused bytes.
> > >
> > > Also, it is best to change SIZE_STAT_THRESHOLD from 10 to 100? If the
input stream has
> > > a master/slave switch serveral times, the raw size can be easily detected
by mistake.
> > >
> > > Signed-off-by: Limin Wang
> > > ---
> > > libavformat/mpegts.c | 13 +++--
> > > 1 file changed, 7 insertions(+), 6 deletions(-)
> > >
> > > diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c
> > > index 0833d62..049555c 100644
> > > --- a/libavformat/mpegts.c
> > > +++ b/libavformat/mpegts.c
> > > @@ -2932,11 +2932,12 @@ static int read_packet(AVFormatContext *s,
uint8_t *buf, int raw_packet_size,
> > > return 0;
> > > }
> > >
> > > -static void finished_reading_packet(AVFormatContext *s, int
raw_packet_size)
> > > +static void finished_reading_packet(AVFormatContext *s, const uint8_t
*data, int raw_packet_size)
> > > {
> > > AVIOContext *pb = s->pb;
> > > int skip = raw_packet_size - TS_PACKET_SIZE;
> > > -if (skip > 0)
> > > +/* Check the next sync byte to avoid incorrectt detected raw packet
size */
> > > +if (skip > 0 && data[TS_PACKET_SIZE] != 0x47)
> > > avio_skip(pb, skip);
> > > }
> > >
> > > @@ -2985,7 +2986,7 @@ static int handle_packets(MpegTSContext *ts,
int64_t nb_packets)
> > > if (ret != 0)
> > > break;
> > > ret = handle_packet(ts, data, avio_tell(s->pb));
> > > -finished_reading_packet(s, ts->raw_packet_size);
> > > +finished_reading_packet(s, data, ts->raw_packet_size);
> > > if (ret != 0)
> > > break;
> > > }
> > > @@ -3137,7 +3138,7 @@ static int mpegts_read_header(AVFormatContext *s)
> > > pid = AV_RB16(data + 1) & 0x1fff;
> > > if ((pcr_pid == -1 || pcr_pid == pid) &&
> > > parse_pcr(_h, _l, data) == 0) {
> > > -finished_reading_packet(s, ts->raw_packet_size);
> > > +finished_reading_packet(s, data, ts->raw_packet_size);
> > > pcr_pid = pid;
> > > packet_count[nb_pcrs] = nb_packets;
> > > pcrs[nb_pcrs] = pcr_h * 300 + pcr_l;
> > > @@ -3154,7 +3155,7 @@ static int mpegts_read_header(AVFormatContext *s)
> > > }
> > > }
> > > } else {
> > > -finished_reading_packet(s, ts->raw_packet_size);
> > > +finished_reading_packet(s, data, ts->raw_packet_size);
> > > }
> > > nb_packets++;
> > > }
> > > @@ -3194,7 +3195,7 @@ static int mpegts_raw_read_packet(AVFormatContext
*s, AVPacket *pkt)
> > > }
> > > if (data != pkt->data)
> > > memcpy(pkt->data, data, ts->raw_packet_size);
> > > -finished_reading_packet(s, ts->raw_packet_size);
> > > +finished_reading_packet(s, data, ts->raw_packet_size);
> > > if (ts->mpeg2ts_compute_pcr) {
> > > /* compute exact PCR for each packet */
> > > if (parse_pcr(_h, _l, pkt->data) == 0) {
> > > --
> > > 1.8.3.1
> > >
> > Do you have a case to reproduce the cc errors report?
>
> Yes, it's real case which can be reproduced in lab.
Can you share the sample?
No, tested with master and slave udp ts stream which switch between the master
and slave stream
more than five times, it'll cause tons of cc error report and can't be
recovered.
I suggest you capture the input, so this issue can be properly reproduced
and share it. It may even make sense to create a fate test from it.
Anyway, your patch does not seem right, because it seems to revert back
the packet size as soon as the first byte to be skipped is 0x47. That will
surely cause issues for normal streams having a packet size > 188.
Regards,
Marton
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
Re: [FFmpeg-devel] [PATCH] avformat/mpegts: Check the next sync byte to avoid incorrectt detected raw packet size
On Fri, May 15, 2020 at 06:52:55PM +0200, Marton Balint wrote:
>
>
> On Fri, 15 May 2020, lance.lmw...@gmail.com wrote:
>
> > On Fri, May 15, 2020 at 08:02:44PM +0800, myp...@gmail.com wrote:
> > > On Fri, May 15, 2020 at 6:23 PM wrote:
> > > >
> > > > From: Limin Wang
> > > >
> > > > reanalyze() may misdetect the new packet size as 204, but it's 188
> > > > still actualy,
> > > > it'll cause many cc errors report and cannot be recovered. So it's
> > > > better to check
> > > > the next sync byte before skip the extra unused bytes.
> > > >
> > > > Also, it is best to change SIZE_STAT_THRESHOLD from 10 to 100? If the
> > > > input stream has
> > > > a master/slave switch serveral times, the raw size can be easily
> > > > detected by mistake.
> > > >
> > > > Signed-off-by: Limin Wang
> > > > ---
> > > > libavformat/mpegts.c | 13 +++--
> > > > 1 file changed, 7 insertions(+), 6 deletions(-)
> > > >
> > > > diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c
> > > > index 0833d62..049555c 100644
> > > > --- a/libavformat/mpegts.c
> > > > +++ b/libavformat/mpegts.c
> > > > @@ -2932,11 +2932,12 @@ static int read_packet(AVFormatContext *s,
> > > > uint8_t *buf, int raw_packet_size,
> > > > return 0;
> > > > }
> > > >
> > > > -static void finished_reading_packet(AVFormatContext *s, int
> > > > raw_packet_size)
> > > > +static void finished_reading_packet(AVFormatContext *s, const uint8_t
> > > > *data, int raw_packet_size)
> > > > {
> > > > AVIOContext *pb = s->pb;
> > > > int skip = raw_packet_size - TS_PACKET_SIZE;
> > > > -if (skip > 0)
> > > > +/* Check the next sync byte to avoid incorrectt detected raw
> > > > packet size */
> > > > +if (skip > 0 && data[TS_PACKET_SIZE] != 0x47)
> > > > avio_skip(pb, skip);
> > > > }
> > > >
> > > > @@ -2985,7 +2986,7 @@ static int handle_packets(MpegTSContext *ts,
> > > > int64_t nb_packets)
> > > > if (ret != 0)
> > > > break;
> > > > ret = handle_packet(ts, data, avio_tell(s->pb));
> > > > -finished_reading_packet(s, ts->raw_packet_size);
> > > > +finished_reading_packet(s, data, ts->raw_packet_size);
> > > > if (ret != 0)
> > > > break;
> > > > }
> > > > @@ -3137,7 +3138,7 @@ static int mpegts_read_header(AVFormatContext *s)
> > > > pid = AV_RB16(data + 1) & 0x1fff;
> > > > if ((pcr_pid == -1 || pcr_pid == pid) &&
> > > > parse_pcr(_h, _l, data) == 0) {
> > > > -finished_reading_packet(s, ts->raw_packet_size);
> > > > +finished_reading_packet(s, data, ts->raw_packet_size);
> > > > pcr_pid = pid;
> > > > packet_count[nb_pcrs] = nb_packets;
> > > > pcrs[nb_pcrs] = pcr_h * 300 + pcr_l;
> > > > @@ -3154,7 +3155,7 @@ static int mpegts_read_header(AVFormatContext *s)
> > > > }
> > > > }
> > > > } else {
> > > > -finished_reading_packet(s, ts->raw_packet_size);
> > > > +finished_reading_packet(s, data, ts->raw_packet_size);
> > > > }
> > > > nb_packets++;
> > > > }
> > > > @@ -3194,7 +3195,7 @@ static int mpegts_raw_read_packet(AVFormatContext
> > > > *s, AVPacket *pkt)
> > > > }
> > > > if (data != pkt->data)
> > > > memcpy(pkt->data, data, ts->raw_packet_size);
> > > > -finished_reading_packet(s, ts->raw_packet_size);
> > > > +finished_reading_packet(s, data, ts->raw_packet_size);
> > > > if (ts->mpeg2ts_compute_pcr) {
> > > > /* compute exact PCR for each packet */
> > > > if (parse_pcr(_h, _l, pkt->data) == 0) {
> > > > --
> > > > 1.8.3.1
> > > >
> > > Do you have a case to reproduce the cc errors report?
> >
> > Yes, it's real case which can be reproduced in lab.
>
> Can you share the sample?
No, tested with master and slave udp ts stream which switch between the master
and slave stream
more than five times, it'll cause tons of cc error report and can't be
recovered.
>
> Thanks,
> Marton
> ___
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>
> To unsubscribe, visit link above, or email
> ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
--
Thanks,
Limin Wang
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
Re: [FFmpeg-devel] [PATCH] avformat/mpegts: Check the next sync byte to avoid incorrectt detected raw packet size
On Fri, 15 May 2020, lance.lmw...@gmail.com wrote:
On Fri, May 15, 2020 at 08:02:44PM +0800, myp...@gmail.com wrote:
On Fri, May 15, 2020 at 6:23 PM wrote:
>
> From: Limin Wang
>
> reanalyze() may misdetect the new packet size as 204, but it's 188 still
actualy,
> it'll cause many cc errors report and cannot be recovered. So it's better to
check
> the next sync byte before skip the extra unused bytes.
>
> Also, it is best to change SIZE_STAT_THRESHOLD from 10 to 100? If the input
stream has
> a master/slave switch serveral times, the raw size can be easily detected by
mistake.
>
> Signed-off-by: Limin Wang
> ---
> libavformat/mpegts.c | 13 +++--
> 1 file changed, 7 insertions(+), 6 deletions(-)
>
> diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c
> index 0833d62..049555c 100644
> --- a/libavformat/mpegts.c
> +++ b/libavformat/mpegts.c
> @@ -2932,11 +2932,12 @@ static int read_packet(AVFormatContext *s, uint8_t
*buf, int raw_packet_size,
> return 0;
> }
>
> -static void finished_reading_packet(AVFormatContext *s, int raw_packet_size)
> +static void finished_reading_packet(AVFormatContext *s, const uint8_t *data,
int raw_packet_size)
> {
> AVIOContext *pb = s->pb;
> int skip = raw_packet_size - TS_PACKET_SIZE;
> -if (skip > 0)
> +/* Check the next sync byte to avoid incorrectt detected raw packet size
*/
> +if (skip > 0 && data[TS_PACKET_SIZE] != 0x47)
> avio_skip(pb, skip);
> }
>
> @@ -2985,7 +2986,7 @@ static int handle_packets(MpegTSContext *ts, int64_t
nb_packets)
> if (ret != 0)
> break;
> ret = handle_packet(ts, data, avio_tell(s->pb));
> -finished_reading_packet(s, ts->raw_packet_size);
> +finished_reading_packet(s, data, ts->raw_packet_size);
> if (ret != 0)
> break;
> }
> @@ -3137,7 +3138,7 @@ static int mpegts_read_header(AVFormatContext *s)
> pid = AV_RB16(data + 1) & 0x1fff;
> if ((pcr_pid == -1 || pcr_pid == pid) &&
> parse_pcr(_h, _l, data) == 0) {
> -finished_reading_packet(s, ts->raw_packet_size);
> +finished_reading_packet(s, data, ts->raw_packet_size);
> pcr_pid = pid;
> packet_count[nb_pcrs] = nb_packets;
> pcrs[nb_pcrs] = pcr_h * 300 + pcr_l;
> @@ -3154,7 +3155,7 @@ static int mpegts_read_header(AVFormatContext *s)
> }
> }
> } else {
> -finished_reading_packet(s, ts->raw_packet_size);
> +finished_reading_packet(s, data, ts->raw_packet_size);
> }
> nb_packets++;
> }
> @@ -3194,7 +3195,7 @@ static int mpegts_raw_read_packet(AVFormatContext *s,
AVPacket *pkt)
> }
> if (data != pkt->data)
> memcpy(pkt->data, data, ts->raw_packet_size);
> -finished_reading_packet(s, ts->raw_packet_size);
> +finished_reading_packet(s, data, ts->raw_packet_size);
> if (ts->mpeg2ts_compute_pcr) {
> /* compute exact PCR for each packet */
> if (parse_pcr(_h, _l, pkt->data) == 0) {
> --
> 1.8.3.1
>
Do you have a case to reproduce the cc errors report?
Yes, it's real case which can be reproduced in lab.
Can you share the sample?
Thanks,
Marton
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
Re: [FFmpeg-devel] [PATCH] avformat/mpegts: Check the next sync byte to avoid incorrectt detected raw packet size
On Fri, May 15, 2020 at 08:02:44PM +0800, myp...@gmail.com wrote:
> On Fri, May 15, 2020 at 6:23 PM wrote:
> >
> > From: Limin Wang
> >
> > reanalyze() may misdetect the new packet size as 204, but it's 188 still
> > actualy,
> > it'll cause many cc errors report and cannot be recovered. So it's better
> > to check
> > the next sync byte before skip the extra unused bytes.
> >
> > Also, it is best to change SIZE_STAT_THRESHOLD from 10 to 100? If the input
> > stream has
> > a master/slave switch serveral times, the raw size can be easily detected
> > by mistake.
> >
> > Signed-off-by: Limin Wang
> > ---
> > libavformat/mpegts.c | 13 +++--
> > 1 file changed, 7 insertions(+), 6 deletions(-)
> >
> > diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c
> > index 0833d62..049555c 100644
> > --- a/libavformat/mpegts.c
> > +++ b/libavformat/mpegts.c
> > @@ -2932,11 +2932,12 @@ static int read_packet(AVFormatContext *s, uint8_t
> > *buf, int raw_packet_size,
> > return 0;
> > }
> >
> > -static void finished_reading_packet(AVFormatContext *s, int
> > raw_packet_size)
> > +static void finished_reading_packet(AVFormatContext *s, const uint8_t
> > *data, int raw_packet_size)
> > {
> > AVIOContext *pb = s->pb;
> > int skip = raw_packet_size - TS_PACKET_SIZE;
> > -if (skip > 0)
> > +/* Check the next sync byte to avoid incorrectt detected raw packet
> > size */
> > +if (skip > 0 && data[TS_PACKET_SIZE] != 0x47)
> > avio_skip(pb, skip);
> > }
> >
> > @@ -2985,7 +2986,7 @@ static int handle_packets(MpegTSContext *ts, int64_t
> > nb_packets)
> > if (ret != 0)
> > break;
> > ret = handle_packet(ts, data, avio_tell(s->pb));
> > -finished_reading_packet(s, ts->raw_packet_size);
> > +finished_reading_packet(s, data, ts->raw_packet_size);
> > if (ret != 0)
> > break;
> > }
> > @@ -3137,7 +3138,7 @@ static int mpegts_read_header(AVFormatContext *s)
> > pid = AV_RB16(data + 1) & 0x1fff;
> > if ((pcr_pid == -1 || pcr_pid == pid) &&
> > parse_pcr(_h, _l, data) == 0) {
> > -finished_reading_packet(s, ts->raw_packet_size);
> > +finished_reading_packet(s, data, ts->raw_packet_size);
> > pcr_pid = pid;
> > packet_count[nb_pcrs] = nb_packets;
> > pcrs[nb_pcrs] = pcr_h * 300 + pcr_l;
> > @@ -3154,7 +3155,7 @@ static int mpegts_read_header(AVFormatContext *s)
> > }
> > }
> > } else {
> > -finished_reading_packet(s, ts->raw_packet_size);
> > +finished_reading_packet(s, data, ts->raw_packet_size);
> > }
> > nb_packets++;
> > }
> > @@ -3194,7 +3195,7 @@ static int mpegts_raw_read_packet(AVFormatContext *s,
> > AVPacket *pkt)
> > }
> > if (data != pkt->data)
> > memcpy(pkt->data, data, ts->raw_packet_size);
> > -finished_reading_packet(s, ts->raw_packet_size);
> > +finished_reading_packet(s, data, ts->raw_packet_size);
> > if (ts->mpeg2ts_compute_pcr) {
> > /* compute exact PCR for each packet */
> > if (parse_pcr(_h, _l, pkt->data) == 0) {
> > --
> > 1.8.3.1
> >
> Do you have a case to reproduce the cc errors report?
Yes, it's real case which can be reproduced in lab.
--
Thanks,
Limin Wang
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
Re: [FFmpeg-devel] [PATCH] avformat/mpegts: Check the next sync byte to avoid incorrectt detected raw packet size
On Fri, May 15, 2020 at 6:23 PM wrote:
>
> From: Limin Wang
>
> reanalyze() may misdetect the new packet size as 204, but it's 188 still
> actualy,
> it'll cause many cc errors report and cannot be recovered. So it's better to
> check
> the next sync byte before skip the extra unused bytes.
>
> Also, it is best to change SIZE_STAT_THRESHOLD from 10 to 100? If the input
> stream has
> a master/slave switch serveral times, the raw size can be easily detected by
> mistake.
>
> Signed-off-by: Limin Wang
> ---
> libavformat/mpegts.c | 13 +++--
> 1 file changed, 7 insertions(+), 6 deletions(-)
>
> diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c
> index 0833d62..049555c 100644
> --- a/libavformat/mpegts.c
> +++ b/libavformat/mpegts.c
> @@ -2932,11 +2932,12 @@ static int read_packet(AVFormatContext *s, uint8_t
> *buf, int raw_packet_size,
> return 0;
> }
>
> -static void finished_reading_packet(AVFormatContext *s, int raw_packet_size)
> +static void finished_reading_packet(AVFormatContext *s, const uint8_t *data,
> int raw_packet_size)
> {
> AVIOContext *pb = s->pb;
> int skip = raw_packet_size - TS_PACKET_SIZE;
> -if (skip > 0)
> +/* Check the next sync byte to avoid incorrectt detected raw packet size
> */
> +if (skip > 0 && data[TS_PACKET_SIZE] != 0x47)
> avio_skip(pb, skip);
> }
>
> @@ -2985,7 +2986,7 @@ static int handle_packets(MpegTSContext *ts, int64_t
> nb_packets)
> if (ret != 0)
> break;
> ret = handle_packet(ts, data, avio_tell(s->pb));
> -finished_reading_packet(s, ts->raw_packet_size);
> +finished_reading_packet(s, data, ts->raw_packet_size);
> if (ret != 0)
> break;
> }
> @@ -3137,7 +3138,7 @@ static int mpegts_read_header(AVFormatContext *s)
> pid = AV_RB16(data + 1) & 0x1fff;
> if ((pcr_pid == -1 || pcr_pid == pid) &&
> parse_pcr(_h, _l, data) == 0) {
> -finished_reading_packet(s, ts->raw_packet_size);
> +finished_reading_packet(s, data, ts->raw_packet_size);
> pcr_pid = pid;
> packet_count[nb_pcrs] = nb_packets;
> pcrs[nb_pcrs] = pcr_h * 300 + pcr_l;
> @@ -3154,7 +3155,7 @@ static int mpegts_read_header(AVFormatContext *s)
> }
> }
> } else {
> -finished_reading_packet(s, ts->raw_packet_size);
> +finished_reading_packet(s, data, ts->raw_packet_size);
> }
> nb_packets++;
> }
> @@ -3194,7 +3195,7 @@ static int mpegts_raw_read_packet(AVFormatContext *s,
> AVPacket *pkt)
> }
> if (data != pkt->data)
> memcpy(pkt->data, data, ts->raw_packet_size);
> -finished_reading_packet(s, ts->raw_packet_size);
> +finished_reading_packet(s, data, ts->raw_packet_size);
> if (ts->mpeg2ts_compute_pcr) {
> /* compute exact PCR for each packet */
> if (parse_pcr(_h, _l, pkt->data) == 0) {
> --
> 1.8.3.1
>
Do you have a case to reproduce the cc errors report?
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
[FFmpeg-devel] [PATCH] avformat/mpegts: Check the next sync byte to avoid incorrectt detected raw packet size
From: Limin Wang
reanalyze() may misdetect the new packet size as 204, but it's 188 still
actualy,
it'll cause many cc errors report and cannot be recovered. So it's better to
check
the next sync byte before skip the extra unused bytes.
Also, it is best to change SIZE_STAT_THRESHOLD from 10 to 100? If the input
stream has
a master/slave switch serveral times, the raw size can be easily detected by
mistake.
Signed-off-by: Limin Wang
---
libavformat/mpegts.c | 13 +++--
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c
index 0833d62..049555c 100644
--- a/libavformat/mpegts.c
+++ b/libavformat/mpegts.c
@@ -2932,11 +2932,12 @@ static int read_packet(AVFormatContext *s, uint8_t
*buf, int raw_packet_size,
return 0;
}
-static void finished_reading_packet(AVFormatContext *s, int raw_packet_size)
+static void finished_reading_packet(AVFormatContext *s, const uint8_t *data,
int raw_packet_size)
{
AVIOContext *pb = s->pb;
int skip = raw_packet_size - TS_PACKET_SIZE;
-if (skip > 0)
+/* Check the next sync byte to avoid incorrectt detected raw packet size */
+if (skip > 0 && data[TS_PACKET_SIZE] != 0x47)
avio_skip(pb, skip);
}
@@ -2985,7 +2986,7 @@ static int handle_packets(MpegTSContext *ts, int64_t
nb_packets)
if (ret != 0)
break;
ret = handle_packet(ts, data, avio_tell(s->pb));
-finished_reading_packet(s, ts->raw_packet_size);
+finished_reading_packet(s, data, ts->raw_packet_size);
if (ret != 0)
break;
}
@@ -3137,7 +3138,7 @@ static int mpegts_read_header(AVFormatContext *s)
pid = AV_RB16(data + 1) & 0x1fff;
if ((pcr_pid == -1 || pcr_pid == pid) &&
parse_pcr(_h, _l, data) == 0) {
-finished_reading_packet(s, ts->raw_packet_size);
+finished_reading_packet(s, data, ts->raw_packet_size);
pcr_pid = pid;
packet_count[nb_pcrs] = nb_packets;
pcrs[nb_pcrs] = pcr_h * 300 + pcr_l;
@@ -3154,7 +3155,7 @@ static int mpegts_read_header(AVFormatContext *s)
}
}
} else {
-finished_reading_packet(s, ts->raw_packet_size);
+finished_reading_packet(s, data, ts->raw_packet_size);
}
nb_packets++;
}
@@ -3194,7 +3195,7 @@ static int mpegts_raw_read_packet(AVFormatContext *s,
AVPacket *pkt)
}
if (data != pkt->data)
memcpy(pkt->data, data, ts->raw_packet_size);
-finished_reading_packet(s, ts->raw_packet_size);
+finished_reading_packet(s, data, ts->raw_packet_size);
if (ts->mpeg2ts_compute_pcr) {
/* compute exact PCR for each packet */
if (parse_pcr(_h, _l, pkt->data) == 0) {
--
1.8.3.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-requ...@ffmpeg.org with subject "unsubscribe".
