diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2009-11-30 21:08:00 +0000 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2009-11-30 21:08:00 +0000 |
| commit | 5f4681b57dd227a2d2a2dd9050fb6103daa6fabd (patch) | |
| tree | 491716a7c970b5baae0742c184beca4aa0f2809d /src | |
| parent | 8ccd346925d78d70a96ff3da84ac99359611696e (diff) | |
| parent | 6d410af50e98533e07dd8ebb8fdd3870192f8a73 (diff) | |
| download | xine-lib-5f4681b57dd227a2d2a2dd9050fb6103daa6fabd.tar.gz xine-lib-5f4681b57dd227a2d2a2dd9050fb6103daa6fabd.tar.bz2 | |
Merge from 1.1.
Diffstat (limited to 'src')
| -rw-r--r-- | src/demuxers/demux_ts.c | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/src/demuxers/demux_ts.c b/src/demuxers/demux_ts.c index 79c802cc5..8685e8523 100644 --- a/src/demuxers/demux_ts.c +++ b/src/demuxers/demux_ts.c @@ -236,6 +236,14 @@ STREAM_SPU_BITMAP_HDMV = 0x90, STREAM_VIDEO_VC1 = 0xea, /* VC-1 Video */ + + HDMV_AUDIO_80_PCM = 0x80, /* BluRay PCM */ + HDMV_AUDIO_82_DTS = 0x82, /* DTS */ + HDMV_AUDIO_83_TRUEHD = 0x83, /* Dolby TrueHD, primary audio */ + HDMV_AUDIO_84_EAC3 = 0x84, /* Dolby Digital plus, primary audio */ + HDMV_AUDIO_85_DTS_HRA = 0x85, /* DTS-HRA */ + HDMV_AUDIO_86_DTS_HD_MA = 0x86, /* DTS-HD Master audio */ + } streamType; #define WRAP_THRESHOLD 270000 @@ -786,6 +794,19 @@ static int demux_ts_parse_pes_header (xine_t *xine, demux_ts_media *m, m->type |= BUF_AUDIO_A52; return 1; + } else if (m->descriptor_tag == HDMV_AUDIO_83_TRUEHD) { + /* TODO: separate AC3 and TrueHD streams ... */ + m->content = p; + m->size = packet_len; + m->type |= BUF_AUDIO_A52; + return 1; + + } else if (m->descriptor_tag == HDMV_AUDIO_86_DTS_HD_MA ) { + m->content = p; + m->size = packet_len; + m->type |= BUF_AUDIO_DTS; + return 1; + } else if (m->descriptor_tag == ISO_13818_PES_PRIVATE && p[0] == 0x20 && p[1] == 0x00) { /* DVBSUB */ |