* [FFmpeg-devel] [PATCH] libavformat/mpegts.c: ignore a section with next flag
@ 2022-04-03 10:23 TADANO Tokumei
2022-04-07 9:26 ` TADANO Tokumei
2022-04-09 18:29 ` Marton Balint
0 siblings, 2 replies; 4+ messages in thread
From: TADANO Tokumei @ 2022-04-03 10:23 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: TADANO Tokumei
'current_next_indicator' of 0 (next) on each section header indicates
the service information is for immediate future one.
ffmpeg doesn't need to parse it but current (1) one.
ref: section 5.1.1 of DVB BlueBook A038 (EN 300 468)
Signed-off-by: TADANO Tokumei <aimingoff@pc.nifty.jp>
---
libavformat/mpegts.c | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c
index ecffb01562..49f7735123 100644
--- a/libavformat/mpegts.c
+++ b/libavformat/mpegts.c
@@ -645,6 +645,7 @@ typedef struct SectionHeader {
uint8_t tid;
uint16_t id;
uint8_t version;
+ uint8_t current_next;
uint8_t sec_num;
uint8_t last_sec_num;
} SectionHeader;
@@ -773,6 +774,7 @@ static int parse_section_header(SectionHeader *h,
if (val < 0)
return val;
h->version = (val >> 1) & 0x1f;
+ h->current_next = val & 0x01;
val = get8(pp, p_end);
if (val < 0)
return val;
@@ -2332,6 +2334,8 @@ static void pmt_cb(MpegTSFilter *filter, const uint8_t *section, int section_len
return;
if (h->tid != PMT_TID)
return;
+ if (!h->current_next)
+ return;
if (skip_identical(h, tssf))
return;
@@ -2541,6 +2545,8 @@ static void pat_cb(MpegTSFilter *filter, const uint8_t *section, int section_len
return;
if (h->tid != PAT_TID)
return;
+ if (!h->current_next)
+ return;
if (ts->skip_changes)
return;
@@ -2679,6 +2685,8 @@ static void sdt_cb(MpegTSFilter *filter, const uint8_t *section, int section_len
return;
if (h->tid != SDT_TID)
return;
+ if (!h->current_next)
+ return;
if (ts->skip_changes)
return;
if (skip_identical(h, tssf))
--
2.30.2
_______________________________________________
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".
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [FFmpeg-devel] [PATCH] libavformat/mpegts.c: ignore a section with next flag
2022-04-03 10:23 [FFmpeg-devel] [PATCH] libavformat/mpegts.c: ignore a section with next flag TADANO Tokumei
@ 2022-04-07 9:26 ` TADANO Tokumei
2022-04-08 9:43 ` TADANO Tokumei
2022-04-09 18:29 ` Marton Balint
1 sibling, 1 reply; 4+ messages in thread
From: TADANO Tokumei @ 2022-04-07 9:26 UTC (permalink / raw)
To: ffmpeg-devel
will apply
On 2022/04/03 19:23, TADANO Tokumei wrote:
> 'current_next_indicator' of 0 (next) on each section header indicates
> the service information is for immediate future one.
> ffmpeg doesn't need to parse it but current (1) one.
>
> ref: section 5.1.1 of DVB BlueBook A038 (EN 300 468)
>
> Signed-off-by: TADANO Tokumei <aimingoff@pc.nifty.jp>
> ---
> libavformat/mpegts.c | 8 ++++++++
> 1 file changed, 8 insertions(+)
>
> diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c
> index ecffb01562..49f7735123 100644
> --- a/libavformat/mpegts.c
> +++ b/libavformat/mpegts.c
> @@ -645,6 +645,7 @@ typedef struct SectionHeader {
> uint8_t tid;
> uint16_t id;
> uint8_t version;
> + uint8_t current_next;
> uint8_t sec_num;
> uint8_t last_sec_num;
> } SectionHeader;
> @@ -773,6 +774,7 @@ static int parse_section_header(SectionHeader *h,
> if (val < 0)
> return val;
> h->version = (val >> 1) & 0x1f;
> + h->current_next = val & 0x01;
> val = get8(pp, p_end);
> if (val < 0)
> return val;
> @@ -2332,6 +2334,8 @@ static void pmt_cb(MpegTSFilter *filter, const uint8_t *section, int section_len
> return;
> if (h->tid != PMT_TID)
> return;
> + if (!h->current_next)
> + return;
> if (skip_identical(h, tssf))
> return;
>
> @@ -2541,6 +2545,8 @@ static void pat_cb(MpegTSFilter *filter, const uint8_t *section, int section_len
> return;
> if (h->tid != PAT_TID)
> return;
> + if (!h->current_next)
> + return;
> if (ts->skip_changes)
> return;
>
> @@ -2679,6 +2685,8 @@ static void sdt_cb(MpegTSFilter *filter, const uint8_t *section, int section_len
> return;
> if (h->tid != SDT_TID)
> return;
> + if (!h->current_next)
> + return;
> if (ts->skip_changes)
> return;
> if (skip_identical(h, tssf))
_______________________________________________
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".
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [FFmpeg-devel] [PATCH] libavformat/mpegts.c: ignore a section with next flag
2022-04-07 9:26 ` TADANO Tokumei
@ 2022-04-08 9:43 ` TADANO Tokumei
0 siblings, 0 replies; 4+ messages in thread
From: TADANO Tokumei @ 2022-04-08 9:43 UTC (permalink / raw)
To: ffmpeg-devel
sorry, I don't have permission to push the commits.
I've misunderstood the Developer Document.
On 2022/04/07 18:26, TADANO Tokumei wrote:
> will apply
>
> On 2022/04/03 19:23, TADANO Tokumei wrote:
>> 'current_next_indicator' of 0 (next) on each section header indicates
>> the service information is for immediate future one.
>> ffmpeg doesn't need to parse it but current (1) one.
>>
>> ref: section 5.1.1 of DVB BlueBook A038 (EN 300 468)
>>
>> Signed-off-by: TADANO Tokumei <aimingoff@pc.nifty.jp>
>> ---
>> libavformat/mpegts.c | 8 ++++++++
>> 1 file changed, 8 insertions(+)
>>
>> diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c
>> index ecffb01562..49f7735123 100644
>> --- a/libavformat/mpegts.c
>> +++ b/libavformat/mpegts.c
>> @@ -645,6 +645,7 @@ typedef struct SectionHeader {
>> uint8_t tid;
>> uint16_t id;
>> uint8_t version;
>> + uint8_t current_next;
>> uint8_t sec_num;
>> uint8_t last_sec_num;
>> } SectionHeader;
>> @@ -773,6 +774,7 @@ static int parse_section_header(SectionHeader *h,
>> if (val < 0)
>> return val;
>> h->version = (val >> 1) & 0x1f;
>> + h->current_next = val & 0x01;
>> val = get8(pp, p_end);
>> if (val < 0)
>> return val;
>> @@ -2332,6 +2334,8 @@ static void pmt_cb(MpegTSFilter *filter, const uint8_t *section, int section_len
>> return;
>> if (h->tid != PMT_TID)
>> return;
>> + if (!h->current_next)
>> + return;
>> if (skip_identical(h, tssf))
>> return;
>> @@ -2541,6 +2545,8 @@ static void pat_cb(MpegTSFilter *filter, const uint8_t *section, int section_len
>> return;
>> if (h->tid != PAT_TID)
>> return;
>> + if (!h->current_next)
>> + return;
>> if (ts->skip_changes)
>> return;
>> @@ -2679,6 +2685,8 @@ static void sdt_cb(MpegTSFilter *filter, const uint8_t *section, int section_len
>> return;
>> if (h->tid != SDT_TID)
>> return;
>> + if (!h->current_next)
>> + return;
>> if (ts->skip_changes)
>> return;
>> if (skip_identical(h, tssf))
> _______________________________________________
> 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".
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [FFmpeg-devel] [PATCH] libavformat/mpegts.c: ignore a section with next flag
2022-04-03 10:23 [FFmpeg-devel] [PATCH] libavformat/mpegts.c: ignore a section with next flag TADANO Tokumei
2022-04-07 9:26 ` TADANO Tokumei
@ 2022-04-09 18:29 ` Marton Balint
1 sibling, 0 replies; 4+ messages in thread
From: Marton Balint @ 2022-04-09 18:29 UTC (permalink / raw)
To: FFmpeg development discussions and patches
On Sun, 3 Apr 2022, TADANO Tokumei wrote:
> 'current_next_indicator' of 0 (next) on each section header indicates
> the service information is for immediate future one.
> ffmpeg doesn't need to parse it but current (1) one.
>
> ref: section 5.1.1 of DVB BlueBook A038 (EN 300 468)
Thanks, applied.
Regards,
Marton
>
> Signed-off-by: TADANO Tokumei <aimingoff@pc.nifty.jp>
> ---
> libavformat/mpegts.c | 8 ++++++++
> 1 file changed, 8 insertions(+)
>
> diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c
> index ecffb01562..49f7735123 100644
> --- a/libavformat/mpegts.c
> +++ b/libavformat/mpegts.c
> @@ -645,6 +645,7 @@ typedef struct SectionHeader {
> uint8_t tid;
> uint16_t id;
> uint8_t version;
> + uint8_t current_next;
> uint8_t sec_num;
> uint8_t last_sec_num;
> } SectionHeader;
> @@ -773,6 +774,7 @@ static int parse_section_header(SectionHeader *h,
> if (val < 0)
> return val;
> h->version = (val >> 1) & 0x1f;
> + h->current_next = val & 0x01;
> val = get8(pp, p_end);
> if (val < 0)
> return val;
> @@ -2332,6 +2334,8 @@ static void pmt_cb(MpegTSFilter *filter, const uint8_t *section, int section_len
> return;
> if (h->tid != PMT_TID)
> return;
> + if (!h->current_next)
> + return;
> if (skip_identical(h, tssf))
> return;
>
> @@ -2541,6 +2545,8 @@ static void pat_cb(MpegTSFilter *filter, const uint8_t *section, int section_len
> return;
> if (h->tid != PAT_TID)
> return;
> + if (!h->current_next)
> + return;
> if (ts->skip_changes)
> return;
>
> @@ -2679,6 +2685,8 @@ static void sdt_cb(MpegTSFilter *filter, const uint8_t *section, int section_len
> return;
> if (h->tid != SDT_TID)
> return;
> + if (!h->current_next)
> + return;
> if (ts->skip_changes)
> return;
> if (skip_identical(h, tssf))
> --
> 2.30.2
>
> _______________________________________________
> 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".
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-04-09 18:29 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-04-03 10:23 [FFmpeg-devel] [PATCH] libavformat/mpegts.c: ignore a section with next flag TADANO Tokumei
2022-04-07 9:26 ` TADANO Tokumei
2022-04-08 9:43 ` TADANO Tokumei
2022-04-09 18:29 ` Marton Balint
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
This inbox may be cloned and mirrored by anyone:
git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
ffmpegdev@gitmailbox.com
public-inbox-index ffmpegdev
Example config snippet for mirrors.
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git