diff options
| author | Anuradha Suraparaju <anuradha@rd.bbc.co.uk> | 2008-08-13 19:29:35 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2008-08-13 19:29:35 +0000 |
| commit | f4bba2015adbeeede8246d5004a4b5318a8c1fa3 (patch) | |
| tree | 8c8be9807b3503131eba6e4de569eb3325e839ee /libavformat/mpegts.c | |
| parent | ce15710f554ef3520f968c8b4284a0f576611c95 (diff) | |
| download | ffmpeg-f4bba2015adbeeede8246d5004a4b5318a8c1fa3.tar.gz | |
Dirac encapsulation in MPEG-TS
patch by Anuradha Suraparaju, anuradha rd.bbc.co uk
Originally committed as revision 14734 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/mpegts.c')
| -rw-r--r-- | libavformat/mpegts.c | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c index a437ccee7c..a8d60ea469 100644 --- a/libavformat/mpegts.c +++ b/libavformat/mpegts.c @@ -482,6 +482,7 @@ static void pmt_cb(MpegTSFilter *filter, const uint8_t *section, int section_len int comp_page = 0, anc_page = 0; /* initialize to kill warnings */ char language[4] = {0}; /* initialize to kill warnings */ int has_hdmv_descr = 0; + int has_dirac_descr = 0; #ifdef DEBUG_SI av_log(ts->stream, AV_LOG_DEBUG, "PMT: len %i\n", section_len); @@ -589,6 +590,18 @@ static void pmt_cb(MpegTSFilter *filter, const uint8_t *section, int section_len language[2] = get8(&p, desc_end); language[3] = 0; break; + case REGISTRATION_DESCRIPTOR: /*MPEG-2 Registration descriptor */ + { + uint8_t bytes[4]; + bytes[0] = get8(&p, desc_end); + bytes[1] = get8(&p, desc_end); + bytes[2] = get8(&p, desc_end); + bytes[3] = get8(&p, desc_end); + if(bytes[0] == 'd' && bytes[1] == 'r' && + bytes[2] == 'a' && bytes[3] == 'c') + has_dirac_descr = 1; + break; + } default: break; } @@ -610,12 +623,14 @@ static void pmt_cb(MpegTSFilter *filter, const uint8_t *section, int section_len case STREAM_TYPE_VIDEO_MPEG4: case STREAM_TYPE_VIDEO_H264: case STREAM_TYPE_VIDEO_VC1: + case STREAM_TYPE_VIDEO_DIRAC: case STREAM_TYPE_AUDIO_AAC: case STREAM_TYPE_AUDIO_AC3: case STREAM_TYPE_AUDIO_DTS: case STREAM_TYPE_AUDIO_HDMV_DTS: case STREAM_TYPE_SUBTITLE_DVB: - if(stream_type == STREAM_TYPE_AUDIO_HDMV_DTS && !has_hdmv_descr) + if((stream_type == STREAM_TYPE_AUDIO_HDMV_DTS && !has_hdmv_descr) + || (stream_type == STREAM_TYPE_VIDEO_DIRAC && !has_dirac_descr)) break; if(ts->pids[pid] && ts->pids[pid]->type == MPEGTS_PES){ pes= ts->pids[pid]->u.pes_filter.opaque; @@ -944,6 +959,10 @@ static AVStream* new_pes_av_stream(PESContext *pes, uint32_t code) codec_type = CODEC_TYPE_VIDEO; codec_id = CODEC_ID_VC1; break; + case STREAM_TYPE_VIDEO_DIRAC: + codec_type = CODEC_TYPE_VIDEO; + codec_id = CODEC_ID_DIRAC; + break; case STREAM_TYPE_AUDIO_AAC: codec_type = CODEC_TYPE_AUDIO; codec_id = CODEC_ID_AAC; |