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

[cehoyos]

Author: cehoyos
Date: Thu May 12 23:37:24 2011
New Revision: 33461

Log:
Support S302M in the native ts demuxer.

Modified:
   trunk/libmpdemux/demux_ts.c

Modified: trunk/libmpdemux/demux_ts.c
==============================================================================
--- trunk/libmpdemux/demux_ts.c	Thu May 12 20:20:38 2011	(r33460)
+++ trunk/libmpdemux/demux_ts.c	Thu May 12 23:37:24 2011	(r33461)
@@ -81,6 +81,7 @@ typedef enum
 	AUDIO_AAC	= mmioFOURCC('M', 'P', '4', 'A'),
 	AUDIO_AAC_LATM	= mmioFOURCC('M', 'P', '4', 'L'),
 	AUDIO_TRUEHD	= mmioFOURCC('T', 'R', 'H', 'D'),
+	AUDIO_S302M     = mmioFOURCC('B', 'S', 'S', 'D'),
 	SPU_DVD		= 0x3000000,
 	SPU_DVB		= 0x3000001,
 	SPU_TELETEXT	= 0x3000002,
@@ -261,6 +262,7 @@ static int IS_AUDIO(es_stream_type_t typ
 	case AUDIO_AAC_LATM:
 	case AUDIO_DTS:
 	case AUDIO_TRUEHD:
+	case AUDIO_S302M:
 		return 1;
 	}
 	return 0;
@@ -893,6 +895,8 @@ static off_t ts_detect_streams(demuxer_t
 		mp_msg(MSGT_DEMUXER, MSGL_INFO, "AUDIO AAC LATM(pid=%d)", param->apid);
 	else if(param->atype == AUDIO_TRUEHD)
 		mp_msg(MSGT_DEMUXER, MSGL_INFO, "AUDIO TRUEHD(pid=%d)", param->apid);
+	else if(param->atype == AUDIO_S302M)
+		mp_msg(MSGT_DEMUXER, MSGL_INFO, "AUDIO S302M(pid=%d)", param->apid);
 	else
 	{
 		audio_found = 0;
@@ -2354,6 +2358,10 @@ static int parse_descriptors(struct pmt_
 				{
 					es->type = VIDEO_DIRAC;
 				}
+				else if(d[0] == 'B' && d[1] == 'S' && d[2] == 'S' && d[3] == 'D')
+				{
+					es->type = AUDIO_S302M;
+				}
 				else
 					es->type = UNKNOWN;
 				mp_msg(MSGT_DEMUX, MSGL_DBG2, "FORMAT %s\n", es->format_descriptor);