input.c 38.4 KB
Newer Older
1 2
/*****************************************************************************
 * input.c: input thread
Michel Kaempf's avatar
Michel Kaempf committed
3 4
 * Read an MPEG2 stream, demultiplex and parse it before sending it to
 * decoders.
5 6
 *****************************************************************************
 * Copyright (C) 1998, 1999, 2000 VideoLAN
Christophe Massiot's avatar
Christophe Massiot committed
7
 * $Id: input.c,v 1.147 2001/10/30 10:57:37 massiot Exp $
8
 *
9
 * Authors: Christophe Massiot <massiot@via.ecp.fr>
10 11 12 13 14
 *
 * 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.
15
 * 
16 17
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
18 19
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
20
 *
21 22 23
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
24
 *****************************************************************************/
Michel Kaempf's avatar
Michel Kaempf committed
25

26
/*****************************************************************************
Michel Kaempf's avatar
Michel Kaempf committed
27
 * Preamble
28
 *****************************************************************************/
29 30
#include "defs.h"

31 32 33 34
#include <stdlib.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <fcntl.h>
Sam Hocevar's avatar
 
Sam Hocevar committed
35 36

#ifdef HAVE_UNISTD_H
Sam Hocevar's avatar
 
Sam Hocevar committed
37
#   include <unistd.h>
Sam Hocevar's avatar
 
Sam Hocevar committed
38
#elif defined( _MSC_VER ) && defined( _WIN32 )
Sam Hocevar's avatar
 
Sam Hocevar committed
39
#   include <io.h>
Sam Hocevar's avatar
 
Sam Hocevar committed
40 41
#endif

42
#include <string.h>
Sam Hocevar's avatar
 
Sam Hocevar committed
43 44
#include <errno.h>

Sam Hocevar's avatar
 
Sam Hocevar committed
45 46 47
#ifdef STRNCASECMP_IN_STRINGS_H
#   include <strings.h>
#endif
48 49

#ifdef WIN32
50
#   include <winsock.h>
Sam Hocevar's avatar
 
Sam Hocevar committed
51 52 53 54 55 56 57 58
#   include <winsock2.h>
#elif !defined( SYS_BEOS ) && !defined( SYS_NTO )
#   include <netdb.h>                                         /* hostent ... */
#   include <sys/socket.h>
#   include <netinet/in.h>
#   include <arpa/inet.h>
#   include <sys/types.h>
#   include <sys/socket.h>
Sam Hocevar's avatar
 
Sam Hocevar committed
59
#endif
Henri Fallon's avatar
 
Henri Fallon committed
60

61 62
#ifdef HAVE_SYS_TIMES_H
#   include <sys/times.h>
63
#endif
64

Michel Kaempf's avatar
Michel Kaempf committed
65
#include "config.h"
66 67
#include "common.h"
#include "threads.h"
Michel Kaempf's avatar
Michel Kaempf committed
68
#include "mtime.h"
Sam Hocevar's avatar
 
Sam Hocevar committed
69
#include "netutils.h"
Sam Hocevar's avatar
 
Sam Hocevar committed
70
#include "modules.h"
71

72
#include "intf_msg.h"
Sam Hocevar's avatar
 
Sam Hocevar committed
73
#include "intf_playlist.h"
74

75 76 77
#include "stream_control.h"
#include "input_ext-intf.h"
#include "input_ext-dec.h"
78
#include "input_ext-plugins.h"
Michel Lespinasse's avatar
Yop,  
Michel Lespinasse committed
79

Sam Hocevar's avatar
 
Sam Hocevar committed
80 81 82
#include "interface.h"

#include "main.h"
Michel Kaempf's avatar
Michel Kaempf committed
83

84
/*****************************************************************************
Michel Kaempf's avatar
Michel Kaempf committed
85
 * Local prototypes
86
 *****************************************************************************/
Sam Hocevar's avatar
 
Sam Hocevar committed
87 88 89 90 91
static void RunThread       ( input_thread_t *p_input );
static  int InitThread      ( input_thread_t *p_input );
static void ErrorThread     ( input_thread_t *p_input );
static void DestroyThread   ( input_thread_t *p_input );
static void EndThread       ( input_thread_t *p_input );
Michel Kaempf's avatar
Michel Kaempf committed
92

Sam Hocevar's avatar
 
Sam Hocevar committed
93
static void FileOpen        ( input_thread_t *p_input );
Christophe Massiot's avatar
Christophe Massiot committed
94
static void StdOpen         ( input_thread_t *p_input );
Sam Hocevar's avatar
 
Sam Hocevar committed
95
static void FileClose       ( input_thread_t *p_input );
Sam Hocevar's avatar
 
Sam Hocevar committed
96
#if !defined( SYS_BEOS ) && !defined( SYS_NTO )
Sam Hocevar's avatar
 
Sam Hocevar committed
97
static void NetworkOpen     ( input_thread_t *p_input );
98
static void HTTPOpen        ( input_thread_t *p_input );
Sam Hocevar's avatar
 
Sam Hocevar committed
99
static void NetworkClose    ( input_thread_t *p_input );
Sam Hocevar's avatar
 
Sam Hocevar committed
100
#endif
Sam Hocevar's avatar
 
Sam Hocevar committed
101

102
/*****************************************************************************
103
 * input_CreateThread: creates a new input thread
104
 *****************************************************************************
105 106 107 108
 * This function creates a new input, and returns a pointer
 * to its description. On error, it returns NULL.
 * If pi_status is NULL, then the function will block until the thread is ready.
 * If not, it will be updated using one of the THREAD_* constants.
109
 *****************************************************************************/
Sam Hocevar's avatar
 
Sam Hocevar committed
110
input_thread_t *input_CreateThread ( playlist_item_t *p_item, int *pi_status )
Michel Kaempf's avatar
Michel Kaempf committed
111
{
112 113 114
    input_thread_t *    p_input;                        /* thread descriptor */
    int                 i_status;                           /* thread status */

115 116 117
    /* Allocate descriptor */
    p_input = (input_thread_t *)malloc( sizeof(input_thread_t) );
    if( p_input == NULL )
Michel Kaempf's avatar
Michel Kaempf committed
118
    {
Sam Hocevar's avatar
 
Sam Hocevar committed
119 120
        intf_ErrMsg( "input error: can't allocate input thread (%s)",
                     strerror(errno) );
Michel Kaempf's avatar
Michel Kaempf committed
121 122
        return( NULL );
    }
123

124 125 126
    /* Packets read once */
    p_input->i_read_once = INPUT_READ_ONCE;

127 128 129
    /* Initialize thread properties */
    p_input->b_die              = 0;
    p_input->b_error            = 0;
Sam Hocevar's avatar
 
Sam Hocevar committed
130 131 132 133 134
    p_input->b_eof              = 0;

    /* Set target */
    p_input->p_source           = p_item->psz_name;

135
    /* I have never understood that stuff --Meuuh */
136 137
    p_input->pi_status          = (pi_status != NULL) ? pi_status : &i_status;
    *p_input->pi_status         = THREAD_CREATE;
Michel Kaempf's avatar
Michel Kaempf committed
138

139
    /* Initialize stream description */
140 141
    p_input->stream.i_es_number = 0;
    p_input->stream.i_selected_es_number = 0;
142
    p_input->stream.i_pgrm_number = 0;
143
    p_input->stream.i_new_status = p_input->stream.i_new_rate = 0;
144
    p_input->stream.b_new_mute = MUTE_NO_CHANGE;
Christophe Massiot's avatar
Christophe Massiot committed
145
    p_input->stream.i_mux_rate = 0;
Michel Kaempf's avatar
Michel Kaempf committed
146

147
    /* no stream, no area */
Stéphane Borel's avatar
 
Stéphane Borel committed
148 149
    p_input->stream.i_area_nb = 0;
    p_input->stream.pp_areas = NULL;
150
    p_input->stream.p_selected_area = NULL;
151
    p_input->stream.p_new_area = NULL;
Sam Hocevar's avatar
 
Sam Hocevar committed
152 153

    /* By default there is one area in a stream */
Stéphane Borel's avatar
 
Stéphane Borel committed
154
    input_AddArea( p_input );
155
    p_input->stream.p_selected_area = p_input->stream.pp_areas[0];
Stéphane Borel's avatar
 
Stéphane Borel committed
156

157 158 159 160
    /* Initialize stream control properties. */
    p_input->stream.control.i_status = PLAYING_S;
    p_input->stream.control.i_rate = DEFAULT_RATE;
    p_input->stream.control.b_mute = 0;
161 162 163 164
    p_input->stream.control.b_grayscale = main_GetIntVariable(
                            VOUT_GRAYSCALE_VAR, VOUT_GRAYSCALE_DEFAULT );
    p_input->stream.control.i_smp = main_GetIntVariable(
                            VDEC_SMP_VAR, VDEC_SMP_DEFAULT );
Michel Kaempf's avatar
Michel Kaempf committed
165

Sam Hocevar's avatar
 
Sam Hocevar committed
166 167
    intf_WarnMsg( 1, "input: playlist item `%s'", p_input->p_source );

Sam Hocevar's avatar
 
Sam Hocevar committed
168
    /* Create thread. */
169 170
    if( vlc_thread_create( &p_input->thread_id, "input", (void *) RunThread,
                           (void *) p_input ) )
Michel Kaempf's avatar
Michel Kaempf committed
171
    {
Sam Hocevar's avatar
 
Sam Hocevar committed
172 173
        intf_ErrMsg( "input error: can't create input thread (%s)",
                     strerror(errno) );
Michel Kaempf's avatar
Michel Kaempf committed
174 175 176
        free( p_input );
        return( NULL );
    }
177

178 179 180 181
    /* If status is NULL, wait until the thread is created */
    if( pi_status == NULL )
    {
        do
182
        {
183
            msleep( THREAD_SLEEP );
184
        } while( (i_status != THREAD_READY) && (i_status != THREAD_ERROR)
Sam Hocevar's avatar
 
Sam Hocevar committed
185
                && (i_status != THREAD_FATAL) );
186 187
        if( i_status != THREAD_READY )
        {
188 189
            return( NULL );
        }
190
    }
Michel Kaempf's avatar
Michel Kaempf committed
191 192 193
    return( p_input );
}

194
/*****************************************************************************
Michel Kaempf's avatar
Michel Kaempf committed
195
 * input_DestroyThread: mark an input thread as zombie
196
 *****************************************************************************
Michel Kaempf's avatar
Michel Kaempf committed
197
 * This function should not return until the thread is effectively cancelled.
198
 *****************************************************************************/
199
void input_DestroyThread( input_thread_t *p_input, int *pi_status )
Michel Kaempf's avatar
Michel Kaempf committed
200
{
201
    int         i_status;                                   /* thread status */
202 203 204

    /* Set status */
    p_input->pi_status = (pi_status != NULL) ? pi_status : &i_status;
205 206
    *p_input->pi_status = THREAD_DESTROY;

207 208
    /* Request thread destruction */
    p_input->b_die = 1;
Michel Kaempf's avatar
Michel Kaempf committed
209

210 211 212 213 214
    /* Make the thread exit of an eventual vlc_cond_wait() */
    vlc_mutex_lock( &p_input->stream.stream_lock );
    vlc_cond_signal( &p_input->stream.stream_wait );
    vlc_mutex_unlock( &p_input->stream.stream_lock );

215 216 217 218 219 220
    /* If status is NULL, wait until thread has been destroyed */
    if( pi_status == NULL )
    {
        do
        {
            msleep( THREAD_SLEEP );
221 222
        } while ( (i_status != THREAD_OVER) && (i_status != THREAD_ERROR)
                  && (i_status != THREAD_FATAL) );
223
    }
Michel Kaempf's avatar
Michel Kaempf committed
224 225
}

226
/*****************************************************************************
227
 * RunThread: main thread loop
228
 *****************************************************************************
229
 * Thread in charge of processing the network packets and demultiplexing.
230
 *****************************************************************************/
231
static void RunThread( input_thread_t *p_input )
Michel Kaempf's avatar
Michel Kaempf committed
232
{
233
    int                     i_error, i;
Sam Hocevar's avatar
 
Sam Hocevar committed
234
    data_packet_t **        pp_packets;
Michel Kaempf's avatar
Michel Kaempf committed
235

Sam Hocevar's avatar
 
Sam Hocevar committed
236 237 238 239 240 241 242 243 244
    if( InitThread( p_input ) )
    {
        /* If we failed, wait before we are killed, and exit */
        *p_input->pi_status = THREAD_ERROR;
        p_input->b_error = 1;
        ErrorThread( p_input );
        DestroyThread( p_input );
        return;
    }
Michel Kaempf's avatar
Michel Kaempf committed
245

246 247 248 249 250
    /* initialization is completed */
    vlc_mutex_lock( &p_input->stream.stream_lock );
    p_input->stream.b_changed = 1;
    vlc_mutex_unlock( &p_input->stream.stream_lock );

Sam Hocevar's avatar
 
Sam Hocevar committed
251 252 253
    pp_packets = (data_packet_t **) malloc( p_input->i_read_once *
                                        sizeof( data_packet_t * ) );
    if( pp_packets == NULL )
254
    {
Sam Hocevar's avatar
 
Sam Hocevar committed
255
        intf_ErrMsg( "input error: out of memory" );
Sam Hocevar's avatar
 
Sam Hocevar committed
256
        free( pp_packets );
Sam Hocevar's avatar
 
Sam Hocevar committed
257 258
        p_input->b_error = 1;
    }
259

Sam Hocevar's avatar
 
Sam Hocevar committed
260 261
    while( !p_input->b_die && !p_input->b_error && !p_input->b_eof )
    {
Sam Hocevar's avatar
 
Sam Hocevar committed
262
        p_input->c_loops++;
Sam Hocevar's avatar
 
Sam Hocevar committed
263

264
        vlc_mutex_lock( &p_input->stream.stream_lock );
265

266 267
        if( p_input->stream.p_new_area )
        {
268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284
            if( p_input->stream.b_seekable && p_input->pf_set_area != NULL )
            {

                p_input->pf_set_area( p_input, p_input->stream.p_new_area );

                for( i = 0; i < p_input->stream.i_pgrm_number; i++ )
                {
                    pgrm_descriptor_t * p_pgrm
                                            = p_input->stream.pp_programs[i];
                    /* Escape all decoders for the stream discontinuity they
                     * will encounter. */
                    input_EscapeDiscontinuity( p_input, p_pgrm );

                    /* Reinitialize synchro. */
                    p_pgrm->i_synchro_state = SYNCHRO_REINIT;
                }
            }
285 286 287
            p_input->stream.p_new_area = NULL;
        }

288
        if( p_input->stream.p_selected_area->i_seek != NO_SEEK )
Sam Hocevar's avatar
 
Sam Hocevar committed
289
        {
290 291
            if( p_input->stream.b_seekable && p_input->pf_seek != NULL )
            {
292 293
                p_input->pf_seek( p_input,
                                  p_input->stream.p_selected_area->i_seek );
294 295 296 297 298 299 300 301 302 303 304 305 306

                for( i = 0; i < p_input->stream.i_pgrm_number; i++ )
                {
                    pgrm_descriptor_t * p_pgrm
                                            = p_input->stream.pp_programs[i];
                    /* Escape all decoders for the stream discontinuity they
                     * will encounter. */
                    input_EscapeDiscontinuity( p_input, p_pgrm );

                    /* Reinitialize synchro. */
                    p_pgrm->i_synchro_state = SYNCHRO_REINIT;
                }
            }
307
            p_input->stream.p_selected_area->i_seek = NO_SEEK;
Sam Hocevar's avatar
 
Sam Hocevar committed
308
        }
309

310 311 312 313 314 315 316 317 318 319 320 321
        if( p_input->stream.p_removed_es )
        {
            input_UnselectES( p_input, p_input->stream.p_removed_es );
            p_input->stream.p_removed_es = NULL;
        }

        if( p_input->stream.p_newly_selected_es )
        {
            input_SelectES( p_input, p_input->stream.p_newly_selected_es );
            p_input->stream.p_newly_selected_es = NULL;
        }

322 323 324 325 326 327 328 329 330 331 332 333 334 335
        if( p_input->stream.b_new_mute != MUTE_NO_CHANGE )
        {
            if( p_input->stream.b_new_mute )
            {
                input_EscapeAudioDiscontinuity( p_input );
            }

            vlc_mutex_lock( &p_input->stream.control.control_lock );
            p_input->stream.control.b_mute = p_input->stream.b_new_mute;
            vlc_mutex_unlock( &p_input->stream.control.control_lock );

            p_input->stream.b_new_mute = MUTE_NO_CHANGE;
        }

336
        vlc_mutex_unlock( &p_input->stream.stream_lock );
Sam Hocevar's avatar
 
Sam Hocevar committed
337 338

        i_error = p_input->pf_read( p_input, pp_packets );
Sam Hocevar's avatar
 
Sam Hocevar committed
339

Sam Hocevar's avatar
 
Sam Hocevar committed
340
        /* Demultiplex read packets. */
341
        for( i = 0; i < p_input->i_read_once && pp_packets[i] != NULL; i++ )
Sam Hocevar's avatar
 
Sam Hocevar committed
342
        {
343
            p_input->stream.c_packets_read++;
Sam Hocevar's avatar
 
Sam Hocevar committed
344 345
            p_input->pf_demux( p_input, pp_packets[i] );
        }
Sam Hocevar's avatar
 
Sam Hocevar committed
346

Sam Hocevar's avatar
 
Sam Hocevar committed
347 348 349
        if( i_error )
        {
            if( i_error == 1 )
Sam Hocevar's avatar
Sam Hocevar committed
350
            {
Sam Hocevar's avatar
 
Sam Hocevar committed
351 352
                /* End of file - we do not set b_die because only the
                 * interface is allowed to do so. */
353
                intf_WarnMsg( 3, "input: EOF reached" );
Sam Hocevar's avatar
 
Sam Hocevar committed
354
                p_input->b_eof = 1;
Sam Hocevar's avatar
 
Sam Hocevar committed
355
            }
Sam Hocevar's avatar
 
Sam Hocevar committed
356
            else
Sam Hocevar's avatar
 
Sam Hocevar committed
357
            {
Sam Hocevar's avatar
 
Sam Hocevar committed
358
                p_input->b_error = 1;
Sam Hocevar's avatar
Sam Hocevar committed
359
            }
360 361 362
        }
    }

Sam Hocevar's avatar
 
Sam Hocevar committed
363 364
    free( pp_packets );

Sam Hocevar's avatar
 
Sam Hocevar committed
365
    if( p_input->b_error || p_input->b_eof )
366 367 368
    {
        ErrorThread( p_input );
    }
369

370
    EndThread( p_input );
Sam Hocevar's avatar
 
Sam Hocevar committed
371 372 373

    DestroyThread( p_input );

Sam Hocevar's avatar
 
Sam Hocevar committed
374
    intf_DbgMsg("input: Thread end");
375 376
}

377
/*****************************************************************************
Sam Hocevar's avatar
 
Sam Hocevar committed
378
 * InitThread: init the input Thread
379
 *****************************************************************************/
Sam Hocevar's avatar
 
Sam Hocevar committed
380
static int InitThread( input_thread_t * p_input )
Michel Kaempf's avatar
Michel Kaempf committed
381 382
{

383 384
    /* Initialize statistics */
    p_input->c_loops                    = 0;
385 386
    p_input->stream.c_packets_read      = 0;
    p_input->stream.c_packets_trashed   = 0;
387
    p_input->p_stream                   = NULL;
Sam Hocevar's avatar
Sam Hocevar committed
388

Sam Hocevar's avatar
 
Sam Hocevar committed
389 390 391 392 393
    /* Set locks. */
    vlc_mutex_init( &p_input->stream.stream_lock );
    vlc_cond_init( &p_input->stream.stream_wait );
    vlc_mutex_init( &p_input->stream.control.control_lock );

394
    /* Find appropriate module. */
Sam Hocevar's avatar
 
Sam Hocevar committed
395
    p_input->p_input_module = module_Need( MODULE_CAPABILITY_INPUT,
Sam Hocevar's avatar
 
Sam Hocevar committed
396
                                           (probedata_t *)p_input );
Sam Hocevar's avatar
 
Sam Hocevar committed
397 398

    if( p_input->p_input_module == NULL )
399
    {
Sam Hocevar's avatar
 
Sam Hocevar committed
400 401
        intf_ErrMsg( "input error: no suitable input module for `%s'",
                     p_input->p_source );
Sam Hocevar's avatar
 
Sam Hocevar committed
402
        return( -1 );
Michel Kaempf's avatar
Michel Kaempf committed
403
    }
404

Sam Hocevar's avatar
 
Sam Hocevar committed
405 406 407
#define f p_input->p_input_module->p_functions->input.functions.input
    p_input->pf_init          = f.pf_init;
    p_input->pf_end           = f.pf_end;
408
    p_input->pf_init_bit_stream= f.pf_init_bit_stream;
Sam Hocevar's avatar
 
Sam Hocevar committed
409
    p_input->pf_read          = f.pf_read;
410
    p_input->pf_set_area      = f.pf_set_area;
Sam Hocevar's avatar
 
Sam Hocevar committed
411 412 413 414 415 416 417 418
    p_input->pf_demux         = f.pf_demux;
    p_input->pf_new_packet    = f.pf_new_packet;
    p_input->pf_new_pes       = f.pf_new_pes;
    p_input->pf_delete_packet = f.pf_delete_packet;
    p_input->pf_delete_pes    = f.pf_delete_pes;
    p_input->pf_rewind        = f.pf_rewind;
    p_input->pf_seek          = f.pf_seek;
#undef f
Sam Hocevar's avatar
 
Sam Hocevar committed
419

420
#if !defined( SYS_BEOS ) && !defined( SYS_NTO )
421 422 423 424 425 426 427 428 429 430 431 432 433
    /* FIXME : this is waaaay too kludgy */
    if( (strlen( p_input->p_source ) > 3) && !strncasecmp( p_input->p_source, "ts:", 3 ) )
    {
        /* Network stream */
        NetworkOpen( p_input );
        p_input->stream.i_method = INPUT_METHOD_NETWORK;
    }
    else if( ( strlen( p_input->p_source ) > 5 ) && !strncasecmp( p_input->p_source, "http:", 5 ) )
    {
        /* HTTP stream */
        HTTPOpen( p_input );
        p_input->stream.i_method = INPUT_METHOD_NETWORK;
    }
434 435 436
    else 
#endif
        if( ( strlen( p_input->p_source ) > 4 ) && !strncasecmp( p_input->p_source, "dvd:", 4 ) )
437 438 439 440 441
    {
        /* DVD - this is THE kludge */
        p_input->p_input_module->p_functions->input.functions.input.pf_open( p_input );
        p_input->stream.i_method = INPUT_METHOD_DVD;
    }
442 443 444 445 446
    else if( ( strlen( p_input->p_source ) > 4 ) && !strncasecmp( p_input->p_source, "vlc:", 4 ) )
    {
        /* Dummy input - very kludgy */
        p_input->p_input_module->p_functions->input.functions.input.pf_open( p_input );
    }
Christophe Massiot's avatar
Christophe Massiot committed
447 448 449 450 451
    else if( ( strlen( p_input->p_source ) == 1 ) && *p_input->p_source == '-' )
    {
        /* Stdin */
        StdOpen( p_input );
    }
452 453 454 455 456 457
    else
    {
        /* File input */
        FileOpen( p_input );
        p_input->stream.i_method = INPUT_METHOD_FILE;
    }
458

Sam Hocevar's avatar
 
Sam Hocevar committed
459
    if( p_input->b_error )
460
    {
Sam Hocevar's avatar
 
Sam Hocevar committed
461
        /* We barfed -- exit nicely */
Sam Hocevar's avatar
 
Sam Hocevar committed
462
        module_Unneed( p_input->p_input_module );
Sam Hocevar's avatar
 
Sam Hocevar committed
463
        return( -1 );
464
    }
Sam Hocevar's avatar
 
Sam Hocevar committed
465 466

    p_input->pf_init( p_input );
Sam Hocevar's avatar
 
Sam Hocevar committed
467

468 469 470 471
    if( p_input->b_error )
    {
        /* We barfed -- exit nicely */
        p_input->pf_close( p_input );
Sam Hocevar's avatar
 
Sam Hocevar committed
472
        module_Unneed( p_input->p_input_module );
473 474 475
        return( -1 );
    }

Sam Hocevar's avatar
 
Sam Hocevar committed
476
    *p_input->pi_status = THREAD_READY;
Sam Hocevar's avatar
 
Sam Hocevar committed
477 478

    return( 0 );
Michel Kaempf's avatar
Michel Kaempf committed
479 480
}

481
/*****************************************************************************
482
 * ErrorThread: RunThread() error loop
483
 *****************************************************************************
484
 * This function is called when an error occured during thread main's loop.
485
 *****************************************************************************/
486
static void ErrorThread( input_thread_t *p_input )
Michel Kaempf's avatar
Michel Kaempf committed
487
{
488
    while( !p_input->b_die )
Michel Kaempf's avatar
Michel Kaempf committed
489
    {
490 491
        /* Sleep a while */
        msleep( INPUT_IDLE_SLEEP );
Michel Kaempf's avatar
Michel Kaempf committed
492 493 494
    }
}

495
/*****************************************************************************
496
 * EndThread: end the input thread
497
 *****************************************************************************/
498
static void EndThread( input_thread_t * p_input )
499
{
500
    int *       pi_status;                                  /* thread status */
501

502 503 504
    /* Store status */
    pi_status = p_input->pi_status;
    *pi_status = THREAD_END;
Sam Hocevar's avatar
Sam Hocevar committed
505

506
    if( p_main->b_stats )
Sam Hocevar's avatar
 
Sam Hocevar committed
507
    {
508
#ifdef HAVE_SYS_TIMES_H
509 510
        /* Display statistics */
        struct tms  cpu_usage;
Sam Hocevar's avatar
 
Sam Hocevar committed
511 512
        times( &cpu_usage );

513 514 515
        intf_StatMsg( "input stats: %d loops consuming user: %d, system: %d",
                      p_input->c_loops,
                      cpu_usage.tms_utime, cpu_usage.tms_stime );
516 517 518
#else
        intf_StatMsg( "input stats: %d loops", p_input->c_loops );
#endif
519 520

        input_DumpStream( p_input );
Sam Hocevar's avatar
 
Sam Hocevar committed
521 522 523 524 525 526 527 528
    }

    /* Free all ES and destroy all decoder threads */
    input_EndStream( p_input );

    /* Free demultiplexer's data */
    p_input->pf_end( p_input );

529
#if !defined( SYS_BEOS ) && !defined( SYS_NTO )
Sam Hocevar's avatar
 
Sam Hocevar committed
530
    /* Close stream */
531 532 533 534 535 536 537 538
    if( (strlen( p_input->p_source ) > 3) && !strncasecmp( p_input->p_source, "ts:", 3 ) )
    {
        NetworkClose( p_input );
    }
    else if( ( strlen( p_input->p_source ) > 5 ) && !strncasecmp( p_input->p_source, "http:", 5 ) )
    {
        NetworkClose( p_input );
    }
539 540 541
    else 
#endif
    if( ( strlen( p_input->p_source ) > 4 ) && !strncasecmp( p_input->p_source, "dvd:", 4 ) )
542 543 544
    {
        p_input->p_input_module->p_functions->input.functions.input.pf_close( p_input );
    }
545 546 547 548
    else if( ( strlen( p_input->p_source ) > 4 ) && !strncasecmp( p_input->p_source, "vlc:", 4 ) )
    {
        p_input->p_input_module->p_functions->input.functions.input.pf_close( p_input );
    }
549 550 551 552
    else
    {
        FileClose( p_input );
    }
Sam Hocevar's avatar
 
Sam Hocevar committed
553

Sam Hocevar's avatar
 
Sam Hocevar committed
554
    /* Release modules */
Sam Hocevar's avatar
 
Sam Hocevar committed
555
    module_Unneed( p_input->p_input_module );
Sam Hocevar's avatar
 
Sam Hocevar committed
556

Sam Hocevar's avatar
 
Sam Hocevar committed
557 558 559 560 561 562 563 564 565 566 567
}

/*****************************************************************************
 * DestroyThread: destroy the input thread
 *****************************************************************************/
static void DestroyThread( input_thread_t * p_input )
{
    int *       pi_status;                                  /* thread status */

    /* Store status */
    pi_status = p_input->pi_status;
Sam Hocevar's avatar
 
Sam Hocevar committed
568

Henri Fallon's avatar
 
Henri Fallon committed
569 570
    /* Destroy Mutex locks */
    vlc_mutex_destroy( &p_input->stream.control.control_lock );
Henri Fallon's avatar
 
Henri Fallon committed
571
    vlc_mutex_destroy( &p_input->stream.stream_lock );
Henri Fallon's avatar
 
Henri Fallon committed
572
    
573
    /* Free input structure */
574
    free( p_input );
575

576 577
    /* Update status */
    *pi_status = THREAD_OVER;
Sam Hocevar's avatar
Sam Hocevar committed
578
}
579

Christophe Massiot's avatar
Christophe Massiot committed
580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598
/*****************************************************************************
 * StdOpen : open standard input
 *****************************************************************************/
static void StdOpen( input_thread_t * p_input )
{
    vlc_mutex_lock( &p_input->stream.stream_lock );

    /* Suppose we can control the pace - this won't work in some cases ! */
    p_input->stream.b_pace_control = 1;

    p_input->stream.b_seekable = 0;
    p_input->stream.p_selected_area->i_size = 0;
    p_input->stream.p_selected_area->i_tell = 0;
    vlc_mutex_unlock( &p_input->stream.stream_lock );

    intf_WarnMsg( 2, "input: opening stdin" );
    p_input->i_handle = 0;
}

Sam Hocevar's avatar
Sam Hocevar committed
599
/*****************************************************************************
Sam Hocevar's avatar
 
Sam Hocevar committed
600
 * FileOpen : open a file descriptor
Sam Hocevar's avatar
Sam Hocevar committed
601
 *****************************************************************************/
Sam Hocevar's avatar
 
Sam Hocevar committed
602
static void FileOpen( input_thread_t * p_input )
Michel Kaempf's avatar
Michel Kaempf committed
603
{
604
    struct stat         stat_info;
Sam Hocevar's avatar
 
Sam Hocevar committed
605 606 607
    int                 i_stat;

    char *psz_name = p_input->p_source;
Michel Kaempf's avatar
Michel Kaempf committed
608

Sam Hocevar's avatar
 
Sam Hocevar committed
609
    if( ( i_stat = stat( psz_name, &stat_info ) ) == (-1) )
Sam Hocevar's avatar
 
Sam Hocevar committed
610
    {
Sam Hocevar's avatar
 
Sam Hocevar committed
611 612 613 614 615 616 617 618
        int i_size = strlen( psz_name );

        if( ( i_size > 4 )
            && !strncasecmp( psz_name, "dvd:", 4 ) )
        {
            /* get rid of the 'dvd:' stuff and try again */
            psz_name += 4;
            i_stat = stat( psz_name, &stat_info );
Henri Fallon's avatar
 
Henri Fallon committed
619
        }
620 621
        else if( ( i_size > 4 )
                 && !strncasecmp( psz_name, "vcd:", 4 ) )
622 623 624 625 626
        {
            /* get rid of the 'vcd:' stuff and try again */
            psz_name += 4;
            i_stat = stat( psz_name, &stat_info );
        }
Sam Hocevar's avatar
 
Sam Hocevar committed
627
        else if( ( i_size > 5 )
Sam Hocevar's avatar
 
Sam Hocevar committed
628 629 630 631 632
                 && !strncasecmp( psz_name, "file:", 5 ) )
        {
            /* get rid of the 'file:' stuff and try again */
            psz_name += 5;
            i_stat = stat( psz_name, &stat_info );
Henri Fallon's avatar
 
Henri Fallon committed
633
        }
Sam Hocevar's avatar
 
Sam Hocevar committed
634

Sam Hocevar's avatar
 
Sam Hocevar committed
635
        if( i_stat == (-1) )
Sam Hocevar's avatar
 
Sam Hocevar committed
636 637 638 639 640 641
        {
            intf_ErrMsg( "input error: cannot stat() file `%s' (%s)",
                         psz_name, strerror(errno));
            p_input->b_error = 1;
            return;
        }
Sam Hocevar's avatar
 
Sam Hocevar committed
642 643 644 645 646 647 648 649
    }

    vlc_mutex_lock( &p_input->stream.stream_lock );

    /* If we are here we can control the pace... */
    p_input->stream.b_pace_control = 1;

    if( S_ISREG(stat_info.st_mode) || S_ISCHR(stat_info.st_mode)
Sam Hocevar's avatar
 
Sam Hocevar committed
650
         || S_ISBLK(stat_info.st_mode) )
Sam Hocevar's avatar
 
Sam Hocevar committed
651 652
    {
        p_input->stream.b_seekable = 1;
653
        p_input->stream.p_selected_area->i_size = stat_info.st_size;
Sam Hocevar's avatar
 
Sam Hocevar committed
654
    }
Jean-Marc Dressler's avatar
 
Jean-Marc Dressler committed
655
    else if( S_ISFIFO(stat_info.st_mode)
Sam Hocevar's avatar
 
Sam Hocevar committed
656
#if !defined( SYS_BEOS ) && !defined( WIN32 )
Jean-Marc Dressler's avatar
 
Jean-Marc Dressler committed
657 658 659
             || S_ISSOCK(stat_info.st_mode)
#endif
             )
Sam Hocevar's avatar
Sam Hocevar committed
660
    {
661
        p_input->stream.b_seekable = 0;
662
        p_input->stream.p_selected_area->i_size = 0;
Benoit Steiner's avatar
 
Benoit Steiner committed
663 664 665
    }
    else
    {
666
        vlc_mutex_unlock( &p_input->stream.stream_lock );
Sam Hocevar's avatar
 
Sam Hocevar committed
667
        intf_ErrMsg( "input error: unknown file type for `%s'",
Sam Hocevar's avatar
 
Sam Hocevar committed
668
                     psz_name );
Sam Hocevar's avatar
 
Sam Hocevar committed
669 670 671
        p_input->b_error = 1;
        return;
    }
672

673
    p_input->stream.p_selected_area->i_tell = 0;
Sam Hocevar's avatar
 
Sam Hocevar committed
674 675
    vlc_mutex_unlock( &p_input->stream.stream_lock );

Sam Hocevar's avatar
 
Sam Hocevar committed
676
    intf_WarnMsg( 2, "input: opening file `%s'", p_input->p_source );
Sam Hocevar's avatar
 
Sam Hocevar committed
677
    if( (p_input->i_handle = open( psz_name,
Sam Hocevar's avatar
 
Sam Hocevar committed
678 679
                                   /*O_NONBLOCK | O_LARGEFILE*/0 )) == (-1) )
    {
Sam Hocevar's avatar
 
Sam Hocevar committed
680
        intf_ErrMsg( "input error: cannot open file (%s)", strerror(errno) );
Sam Hocevar's avatar
 
Sam Hocevar committed
681 682
        p_input->b_error = 1;
        return;
Michel Kaempf's avatar
Michel Kaempf committed
683 684 685
    }

}
Stéphane Borel's avatar
Stéphane Borel committed
686 687

/*****************************************************************************
Sam Hocevar's avatar
 
Sam Hocevar committed
688
 * FileClose : close a file descriptor
Stéphane Borel's avatar
Stéphane Borel committed
689
 *****************************************************************************/
Sam Hocevar's avatar
 
Sam Hocevar committed
690
static void FileClose( input_thread_t * p_input )
Stéphane Borel's avatar
Stéphane Borel committed
691
{
Sam Hocevar's avatar
 
Sam Hocevar committed
692
    intf_WarnMsg( 2, "input: closing file `%s'", p_input->p_source );
Sam Hocevar's avatar
 
Sam Hocevar committed
693

Sam Hocevar's avatar
 
Sam Hocevar committed
694
    close( p_input->i_handle );
Stéphane Borel's avatar
Stéphane Borel committed
695

Sam Hocevar's avatar
 
Sam Hocevar committed
696
    return;
Stéphane Borel's avatar
Stéphane Borel committed
697
}
Sam Hocevar's avatar
 
Sam Hocevar committed
698

699
#if !defined( SYS_BEOS ) && !defined( SYS_NTO )
Henri Fallon's avatar
 
Henri Fallon committed
700
/*****************************************************************************
Sam Hocevar's avatar
 
Sam Hocevar committed
701
 * NetworkOpen : open a network socket 
Henri Fallon's avatar
 
Henri Fallon committed
702
 *****************************************************************************/
Sam Hocevar's avatar
 
Sam Hocevar committed
703
static void NetworkOpen( input_thread_t * p_input )
Henri Fallon's avatar
 
Henri Fallon committed
704
{
Henri Fallon's avatar
 
Henri Fallon committed
705
    char                *psz_server = NULL;
706
    char                *psz_broadcast = NULL;
Henri Fallon's avatar
 
Henri Fallon committed
707
    int                 i_port = 0;
Sam Hocevar's avatar
 
Sam Hocevar committed
708
    int                 i_opt;
709
    int                 i_opt_size;
Sam Hocevar's avatar
 
Sam Hocevar committed
710
    struct sockaddr_in  sock;
711 712
    unsigned int        i_mc_group;

Sam Hocevar's avatar
 
Sam Hocevar committed
713 714
#ifdef WIN32
    WSADATA Data;
Sam Hocevar's avatar
 
Sam Hocevar committed
715 716 717 718 719 720
    int i_err;
#endif
    
#ifdef WIN32
    /* WinSock Library Init. */
    i_err = WSAStartup( MAKEWORD( 1, 1 ), &Data );
Sam Hocevar's avatar
 
Sam Hocevar committed
721 722 723 724 725 726 727

    if( i_err )
    {
        intf_ErrMsg( "input: can't initiate WinSocks, error %i", i_err );
        return ;
    }
#endif
Henri Fallon's avatar
 
Henri Fallon committed
728 729
    
    /* Get the remote server */
Sam Hocevar's avatar
 
Sam Hocevar committed
730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751
    if( p_input->p_source != NULL )
    {
        psz_server = p_input->p_source;

        /* Skip the protocol name */
        while( *psz_server && *psz_server != ':' )
        {
            psz_server++;
        }

        /* Skip the "://" part */
        while( *psz_server && (*psz_server == ':' || *psz_server == '/') )
        {
            psz_server++;
        }

        /* Found a server name */
        if( *psz_server )
        {
            char *psz_port = psz_server;

            /* Skip the hostname part */
Sam Hocevar's avatar
 
Sam Hocevar committed
752
            while( *psz_port && *psz_port != ':' && *psz_port != '/' )
Sam Hocevar's avatar
 
Sam Hocevar committed
753 754 755 756
            {
                psz_port++;
            }

Sam Hocevar's avatar
 
Sam Hocevar committed
757
            /* Found a port name or a broadcast addres */
Sam Hocevar's avatar
 
Sam Hocevar committed
758 759
            if( *psz_port )
            {
Sam Hocevar's avatar
 
Sam Hocevar committed
760 761 762 763 764 765 766
		/* That's a port name */
		if( *psz_port == ':' )
		{
                    *psz_port = '\0';
                    psz_port++;
                    i_port = atoi( psz_port );
		}
Sam Hocevar's avatar
 
Sam Hocevar committed
767

Sam Hocevar's avatar
 
Sam Hocevar committed
768 769
		/* Search for '/' just after the port in case
		 * we also have a broadcast address */
770
                psz_broadcast = psz_port;
Sam Hocevar's avatar
 
Sam Hocevar committed
771
                while( *psz_broadcast && *psz_broadcast != '/' )
772 773 774 775 776 777 778 779
                {
                    psz_broadcast++;
                }

                if( *psz_broadcast )
                {
                    *psz_broadcast = '\0';
                    psz_broadcast++;
Sam Hocevar's avatar
 
Sam Hocevar committed
780
                    while( *psz_broadcast && *psz_broadcast == '/' )
781 782 783 784 785 786 787 788
                    {
                        psz_broadcast++;
                    }
                }
                else
                {
                    psz_broadcast = NULL;
                }
Sam Hocevar's avatar
 
Sam Hocevar committed
789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805
            }
        }
        else
        {
            psz_server = NULL;
        }
    }

    /* Check that we got a valid server */
    if( psz_server == NULL )
    {
        psz_server = main_GetPszVariable( INPUT_SERVER_VAR, 
                                          INPUT_SERVER_DEFAULT );
    }

    /* Check that we got a valid port */
    if( i_port == 0 )
Henri Fallon's avatar
 
Henri Fallon committed
806
    {
Sam Hocevar's avatar
 
Sam Hocevar committed
807
        i_port = main_GetIntVariable( INPUT_PORT_VAR, INPUT_PORT_DEFAULT );
Henri Fallon's avatar
 
Henri Fallon committed
808
    }
809 810 811 812

    if( psz_broadcast == NULL )
    {
        /* Are we broadcasting ? */
813 814 815 816 817 818 819 820 821 822
        if( main_GetIntVariable( INPUT_BROADCAST_VAR,
                                 INPUT_BROADCAST_DEFAULT ) )
        {
            psz_broadcast = main_GetPszVariable( INPUT_BCAST_ADDR_VAR,
                                                 INPUT_BCAST_ADDR_DEFAULT );
        }
        else
        {
           psz_broadcast = NULL; 
        }
823 824
    }

Sam Hocevar's avatar
 
Sam Hocevar committed
825
    intf_WarnMsg( 2, "input: server=%s port=%d broadcast=%s",
826 827
                     psz_server, i_port, psz_broadcast );

Henri Fallon's avatar
 
Henri Fallon committed
828 829 830 831 832
    /* Open a SOCK_DGRAM (UDP) socket, in the AF_INET domain, automatic (0)
     * protocol */
    p_input->i_handle = socket( AF_INET, SOCK_DGRAM, 0 );
    if( p_input->i_handle == -1 )
    {
Sam Hocevar's avatar
 
Sam Hocevar committed
833
        intf_ErrMsg( "input error: can't create socket (%s)", strerror(errno) );
Henri Fallon's avatar
 
Henri Fallon committed
834 835 836 837 838
        p_input->b_error = 1;
        return;
    }

    /* We may want to reuse an already used socket */
Sam Hocevar's avatar
 
Sam Hocevar committed
839
    i_opt = 1;
Henri Fallon's avatar
 
Henri Fallon committed
840
    if( setsockopt( p_input->i_handle, SOL_SOCKET, SO_REUSEADDR,
841
                    (void *) &i_opt, sizeof( i_opt ) ) == -1 )
Henri Fallon's avatar
 
Henri Fallon committed
842
    {
Sam Hocevar's avatar
 
Sam Hocevar committed
843 844
        intf_ErrMsg( "input error: can't configure socket (SO_REUSEADDR: %s)",
                     strerror(errno));
Henri Fallon's avatar
 
Henri Fallon committed
845 846 847 848 849 850 851
        close( p_input->i_handle );
        p_input->b_error = 1;
        return;
    }

    /* Increase the receive buffer size to 1/2MB (8Mb/s during 1/2s) to avoid
     * packet loss caused by scheduling problems */
Sam Hocevar's avatar
 
Sam Hocevar committed
852 853
    i_opt = 0x80000;
    if( setsockopt( p_input->i_handle, SOL_SOCKET, SO_RCVBUF,
854
                    (void *) &i_opt, sizeof( i_opt ) ) == -1 )
Henri Fallon's avatar
 
Henri Fallon committed
855
    {
Sam Hocevar's avatar
 
Sam Hocevar committed
856 857
        intf_ErrMsg( "input error: can't configure socket (SO_RCVBUF: %s)", 
                     strerror(errno));
Henri Fallon's avatar
 
Henri Fallon committed
858 859 860 861 862
        close( p_input->i_handle );
        p_input->b_error = 1;
        return;
    }

863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879
    /* Check if we really got what we have asked for, because Linux, etc.
     * will silently limit the max buffer size to net.core.rmem_max which
     * is typically only 65535 bytes */
    i_opt = 0;
    i_opt_size = sizeof( i_opt );
    if( getsockopt( p_input->i_handle, SOL_SOCKET, SO_RCVBUF,
                    (void*) &i_opt, &i_opt_size ) == -1 )
    {
        intf_ErrMsg( "input error: can't configure socket (SO_RCVBUF: %s)", 
                     strerror(errno));
        close( p_input->i_handle );
        p_input->b_error = 1;
        return;
    }
    
    if( i_opt < 0x80000 )
    {
Sam Hocevar's avatar
 
Sam Hocevar committed
880 881
        intf_WarnMsg( 1, "input warning: socket receive buffer size just 0x%x"
                         " instead of 0x%x bytes.", i_opt, 0x80000 );
882 883
    }

Henri Fallon's avatar
 
Henri Fallon committed
884
    /* Build the local socket */
Sam Hocevar's avatar
 
Sam Hocevar committed
885
    if ( network_BuildLocalAddr( &sock, i_port, psz_broadcast ) == -1 )
Henri Fallon's avatar
 
Henri Fallon committed
886
    {
Sam Hocevar's avatar
 
Sam Hocevar committed
887
        intf_ErrMsg( "input error: can't build local address" );
Henri Fallon's avatar
 
Henri Fallon committed
888 889 890 891
        close( p_input->i_handle );
        p_input->b_error = 1;
        return;
    }
Sam Hocevar's avatar
 
Sam Hocevar committed
892

893 894 895
    /* Required for IP_ADD_MEMBERSHIP */
    i_mc_group = sock.sin_addr.s_addr;

Sam Hocevar's avatar
 
Sam Hocevar committed
896 897 898 899 900
#if defined( WIN32 )
    if ( psz_broadcast != NULL )
    {
        sock.sin_addr.s_addr = INADDR_ANY;
    }
901
    
902
#define IN_MULTICAST(a)         IN_CLASSD(a)
Sam Hocevar's avatar
 
Sam Hocevar committed
903
#endif
904

Henri Fallon's avatar
 
Henri Fallon committed
905
    /* Bind it */
Sam Hocevar's avatar
 
Sam Hocevar committed
906 907
    if( bind( p_input->i_handle, (struct sockaddr *)&sock, 
              sizeof( sock ) ) < 0 )
Henri Fallon's avatar
 
Henri Fallon committed
908
    {
Sam Hocevar's avatar
 
Sam Hocevar committed
909
        intf_ErrMsg( "input error: can't bind socket (%s)", strerror(errno) );
Henri Fallon's avatar
 
Henri Fallon committed
910 911 912 913 914
        close( p_input->i_handle );
        p_input->b_error = 1;
        return;
    }

915
    /* Join the multicast group if the socket is a multicast address */
916 917

#ifndef WIN32    
918 919 920 921 922 923
    if( IN_MULTICAST( ntohl(i_mc_group) ) )
    {
        struct ip_mreq imr;

        imr.imr_interface.s_addr = htonl(INADDR_ANY);
        imr.imr_multiaddr.s_addr = i_mc_group;
924
        if( setsockopt( p_input->i_handle, IPPROTO_IP, IP_ADD_MEMBERSHIP,
925 926 927 928 929 930 931 932 933
                        (char*)&imr, sizeof(struct ip_mreq) ) == -1 )
        {
            intf_ErrMsg( "input error: failed to join IP multicast group (%s)",
                         strerror(errno) );
            close( p_input->i_handle);
            p_input->b_error = 1;
            return;
        }
    }
934 935
#endif
    
Henri Fallon's avatar
 
Henri Fallon committed
936
    /* Build socket for remote connection */
Sam Hocevar's avatar
 
Sam Hocevar committed
937
    if ( network_BuildRemoteAddr( &sock, psz_server ) == -1 )
Henri Fallon's avatar
 
Henri Fallon committed
938
    {
Sam Hocevar's avatar
 
Sam Hocevar committed
939
        intf_ErrMsg( "input error: can't build remote address" );
Henri Fallon's avatar
 
Henri Fallon committed
940 941 942 943 944
        close( p_input->i_handle );
        p_input->b_error = 1;
        return;
    }

945 946
    /* Only connect if the user has passed a valid host */
    if( sock.sin_addr.s_addr != INADDR_ANY )
Henri Fallon's avatar
 
Henri Fallon committed
947
    {
948 949 950 951 952 953 954 955 956 957
        /* Connect the socket */
        if( connect( p_input->i_handle, (struct sockaddr *) &sock,
                     sizeof( sock ) ) == (-1) )
        {
            intf_ErrMsg( "input error: can't connect socket (%s)", 
                         strerror(errno) );
            close( p_input->i_handle );
            p_input->b_error = 1;
            return;
        }
Henri Fallon's avatar
 
Henri Fallon committed
958 959
    }

Henri Fallon's avatar
 
Henri Fallon committed