Changeset 543556379d3748bc9e724cbbcdd4b7c100fca3dc

Show
Ignore:
Timestamp:
05/01/01 14:22:18 (7 years ago)
Author:
Sam Hocevar <sam@videolan.org>
git-committer:
Sam Hocevar <sam@videolan.org> 988719738 +0000
git-parent:

[a70f8bb371466209770c4c3bcdb7137b94acef66]

git-author:
Sam Hocevar <sam@videolan.org> 988719738 +0000
Message:
  • Fixed a segfault in the SPU decoder initialization.
Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • ChangeLog

    ra70f8bb r5435563  
    55HEAD 
    66 
     7  * Fixed a segfault in the SPU decoder initialization. 
    78  * Mandatory step for video output IV and the audio output quality 
    89    fix: the output threads are now spawned when a decoder needs one, 

  • INSTALL

    ra70f8bb r5435563  
    2222      --enable-fb --with-glide --with-ggi --with-sdl --enable-esd \ 
    2323      --enable-mga --enable-gtk --enable-qt --enable-xvideo \ 
    24       --disable-optimizatons 
     24      --enable-debug 
    2525 
    2626 

  • README

    rac57e78 r5435563  
    6262The following students were members of the VideoLAN team : 
    6363 
     641996-1997: 
    6465  Pierre Almeras <almeras@via.ecp.fr> 
    6566  Christophe Arnaud <christophe.arnaud@tps.fr> 
    …… 
    7071  Hugo Haas <hugo@via.ecp.fr> 
    7172  Mikael Journo <mj32@cornell.edu> 
    72   Michel Lespinasse <walken@wrs.com> 
     73  Michel Lespinasse <walken@zoy.org> 
    7374  Christophe Ulses <mowgli@laotseu.via.ecp.fr> 
    7475  Pierre Vandecasteele <pabv2@hermes.cam.ac.uk> 
    7576  Guillaume Vergnaud <vergnaud@via.ecp.fr> 
    7677 
     781997-1998: 
    7779  Olivier Baxa <oli@via.ecp.fr> 
    7880  Patrice Bazerque <patrice.bazerque@via.ecp.fr> 
    …… 
    8486  Olivier Pomel <pomel@via.ecp.fr> 
    8587 
     881998-1999: 
    8689  Pierre Baillet <octplane@via.ecp.fr> 
    8790  Alban Fonrouge <alban@via.ecp.fr> 
    …… 
    9497  Benoit Steiner <benny@via.ecp.fr> 
    9598 
     991999-2000: 
    96100  Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr> 
    97101  Jean-Marc Dressler <polux@via.ecp.fr> 
    98102  Ga�Hendryckx <jimmy@via.ecp.fr> 
    99   Samuel Hocevar <sam@via.ecp.fr> 
     103  Samuel Hocevar <sam@zoy.org> 
    100104  Brieuc Jeunhomme <bbp@via.ecp.fr> 
    101105  Michel Kaempf <maxx@via.ecp.fr> 
    102106  Florent Rougon <flo@via.ecp.fr> 
    103107 
     1082000-2001: 
     109  Arnaud de Bossoreille de Ribou <bozo@via.ecp.fr> 
    104110  St�ane Borel <stef@via.ecp.fr> 
    105111  Renaud Dartus <reno@via.ecp.fr> 
    106112  Henri Fallon <henri@via.ecp.fr> 
    107113  Jean-Michel Grimaldi <jm@via.ecp.fr> 
     114  Samuel Hocevar <sam@zoy.org> 
    108115  Damien Lucas <nitrox@via.ecp.fr> 
    109116  R� Peyronnet <remi@via.ecp.fr> 

  • include/input_ext-dec.h

    ra70f8bb r5435563  
    33 ***************************************************************************** 
    44 * Copyright (C) 1999, 2000 VideoLAN 
    5  * $Id: input_ext-dec.h,v 1.31 2001/05/01 04:18:17 sam Exp $ 
     5 * $Id: input_ext-dec.h,v 1.32 2001/05/01 12:22:18 sam Exp $ 
    66 * 
    77 * Authors: Christophe Massiot <massiot@via.ecp.fr> 
    …… 
    516516typedef struct vdec_config_s 
    517517{ 
    518     struct vout_thread_s *  p_vout; 
    519  
    520518    struct picture_s *   (* pf_create_picture)( struct vout_thread_s *, 
    521519                                                int i_type, int i_width, 

  • include/input_ext-intf.h

    ra70f8bb r5435563  
    55 ***************************************************************************** 
    66 * Copyright (C) 1999, 2000 VideoLAN 
    7  * $Id: input_ext-intf.h,v 1.35 2001/05/01 04:18:17 sam Exp $ 
     7 * $Id: input_ext-intf.h,v 1.36 2001/05/01 12:22:18 sam Exp $ 
    88 * 
    99 * Authors: Christophe Massiot <massiot@via.ecp.fr> 
    …… 
    133133    void *                  p_demux_data; 
    134134 
    135     /* Decoders control */ 
    136     struct vout_thread_s *  p_vout; 
    137  
    138135    int                     i_es_number;      /* size of the following array */ 
    139136    es_descriptor_t **      pp_es;                /* array of pointers to ES */ 
    …… 
    302299    /* General stream description */ 
    303300    stream_descriptor_t     stream;                            /* PAT tables */ 
    304  
    305     /* For auto-launch of decoders */ 
    306     struct vout_thread_s *  p_default_vout; 
    307301 
    308302#ifdef STATS 

  • plugins/text/intf_rc.c

    ra70f8bb r5435563  
    213213                case 'f': 
    214214                case 'F': 
    215                     p_intf->p_input->p_default_vout->i_changes |=  
    216                         VOUT_FULLSCREEN_CHANGE; 
     215                    p_main->p_vout->i_changes |= VOUT_FULLSCREEN_CHANGE; 
    217216                    break; 
    218217 

  • src/input/input.c

    ra70f8bb r5435563  
    55 ***************************************************************************** 
    66 * Copyright (C) 1998, 1999, 2000 VideoLAN 
    7  * $Id: input.c,v 1.104 2001/05/01 04:18:18 sam Exp $ 
     7 * $Id: input.c,v 1.105 2001/05/01 12:22:18 sam Exp $ 
    88 * 
    99 * Authors: Christophe Massiot <massiot@via.ecp.fr> 
    …… 
    144144    p_input->stream.control.b_bw = 0; 
    145145 
    146     /* Initialize default settings for spawned decoders */ 
    147     p_input->p_default_vout = p_main->p_vout; 
    148  
    149146    /* Create thread and set locks. */ 
    150147    vlc_mutex_init( &p_input->stream.stream_lock ); 

  • src/input/input_programs.c

    ra70f8bb r5435563  
    33 ***************************************************************************** 
    44 * Copyright (C) 1999, 2000 VideoLAN 
    5  * $Id: input_programs.c,v 1.54 2001/05/01 04:18:18 sam Exp $ 
     5 * $Id: input_programs.c,v 1.55 2001/05/01 12:22:18 sam Exp $ 
    66 * 
    77 * Authors: Christophe Massiot <massiot@via.ecp.fr> 
    …… 
    173173                                                = SYNCHRO_START; 
    174174 
    175     p_input->stream.pp_programs[i_pgrm_index]->p_vout 
    176                                             = p_input->p_default_vout; 
    177  
    178175    if( i_data_len ) 
    179176    { 
    …… 
    555552        return( NULL ); 
    556553    } 
    557     p_config->p_vout = p_input->p_default_vout; 
    558554    if( InitDecConfig( p_input, p_es, &p_config->decoder_config ) == -1 ) 
    559555    { 

  • src/spu_decoder/spu_decoder.c

    r0a4aeaa r5435563  
    33 ***************************************************************************** 
    44 * Copyright (C) 2000 VideoLAN 
    5  * $Id: spu_decoder.c,v 1.38 2001/04/28 03:36:25 sam Exp $ 
     5 * $Id: spu_decoder.c,v 1.39 2001/05/01 12:22:18 sam Exp $ 
    66 * 
    77 * Authors: Samuel Hocevar <sam@zoy.org> 
    …… 
    5050#include "spu_decoder.h" 
    5151 
     52#include "main.h" /* XXX: remove this later */ 
     53 
    5254/***************************************************************************** 
    5355 * Local prototypes 
    …… 
    8486     */ 
    8587    p_spudec->p_config = p_config; 
     88 
    8689    p_spudec->p_fifo = p_config->decoder_config.p_decoder_fifo; 
    8790 
    88     /* Get the video output informations */ 
    89     p_spudec->p_vout = p_config->p_vout; 
     91    /* XXX: The vout request and fifo opening will eventually be here */ 
     92    if( p_spudec->p_vout == NULL ) 
     93    { 
     94        if( p_main->p_vout == NULL ) 
     95        { 
     96            intf_Msg( "vpar: no vout present, spawning one" ); 
     97            p_main->p_vout = vout_CreateThread( NULL ); 
     98        } 
     99 
     100        p_spudec->p_vout = p_main->p_vout; 
     101    } 
    90102 
    91103    /* Spawn the spu decoder thread */ 

  • src/video_parser/video_parser.c

    ra70f8bb r5435563  
    33 ***************************************************************************** 
    44 * Copyright (C) 1999, 2000 VideoLAN 
    5  * $Id: video_parser.c,v 1.82 2001/05/01 04:18:18 sam Exp $ 
     5 * $Id: video_parser.c,v 1.83 2001/05/01 12:22:18 sam Exp $ 
    66 * 
    77 * Authors: Christophe Massiot <massiot@via.ecp.fr> 
    …… 
    9595    p_vpar->p_fifo = p_config->decoder_config.p_decoder_fifo; 
    9696    p_vpar->p_config = p_config; 
    97  
    98     p_vpar->p_vout = p_config->p_vout; 
    9997 
    10098    /* 

  • src/video_parser/vpar_headers.c

    ra70f8bb r5435563  
    33 ***************************************************************************** 
    44 * Copyright (C) 1999, 2000 VideoLAN 
    5  * $Id: vpar_headers.c,v 1.83 2001/05/01 04:18:18 sam Exp $ 
     5 * $Id: vpar_headers.c,v 1.84 2001/05/01 12:22:18 sam Exp $ 
    66 * 
    77 * Authors: Christophe Massiot <massiot@via.ecp.fr> 
    …… 
    453453 
    454454    /* XXX: The vout request and fifo opening will eventually be here */ 
    455     if( p_main->p_vout == NULL ) 
    456     { 
    457     intf_Msg( "vpar: no vout present, spawning one" ); 
    458         p_main->p_vout = p_vpar->p_vout = vout_CreateThread( NULL ); 
     455    if( p_vpar->p_vout == NULL ) 
     456    { 
     457        if( p_main->p_vout == NULL ) 
     458        { 
     459            intf_Msg( "vpar: no vout present, spawning one" ); 
     460            p_main->p_vout = vout_CreateThread( NULL ); 
     461        } 
     462 
     463        p_vpar->p_vout = p_main->p_vout; 
    459464    } 
    460465}