Commit 9a1da9ef authored by gbazin's avatar gbazin

* modules/demux/mpeg/*: added support for ISO/IEC 13818-7 Audio with ADTS...

* modules/demux/mpeg/*: added support for ISO/IEC 13818-7 Audio with ADTS transport syntax to the TS demux.
parent 80646cc9
......@@ -2,7 +2,7 @@
* system.h: MPEG demultiplexing.
*****************************************************************************
* Copyright (C) 1999-2002 VideoLAN
* $Id: system.h,v 1.10 2003/10/25 00:49:14 sam Exp $
* $Id: system.h,v 1.11 2003/11/03 14:02:54 gbazin Exp $
*
* Authors: Christophe Massiot <massiot@via.ecp.fr>
*
......@@ -50,6 +50,9 @@
* We have to check for the presence of a descriptor to have the codec */
#define PES_PRIVATE_ES 0x06
/* ISO/IEC 13818-7 Audio with ADTS transport syntax */
#define AAC_ADTS_AUDIO_ES 0x0F
#define MPEG4_VIDEO_ES 0x10
#define MPEG4_AUDIO_ES 0x11
......
......@@ -2,7 +2,7 @@
* mpeg_ts.c : Transport Stream input module for vlc
*****************************************************************************
* Copyright (C) 2000-2001 VideoLAN
* $Id: ts.c,v 1.38 2003/10/27 13:35:15 nitrox Exp $
* $Id: ts.c,v 1.39 2003/11/03 14:02:54 gbazin Exp $
*
* Authors: Henri Fallon <henri@via.ecp.fr>
* Johan Bilien <jobi@via.ecp.fr>
......@@ -702,6 +702,11 @@ static void TSDecodePMT( input_thread_t * p_input, es_descriptor_t * p_es )
i_stream_id = 0xBD;
i_cat = SPU_ES;
break;
case AAC_ADTS_AUDIO_ES:
i_fourcc = VLC_FOURCC('m','p','4','a');
i_cat = AUDIO_ES;
i_stream_id = 0xfa;
break;
default :
i_stream_id = 0;
......@@ -1387,6 +1392,7 @@ static void TS_DVBPSI_HandlePMT( input_thread_t * p_input,
i_stream_id = 0xfa;
break;
case MPEG4_AUDIO_ES:
case AAC_ADTS_AUDIO_ES:
i_fourcc = VLC_FOURCC('m','p','4','a');
i_cat = AUDIO_ES;
i_stream_id = 0xfa;
......@@ -1672,6 +1678,7 @@ static void TS_DVBPSI_HandlePMT( input_thread_t * p_input,
strcat( psz_desc, " (A52)" );
break;
case MPEG4_AUDIO_ES:
case AAC_ADTS_AUDIO_ES:
strcat( psz_desc, " (aac)" );
break;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment