Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
F
ffmpeg.wasm-core
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Linshizhi
ffmpeg.wasm-core
Commits
a221af1f
Commit
a221af1f
authored
Aug 21, 2019
by
Anthony Delannoy
Committed by
Marton Balint
Sep 19, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avformat/mpegts: add support for EPG extraction from mpegts
Signed-off-by:
Marton Balint
<
cus@passwd.hu
>
parent
81bb7176
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
62 additions
and
1 deletion
+62
-1
mpegts.c
libavformat/mpegts.c
+59
-1
mpegts-probe-latm
tests/ref/fate/mpegts-probe-latm
+3
-0
No files found.
libavformat/mpegts.c
View file @
a221af1f
...
...
@@ -168,6 +168,8 @@ struct MpegTSContext {
/** filters for various streams specified by PMT + for the PAT and PMT */
MpegTSFilter
*
pids
[
NB_PID_MAX
];
int
current_pid
;
AVStream
*
epg_stream
;
};
#define MPEGTS_OPTIONS \
...
...
@@ -2499,6 +2501,60 @@ static void pat_cb(MpegTSFilter *filter, const uint8_t *section, int section_len
}
}
static
void
eit_cb
(
MpegTSFilter
*
filter
,
const
uint8_t
*
section
,
int
section_len
)
{
MpegTSContext
*
ts
=
filter
->
u
.
section_filter
.
opaque
;
const
uint8_t
*
p
,
*
p_end
;
SectionHeader
h1
,
*
h
=
&
h1
;
/*
* Sometimes we receive EPG packets but SDT table do not have
* eit_pres_following or eit_sched turned on, so we open EPG
* stream directly here.
*/
if
(
!
ts
->
epg_stream
)
{
ts
->
epg_stream
=
avformat_new_stream
(
ts
->
stream
,
NULL
);
if
(
!
ts
->
epg_stream
)
return
;
ts
->
epg_stream
->
id
=
EIT_PID
;
ts
->
epg_stream
->
codecpar
->
codec_type
=
AVMEDIA_TYPE_DATA
;
ts
->
epg_stream
->
codecpar
->
codec_id
=
AV_CODEC_ID_EPG
;
}
if
(
ts
->
epg_stream
->
discard
==
AVDISCARD_ALL
)
return
;
p_end
=
section
+
section_len
-
4
;
p
=
section
;
if
(
parse_section_header
(
h
,
&
p
,
p_end
)
<
0
)
return
;
if
(
h
->
tid
<
EIT_TID
||
h
->
tid
>
OEITS_END_TID
)
return
;
av_log
(
ts
->
stream
,
AV_LOG_TRACE
,
"EIT: tid received = %.02x
\n
"
,
h
->
tid
);
/**
* Service_id 0xFFFF is reserved, it indicates that the current EIT table
* is scrambled.
*/
if
(
h
->
id
==
0xFFFF
)
{
av_log
(
ts
->
stream
,
AV_LOG_TRACE
,
"Scrambled EIT table received.
\n
"
);
return
;
}
/**
* In case we receive an EPG packet before mpegts context is fully
* initialized.
*/
if
(
!
ts
->
pkt
)
return
;
new_data_packet
(
section
,
section_len
,
ts
->
pkt
);
ts
->
pkt
->
stream_index
=
ts
->
epg_stream
->
index
;
ts
->
stop_parse
=
1
;
}
static
void
sdt_cb
(
MpegTSFilter
*
filter
,
const
uint8_t
*
section
,
int
section_len
)
{
MpegTSContext
*
ts
=
filter
->
u
.
section_filter
.
opaque
;
...
...
@@ -2985,8 +3041,8 @@ static int mpegts_read_header(AVFormatContext *s)
seek_back
(
s
,
pb
,
pos
);
mpegts_open_section_filter
(
ts
,
SDT_PID
,
sdt_cb
,
ts
,
1
);
mpegts_open_section_filter
(
ts
,
PAT_PID
,
pat_cb
,
ts
,
1
);
mpegts_open_section_filter
(
ts
,
EIT_PID
,
eit_cb
,
ts
,
1
);
handle_packets
(
ts
,
probesize
/
ts
->
raw_packet_size
);
/* if could not find service, enable auto_guess */
...
...
@@ -3241,8 +3297,10 @@ MpegTSContext *avpriv_mpegts_parse_open(AVFormatContext *s)
ts
->
raw_packet_size
=
TS_PACKET_SIZE
;
ts
->
stream
=
s
;
ts
->
auto_guess
=
1
;
mpegts_open_section_filter
(
ts
,
SDT_PID
,
sdt_cb
,
ts
,
1
);
mpegts_open_section_filter
(
ts
,
PAT_PID
,
pat_cb
,
ts
,
1
);
mpegts_open_section_filter
(
ts
,
EIT_PID
,
eit_cb
,
ts
,
1
);
return
ts
;
}
...
...
tests/ref/fate/mpegts-probe-latm
View file @
a221af1f
...
...
@@ -12,3 +12,6 @@ codec_name=hevc
[STREAM]
codec_name=aac_latm
[/STREAM]
[STREAM]
codec_name=epg
[/STREAM]
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment