Changeset 40e3fb152965c0dd7efe4e381959b692ead65fe4

Timestamp:

27/01/07 22:22:13 (2 years ago)

Author:

Antoine Cellerier <dionoea@videolan.org>

git-committer:

Antoine Cellerier <dionoea@videolan.org> 1169932933 +0000

git-parent:

[dc0f2c1d30fc3a80ad620e23a1adc6f1f2e0d71c]

git-author:

Antoine Cellerier <dionoea@videolan.org> 1169932933 +0000

Message:

• add stream assignements for DTS(-HD) / (E-)AC3 / MLP / VC1 used by HD DVDs.
  
  • the dts/ac3 changes fix some files from http://samples.mplayerhq.hu/evob/ and some other sources.
    
  • MLP doesn't have any know free decoder (nor do i have any sample) so this is basically "for the future"
    
  • VC1 doesn't work ... most likely needs some more changes to the code.
    
• remove trailing spaces
  

Files:

• modules/demux/ps.h (modified) (5 diffs)

modules/demux/ps.h

@@ -67 +67 @@
-    if( ( i_id&0xff00 ) == 0xbd00 )
-    {
-
+|| (i_id&0xf8) == 0x98 
-        {
-            es_format_Init( &tk->fmt, AUDIO_ES, VLC_FOURCC('d','t','s',' ') );
-            tk->i_skip = 4;
-        }
-
+
+
-        {
-            es_format_Init( &tk->fmt, AUDIO_ES, VLC_FOURCC('a','5','2',' ') );
-            tk->i_skip = 4;
-        }
+        else if( (i_id&0xf0) == 0xb0 )
+        {
+            es_format_Init( &tk->fmt, AUDIO_ES, VLC_FOURCC('m','l','p',' ') );
+            /* FIXME / untested ... no known decoder (at least not in VLC/ffmpeg) */
+        }
-        else if( ( i_id&0xe0 ) == 0x20 )
-        {
@@ -94 +100 @@
-        {
-            es_format_Init( &tk->fmt, SPU_ES, VLC_FOURCC('c','v','d',' ') );
+        }
+        else
+        {
+            es_format_Init( &tk->fmt, UNKNOWN_ES, 0 );
+            return VLC_EGENERIC;
+        }
+    }
+    else if( (i_id&0xff00) == 0xfd00 )
+    {
+        if( i_id>=0x55 && i_id<=0x5f )
+        {
+            es_format_Init( &tk->fmt, VIDEO_ES, VLC_FOURCC('v','c','1',' ') );
-        }
-        else
@@ -392 +410 @@
-    for( i = 0; p_psm && i < p_psm->i_es; i++ )
-    {
-     
+
-    }
-    return 0;
@@ -402 +420 @@
-    for( i = 0; p_psm && i < p_psm->i_es; i++ )
-    {
-     
+
-    }
-    return 0;
@@ -498 +516 @@
-        p_psm->es[p_psm->i_es] = malloc( sizeof(ps_es_t) );
-        *p_psm->es[p_psm->i_es++] = es;
- 
+
-    }
-