Changeset e2da42f9737f1197cd7e8d768266b5e0c6ec87e7

Timestamp:

28/11/02 18:35:01 (6 years ago)

Author:

Sam Hocevar <sam@videolan.org>

git-committer:

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

git-parent:

[798e97904d1cc5c42d637616525af9f2c123a023]

git-author:

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

Message:

• ./src/video_output/video_output.c, modules/*: factorized video output
  creation code into vout_Request which looks for existing vout objects
  and spawns a new one if none was found.
  

Files:

• include/video_output.h (modified) (2 diffs)
• modules/codec/cinepak/cinepak.c (modified) (5 diffs)
• modules/codec/dv.c (modified) (10 diffs)
• modules/codec/ffmpeg/video.c (modified) (7 diffs)
• modules/codec/mpeg_video/headers.c (modified) (4 diffs)
• modules/codec/mpeg_video/parser.c (modified) (2 diffs)
• modules/codec/tarkin.c (modified) (6 diffs)
• modules/codec/theora.c (modified) (5 diffs)
• modules/codec/xvid.c (modified) (4 diffs)
• modules/gui/macosx/intf.m (modified) (2 diffs)
• modules/video_filter/adjust.c (modified) (3 diffs)
• modules/video_filter/clone.c (modified) (3 diffs)
• modules/video_filter/crop.c (modified) (4 diffs)
• modules/video_filter/deinterlace/deinterlace.c (modified) (5 diffs)
• modules/video_filter/distort.c (modified) (4 diffs)
• modules/video_filter/invert.c (modified) (3 diffs)
• modules/video_filter/motionblur.c (modified) (3 diffs)
• modules/video_filter/transform.c (modified) (4 diffs)
• modules/video_filter/wall.c (modified) (3 diffs)
• src/libvlc.c (modified) (2 diffs)
• src/video_output/video_output.c (modified) (6 diffs)
• src/video_output/vout_pictures.h (modified) (2 diffs)

include/video_output.h

@@ -6 +6 @@
- *****************************************************************************
- * Copyright (C) 1999, 2000 VideoLAN
-7 2002/11/20 13:37:35
+8 2002/11/28 17:34:59
- *
- * Authors: Vincent Seguin <seguin@via.ecp.fr>
@@ -142 +142 @@
- * Prototypes
- *****************************************************************************/
-
-
-
+
+
+
+
+
-
-VLC_EXPORT( int,             vout_ChromaCmp,      ( uint32_t, uint32_t ) );

modules/codec/cinepak/cinepak.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 1999-2001 VideoLAN
-8 2002/11/27 15:18:24
+9 2002/11/28 17:34:59
- *
- * Authors: Laurent Aimar <fenrir@via.ecp.fr>
@@ -190 +190 @@
-}
-
-static int cinepak_CheckVout( vout_thread_t *p_vout,
-                              int i_width,
-                              int i_height )
-{
-    if( !p_vout )
-    {
-        return( 0 );
-    }
-    
-    if( ( p_vout->render.i_width != i_width )||
-        ( p_vout->render.i_height != i_height )||
-        ( p_vout->render.i_chroma != VLC_FOURCC('I','4','2','0') )||
-        ( p_vout->render.i_aspect != VOUT_ASPECT_FACTOR * i_width / i_height) )
-    {
-        return( 0 );
-    }
-    else
-    {
-        return( 1 );
-    }
-}
-
-/* Return a Vout */
-
-static vout_thread_t *cinepak_CreateVout( videodec_thread_t *p_vdec,
-                                         int i_width,
-                                         int i_height )
-{
-    vout_thread_t *p_vout;
-
-    if( (!i_width)||(!i_height) )
-    {
-        return( NULL ); /* Can't create a new vout without display size */
-    }
-
-    /* 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. */
-    p_vout = vlc_object_find( p_vdec->p_fifo, VLC_OBJECT_VOUT,
-                                              FIND_CHILD );
-    if( !p_vout )
-    {
-        p_vout = vlc_object_find( p_vdec->p_fifo, VLC_OBJECT_VOUT,
-                                                  FIND_ANYWHERE );
-    }
-
-    if( p_vout )
-    {
-        if( !cinepak_CheckVout( p_vout, i_width, i_height ) )
-        {
-            /* We are not interested in this format, close this vout */
-            vlc_object_detach( p_vout );
-            vlc_object_release( p_vout );
-            vout_DestroyThread( p_vout );
-            p_vout = NULL;
-        }
-        else
-        {
-            /* This video output is cool! Hijack it. */
-            vlc_object_detach( p_vout );
-            vlc_object_attach( p_vout, p_vdec->p_fifo );
-            vlc_object_release( p_vout );
-        }
-    }
-
-    if( p_vout == NULL )
-    {
-        msg_Dbg( p_vdec->p_fifo, "no vout present, spawning one" );
-    
-        p_vout = vout_CreateThread( p_vdec->p_fifo,
-                                    i_width,
-                                    i_height,
-                                    VLC_FOURCC('I','4','2','0'),
-                                    VOUT_ASPECT_FACTOR * i_width / i_height );
-    }
-
-    return( p_vout );
-}
-
-void cinepak_LoadCodebook( cinepak_codebook_t *p_codebook,
@@ -841 +764 @@
-        return;
-    }
-
+
-    /* Check our vout */
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-
@@ -906 +827 @@
-{
-    int i;
-
+
-    if( !p_vdec )
-    {
@@ -917 +838 @@
-        FREE( p_vdec->p_context->p_pix[i] );
-    }
-
+
-    free( p_vdec->p_context );
-
-
-
-
-
-
-
-
+
+
+
+
-    free( p_vdec );
-}

modules/codec/dv.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2002 VideoLAN
-2 2002/11/06 09:26:25
+3 2002/11/28 17:34:59
- *
- * Authors: Samuel Hocevar <sam@zoy.org>
-      
+
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- 
+
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -40 +40 @@
-static int OpenDecoder ( vlc_object_t * );
-
-u32
+vlc_fourcc_t
-
-/*****************************************************************************
@@ -74 +74 @@
-static int RunDecoder ( decoder_fifo_t *p_fifo )
-{
-8
+int8_t
-    pes_packet_t *p_pes = NULL;
-    int i_data = 120000;
@@ -82 +82 @@
-    dv_decoder_t *  p_decoder;
-    vout_thread_t * p_vout;
-
+
-    p_buffer = malloc( i_data );
-    if( !p_buffer )
@@ -150 +150 @@
-            p_buffer = realloc( p_buffer, p_decoder->frame_size );
-        }
-
+
-        /* Don't trust the sucker */
-        //p_decoder->quality = p_decoder->video->quality;
@@ -158 +158 @@
-        /* Spawn a video output if there is none. First we look amongst our
-         * children, then we look for any other vout that might be available */
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-        /* Main loop */
@@ -232 +198 @@
-            {
-                picture_t *p_pic;
-8
+int8_t
-                int pitches[3], i;
-
@@ -240 +206 @@
-                    {
-                        break;
- 
+
-                    msleep( VOUT_OUTMEM_SLEEP );
-                }
@@ -266 +232 @@
-        }
-
-
-
-
-
-
+
-    }
-
@@ -290 +252 @@
-}
-
-u32
+vlc_fourcc_t
-{
-    switch( x )

modules/codec/ffmpeg/video.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 1999-2001 VideoLAN
-7 2002/11/28 16:44:05 fenrir
+8 2002/11/28 17:35:00 sam
- *
- * Authors: Laurent Aimar <fenrir@via.ecp.fr>
@@ -100 +100 @@
-}
-
-/* Check if we have a Vout with good parameters */
-static int ffmpeg_CheckVout( vout_thread_t *p_vout,
-                             int i_width,
-                             int i_height,
-                             int i_chroma )
-{
-    if( !p_vout )
-    {
-        return( 0 );
-    }
-    if( !i_chroma )
-    {
-        /* we will try to make conversion */
-        i_chroma = VLC_FOURCC('I','4','2','0');
-    } 
-
-    if( ( p_vout->render.i_width != i_width )||
-        ( p_vout->render.i_height != i_height )||
-        ( p_vout->render.i_chroma != i_chroma ) )
-    {
-        return( 0 );
-    }
-    else
-    {
-        return( 1 );
-    }
-}
-
-/* Return a Vout */
-static vout_thread_t *ffmpeg_CreateVout( vdec_thread_t  *p_vdec,
@@ -150 +122 @@
-        /* It's mainly for I410 -> I420 conversion that I've made,
-           it's buggy and very slow */
- 
+
-
-#if LIBAVCODEC_BUILD >= 4640
@@ -179 +151 @@
-    /* 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. */
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-}
-
@@ -723 +662 @@
-    if( !p_vdec->b_direct_rendering )
-    {
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-        }
-
@@ -812 +744 @@
-    }
-
-
-
-
-
-
-
+
+
-}
-
@@ -905 +833 @@
-
-    /* Check our vout */
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-    }
-

modules/codec/mpeg_video/headers.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 1999-2001 VideoLAN
-5 2002/11/20 13:37:35
+6 2002/11/28 17:35:00
- *
- * Authors: Christophe Massiot <massiot@via.ecp.fr>
@@ -312 +312 @@
-    int i_aspect;
-
-    vout_thread_t *p_vout;
-
-    p_vpar->sequence.i_width = GetBits( &p_vpar->bit_stream, 12 );
-    p_vpar->sequence.i_height = GetBits( &p_vpar->bit_stream, 12 );
@@ -480 +478 @@
-    /* 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. */
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-    if( p_vpar->p_fifo->b_die || p_vpar->p_fifo->b_error )
@@ -521 +491 @@
-    if( p_vpar->p_vout == NULL )
-    {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-    }
-}

modules/codec/mpeg_video/parser.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 1999-2001 VideoLAN
-7 2002/11/20 13:37:35
+8 2002/11/28 17:35:00
- *
- * Authors: Christophe Massiot <massiot@via.ecp.fr>
@@ -300 +300 @@
-#endif
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    msg_Dbg( p_vpar->p_fifo, "%d loops among %d sequence(s)",

modules/codec/tarkin.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 1999-2001 VideoLAN
-2 2002/11/20 14:09:57 gbazin
+3 2002/11/28 17:34:59 sam
- *
- * Authors: Gildas Bazin <gbazin@netcourrier.com>
@@ -88 +88 @@
-
-static void tarkin_CopyPicture( dec_thread_t *, picture_t *, uint8_t * );
-
+
-/*****************************************************************************
- * Module descriptor
@@ -136 +136 @@
-    p_dec->p_fifo = p_fifo;
-    p_dec->p_pes  = NULL;
+    p_dec->p_vout = NULL;
-
-    /* Take care of the initial Tarkin header */
@@ -250 +251 @@
-        }
-        i_aspect = VOUT_ASPECT_FACTOR * i_width / i_height;
-tarkin_SpawnVout( p_dec, i_width, i_heigh
-   
+vout_Request( p_dec->p_fifo, p_dec->p_vou
+i_width, i_height,
-
-        /* Get a new picture */
@@ -313 +314 @@
-            input_DeletePES( p_dec->p_fifo->p_packets_mgt, p_dec->p_pes );
-
-
-
-
-
-
+
-
-        if( p_dec->tarkin_stream )
@@ -324 +321 @@
-        free( p_dec );
-    }
-}
-
-/*****************************************************************************
- * tarkin_SpawnVout: creates a new video output
- *****************************************************************************/
-static vout_thread_t *tarkin_SpawnVout( dec_thread_t *p_dec,
-                                        int i_width,
-                                        int i_height,
-                                        int i_aspect,
-                                        int i_chroma )
-{
-    vout_thread_t *p_vout;
-
-    if( !i_width || !i_height )
-        return NULL;
-
-    if( !i_chroma )
-        return NULL;
-
-    /* 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. */
-    p_vout = vlc_object_find( p_dec->p_fifo, VLC_OBJECT_VOUT,
-                                              FIND_CHILD );
-    if( !p_vout )
-    {
-        p_vout = vlc_object_find( p_dec->p_fifo, VLC_OBJECT_VOUT,
-                                                  FIND_ANYWHERE );
-    }
-
-    if( p_vout )
-    {
-        if( p_vout->render.i_width != i_width
-            || p_vout->render.i_height != i_height
-            || p_vout->render.i_chroma != i_chroma
-            || p_vout->render.i_aspect != i_aspect )
-        {
-            /* We are not interested in this format, close this vout */
-            vlc_object_detach( p_vout );
-            vlc_object_release( p_vout );
-            vout_DestroyThread( p_vout );
-            p_vout = NULL;
-        }
-        else
-        {
-            /* This video output is cool! Hijack it. */
-            vlc_object_detach( p_vout );
-            vlc_object_attach( p_vout, p_dec->p_fifo );
-            vlc_object_release( p_vout );
-        }
-    }
-
-    if( p_vout == NULL )
-    {
-        msg_Dbg( p_dec->p_fifo, "no vout present, spawning one" );
-
-        p_vout = vout_CreateThread( p_dec->p_fifo,
-                                    i_width, i_height,
-                                    i_chroma, i_aspect );
-    }
-
-    return( p_vout );
-}
-

modules/codec/theora.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 1999-2001 VideoLAN
-1 2002/11/20 14:09:57 gbazin
+2 2002/11/28 17:34:59 sam
- *
- * Authors: Gildas Bazin <gbazin@netcourrier.com>
@@ -77 +77 @@
-
-static void theora_CopyPicture( dec_thread_t *, picture_t *, yuv_buffer * );
-
+
-/*****************************************************************************
- * Module descriptor
@@ -125 +125 @@
-    p_dec->p_fifo = p_fifo;
-    p_dec->p_pes  = NULL;
+    p_dec->p_vout = NULL;
-
-    /* Take care of the initial Theora header */
@@ -153 +154 @@
-    i_chroma = VLC_FOURCC('Y','V','1','2');
-
-
-
+
+
+
-
-    /* theora decoder thread's main loop */
@@ -264 +266 @@
-            input_DeletePES( p_dec->p_fifo->p_packets_mgt, p_dec->p_pes );
-
-
-
-
-
-
+
-
-        free( p_dec );
-    }
-}
-
-/*****************************************************************************
- * theora_SpawnVout: creates a new video output
- *****************************************************************************/
-static vout_thread_t *theora_SpawnVout( dec_thread_t *p_dec,
-                                        int i_width,
-                                        int i_height,
-                                        int i_aspect,
-                                        int i_chroma )
-{
-    vout_thread_t *p_vout;
-
-    if( !i_width || !i_height )
-        return NULL;
-
-    if( !i_chroma )
-        return NULL;
-
-    /* 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. */
-    p_vout = vlc_object_find( p_dec->p_fifo, VLC_OBJECT_VOUT,
-                                              FIND_CHILD );
-    if( !p_vout )
-    {
-        p_vout = vlc_object_find( p_dec->p_fifo, VLC_OBJECT_VOUT,
-                                                  FIND_ANYWHERE );
-    }
-
-    if( p_vout )
-    {
-        if( p_vout->render.i_width != i_width
-            || p_vout->render.i_height != i_height
-            || p_vout->render.i_chroma != i_chroma
-            || p_vout->render.i_aspect != i_aspect )
-        {
-            /* We are not interested in this format, close this vout */
-            vlc_object_detach( p_vout );
-            vlc_object_release( p_vout );
-            vout_DestroyThread( p_vout );
-            p_vout = NULL;
-        }
-        else
-        {
-            /* This video output is cool! Hijack it. */
-            vlc_object_detach( p_vout );
-            vlc_object_attach( p_vout, p_dec->p_fifo );
-            vlc_object_release( p_vout );
-        }
-    }
-
-    if( p_vout == NULL )
-    {
-        msg_Dbg( p_dec->p_fifo, "no vout present, spawning one" );
-
-        p_vout = vout_CreateThread( p_dec->p_fifo,
-                                    i_width, i_height,
-                                    i_chroma, i_aspect );
-    }
-
-    return( p_vout );
-}
-

modules/codec/xvid.c

@@ -3 +3 @@
- *****************************************************************************
- * Copyright (C) 2002 VideoLAN
-2 2002/11/06 09:26:25
+3 2002/11/28 17:34:59
- *
- * Authors: Samuel Hocevar <sam@zoy.org>
-      
+
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- 
+
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -49 +49 @@
-    set_capability( "decoder", 50 );
-    set_callbacks( OpenDecoder, NULL );
- 
+
-              "Use libxvidcore's direct rendering feature." );
-vlc_module_end();
@@ -148 +148 @@
-    /* Spawn a video output if there is none. First we look amongst our
-     * children, then we look for any other vout that might be available */
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-    if( !p_vout )
-    {
-
-
-
-
-