Changeset 009a1e8d2eca3a813d66aa1d067dd6def9eefd26

Timestamp:

25/03/04 02:01:58 (5 years ago)

Author:

Laurent Aimar <fenrir@videolan.org>

git-committer:

Laurent Aimar <fenrir@videolan.org> 1080176518 +0000

git-parent:

[1f878728d314a9028a3a584b5b26a80e45a11b81]

git-author:

Laurent Aimar <fenrir@videolan.org> 1080176518 +0000

Message:

• real: added support for aac codec.
  

Files:

• modules/demux/real.c (modified) (5 diffs)

modules/demux/real.c

@@ -447 +447 @@
-    else if( tk->fmt.i_cat == AUDIO_ES && b_selected )
-    {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            }
-        }
-        else
-        {
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-
@@ -764 +790 @@
-                    else if( !strncmp( p_peek, ".ra\xfd", 4 ) )
-                    {
-
+
+
-                        msg_Dbg( p_demux, "    - audio version=%d", i_version );
-
@@ -780 +807 @@
-                                    memcpy( &fmt.i_codec, &p_peek[57 + p_peek[56] + 1], 4 );
-                                }
+                                p_extra = &p_peek[57 + p_peek[56] + 1+ 4 + 3];
-                            }
-                        }
@@ -787 +815 @@
-                            fmt.audio.i_channels = GetWBE( &p_peek[60] );
-                            fmt.audio.i_rate = GetWBE( &p_peek[54] );
+
+                            p_extra = &p_peek[66+4+3+1];
-                        }
-                        msg_Dbg( p_demux, "    - audio codec=%4.4s channels=%d rate=%dHz",
@@ -792 +822 @@
-                                fmt.audio.i_channels, fmt.audio.i_rate );
-
-!strncasecmp( (char*)&fmt.i_codec, "dnet", 4
+fmt.i_codec == VLC_FOURCC( 'd', 'n', 'e', 't'
-                        {
-                            fmt.i_codec = VLC_FOURCC( 'a', '5', '2', ' ' );
+                        }
+                        else if( fmt.i_codec == VLC_FOURCC( 'r', 'a', 'a', 'c' ) ||
+                                 fmt.i_codec == VLC_FOURCC( 'r', 'a', 'c', 'p' ) )
+                        {
+                            int i_peek = p_extra - p_peek;
+                            if( stream_Peek( p_demux->s, &p_peek, i_peek + 4 ) >= i_peek + 4 )
+                            {
+                                int i_extra = GetDWBE( &p_peek[i_peek] );
+
+                                if( i_extra > 1 && i_peek + 4 + i_extra <= i_len &&
+                                    stream_Peek( p_demux->s, &p_peek, i_peek + 4 + i_extra ) >= i_peek + 4 + i_extra )
+                                {
+                                    fmt.i_extra = i_extra - 1;
+                                    fmt.p_extra = malloc ( i_extra - 1 );
+                                    memcpy( fmt.p_extra, &p_peek[i_peek+4+1], i_extra - 1 );
+
+                                    msg_Dbg( p_demux, "        - extra data=%d", i_extra );
+                                    {
+                                        int i;
+                                        for( i = 0; i < fmt.i_extra; i++ )
+                                        {
+                                            msg_Dbg( p_demux, "          data[%d] = 0x%x", i,((uint8_t*)fmt.p_extra)[i] );
+                                        }
+                                    }
+                                }
+                            }
+                            fmt.i_codec = VLC_FOURCC( 'm', 'p', '4', 'a' );
-                        }
-