generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Export more transport stream information.

Browse Source 
with minor addition to the comment by michael
This commit is contained in:
Kieran Kunhya
2011-03-04 19:22:09 +00:00
committed by Michael Niedermayer
parent fa12fb3b00
commit 24adef142f
2 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
libavformat/avformat.h
View File

@@ -647,6 +647,9 @@ typedef struct AVProgram {
unsigned int *stream_index; unsigned int *stream_index;
unsigned int nb_stream_indexes; unsigned int nb_stream_indexes;
AVMetadata *metadata; AVMetadata *metadata;
int program_num;
int pmt_pid;
} AVProgram; } AVProgram;
#define AVFMTCTX_NOHEADER 0x0001 /**< signal that no header is present #define AVFMTCTX_NOHEADER 0x0001 /**< signal that no header is present
@@ -844,6 +847,12 @@ typedef struct AVFormatContext {
* decoding: number of frames used to probe fps * decoding: number of frames used to probe fps
*/ */
int fps_probe_size; int fps_probe_size;
/**
* Transport stream id.
* This will be moved into demuxer private options. Thus no API/ABI compatibility
*/
int ts_id;
} AVFormatContext; } AVFormatContext;
typedef struct AVPacketList { typedef struct AVPacketList {

7
libavformat/mpegts.c
View File

@@ -1137,6 +1137,7 @@ static void pat_cb(MpegTSFilter *filter, const uint8_t *section, int section_len
SectionHeader h1, *h = &h1; SectionHeader h1, *h = &h1;
const uint8_t *p, *p_end; const uint8_t *p, *p_end;
int sid, pmt_pid; int sid, pmt_pid;
AVProgram *program;
#ifdef DEBUG #ifdef DEBUG
av_dlog(ts->stream, "PAT:\n"); av_dlog(ts->stream, "PAT:\n");
@@ -1149,6 +1150,8 @@ static void pat_cb(MpegTSFilter *filter, const uint8_t *section, int section_len
if (h->tid != PAT_TID) if (h->tid != PAT_TID)
return; return;
ts->stream->ts_id = h->id;
clear_programs(ts); clear_programs(ts);
for(;;) { for(;;) {
sid = get16(&p, p_end); sid = get16(&p, p_end);
@@ -1163,7 +1166,9 @@ static void pat_cb(MpegTSFilter *filter, const uint8_t *section, int section_len
if (sid == 0x0000) { if (sid == 0x0000) {
/* NIT info */ /* NIT info */
} else { } else {
av_new_program(ts->stream, sid); program = av_new_program(ts->stream, sid);
program->program_num = sid;
program->pmt_pid = pmt_pid;
if (ts->pids[pmt_pid]) if (ts->pids[pmt_pid])
mpegts_close_filter(ts, ts->pids[pmt_pid]); mpegts_close_filter(ts, ts->pids[pmt_pid]);
mpegts_open_section_filter(ts, pmt_pid, pmt_cb, ts, 1); mpegts_open_section_filter(ts, pmt_pid, pmt_cb, ts, 1);