summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2012-08-18 19:38:47 +0000
committerwm4 <wm4@nowhere>2012-10-30 19:50:17 +0100
commit5104699646c2a53263faf93f537e759b5d1c5fe6 (patch)
treef5033d19d1ba3384839681819757dd8bc07e3703
parent7bc7d9955ac97cf9dbbe95b2ba8903713e031321 (diff)
downloadmpv-5104699646c2a53263faf93f537e759b5d1c5fe6.tar.bz2
mpv-5104699646c2a53263faf93f537e759b5d1c5fe6.tar.xz
demux_ts: add support for PCM variant found on BluRay
TS demuxer: Add support for PCM variant found on BluRay. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@35106 b3059339-0415-0410-9bf9-f77b7e298cf2
-rw-r--r--libmpdemux/demux_ts.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/libmpdemux/demux_ts.c b/libmpdemux/demux_ts.c
index dbf12b7456..fc8149b483 100644
--- a/libmpdemux/demux_ts.c
+++ b/libmpdemux/demux_ts.c
@@ -81,6 +81,7 @@ typedef enum
AUDIO_AAC_LATM = mmioFOURCC('M', 'P', '4', 'L'),
AUDIO_TRUEHD = mmioFOURCC('T', 'R', 'H', 'D'),
AUDIO_S302M = mmioFOURCC('B', 'S', 'S', 'D'),
+ AUDIO_PCM_BR = mmioFOURCC('B', 'P', 'C', 'M'),
SPU_DVD = 0x3000000,
SPU_DVB = 0x3000001,
SPU_TELETEXT = 0x3000002,
@@ -257,6 +258,7 @@ static int IS_AUDIO(es_stream_type_t type)
case AUDIO_MP2:
case AUDIO_A52:
case AUDIO_LPCM_BE:
+ case AUDIO_PCM_BR:
case AUDIO_AAC:
case AUDIO_AAC_LATM:
case AUDIO_DTS:
@@ -891,6 +893,8 @@ static off_t ts_detect_streams(demuxer_t *demuxer, tsdemux_init_t *param)
mp_msg(MSGT_DEMUXER, MSGL_INFO, "AUDIO DTS(pid=%d)", param->apid);
else if(param->atype == AUDIO_LPCM_BE)
mp_msg(MSGT_DEMUXER, MSGL_INFO, "AUDIO LPCM(pid=%d)", param->apid);
+ else if(param->atype == AUDIO_PCM_BR)
+ mp_msg(MSGT_DEMUXER, MSGL_INFO, "AUDIO PCMBR(pid=%d)", param->apid);
else if(param->atype == AUDIO_AAC)
mp_msg(MSGT_DEMUXER, MSGL_INFO, "AUDIO AAC(pid=%d)", param->apid);
else if(param->atype == AUDIO_AAC_LATM)
@@ -2560,6 +2564,9 @@ static int parse_pmt(ts_priv_t * priv, uint16_t progid, uint16_t pid, int is_sta
case 0x13:
pmt->es[idx].type = SL_SECTION;
break;
+ case 0x80:
+ pmt->es[idx].type = AUDIO_PCM_BR;
+ break;
case 0x81:
pmt->es[idx].type = AUDIO_A52;
break;