diff options
| author | Petri Hintukainen <phintuka@users.sourceforge.net> | 2010-01-06 20:54:42 +0200 |
|---|---|---|
| committer | Petri Hintukainen <phintuka@users.sourceforge.net> | 2010-01-06 20:54:42 +0200 |
| commit | a0560d4679635de400655860810f8148acbdafc8 (patch) | |
| tree | 7be004f3e088c060bbf4f525d35e8ff75a136703 | |
| parent | f717a1a9d3191948f79e6f67a76f8010671dc992 (diff) | |
| download | xine-lib-a0560d4679635de400655860810f8148acbdafc8.tar.gz xine-lib-a0560d4679635de400655860810f8148acbdafc8.tar.bz2 | |
Ignore unsupported BluRay SPU streams (interactive (0x91) and text (0x92))
| -rw-r--r-- | src/demuxers/demux_ts.c | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/src/demuxers/demux_ts.c b/src/demuxers/demux_ts.c index 6844f6a01..a093980d1 100644 --- a/src/demuxers/demux_ts.c +++ b/src/demuxers/demux_ts.c @@ -226,7 +226,6 @@ ISO_14496_PART10_VIDEO = 0x1b, /* ISO/IEC 14496-10 Video (MPEG-4 part 10/AVC, aka H.264) */ STREAM_VIDEO_MPEG = 0x80, STREAM_AUDIO_AC3 = 0x81, - STREAM_SPU_BITMAP_HDMV = 0x90, STREAM_VIDEO_VC1 = 0xea, /* VC-1 Video */ @@ -237,6 +236,10 @@ HDMV_AUDIO_85_DTS_HRA = 0x85, /* DTS-HRA */ HDMV_AUDIO_86_DTS_HD_MA = 0x86, /* DTS-HD Master audio */ + HDMV_SPU_BITMAP = 0x90, + HDMV_SPU_INTERACTIVE = 0x91, + HDMV_SPU_TEXT = 0x92, + } streamType; #define WRAP_THRESHOLD 270000 @@ -777,7 +780,7 @@ static int demux_ts_parse_pes_header (xine_t *xine, demux_ts_media *m, return 1; } - if (m->descriptor_tag == STREAM_SPU_BITMAP_HDMV) { + if (m->descriptor_tag == HDMV_SPU_BITMAP) { long payload_len = ((buf[4] << 8) | buf[5]) - header_len - 3; m->content = p; @@ -1499,7 +1502,16 @@ printf("Program Number is %i, looking for %i\n",program_number,this->program_num } break; - case STREAM_SPU_BITMAP_HDMV: + case HDMV_SPU_INTERACTIVE: + case HDMV_SPU_TEXT: + if (this->hdmv > 0) { + printf("demux_ts: Skipping unsupported HDMV subtitle stream_type: 0x%.2x pid: 0x%.4x\n", + stream[0], pid); + break; + } + /* fall thru */ + + case HDMV_SPU_BITMAP: if (this->hdmv > 0) { if (pid >= 0x1200 && pid < 0x1300) { /* HDMV Presentation Graphics / SPU */ |