[MPlayer-cvslog] r35106 - trunk/libmpdemux/demux_ts.c

[reimar]

Author: reimar
Date: Sat Aug 18 21:38:47 2012
New Revision: 35106

Log:
TS demuxer: Add support for PCM variant found on BluRay.

Modified:
   trunk/libmpdemux/demux_ts.c

Modified: trunk/libmpdemux/demux_ts.c
==============================================================================
--- trunk/libmpdemux/demux_ts.c	Sat Aug 18 20:45:45 2012	(r35105)
+++ trunk/libmpdemux/demux_ts.c	Sat Aug 18 21:38:47 2012	(r35106)
@@ -82,6 +82,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,
@@ -258,6 +259,7 @@ static int IS_AUDIO(es_stream_type_t typ
 	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
 		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, u
 			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;