Changeset f8823a8fd023052e26de9bc6624bb1373e1807f7

Timestamp:

06/29/08 20:44:42 (2 months ago)

Author:

Rémi Denis-Courmont <rdenis@simphalempin.com>

git-committer:

Rémi Denis-Courmont <rdenis@simphalempin.com> 1214765082 +0300

git-parent:

[425a85df64f1c1671ea9536f0140a611a1e0d7a5]

git-author:

David Flynn <davidf@rd.bbc.co.uk> 1214397898 +0000

Message:

ts demux: add support for dirac streams via registration_descriptor

Signed-off-by: Rémi Denis-Courmont <rdenis@simphalempin.com>

Files:

• modules/demux/ts.c (modified) (1 diff)

modules/demux/ts.c

@@ -3547 +3547 @@
-            }
-        }
+        else if( p_es->i_type == 0xd1 )
+        {
+            dvbpsi_descriptor_t *p_dr;
+
+            for( p_dr = p_es->p_first_descriptor; p_dr != NULL;
+                 p_dr = p_dr->p_next )
+            {
+                msg_Dbg( p_demux, "  * es pid=%d type=%d dr->i_tag=0x%x",
+                         p_es->i_pid, p_es->i_type, p_dr->i_tag );
+
+                if( p_dr->i_tag == 0x05 )
+                {
+                    /* Registration Descriptor */
+                    if( !memcmp( p_dr->p_data, "drac", 4 ) )
+                    {
+                        /* registration descriptor for Dirac
+                         * (backwards compatable with VC-2 (SMPTE Sxxxx:2008)) */
+                        pid->es->fmt.i_cat = VIDEO_ES;
+                        pid->es->fmt.i_codec = VLC_FOURCC('d','r','a','c');
+                    }
+                    else
+                    {
+                        msg_Warn( p_demux,
+                                  "unknown Registration Descriptor (%4.4s)",
+                                  p_dr->p_data );
+                    }
+                }
+            }
+        }
-        else if( p_es->i_type == 0xa0 )
-        {