Remove useless test before a free (again).

[vlc] / modules / demux / ogg.c

diff --git a/modules/demux/ogg.c b/modules/demux/ogg.c
index 3c55ff933c6d12241e8998c9cb1fd18458caa1dd..ab3c081bd8e6e0099fd9a46b92e704c866910674 100644 (file)
--- a/modules/demux/ogg.c
+++ b/modules/demux/ogg.c
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * ogg.c : ogg stream demux module for vlc
  *****************************************************************************
- * Copyright (C) 2001-2003 the VideoLAN team
+ * Copyright (C) 2001-2007 the VideoLAN team
  * $Id$
  *
  * Authors: Gildas Bazin <gbazin@netcourrier.com>
@@ -25,13 +25,19 @@
 /*****************************************************************************
  * Preamble
  *****************************************************************************/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include <vlc/vlc.h>
-#include <vlc/input.h>
+#include <vlc_demux.h>
+#include <vlc_meta.h>
+#include <vlc_input.h>
 
 #include <ogg/ogg.h>
 
-#include "codecs.h"
-#include "vlc_bits.h"
+#include <vlc_codecs.h>
+#include <vlc_bits.h>
 
 /*****************************************************************************
  * Module descriptor
@@ -179,12 +185,12 @@ static int Open( vlc_object_t * p_this )
 {
     demux_t *p_demux = (demux_t *)p_this;
     demux_sys_t    *p_sys;
-    uint8_t        *p_peek;
+    const uint8_t  *p_peek;
 
 
     /* Check if we are dealing with an ogg stream */
     if( stream_Peek( p_demux->s, &p_peek, 4 ) < 4 ) return VLC_EGENERIC;
-    if( strcmp( p_demux->psz_demux, "ogg" ) && memcmp( p_peek, "OggS", 4 ) )
+    if( !p_demux->b_force && memcmp( p_peek, "OggS", 4 ) )
     {
         return VLC_EGENERIC;
     }
@@ -277,14 +283,14 @@ static int Demux( demux_t * p_demux )
             {
                 if( p_stream->fmt.i_codec == VLC_FOURCC('t','h','e','o') &&
                         oggpacket.bytes >= 7 &&
-                        ! memcmp( &oggpacket.packet[1], "theora", 6 ) )
+                        ! memcmp( oggpacket.packet, "\x80theora", 7 ) )
                 {
                     Ogg_ReadTheoraHeader( p_stream, &oggpacket );
                     p_stream->secondary_header_packets = 0;
                 }
                 else if( p_stream->fmt.i_codec == VLC_FOURCC('v','o','r','b') &&
                         oggpacket.bytes >= 7 &&
-                        ! memcmp( &oggpacket.packet[1], "vorbis", 6 ) )
+                        ! memcmp( oggpacket.packet, "\x01vorbis", 7 ) )
                 {
                     Ogg_ReadVorbisHeader( p_stream, &oggpacket );
                     p_stream->secondary_header_packets = 0;
@@ -364,10 +370,16 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
 {
     demux_sys_t *p_sys  = p_demux->p_sys;
     int64_t *pi64;
+    vlc_bool_t *pb_bool;
     int i;
 
     switch( i_query )
     {
+        case DEMUX_HAS_UNSUPPORTED_META:
+            pb_bool = (vlc_bool_t*)va_arg( args, vlc_bool_t* );
+            *pb_bool = VLC_TRUE;
+            return VLC_SUCCESS;
+
         case DEMUX_GET_TIME:
             pi64 = (int64_t*)va_arg( args, int64_t * );
             *pi64 = p_sys->i_pcr;
@@ -485,16 +497,16 @@ static void Ogg_DecodePacket( demux_t *p_demux,
     }
 
     if( p_oggpacket->bytes >= 7 &&
-        ! memcmp ( &p_oggpacket->packet[0], "Annodex", 7 ) )
+        ! memcmp ( p_oggpacket->packet, "Annodex", 7 ) )
     {
         /* it's an Annodex packet -- skip it (do nothing) */
-        return; 
+        return;
     }
     else if( p_oggpacket->bytes >= 7 &&
-        ! memcmp ( &p_oggpacket->packet[0], "AnxData", 7 ) )
+        ! memcmp ( p_oggpacket->packet, "AnxData", 7 ) )
     {
         /* it's an AnxData packet -- skip it (do nothing) */
-        return; 
+        return;
     }
 
     if( p_stream->fmt.i_codec == VLC_FOURCC( 's','u','b','t' ) &&
@@ -682,7 +694,7 @@ static void Ogg_DecodePacket( demux_t *p_demux,
             }
             if( p_oggpacket->bytes - 1 - i_header_len > 2 ||
                 ( p_oggpacket->packet[i_header_len + 1] != ' ' &&
-                  p_oggpacket->packet[i_header_len + 1] != 0 && 
+                  p_oggpacket->packet[i_header_len + 1] != 0 &&
                   p_oggpacket->packet[i_header_len + 1] != '\n' &&
                   p_oggpacket->packet[i_header_len + 1] != '\r' ) )
             {
@@ -691,7 +703,7 @@ static void Ogg_DecodePacket( demux_t *p_demux,
         }
 
         i_header_len++;
-        if( p_block->i_buffer >= i_header_len )
+        if( p_block->i_buffer >= (unsigned int)i_header_len )
             p_block->i_buffer -= i_header_len;
         else
             p_block->i_buffer = 0;
@@ -770,14 +782,14 @@ static int Ogg_FindLogicalStreams( demux_t *p_demux )
 
                 /* Check for Vorbis header */
                 if( oggpacket.bytes >= 7 &&
-                    ! memcmp( &oggpacket.packet[1], "vorbis", 6 ) )
+                    ! memcmp( oggpacket.packet, "\x01vorbis", 7 ) )
                 {
                     Ogg_ReadVorbisHeader( p_stream, &oggpacket );
                     msg_Dbg( p_demux, "found vorbis header" );
                 }
                 /* Check for Speex header */
-                else if( oggpacket.bytes >= 7 &&
-                    ! memcmp( &oggpacket.packet[0], "Speex", 5 ) )
+                else if( oggpacket.bytes >= 5 &&
+                    ! memcmp( oggpacket.packet, "Speex", 5 ) )
                 {
                     Ogg_ReadSpeexHeader( p_stream, &oggpacket );
                     msg_Dbg( p_demux, "found speex header, channels: %i, "
@@ -787,7 +799,7 @@ static int Ogg_FindLogicalStreams( demux_t *p_demux )
                 }
                 /* Check for Flac header (< version 1.1.1) */
                 else if( oggpacket.bytes >= 4 &&
-                    ! memcmp( &oggpacket.packet[0], "fLaC", 4 ) )
+                    ! memcmp( oggpacket.packet, "fLaC", 4 ) )
                 {
                     msg_Dbg( p_demux, "found FLAC header" );
 
@@ -820,7 +832,7 @@ static int Ogg_FindLogicalStreams( demux_t *p_demux )
                 }
                 /* Check for Theora header */
                 else if( oggpacket.bytes >= 7 &&
-                         ! memcmp( &oggpacket.packet[1], "theora", 6 ) )
+                         ! memcmp( oggpacket.packet, "\x80theora", 7 ) )
                 {
                     Ogg_ReadTheoraHeader( p_stream, &oggpacket );
 
@@ -850,7 +862,7 @@ static int Ogg_FindLogicalStreams( demux_t *p_demux )
                 }
                 /* Check for Annodex header */
                 else if( oggpacket.bytes >= 7 &&
-                         ! memcmp( &oggpacket.packet[0], "Annodex", 7 ) )
+                         ! memcmp( oggpacket.packet, "Annodex", 7 ) )
                 {
                     Ogg_ReadAnnodexHeader( VLC_OBJECT(p_demux), p_stream,
                                            &oggpacket );
@@ -860,7 +872,7 @@ static int Ogg_FindLogicalStreams( demux_t *p_demux )
                 }
                 /* Check for Annodex header */
                 else if( oggpacket.bytes >= 7 &&
-                         ! memcmp( &oggpacket.packet[0], "AnxData", 7 ) )
+                         ! memcmp( oggpacket.packet, "AnxData", 7 ) )
                 {
                     Ogg_ReadAnnodexHeader( VLC_OBJECT(p_demux), p_stream,
                                            &oggpacket );
@@ -1080,6 +1092,15 @@ static int Ogg_FindLogicalStreams( demux_t *p_demux )
                         p_ogg->i_streams--;
                     }
                 }
+                else if( oggpacket.bytes >= 7 &&
+                             ! memcmp( oggpacket.packet, "fishead", 7 ) )
+
+                {
+                    /* Skeleton */
+                    msg_Dbg( p_demux, "stream %d is a skeleton",
+                                p_ogg->i_streams-1 );
+                    /* FIXME: https://trac.videolan.org/vlc/ticket/1412 */
+                }
                 else
                 {
                     msg_Dbg( p_demux, "stream %d is of unknown type",
@@ -1170,8 +1191,7 @@ static void Ogg_EndOfStream( demux_t *p_demux )
         p_ogg->i_bitrate -= p_stream->fmt.i_bitrate;
 
         ogg_stream_clear( &p_ogg->pp_stream[i_stream]->os );
-        if( p_ogg->pp_stream[i_stream]->p_headers)
-            free( p_ogg->pp_stream[i_stream]->p_headers );
+        free( p_ogg->pp_stream[i_stream]->p_headers );
 
         es_format_Clean( &p_stream->fmt );
 
@@ -1180,7 +1200,7 @@ static void Ogg_EndOfStream( demux_t *p_demux )
 #undef p_stream
 
     /* Reinit p_ogg */
-    if( p_ogg->pp_stream ) free( p_ogg->pp_stream );
+    free( p_ogg->pp_stream );
     p_ogg->pp_stream = NULL;
     p_ogg->i_streams = 0;
 }
@@ -1325,7 +1345,7 @@ static void Ogg_ReadAnnodexHeader( vlc_object_t *p_this,
                                    ogg_packet *p_oggpacket )
 {
     if( p_oggpacket->bytes >= 28 &&
-        !memcmp( &p_oggpacket->packet[0], "Annodex", 7 ) )
+        !memcmp( p_oggpacket->packet, "Annodex", 7 ) )
     {
         oggpack_buffer opb;
 
@@ -1344,7 +1364,7 @@ static void Ogg_ReadAnnodexHeader( vlc_object_t *p_this,
         timebase_denominator = GetQWLE( &p_oggpacket->packet[24] );
     }
     else if( p_oggpacket->bytes >= 42 &&
-             !memcmp( &p_oggpacket->packet[0], "AnxData", 7 ) )
+             !memcmp( p_oggpacket->packet, "AnxData", 7 ) )
     {
         uint64_t granule_rate_numerator;
         uint64_t granule_rate_denominator;