Changeset 6e8f9504cb15556b811badce004b806f69aadb5e

Timestamp:

12/08/02 11:34:15 (6 years ago)

Author:

Sam Hocevar <sam@videolan.org>

git-committer:

Sam Hocevar <sam@videolan.org> 1029144855 +0000

git-parent:

[2e448ef8ddd59d81aa28e207bda0bd2b4fcdf1b7]

git-author:

Sam Hocevar <sam@videolan.org> 1029144855 +0000

Message:

• ./src/misc/objects.c: two big changes in the object API: now objects can
  only have one parent, because I don't want to deal with cycles, and each
  created object is indexed in a global array. This feature is unused yet,
  but it will speed up vlc_object_find(FIND_ANYWHERE).
  
• ./debian/rules: activated the faad codec.
  
• ./doc/fortunes.txt: new fortune cookies.
  
• ./modules/codec/mpeg_video/headers.c: reduced the use of attach/detach.
  
• ./modules/audio_output/oss.c: fixed two compilation warnings.
  

Files:

• configure (modified) (1 diff)
• configure.in (modified) (1 diff)
• debian/rules (modified) (1 diff)
• doc/fortunes.txt (modified) (1 diff)
• doc/vlc-config.1 (added)
• include/main.h (modified) (3 diffs)
• include/vlc_common.h (modified) (2 diffs)
• include/vlc_objects.h (modified) (3 diffs)
• include/vlc_symbols.h (modified) (2 diffs)
• modules/access/dvdplay/demux.c (modified) (2 diffs)
• modules/audio_output/oss.c (modified) (2 diffs)
• modules/codec/cinepak/cinepak.c (modified) (4 diffs)
• modules/codec/dv/dv.c (modified) (3 diffs)
• modules/codec/ffmpeg/ffmpeg.c (modified) (4 diffs)
• modules/codec/mpeg_video/headers.c (modified) (3 diffs)
• modules/codec/mpeg_video/parser.c (modified) (2 diffs)
• modules/codec/mpeg_video/pool.c (modified) (4 diffs)
• modules/gui/macosx/intf.m (modified) (3 diffs)
• modules/video_output/directx/aout.c (modified) (2 diffs)
• modules/video_output/directx/vout.c (modified) (2 diffs)
• modules/video_output/sdl/aout.c (modified) (2 diffs)
• modules/visualization/scope/scope.c (modified) (2 diffs)
• src/audio_output/aout_ext-dec.c (modified) (2 diffs)
• src/audio_output/audio_output.c (modified) (2 diffs)
• src/audio_output/filters.c (modified) (5 diffs)
• src/input/input_dec.c (modified) (2 diffs)
• src/libvlc.c (modified) (6 diffs)
• src/misc/beos_specific.cpp (modified) (2 diffs)
• src/misc/modules.c (modified) (4 diffs)
• src/misc/modules_plugin.h (modified) (1 diff)
• src/misc/objects.c (modified) (11 diffs)
• src/playlist/playlist.c (modified) (3 diffs)
• src/video_output/video_output.c (modified) (2 diffs)

configure

@@ -7109 +7109 @@
-    else
-            echo "$ac_t""no" 1>&6
-
+libfaad/
-    fi
-  else

configure.in

@@ -1096 +1096 @@
-      dnl  The given libfaad wasn't built
-      AC_MSG_RESULT(no)
-
+libfaad/
-    fi
-  else

debian/rules

@@ -11 +11 @@
-# Compilation options
-export FFMPEG_VERSION=cvs
-
+
+
-# Remove --without-dvdcss here in non-totalitarian countries
-export DVDCSS_FLAGS="--enable-dvd --without-dvdcss"

doc/fortunes.txt

@@ -197 +197 @@
-  -- #videolan
-%
+<ali> by the way i've never learnt the way to make figlets lool ...
+<lool> /exec -o figlet -f small 'ali is so stupid !'
+<sam> I'm not absolutely positive it was a good idea to teach her
+<sam> it's like handing a rocket launcher to a 6yr old ...
+
+  -- #videolan
+%
+<|sF|Vengance|> do u have any videos of porn u can send me?
+
+  -- #videolan
+%
+-+- Ourumov [www-data@brahma.via.ecp.fr] has joined #videolan
+<Ourumov> hey anybody here know videolan ?
+-*- SignOff: Ourumov (Client Quit)
+
+  -- #videolan
+%

include/main.h

@@ -4 +4 @@
- *****************************************************************************
- * Copyright (C) 1999, 2000, 2001, 2002 VideoLAN
-3 2002/08/09 16:39:08
+4 2002/08/12 09:34:15
- *
- * Authors: Vincent Seguin <seguin@via.ecp.fr>
@@ -59 +59 @@
-
-    /* The module bank */
-
+       
-
-    /* The message bank */
-
+       
-
-    /* Shared data - these structures are accessed directly from p_vlc by
-     * several modules */
-    intf_msg_t *           p_msg;                 /* messages interface data */
-    input_channel_t *      p_channel;                /* channel library data */
-
@@ -72 +71 @@
-    vlc_mutex_t            config_lock;          /* lock for the config file */
-    vlc_mutex_t            structure_lock;        /* lock for the p_vlc tree */
+
+    /* Object structure data */
-    int                    i_unique;                    /* p_vlc occurence # */
-    int                    i_counter;                      /* object counter */
+    int                    i_objects;              /* Attached objects count */
+    vlc_object_t **        pp_objects;               /* Array of all objects */
-
-    /* Pointer to the big, evil global lock */

include/vlc_common.h

@@ -4 +4 @@
- *****************************************************************************
- * Copyright (C) 1998, 1999, 2000 VideoLAN
-7 2002/08/10 19:23:06
+8 2002/08/12 09:34:15
- *
- * Authors: Samuel Hocevar <sam@via.ecp.fr>
@@ -246 +246 @@
-    volatile vlc_bool_t b_die;                     /* set by the outside */ \
-    volatile vlc_bool_t b_dead;                     /* set by the object */ \
+    volatile vlc_bool_t b_attached;                 /* set by the object */ \
-                                                                            \
-    vlc_t *         p_vlc;                           /* root of all evil */ \
-                                                                            \
-
-
-
+
+
-    vlc_object_t ** pp_children;                         /* our children */ \
-    volatile int    i_children;                                             \

include/vlc_objects.h

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2002 VideoLAN
-5 2002/07/31 20:56:50
+6 2002/08/12 09:34:15
- *
- * Authors: Samuel Hocevar <sam@zoy.org>
@@ -52 +52 @@
-VLC_EXPORT( void, __vlc_object_yield, ( vlc_object_t * ) );
-VLC_EXPORT( void, __vlc_object_release, ( vlc_object_t * ) );
-
-
+
-VLC_EXPORT( void, __vlc_object_attach, ( vlc_object_t *, vlc_object_t * ) );
-#if 0
@@ -77 +76 @@
-    __vlc_object_release( VLC_OBJECT(a) )
-
-
-
-
-
-
+
+
-
-#define vlc_object_attach(a,b) \

include/vlc_symbols.h

@@ -94 +94 @@
-    void (* __vlc_object_attach_inner) ( vlc_object_t *, vlc_object_t * ) ;
-    void (* __vlc_object_destroy_inner) ( vlc_object_t * ) ;
-
-
+
-    void (* __vlc_object_release_inner) ( vlc_object_t * ) ;
-    void (* __vlc_object_yield_inner) ( vlc_object_t * ) ;
@@ -192 +191 @@
-#   define __vlc_object_destroy p_symbols->__vlc_object_destroy_inner
-#   define __vlc_object_detach p_symbols->__vlc_object_detach_inner
-#   define __vlc_object_detach_all p_symbols->__vlc_object_detach_all_inner
-#   define __vlc_object_find p_symbols->__vlc_object_find_inner
-#   define __vlc_object_release p_symbols->__vlc_object_release_inner

modules/access/dvdplay/demux.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 1998-2001 VideoLAN
-2 2002/08/07 00:29:36
+3 2002/08/12 09:34:15
- *
- * Author: St�ane Borel <stef@via.ecp.fr>
@@ -133 +133 @@
-    {
-        intf_StopThread( p_intf );
-_all
+
-        vlc_object_release( p_intf );
-        intf_Destroy( p_intf );

modules/audio_output/oss.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2000-2002 VideoLAN
-6 2002/08/11 22:36:35 massiot
+7 2002/08/12 09:34:15 sam
- *
- * Authors: Michel Kaempf <maxx@via.ecp.fr>
@@ -294 +294 @@
-    while ( !p_sys->b_die )
-    {
-        int i_bytes_per_sample;
-        aout_buffer_t * p_buffer;
-
+ = 0
-        int i_tmp, i_size;
-        byte_t * p_bytes;

modules/codec/cinepak/cinepak.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 1999-2001 VideoLAN
-2 2002/08/04 18:39:41
+3 2002/08/12 09:34:15
- *
- * Authors: Laurent Aimar <fenrir@via.ecp.fr>
@@ -301 +301 @@
-        {
-            /* We are not interested in this format, close this vout */
-_all
+
-            vlc_object_release( p_vout );
-            vout_DestroyThread( p_vout );
@@ -309 +309 @@
-        {
-            /* This video output is cool! Hijack it. */
-_all
+
-            vlc_object_attach( p_vout, p_vdec->p_fifo );
-            vlc_object_release( p_vout );
@@ -956 +956 @@
-    {
-        /* We are about to die. Reattach video output to p_vlc. */
-, p_vdec->p_fifo
+
-        vlc_object_attach( p_vdec->p_vout, p_vdec->p_fifo->p_vlc );
-    }

modules/codec/dv/dv.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2002 VideoLAN
-1 2002/08/05 15:16:18
+2 2002/08/12 09:34:15
- *
- * Authors: Samuel Hocevar <sam@zoy.org>
@@ -163 +163 @@
-            {
-                /* We are not interested in this format, close this vout */
-_all
+
-                vlc_object_release( p_vout );
-                vout_DestroyThread( p_vout );
@@ -171 +171 @@
-            {
-                /* This video output is cool! Hijack it. */
-_all
+
-                vlc_object_attach( p_vout, p_fifo );
-                vlc_object_release( p_vout );

modules/codec/ffmpeg/ffmpeg.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 1999-2001 VideoLAN
-4 2002/08/10 20:05:21 fenrir
+5 2002/08/12 09:34:15 sam
- *
- * Authors: Laurent Aimar <fenrir@via.ecp.fr>
@@ -414 +414 @@
-        {
-            /* We are not interested in this format, close this vout */
-_all
+
-            vlc_object_release( p_vout );
-            vout_DestroyThread( p_vout );
@@ -422 +422 @@
-        {
-            /* This video output is cool! Hijack it. */
-_all
+
-            vlc_object_attach( p_vout, p_vdec->p_fifo );
-            vlc_object_release( p_vout );
@@ -972 +972 @@
-    {
-        /* We are about to die. Reattach video output to p_vlc. */
-, p_vdec->p_fifo
+
-        vlc_object_attach( p_vdec->p_vout, p_vdec->p_fifo->p_vlc );
-    }

modules/codec/mpeg_video/headers.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 1999-2001 VideoLAN
-2 2002/08/04 18:39:41
+3 2002/08/12 09:34:15
- *
- * Authors: Christophe Massiot <massiot@via.ecp.fr>
@@ -312 +312 @@
-    int i_height_save, i_width_save, i_aspect;
-
+    vout_thread_t *p_vout;
+
-    i_height_save = p_vpar->sequence.i_height;
-    i_width_save = p_vpar->sequence.i_width;
@@ -489 +491 @@
-    /* Spawn a video output if there is none. First we look for our children,
-     * then we look for any other vout that might be available. */
-
-
-
-
-
-
+
+
+
+
+
-    }
-    
-par->p_v
-
-par->p_v
-par->p_v
-par->p_v
-par->p_v
+
+
+
+
+
+
-        {
-            /* We are not interested in this format, close this vout */
-_all( p_vpar->
-par->p_v
-par->p_v
-par->p_v
+( 
+
+
+
-        }
-        else
-        {
-            /* This video output is cool! Hijack it. */
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-    if( p_vpar->p_fifo->b_die || p_vpar->p_fifo->b_error )

modules/codec/mpeg_video/parser.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 1999-2001 VideoLAN
-3 2002/08/04 20:04:11
+4 2002/08/12 09:34:15
- *
- * Authors: Christophe Massiot <massiot@via.ecp.fr>
@@ -316 +316 @@
-
-        /* We are about to die. Reattach video output to p_vlc. */
-, p_vpar->p_fifo
+
-        vlc_object_attach( p_vpar->p_vout, p_vpar->p_fifo->p_vlc );
-    }

modules/codec/mpeg_video/pool.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2001 VideoLAN
-2 2002/08/04 18:39:41
+3 2002/08/12 09:34:15
- *
- * Authors: Christophe Massiot <massiot@via.ecp.fr>
@@ -126 +126 @@
-                int j;
-
-_all
+
-                vdec_DestroyThread( p_vpar->pool.pp_vdec[i] );
-
@@ -219 +219 @@
-        int j;
-
-_all
+
-        vdec_DestroyThread( p_vpar->pool.pp_vdec[i] );
-
@@ -236 +236 @@
-
-    /* Free fake video decoder (used when parser == decoder). */
-_all
+
-    vdec_EndThread( p_vpar->pool.p_vdec );
-    vlc_object_destroy( p_vpar->pool.p_vdec );

modules/gui/macosx/intf.m

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2002 VideoLAN
-1 2002/08/04 17:23:43
+2 2002/08/12 09:34:15
- *
- * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
@@ -403 +403 @@
-                                          FIND_CHILD )) )
-    {
-_all
+
-        vlc_object_release( p_playlist );
-        playlist_Destroy( p_playlist );
@@ -415 +415 @@
-                                      VLC_OBJECT_VOUT, FIND_CHILD )) )
-    {
-_all
+
-        vlc_object_release( p_vout );
-        vout_DestroyThread( p_vout );

modules/video_output/directx/aout.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2001 VideoLAN
-2 2002/08/10 18:17:06 gbazin
+3 2002/08/12 09:34:15 sam
- *
- * Authors: Gildas Bazin <gbazin@netcourrier.com>
@@ -266 +266 @@
-    if( p_aout->output.p_sys->p_notif )
-    {
-_all
+
-        if( p_aout->output.p_sys->p_notif->b_thread )
-        {

modules/video_output/directx/vout.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2001 VideoLAN
-1 2002/08/04 17:23:43
+2 2002/08/12 09:34:15
- *
- * Authors: Gildas Bazin <gbazin@netcourrier.com>
@@ -289 +289 @@
-    if( p_vout->p_sys->p_event )
-    {
-_all
+
-
-        /* Kill DirectXEventThread */

modules/video_output/sdl/aout.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 1999-2001 VideoLAN
-2 2002/08/07 21:36:56 massiot
+3 2002/08/12 09:34:15 sam
- *
- * Authors: Michel Kaempf <maxx@via.ecp.fr>
@@ -157 +157 @@
-    else
-    {
-
+p_aout->p_vlc->pf_
-    }
-}

modules/visualization/scope/scope.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2002 VideoLAN
-1 2002/08/04 17:23:44
+2 2002/08/12 09:34:15
- *
- * Authors: Samuel Hocevar <sam@zoy.org>
@@ -289 +289 @@
-    /* Kill audio output */
-    module_Unneed( p_aout->p_sys->p_aout, p_aout->p_sys->p_aout->p_module );
-_all
+
-    vlc_object_destroy( p_aout->p_sys->p_aout );
-

src/audio_output/aout_ext-dec.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 1999-2001 VideoLAN
-0 2002/08/08 00:35:11
+1 2002/08/12 09:34:15
- *
- * Authors: Michel Kaempf <maxx@via.ecp.fr>
@@ -52 +52 @@
-        {
-            msg_Dbg( p_this, "changing aout type" );
-_all
+
-            vlc_object_release( p_aout );
-            aout_DestroyThread( p_aout );

src/audio_output/audio_output.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2002 VideoLAN
-3 2002/08/11 23:26:28 massiot
+4 2002/08/12 09:34:15 sam
- *
- * Authors: Christophe Massiot <massiot@via.ecp.fr>
@@ -78 +78 @@
-
-    /* Free structure. */
-    vlc_object_detach_all( p_aout );
-    vlc_object_destroy( p_aout );
-}

src/audio_output/filters.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2002 VideoLAN
-2 2002/08/09 23:47:23 massiot
+3 2002/08/12 09:34:15 sam
- *
- * Authors: Christophe Massiot <massiot@via.ecp.fr>
@@ -92 +92 @@
-        {
-            msg_Err( p_aout, "couldn't find a filter for any conversion" );
-_all
+
-            vlc_object_destroy( pp_filters[0] );
-            return -1;
@@ -102 +102 @@
-    if ( pp_filters[1] == NULL )
-    {
-_all
+
-        vlc_object_destroy( pp_filters[0] );
-        return -1;
@@ -118 +118 @@
-        msg_Err( p_aout,
-                 "couldn't find a filter for the 2nd part of the conversion" );
-_all
+
-        vlc_object_destroy( pp_filters[0] );
-_all
+
-        vlc_object_destroy( pp_filters[1] );
-        return -1;
@@ -143 +143 @@
-    {
-        module_Unneed( pp_filters[i], pp_filters[i]->p_module );
-_all
+
-        vlc_object_destroy( pp_filters[i] );
-    }

src/input/input_dec.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 1999-2001 VideoLAN
-3 2002/08/08 00:35:11
+4 2002/08/12 09:34:15
- *
- * Authors: Christophe Massiot <massiot@via.ecp.fr>
@@ -246 +246 @@
-static void DeleteDecoderFifo( decoder_fifo_t * p_fifo )
-{
-_all
+
-
-    msg_Dbg( p_fifo, "killing decoder for 0x%x, fourcc `%4.4s', %d PES in FIFO",

src/libvlc.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 1998-2002 VideoLAN
-4 2002/08/09 16:39:08
+5 2002/08/12 09:34:15
- *
- * Authors: Vincent Seguin <seguin@via.ecp.fr>
@@ -590 +590 @@
-    if( err )
-    {
-_all
+
-        intf_Destroy( p_intf );
-        return err;
@@ -630 +630 @@
-    {
-        intf_StopThread( p_intf );
-_all
+
-        vlc_object_release( p_intf );
-        intf_Destroy( p_intf );
@@ -642 +642 @@
-                                          FIND_CHILD )) )
-    {
-_all
+
-        vlc_object_release( p_playlist );
-        playlist_Destroy( p_playlist );
@@ -653 +653 @@
-    while( (p_vout = vlc_object_find( p_vlc, VLC_OBJECT_VOUT, FIND_CHILD )) )
-    {
-_all
+
-        vlc_object_release( p_vout );
-        vout_DestroyThread( p_vout );
@@ -664 +664 @@
-    while( (p_aout = vlc_object_find( p_vlc, VLC_OBJECT_AOUT, FIND_CHILD )) )
-    {
-_all
+
-        vlc_object_release( (vlc_object_t *)p_aout );
-        aout_DeleteInstance( p_aout );

src/misc/beos_specific.cpp

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 1999-2001 VideoLAN
-3 2002/06/02 14:26:15 gbazin
+4 2002/08/12 09:34:15 sam
- *
- * Authors: Jean-Marc Dressler <polux@via.ecp.fr>
@@ -115 +115 @@
-    BeApp->p_this = p_this;
-    BeApp->Run();
-_all
+
-    delete BeApp;
-}

src/misc/modules.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2001 VideoLAN
-2 2002/08/08 00:35:11
+3 2002/08/12 09:34:15
- *
- * Authors: Samuel Hocevar <sam@zoy.org>
@@ -156 +156 @@
-    module_t * p_next;
-
-_all
+
-
-    while( p_this->p_vlc->p_module_bank->first != NULL )
@@ -939 +939 @@
-#endif
-
-_all
+
-
-    /* Unlink the module from the linked list. */
@@ -972 +972 @@
-    {
-        vlc_object_t *p_this = p_module->pp_children[0];
-_all
+
-        vlc_object_destroy( p_this );
-    }

src/misc/modules_plugin.h

@@ -301 +301 @@
-    (p_symbols)->__vlc_object_release_inner = __vlc_object_release; \
-    (p_symbols)->__vlc_object_detach_inner = __vlc_object_detach; \
-    (p_symbols)->__vlc_object_detach_all_inner = __vlc_object_detach_all; \
-    (p_symbols)->__vlc_object_attach_inner = __vlc_object_attach; \
-    (p_symbols)->__vlc_dumpstructure_inner = __vlc_dumpstructure; \

src/misc/objects.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2002 VideoLAN
-5 2002/08/08 00:35:11
+6 2002/08/12 09:34:15
- *
- * Authors: Samuel Hocevar <sam@zoy.org>
@@ -48 +48 @@
- *****************************************************************************/
-static vlc_object_t * vlc_object_find_inner( vlc_object_t *, int, int );
-, vlc_object_t *
+
-static void vlc_dumpstructure_inner( vlc_object_t *, int, char * );
+static int  find_index_inner( vlc_object_t *, vlc_object_t **, int );
+static void set_attachment_flag( vlc_object_t *, vlc_bool_t );
-
-/*****************************************************************************
@@ -121 +123 @@
-
-    p_new->i_refcount = 0;
-
-
+