ogg.c 57.1 KB
Newer Older
Gildas Bazin's avatar
 
Gildas Bazin committed
1 2 3 4
/*****************************************************************************
 * ogg.c : ogg stream input module for vlc
 *****************************************************************************
 * Copyright (C) 2001 VideoLAN
Gildas Bazin's avatar
 
Gildas Bazin committed
5
 * $Id: ogg.c,v 1.30 2003/08/09 19:49:13 gbazin Exp $
Gildas Bazin's avatar
 
Gildas Bazin committed
6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36
 *
 * Authors: Gildas Bazin <gbazin@netcourrier.com>
 * 
 * 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
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * 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.
 *****************************************************************************/

/*****************************************************************************
 * Preamble
 *****************************************************************************/
#include <stdlib.h>                                      /* malloc(), free() */
#include <string.h>

#include <vlc/vlc.h>
#include <vlc/input.h>

#include <sys/types.h>

#include <ogg/ogg.h>

Gildas Bazin's avatar
 
Gildas Bazin committed
37 38
#include <codecs.h>                        /* BITMAPINFOHEADER, WAVEFORMATEX */

Gildas Bazin's avatar
 
Gildas Bazin committed
39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54
#define OGG_BLOCK_SIZE 4096
#define PAGES_READ_ONCE 1

/*****************************************************************************
 * Definitions of structures and functions used by this plugins 
 *****************************************************************************/
typedef struct logical_stream_s
{
    ogg_stream_state os;                        /* logical stream of packets */

    int              i_serial_no;
    int              i_cat;                            /* AUDIO_ES, VIDEO_ES */
    int              i_activated;
    vlc_fourcc_t     i_fourcc;
    vlc_fourcc_t     i_codec;

Gildas Bazin's avatar
 
Gildas Bazin committed
55
    es_descriptor_t  *p_es;
Gildas Bazin's avatar
 
Gildas Bazin committed
56 57
    int              b_selected;                           /* newly selected */

Gildas Bazin's avatar
 
Gildas Bazin committed
58 59 60 61 62 63 64
    /* the header of some logical streams (eg vorbis) contain essential
     * data for the decoder. We back them up here in case we need to re-feed
     * them to the decoder. */
    int              b_force_backup;
    int              i_packets_backup;
    ogg_packet       *p_packets_backup;

Gildas Bazin's avatar
 
Gildas Bazin committed
65 66
    /* program clock reference (in units of 90kHz) derived from the previous
     * granulepos */
Gildas Bazin's avatar
 
Gildas Bazin committed
67
    mtime_t          i_pcr;
Gildas Bazin's avatar
 
Gildas Bazin committed
68
    mtime_t          i_interpolated_pcr;
Gildas Bazin's avatar
 
Gildas Bazin committed
69 70

    /* info from logical streams */
Gildas Bazin's avatar
 
Gildas Bazin committed
71
    double f_rate;
Gildas Bazin's avatar
 
Gildas Bazin committed
72
    int i_bitrate;
Gildas Bazin's avatar
 
Gildas Bazin committed
73
    int i_channels;
Gildas Bazin's avatar
 
Gildas Bazin committed
74
    int b_reinit;
Gildas Bazin's avatar
 
Gildas Bazin committed
75

Gildas Bazin's avatar
 
Gildas Bazin committed
76
    /* codec specific stuff */
Gildas Bazin's avatar
 
Gildas Bazin committed
77 78
    BITMAPINFOHEADER *p_bih;
    WAVEFORMATEX *p_wf;
Gildas Bazin's avatar
 
Gildas Bazin committed
79
    int i_theora_keyframe_granule_shift;
Gildas Bazin's avatar
 
Gildas Bazin committed
80

Gildas Bazin's avatar
 
Gildas Bazin committed
81 82 83 84 85 86 87 88 89 90 91 92
} logical_stream_t;

struct demux_sys_t
{
    ogg_sync_state oy;        /* sync and verify incoming physical bitstream */

    int i_streams;                           /* number of logical bitstreams */
    logical_stream_t **pp_stream;  /* pointer to an array of logical streams */

    /* current audio and video es */
    logical_stream_t *p_stream_video;
    logical_stream_t *p_stream_audio;
Gildas Bazin's avatar
 
Gildas Bazin committed
93
    logical_stream_t *p_stream_spu;
Gildas Bazin's avatar
 
Gildas Bazin committed
94

Gildas Bazin's avatar
 
Gildas Bazin committed
95
    /* program clock reference (in units of 90kHz) derived from the pcr of
Gildas Bazin's avatar
 
Gildas Bazin committed
96
     * the sub-streams */
Gildas Bazin's avatar
 
Gildas Bazin committed
97
    mtime_t i_pcr;
Gildas Bazin's avatar
 
Gildas Bazin committed
98
    mtime_t i_old_pcr;
Gildas Bazin's avatar
 
Gildas Bazin committed
99

Gildas Bazin's avatar
 
Gildas Bazin committed
100
    int     b_seekable;
Gildas Bazin's avatar
 
Gildas Bazin committed
101
    int     b_reinit;
Gildas Bazin's avatar
 
Gildas Bazin committed
102 103
};

Gildas Bazin's avatar
 
Gildas Bazin committed
104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147
/* OggDS headers for the new header format (used in ogm files) */
typedef struct stream_header_video
{
    ogg_int32_t width;
    ogg_int32_t height;
} stream_header_video;
        
typedef struct stream_header_audio
{
    ogg_int16_t channels;
    ogg_int16_t blockalign;
    ogg_int32_t avgbytespersec;
} stream_header_audio;

typedef struct stream_header
{
    char        streamtype[8];
    char        subtype[4];

    ogg_int32_t size;                               /* size of the structure */

    ogg_int64_t time_unit;                              /* in reference time */
    ogg_int64_t samples_per_unit;
    ogg_int32_t default_len;                                /* in media time */

    ogg_int32_t buffersize;
    ogg_int16_t bits_per_sample;

    union
    {
        /* Video specific */
        stream_header_video video;
        /* Audio specific */
        stream_header_audio audio;
    } sh;
} stream_header;

/* Some defines from OggDS */
#define PACKET_TYPE_HEADER   0x01
#define PACKET_TYPE_BITS     0x07
#define PACKET_LEN_BITS01    0xc0
#define PACKET_LEN_BITS2     0x02
#define PACKET_IS_SYNCPOINT  0x08

Gildas Bazin's avatar
 
Gildas Bazin committed
148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163
/* Some functions to manipulate memory */
static uint16_t GetWLE( uint8_t *p_buff )
{
    return( (p_buff[0]) + ( p_buff[1] <<8 ) );
}

static uint32_t GetDWLE( uint8_t *p_buff )
{
    return( p_buff[0] + ( p_buff[1] <<8 ) +
            ( p_buff[2] <<16 ) + ( p_buff[3] <<24 ) );
}

static uint64_t GetQWLE( uint8_t *p_buff )
{
    return( GetDWLE( p_buff ) + ( ((uint64_t)GetDWLE( p_buff + 4 )) << 32 ) );
}
Gildas Bazin's avatar
 
Gildas Bazin committed
164 165 166 167 168 169 170 171 172 173 174 175 176 177
/*****************************************************************************
 * Local prototypes
 *****************************************************************************/
static int  Activate  ( vlc_object_t * );
static void Deactivate( vlc_object_t * );
static int  Demux     ( input_thread_t * );

/* Stream managment */
static int  Ogg_StreamStart  ( input_thread_t *, demux_sys_t *, int );
static void Ogg_StreamStop   ( input_thread_t *, demux_sys_t *, int );

/* Bitstream manipulation */
static int  Ogg_Check        ( input_thread_t *p_input );
static int  Ogg_ReadPage     ( input_thread_t *, demux_sys_t *, ogg_page * );
Gildas Bazin's avatar
 
Gildas Bazin committed
178
static void Ogg_UpdatePCR    ( logical_stream_t *, ogg_packet * );
Gildas Bazin's avatar
 
Gildas Bazin committed
179
static void Ogg_DecodePacket ( input_thread_t *p_input,
Gildas Bazin's avatar
 
Gildas Bazin committed
180
                               logical_stream_t *p_stream, ogg_packet * );
Gildas Bazin's avatar
 
Gildas Bazin committed
181 182 183 184 185 186 187
static int  Ogg_FindLogicalStreams( input_thread_t *p_input,
                                    demux_sys_t *p_ogg );

/*****************************************************************************
 * Module descriptor
 *****************************************************************************/
vlc_module_begin();
Gildas Bazin's avatar
 
Gildas Bazin committed
188
    set_description( _("ogg stream demuxer" ) );
Gildas Bazin's avatar
 
Gildas Bazin committed
189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219
    set_capability( "demux", 50 );
    set_callbacks( Activate, Deactivate );
    add_shortcut( "ogg" );
vlc_module_end();

/*****************************************************************************
 * Stream managment
 *****************************************************************************/
static int Ogg_StreamStart( input_thread_t *p_input,
                            demux_sys_t *p_ogg, int i_stream )
{
#define p_stream p_ogg->pp_stream[i_stream]
    if( !p_stream->p_es )
    {
        msg_Warn( p_input, "stream[%d] unselectable", i_stream );
        return( 0 );
    }
    if( p_stream->i_activated )
    {
        msg_Warn( p_input, "stream[%d] already selected", i_stream );
        return( 1 );
    }

    if( !p_stream->p_es->p_decoder_fifo )
    {
        vlc_mutex_lock( &p_input->stream.stream_lock );
        input_SelectES( p_input, p_stream->p_es );
        vlc_mutex_unlock( &p_input->stream.stream_lock );
    }
    p_stream->i_activated = p_stream->p_es->p_decoder_fifo ? 1 : 0;

Gildas Bazin's avatar
 
Gildas Bazin committed
220 221 222 223 224 225 226 227 228 229 230
    /* Feed the backup header to the decoder */
    if( !p_stream->b_force_backup )
    {
        int i;
        for( i = 0; i < p_stream->i_packets_backup; i++ )
        {
            Ogg_DecodePacket( p_input, p_stream,
                              &p_stream->p_packets_backup[i] );
        }
    }

Gildas Bazin's avatar
 
Gildas Bazin committed
231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304
    return( p_stream->i_activated );
#undef  p_stream
}

static void Ogg_StreamStop( input_thread_t *p_input,
                            demux_sys_t *p_ogg, int i_stream )
{
#define p_stream    p_ogg->pp_stream[i_stream]

    if( !p_stream->i_activated )
    {
        msg_Warn( p_input, "stream[%d] already unselected", i_stream );
        return;
    }

    if( p_stream->p_es->p_decoder_fifo )
    {
        vlc_mutex_lock( &p_input->stream.stream_lock );
        input_UnselectES( p_input, p_stream->p_es );
        vlc_mutex_unlock( &p_input->stream.stream_lock );
    }

    p_stream->i_activated = 0;

#undef  p_stream
}

/****************************************************************************
 * Ogg_Check: Check we are dealing with an ogg stream.
 ****************************************************************************/
static int Ogg_Check( input_thread_t *p_input )
{
    u8 *p_peek;
    int i_size = input_Peek( p_input, &p_peek, 4 );

    /* Check for the Ogg capture pattern */
    if( !(i_size>3) || !(p_peek[0] == 'O') || !(p_peek[1] == 'g') ||
        !(p_peek[2] == 'g') || !(p_peek[3] == 'S') )
        return VLC_EGENERIC;

    /* FIXME: Capture pattern might not be enough so we can also check for the
     * the first complete page */

    return VLC_SUCCESS;
}

/****************************************************************************
 * Ogg_ReadPage: Read a full Ogg page from the physical bitstream.
 ****************************************************************************
 * Returns VLC_SUCCESS if a page has been read. An error might happen if we
 * are at the end of stream.
 ****************************************************************************/
static int Ogg_ReadPage( input_thread_t *p_input, demux_sys_t *p_ogg,
                         ogg_page *p_oggpage )
{
    int i_read = 0;
    data_packet_t *p_data;
    byte_t *p_buffer;

    while( ogg_sync_pageout( &p_ogg->oy, p_oggpage ) != 1 )
    {
        i_read = input_SplitBuffer( p_input, &p_data, OGG_BLOCK_SIZE );
        if( i_read <= 0 )
            return VLC_EGENERIC;

        p_buffer = ogg_sync_buffer( &p_ogg->oy, i_read );
        p_input->p_vlc->pf_memcpy( p_buffer, p_data->p_payload_start, i_read );
        ogg_sync_wrote( &p_ogg->oy, i_read );
        input_DeletePacket( p_input->p_method_data, p_data );
    }

    return VLC_SUCCESS;
}

Gildas Bazin's avatar
 
Gildas Bazin committed
305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342
/****************************************************************************
 * Ogg_UpdatePCR: update the PCR (90kHz program clock reference) for the
 *                current stream.
 ****************************************************************************/
static void Ogg_UpdatePCR( logical_stream_t *p_stream,
                           ogg_packet *p_oggpacket )
{

    /* Convert the next granulepos into a pcr */
    if( p_oggpacket->granulepos >= 0 )
    {
        if( p_stream->i_fourcc != VLC_FOURCC( 't','h','e','o' ) )
        {
            p_stream->i_pcr = p_oggpacket->granulepos * 90000
                              / p_stream->f_rate;
        }
        else
        {
            ogg_int64_t iframe = p_oggpacket->granulepos >>
              p_stream->i_theora_keyframe_granule_shift;
            ogg_int64_t pframe = p_oggpacket->granulepos -
              ( iframe << p_stream->i_theora_keyframe_granule_shift );

            p_stream->i_pcr = ( iframe + pframe ) * 90000
                              / p_stream->f_rate;
        }

        p_stream->i_interpolated_pcr = p_stream->i_pcr;
    }
    else
    {
        /* FIXME: ffmpeg doesn't like null pts */
        if( p_stream->i_cat == VIDEO_ES )
            /* 1 frame per packet */
            p_stream->i_pcr += (90000 / p_stream->f_rate);
        else
            p_stream->i_pcr = -1;

Gildas Bazin's avatar
 
Gildas Bazin committed
343 344
        /* no granulepos available, try to interpolate the pcr.
         * If we can't then don't touch the old value. */
Gildas Bazin's avatar
 
Gildas Bazin committed
345 346 347 348 349 350
        if( p_stream->i_bitrate )
            p_stream->i_interpolated_pcr += ( p_oggpacket->bytes * 90000
                                              / p_stream->i_bitrate / 8 );
    }
}

Gildas Bazin's avatar
 
Gildas Bazin committed
351 352 353 354 355 356 357 358 359
/****************************************************************************
 * Ogg_DecodePacket: Decode an Ogg packet.
 ****************************************************************************/
static void Ogg_DecodePacket( input_thread_t *p_input,
                              logical_stream_t *p_stream,
                              ogg_packet *p_oggpacket )
{
    pes_packet_t  *p_pes;
    data_packet_t *p_data;
Gildas Bazin's avatar
 
Gildas Bazin committed
360
    vlc_bool_t b_trash = VLC_FALSE;
Gildas Bazin's avatar
 
Gildas Bazin committed
361
    int i_header_len = 0;
Gildas Bazin's avatar
 
Gildas Bazin committed
362

Gildas Bazin's avatar
 
Gildas Bazin committed
363 364
    if( p_stream->b_force_backup )
    {
Gildas Bazin's avatar
 
Gildas Bazin committed
365
        /* Backup the ogg packet (likely an header packet) */
Gildas Bazin's avatar
 
Gildas Bazin committed
366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384
        ogg_packet *p_packet_backup;
        p_stream->i_packets_backup++;
        p_stream->p_packets_backup =
            realloc( p_stream->p_packets_backup, p_stream->i_packets_backup *
                     sizeof(ogg_packet) );

        p_packet_backup =
            &p_stream->p_packets_backup[p_stream->i_packets_backup - 1];

        p_packet_backup->bytes = p_oggpacket->bytes;
        p_packet_backup->granulepos = p_oggpacket->granulepos;
        p_packet_backup->packet = malloc( p_oggpacket->bytes );
        if( !p_packet_backup->packet ) return;
        memcpy( p_packet_backup->packet, p_oggpacket->packet,
                p_oggpacket->bytes );

        switch( p_stream->i_fourcc )
        {
        case VLC_FOURCC( 'v','o','r','b' ):
Gildas Bazin's avatar
 
Gildas Bazin committed
385
        case VLC_FOURCC( 't','h','e','o' ):
Gildas Bazin's avatar
 
Gildas Bazin committed
386 387 388 389 390 391 392 393 394
          if( p_stream->i_packets_backup == 3 ) p_stream->b_force_backup = 0;
          break;

        default:
          p_stream->b_force_backup = 0;
          break;
        }
    }

Gildas Bazin's avatar
 
Gildas Bazin committed
395 396 397 398 399 400 401 402
    vlc_mutex_lock( &p_input->stream.control.control_lock );
    if( p_stream->i_cat == AUDIO_ES && p_input->stream.control.b_mute )
    {
        b_trash = VLC_TRUE;
    }
    vlc_mutex_unlock( &p_input->stream.control.control_lock );

    if( !p_stream->p_es->p_decoder_fifo || b_trash )
Gildas Bazin's avatar
 
Gildas Bazin committed
403 404 405
    {
        /* This stream isn't currently selected so we don't need to decode it,
         * but we do need to store its pcr as it might be selected later on. */
Gildas Bazin's avatar
 
Gildas Bazin committed
406
        Ogg_UpdatePCR( p_stream, p_oggpacket );
Gildas Bazin's avatar
 
Gildas Bazin committed
407 408 409 410

        return;
    }

Gildas Bazin's avatar
 
Gildas Bazin committed
411 412 413 414 415 416 417 418 419 420
    if( !( p_pes = input_NewPES( p_input->p_method_data ) ) )
    {
        return;
    }
    if( !( p_data = input_NewPacket( p_input->p_method_data,
                                     p_oggpacket->bytes ) ) )
    {
        input_DeletePES( p_input->p_method_data, p_pes );
        return;
    }
421
    p_data->p_payload_end = p_data->p_payload_start + p_oggpacket->bytes;
Gildas Bazin's avatar
 
Gildas Bazin committed
422

Gildas Bazin's avatar
 
Gildas Bazin committed
423
    /* Convert the pcr into a pts */
Gildas Bazin's avatar
 
Gildas Bazin committed
424 425
    if( p_stream->i_fourcc == VLC_FOURCC( 'v','o','r','b' ) ||
        p_stream->i_fourcc == VLC_FOURCC( 't','h','e','o' ) )
Gildas Bazin's avatar
 
Gildas Bazin committed
426 427 428 429 430 431 432 433 434 435 436
    {
        p_pes->i_pts = ( p_stream->i_pcr < 0 ) ? 0 :
            input_ClockGetTS( p_input, p_input->stream.p_selected_program,
                              p_stream->i_pcr );
    }
    else
    {
        /* Of course subtitles had to be different! */
        p_pes->i_pts = ( p_oggpacket->granulepos < 0 ) ? 0 :
            input_ClockGetTS( p_input, p_input->stream.p_selected_program,
                              p_oggpacket->granulepos * 90000 /
Gildas Bazin's avatar
 
Gildas Bazin committed
437
                              p_stream->f_rate );
Gildas Bazin's avatar
 
Gildas Bazin committed
438
    }
Gildas Bazin's avatar
 
Gildas Bazin committed
439

Gildas Bazin's avatar
 
Gildas Bazin committed
440
    /* Convert the next granulepos into a pcr */
Gildas Bazin's avatar
 
Gildas Bazin committed
441
    Ogg_UpdatePCR( p_stream, p_oggpacket );
Gildas Bazin's avatar
 
Gildas Bazin committed
442

Gildas Bazin's avatar
 
Gildas Bazin committed
443
    p_pes->i_nb_data = 1;
Gildas Bazin's avatar
 
Gildas Bazin committed
444
    p_pes->i_dts = p_oggpacket->granulepos;
Gildas Bazin's avatar
 
Gildas Bazin committed
445 446 447
    p_pes->p_first = p_pes->p_last = p_data;
    p_pes->i_pes_size = p_oggpacket->bytes;

Gildas Bazin's avatar
 
Gildas Bazin committed
448 449
    if( p_stream->i_fourcc != VLC_FOURCC( 'v','o','r','b' ) &&
        p_stream->i_fourcc != VLC_FOURCC( 't','a','r','k' ) &&
450
        p_stream->i_fourcc != VLC_FOURCC( 't','h','e','o' ) )
Gildas Bazin's avatar
 
Gildas Bazin committed
451 452 453 454 455 456 457
    {
        /* Remove the header from the packet */
        i_header_len = (*p_oggpacket->packet & PACKET_LEN_BITS01) >> 6;
        i_header_len |= (*p_oggpacket->packet & PACKET_LEN_BITS2) << 1;
        i_header_len++;

        p_pes->i_pes_size -= i_header_len;
Gildas Bazin's avatar
 
Gildas Bazin committed
458 459 460 461 462 463
        p_pes->i_dts = 0;
    }

    if( p_stream->i_fourcc == VLC_FOURCC( 't','a','r','k' ) )
    {
        /* FIXME: the biggest hack I've ever done */
464
        msg_Warn( p_input, "tark pts: "I64Fd", granule: "I64Fd,
Gildas Bazin's avatar
 
Gildas Bazin committed
465 466
                  p_pes->i_pts, p_pes->i_dts );
        msleep(10000);
Gildas Bazin's avatar
 
Gildas Bazin committed
467 468 469 470 471 472 473
    }

    memcpy( p_data->p_payload_start,
            p_oggpacket->packet + i_header_len,
            p_oggpacket->bytes - i_header_len );

    p_data->p_payload_end = p_data->p_payload_start + p_pes->i_pes_size;
Gildas Bazin's avatar
 
Gildas Bazin committed
474
    p_data->b_discard_payload = 0;
Gildas Bazin's avatar
 
Gildas Bazin committed
475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531

    input_DecodePES( p_stream->p_es->p_decoder_fifo, p_pes );
}

/****************************************************************************
 * Ogg_FindLogicalStreams: Find the logical streams embedded in the physical
 *                         stream and fill p_ogg.
 *****************************************************************************
 * The initial page of a logical stream is marked as a 'bos' page.
 * Furthermore, the Ogg specification mandates that grouped bitstreams begin
 * together and all of the initial pages must appear before any data pages.
 *
 * On success this function returns VLC_SUCCESS.
 ****************************************************************************/
static int Ogg_FindLogicalStreams( input_thread_t *p_input, demux_sys_t *p_ogg)
{
    ogg_packet oggpacket;
    ogg_page oggpage;
    int i_stream;

    while( Ogg_ReadPage( p_input, p_ogg, &oggpage ) == VLC_SUCCESS )
    {
        if( ogg_page_bos( &oggpage ) )
        {

            /* All is wonderful in our fine fine little world.
             * We found the beginning of our first logical stream. */
            while( ogg_page_bos( &oggpage ) )
            {
                p_ogg->i_streams++;
                p_ogg->pp_stream =
                    realloc( p_ogg->pp_stream, p_ogg->i_streams *
                             sizeof(logical_stream_t *) );

#define p_stream p_ogg->pp_stream[p_ogg->i_streams - 1]

                p_stream = malloc( sizeof(logical_stream_t) );
                memset( p_stream, 0, sizeof(logical_stream_t) );

                /* Setup the logical stream */
                p_stream->i_serial_no = ogg_page_serialno( &oggpage );
                ogg_stream_init( &p_stream->os, p_stream->i_serial_no );

                /* Extract the initial header from the first page and verify
                 * the codec type of tis Ogg bitstream */
                if( ogg_stream_pagein( &p_stream->os, &oggpage ) < 0 )
                {
                    /* error. stream version mismatch perhaps */
                    msg_Err( p_input, "Error reading first page of "
                             "Ogg bitstream data" );
                    return VLC_EGENERIC;
                }

                /* FIXME: check return value */
                ogg_stream_packetpeek( &p_stream->os, &oggpacket );

                /* Check for Vorbis header */
532
                if( oggpacket.bytes >= 7 &&
Gildas Bazin's avatar
 
Gildas Bazin committed
533 534 535 536 537 538 539 540
                    ! strncmp( &oggpacket.packet[1], "vorbis", 6 ) )
                {
                    oggpack_buffer opb;

                    msg_Dbg( p_input, "found vorbis header" );
                    p_stream->i_cat = AUDIO_ES;
                    p_stream->i_fourcc = VLC_FOURCC( 'v','o','r','b' );

Gildas Bazin's avatar
 
Gildas Bazin committed
541 542 543 544 545
                    /* Signal that we want to keep a backup of the vorbis
                     * stream headers. They will be used when switching between
                     * audio streams. */
                    p_stream->b_force_backup = 1;

Gildas Bazin's avatar
 
Gildas Bazin committed
546 547
                    /* Cheat and get additionnal info ;) */
                    oggpack_readinit( &opb, oggpacket.packet, oggpacket.bytes);
Gildas Bazin's avatar
 
Gildas Bazin committed
548 549
                    oggpack_adv( &opb, 88 );
                    p_stream->i_channels = oggpack_read( &opb, 8 );
Gildas Bazin's avatar
 
Gildas Bazin committed
550
                    p_stream->f_rate = oggpack_read( &opb, 32 );
Gildas Bazin's avatar
 
Gildas Bazin committed
551 552
                    oggpack_adv( &opb, 32 );
                    p_stream->i_bitrate = oggpack_read( &opb, 32 );
553 554 555 556 557
                    {
                        char title[sizeof("Stream") + 10];
                        input_info_category_t *p_cat;
                        sprintf( title, "Stream %d", p_ogg->i_streams );
                        p_cat = input_InfoCategory( p_input, title );
558 559 560
                        input_AddInfo( p_cat, _("Type"), _("Audio") );
                        input_AddInfo( p_cat, _("Codec"), _("Vorbis") );
                        input_AddInfo( p_cat, _("Sample Rate"), "%f",
561
                                       p_stream->f_rate );
Gildas Bazin's avatar
 
Gildas Bazin committed
562 563
                        input_AddInfo( p_cat, _("Channels"), "%d",
                                       p_stream->i_channels );
564
                        input_AddInfo( p_cat, _("Bit Rate"), "%d",
565 566
                                       p_stream->i_bitrate );
                    }
Gildas Bazin's avatar
 
Gildas Bazin committed
567
                }
Gildas Bazin's avatar
 
Gildas Bazin committed
568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583
                /* Check for Theora header */
                else if( oggpacket.bytes >= 7 &&
                         ! strncmp( &oggpacket.packet[1], "theora", 6 ) )
                {
#ifdef HAVE_OGGPACKB
                    oggpack_buffer opb;
                    int i_fps_numerator;
                    int i_fps_denominator;
                    int i_keyframe_frequency_force;
#endif

                    msg_Dbg( p_input, "found theora header" );
#ifdef HAVE_OGGPACKB
                    p_stream->i_cat = VIDEO_ES;
                    p_stream->i_fourcc = VLC_FOURCC( 't','h','e','o' );

Gildas Bazin's avatar
 
Gildas Bazin committed
584 585 586 587 588
                    /* Signal that we want to keep a backup of the vorbis
                     * stream headers. They will be used when switching between
                     * audio streams. */
                    p_stream->b_force_backup = 1;

Gildas Bazin's avatar
 
Gildas Bazin committed
589 590 591 592 593 594 595 596
                    /* Cheat and get additionnal info ;) */
                    oggpackB_readinit(&opb, oggpacket.packet, oggpacket.bytes);
                    oggpackB_adv( &opb, 56 );
                    oggpackB_read( &opb, 8 ); /* major version num */
                    oggpackB_read( &opb, 8 ); /* minor version num */
                    oggpackB_read( &opb, 8 ); /* subminor version num */
                    oggpackB_read( &opb, 16 ) /*<< 4*/; /* width */
                    oggpackB_read( &opb, 16 ) /*<< 4*/; /* height */
Gildas Bazin's avatar
 
Gildas Bazin committed
597 598 599 600 601
                    oggpackB_read( &opb, 24 ); /* frame width */
                    oggpackB_read( &opb, 24 ); /* frame height */
                    oggpackB_read( &opb, 8 ); /* x offset */
                    oggpackB_read( &opb, 8 ); /* y offset */

Gildas Bazin's avatar
 
Gildas Bazin committed
602 603 604 605 606
                    i_fps_numerator = oggpackB_read( &opb, 32 );
                    i_fps_denominator = oggpackB_read( &opb, 32 );
                    oggpackB_read( &opb, 24 ); /* aspect_numerator */
                    oggpackB_read( &opb, 24 ); /* aspect_denominator */
                    i_keyframe_frequency_force = 1 << oggpackB_read( &opb, 5 );
Gildas Bazin's avatar
 
Gildas Bazin committed
607
                    oggpackB_read( &opb, 8 ); /* colorspace */
Gildas Bazin's avatar
 
Gildas Bazin committed
608
                    p_stream->i_bitrate = oggpackB_read( &opb, 24 );
Gildas Bazin's avatar
 
Gildas Bazin committed
609
                    oggpackB_read( &opb, 6 ); /* quality */
Gildas Bazin's avatar
 
Gildas Bazin committed
610 611 612 613 614 615 616 617 618 619 620 621 622 623 624

                    /* granule_shift = i_log( frequency_force -1 ) */
                    p_stream->i_theora_keyframe_granule_shift = 0;
                    i_keyframe_frequency_force--;
                    while( i_keyframe_frequency_force )
                    {
                        p_stream->i_theora_keyframe_granule_shift++;
                        i_keyframe_frequency_force >>= 1;
                    }

                    p_stream->f_rate = (float)i_fps_numerator /
                                                i_fps_denominator;
                    msg_Dbg( p_input,
                             "found theora header, bitrate: %i, rate: %f",
                             p_stream->i_bitrate, p_stream->f_rate );
625 626 627 628 629
                    {
                        char title[sizeof("Stream") + 10];
                        input_info_category_t *p_cat;
                        sprintf( title, "Stream %d", p_ogg->i_streams );
                        p_cat = input_InfoCategory( p_input, title );
630 631 632
                        input_AddInfo( p_cat, _("Type"), _("Video") );
                        input_AddInfo( p_cat, _("Codec"), _("Theora") );
                        input_AddInfo( p_cat, _("Frame Rate"), "%f",
633
                                       p_stream->f_rate );
634
                        input_AddInfo( p_cat, _("Bit Rate"), "%d",
635 636
                                       p_stream->i_bitrate );
                    }
Gildas Bazin's avatar
 
Gildas Bazin committed
637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664
#else /* HAVE_OGGPACKB */
                    msg_Dbg( p_input, "the ogg demuxer has been compiled "
                             "without support for the oggpackB extension."
                             "The theora stream won't be decoded." );
                    free( p_stream );
                    p_ogg->i_streams--;
                    continue;
#endif /* HAVE_OGGPACKB */
                }
                /* Check for Tarkin header */
                else if( oggpacket.bytes >= 7 &&
                         ! strncmp( &oggpacket.packet[1], "tarkin", 6 ) )
                {
                    oggpack_buffer opb;

                    msg_Dbg( p_input, "found tarkin header" );
                    p_stream->i_cat = VIDEO_ES;
                    p_stream->i_fourcc = VLC_FOURCC( 't','a','r','k' );

                    /* Cheat and get additionnal info ;) */
                    oggpack_readinit( &opb, oggpacket.packet, oggpacket.bytes);
                    oggpack_adv( &opb, 88 );
                    oggpack_adv( &opb, 104 );
                    p_stream->i_bitrate = oggpack_read( &opb, 32 );
                    p_stream->f_rate = 2; /* FIXME */
                    msg_Dbg( p_input,
                             "found tarkin header, bitrate: %i, rate: %f",
                             p_stream->i_bitrate, p_stream->f_rate );
665 666 667 668 669
                                        {
                        char title[sizeof("Stream") + 10];
                        input_info_category_t *p_cat;
                        sprintf( title, "Stream %d", p_ogg->i_streams );
                        p_cat = input_InfoCategory( p_input, title );
670 671 672
                        input_AddInfo( p_cat, _("Type"), _("Video") );
                        input_AddInfo( p_cat, _("Codec"), _("tarkin") );
                        input_AddInfo( p_cat, _("Sample Rate"), "%f",
673
                                       p_stream->f_rate );
674
                        input_AddInfo( p_cat, _("Bit Rate"), "%d",
675 676 677
                                       p_stream->i_bitrate );
                    }

Gildas Bazin's avatar
 
Gildas Bazin committed
678
                }
Gildas Bazin's avatar
 
Gildas Bazin committed
679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729
                else if( oggpacket.bytes >= 142 &&
                         !strncmp( &oggpacket.packet[1],
                                   "Direct Show Samples embedded in Ogg", 35 ))
                {
                    /* Old header type */

                    /* Check for video header (old format) */
                    if( GetDWLE((oggpacket.packet+96)) == 0x05589f80 &&
                        oggpacket.bytes >= 184 )
                    {
                        p_stream->i_cat = VIDEO_ES;

                        p_stream->p_bih = (BITMAPINFOHEADER *)
                            malloc( sizeof(BITMAPINFOHEADER) );
                        if( !p_stream->p_bih )
                        {
                            /* Mem allocation error, just ignore the stream */
                            free( p_stream );
                            p_ogg->i_streams--;
                            continue;
                        }
                        p_stream->p_bih->biSize = sizeof(BITMAPINFOHEADER);
                        p_stream->p_bih->biCompression= p_stream->i_fourcc =
                            VLC_FOURCC( oggpacket.packet[68],
                                        oggpacket.packet[69],
                                        oggpacket.packet[70],
                                        oggpacket.packet[71] );
                        msg_Dbg( p_input, "found video header of type: %.4s",
                                 (char *)&p_stream->i_fourcc );

                        p_stream->f_rate = 10000000.0 /
                            GetQWLE((oggpacket.packet+164));
                        p_stream->p_bih->biBitCount =
                            GetWLE((oggpacket.packet+182));
                        if( !p_stream->p_bih->biBitCount )
                            p_stream->p_bih->biBitCount=24; // hack, FIXME
                        p_stream->p_bih->biWidth =
                            GetDWLE((oggpacket.packet+176));
                        p_stream->p_bih->biHeight =
                            GetDWLE((oggpacket.packet+180));
                        p_stream->p_bih->biPlanes= 1 ;
                        p_stream->p_bih->biSizeImage =
                            (p_stream->p_bih->biBitCount >> 3) *
                            p_stream->p_bih->biWidth *
                            p_stream->p_bih->biHeight;

                        msg_Dbg( p_input,
                             "fps: %f, width:%i; height:%i, bitcount:%i",
                            p_stream->f_rate, p_stream->p_bih->biWidth,
                            p_stream->p_bih->biHeight,
                            p_stream->p_bih->biBitCount);
730 731 732 733 734
                        {
                            char title[sizeof("Stream") + 10];
                            input_info_category_t *p_cat;
                            sprintf( title, "Stream %d", p_ogg->i_streams );
                            p_cat = input_InfoCategory( p_input, title );
735 736
                            input_AddInfo( p_cat, _("Type"), _("Video") );
                            input_AddInfo( p_cat, _("Codec"), "%.4s",
737
                                           (char *)&p_stream->i_fourcc );
738
                            input_AddInfo( p_cat, _("Frame Rate"), "%f",
739
                                           p_stream->f_rate );
740
                            input_AddInfo( p_cat, _("Bit Count"), "%d",
741
                                           p_stream->p_bih->biBitCount );
742
                            input_AddInfo( p_cat, _("Width"), "%d",
743
                                           p_stream->p_bih->biWidth );
744
                            input_AddInfo( p_cat, _("Height"), "%d",
745 746
                                           p_stream->p_bih->biHeight );
                        }
Gildas Bazin's avatar
 
Gildas Bazin committed
747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824
                        p_stream->i_bitrate = 0;
                    }
                    /* Check for audio header (old format) */
                    else if( GetDWLE((oggpacket.packet+96)) == 0x05589F81 )
                    {
                        unsigned int i_extra_size;

                        p_stream->i_cat = AUDIO_ES;

                        i_extra_size = GetWLE((oggpacket.packet+140));

                        p_stream->p_wf = (WAVEFORMATEX *)
                            malloc( sizeof(WAVEFORMATEX) + i_extra_size );
                        if( !p_stream->p_wf )
                        {
                            /* Mem allocation error, just ignore the stream */
                            free( p_stream );
                            p_ogg->i_streams--;
                            continue;
                        }

                        p_stream->p_wf->wFormatTag =
                            GetWLE((oggpacket.packet+124));
                        p_stream->p_wf->nChannels =
                            GetWLE((oggpacket.packet+126));
                        p_stream->f_rate = p_stream->p_wf->nSamplesPerSec =
                            GetDWLE((oggpacket.packet+128));
                        p_stream->i_bitrate = p_stream->p_wf->nAvgBytesPerSec =
                            GetDWLE((oggpacket.packet+132));
                        p_stream->i_bitrate *= 8;
                        p_stream->p_wf->nBlockAlign =
                            GetWLE((oggpacket.packet+136));
                        p_stream->p_wf->wBitsPerSample =
                            GetWLE((oggpacket.packet+138));
                        p_stream->p_wf->cbSize = i_extra_size;

                        if( i_extra_size > 0 )
                            memcpy( p_stream->p_wf+sizeof(WAVEFORMATEX),
                                    oggpacket.packet+142, i_extra_size );

                        switch( p_stream->p_wf->wFormatTag )
                        {
                        case WAVE_FORMAT_PCM:
                            p_stream->i_fourcc =
                                VLC_FOURCC( 'a', 'r', 'a', 'w' );
                            break;
                        case WAVE_FORMAT_MPEG:
                        case WAVE_FORMAT_MPEGLAYER3:
                            p_stream->i_fourcc =
                                VLC_FOURCC( 'm', 'p', 'g', 'a' );
                            break;
                        case WAVE_FORMAT_A52:
                            p_stream->i_fourcc =
                                VLC_FOURCC( 'a', '5', '2', ' ' );
                            break;
                        case WAVE_FORMAT_WMA1:
                            p_stream->i_fourcc =
                                VLC_FOURCC( 'w', 'm', 'a', '1' );
                            break;
                        case WAVE_FORMAT_WMA2:
                            p_stream->i_fourcc =
                                VLC_FOURCC( 'w', 'm', 'a', '2' );
                            break;
                        default:
                            p_stream->i_fourcc = VLC_FOURCC( 'm', 's',
                                ( p_stream->p_wf->wFormatTag >> 8 ) & 0xff,
                                p_stream->p_wf->wFormatTag & 0xff );
                        }

                        msg_Dbg( p_input, "found audio header of type: %.4s",
                                 (char *)&p_stream->i_fourcc );
                        msg_Dbg( p_input, "audio:0x%4.4x channels:%d %dHz "
                                 "%dbits/sample %dkb/s",
                                 p_stream->p_wf->wFormatTag,
                                 p_stream->p_wf->nChannels,
                                 p_stream->p_wf->nSamplesPerSec,
                                 p_stream->p_wf->wBitsPerSample,
                                 p_stream->p_wf->nAvgBytesPerSec * 8 / 1024 );
825 826 827 828 829
                        {
                            char title[sizeof("Stream") + 10];
                            input_info_category_t *p_cat;
                            sprintf( title, "Stream %d", p_ogg->i_streams );
                            p_cat = input_InfoCategory( p_input, title );
830
                            input_AddInfo( p_cat, _("Type"), _("Audio") );
831
                            input_AddInfo( p_cat, _("Codec"), "%.4s", 
832
                                           (char *)&p_stream->i_fourcc );
833
                            input_AddInfo( p_cat, _("Sample Rate"), "%d",
834
                                           p_stream->p_wf->nSamplesPerSec );
835
                            input_AddInfo( p_cat, _("Bit Rate"), "%d",
836 837
                                           p_stream->p_wf->nAvgBytesPerSec * 8
                                              / 1024 );
838
                            input_AddInfo( p_cat, _("Channels"), "%d",
839
                                           p_stream->p_wf->nChannels );
840
                            input_AddInfo( p_cat, _("Bits per Sample"), "%d",
841 842 843
                                           p_stream->p_wf->wBitsPerSample );
                        }

Gildas Bazin's avatar
 
Gildas Bazin committed
844 845 846 847 848 849 850 851 852
                    }
                    else
                    {
                        msg_Dbg( p_input, "stream %d has an old header "
                            "but is of an unknown type", p_ogg->i_streams-1 );
                        free( p_stream );
                        p_ogg->i_streams--;
                    }
                }
Gildas Bazin's avatar
 
Gildas Bazin committed
853 854 855 856 857 858 859 860 861 862 863 864 865 866
                else if( (*oggpacket.packet & PACKET_TYPE_BITS )
                         == PACKET_TYPE_HEADER && 
                         oggpacket.bytes >= (int)sizeof(stream_header)+1 )
                {
                    stream_header *st = (stream_header *)(oggpacket.packet+1);

                    /* Check for video header (new format) */
                    if( !strncmp( st->streamtype, "video", 5 ) )
                    {
                        p_stream->i_cat = VIDEO_ES;

                        /* We need to get rid of the header packet */
                        ogg_stream_packetout( &p_stream->os, &oggpacket );

Gildas Bazin's avatar
 
Gildas Bazin committed
867 868 869 870 871 872 873 874 875
                        p_stream->p_bih = (BITMAPINFOHEADER *)
                            malloc( sizeof(BITMAPINFOHEADER) );
                        if( !p_stream->p_bih )
                        {
                            /* Mem allocation error, just ignore the stream */
                            free( p_stream );
                            p_ogg->i_streams--;
                            continue;
                        }
Gildas Bazin's avatar
 
Gildas Bazin committed
876 877 878 879 880 881 882 883 884
                        p_stream->p_bih->biSize = sizeof(BITMAPINFOHEADER);
                        p_stream->p_bih->biCompression=
                            p_stream->i_fourcc = VLC_FOURCC( st->subtype[0],
                                                             st->subtype[1],
                                                             st->subtype[2],
                                                             st->subtype[3] );
                        msg_Dbg( p_input, "found video header of type: %.4s",
                                 (char *)&p_stream->i_fourcc );

Gildas Bazin's avatar
 
Gildas Bazin committed
885
                        p_stream->f_rate = 10000000.0 /
Gildas Bazin's avatar
 
Gildas Bazin committed
886 887 888 889 890 891 892
                            GetQWLE((uint8_t *)&st->time_unit);
                        p_stream->p_bih->biBitCount =
                            GetWLE((uint8_t *)&st->bits_per_sample);
                        p_stream->p_bih->biWidth =
                            GetDWLE((uint8_t *)&st->sh.video.width);
                        p_stream->p_bih->biHeight =
                            GetDWLE((uint8_t *)&st->sh.video.height);
Gildas Bazin's avatar
 
Gildas Bazin committed
893 894 895 896 897 898 899 900
                        p_stream->p_bih->biPlanes= 1 ;
                        p_stream->p_bih->biSizeImage =
                            (p_stream->p_bih->biBitCount >> 3) *
                            p_stream->p_bih->biWidth *
                            p_stream->p_bih->biHeight;

                        msg_Dbg( p_input,
                             "fps: %f, width:%i; height:%i, bitcount:%i",
Gildas Bazin's avatar
 
Gildas Bazin committed
901
                            p_stream->f_rate, p_stream->p_bih->biWidth,
Gildas Bazin's avatar
 
Gildas Bazin committed
902 903
                            p_stream->p_bih->biHeight,
                            p_stream->p_bih->biBitCount);
Gildas Bazin's avatar
 
Gildas Bazin committed
904

905 906 907 908 909
                        {
                            char title[sizeof("Stream") + 10];
                            input_info_category_t *p_cat;
                            sprintf( title, "Stream %d", p_ogg->i_streams );
                            p_cat = input_InfoCategory( p_input, title );
910 911
                            input_AddInfo( p_cat, _("Type"), _("Video") );
                            input_AddInfo( p_cat, _("Codec"), "%.4s",
912
                                           (char *)&p_stream->i_fourcc );
913
                            input_AddInfo( p_cat, _("Frame Rate"), "%f",
914
                                           p_stream->f_rate );
915
                            input_AddInfo( p_cat, _("Bit Count"), "%d",
916
                                           p_stream->p_bih->biBitCount );
917
                            input_AddInfo( p_cat, _("Width"), "%d",
918
                                           p_stream->p_bih->biWidth );
919
                            input_AddInfo( p_cat, _("Height"), "%d",
920 921
                                           p_stream->p_bih->biHeight );
                        }
Gildas Bazin's avatar
 
Gildas Bazin committed
922
                        p_stream->i_bitrate = 0;
Gildas Bazin's avatar
 
Gildas Bazin committed
923 924 925 926 927 928 929 930 931 932 933 934
                    }
                    /* Check for audio header (new format) */
                    else if( !strncmp( st->streamtype, "audio", 5 ) )
                    {
                        char p_buffer[5];

                        p_stream->i_cat = AUDIO_ES;

                        /* We need to get rid of the header packet */
                        ogg_stream_packetout( &p_stream->os, &oggpacket );

                        p_stream->p_wf = (WAVEFORMATEX *)
Gildas Bazin's avatar
 
Gildas Bazin committed
935 936 937 938 939 940 941 942
                            malloc( sizeof(WAVEFORMATEX) );
                        if( !p_stream->p_wf )
                        {
                            /* Mem allocation error, just ignore the stream */
                            free( p_stream );
                            p_ogg->i_streams--;
                            continue;
                        }
Gildas Bazin's avatar
 
Gildas Bazin committed
943

Gildas Bazin's avatar
 
Gildas Bazin committed
944 945
                        memcpy( p_buffer, st->subtype, 4 );
                        p_buffer[4] = '\0';
Gildas Bazin's avatar
 
Gildas Bazin committed
946
                        p_stream->p_wf->wFormatTag = strtol(p_buffer,NULL,16);
Gildas Bazin's avatar
 
Gildas Bazin committed
947 948
                        p_stream->p_wf->nChannels =
                            GetWLE((uint8_t *)&st->sh.audio.channels);
Gildas Bazin's avatar
 
Gildas Bazin committed
949
                        p_stream->f_rate = p_stream->p_wf->nSamplesPerSec =
Gildas Bazin's avatar
 
Gildas Bazin committed
950
                            GetQWLE((uint8_t *)&st->samples_per_unit);
Gildas Bazin's avatar
 
Gildas Bazin committed
951
                        p_stream->i_bitrate = p_stream->p_wf->nAvgBytesPerSec =
Gildas Bazin's avatar
 
Gildas Bazin committed
952
                            GetDWLE((uint8_t *)&st->sh.audio.avgbytespersec);
Gildas Bazin's avatar
 
Gildas Bazin committed
953
                        p_stream->i_bitrate *= 8;
Gildas Bazin's avatar
 
Gildas Bazin committed
954 955 956 957 958
                        p_stream->p_wf->nBlockAlign =
                            GetWLE((uint8_t *)&st->sh.audio.blockalign);
                        p_stream->p_wf->wBitsPerSample =
                            GetWLE((uint8_t *)&st->bits_per_sample);
                        p_stream->p_wf->cbSize = 0;
Gildas Bazin's avatar
 
Gildas Bazin committed
959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 977 978 979 980 981 982 983 984 985 986 987 988 989 990 991 992 993 994 995 996 997

                        switch( p_stream->p_wf->wFormatTag )
                        {
                        case WAVE_FORMAT_PCM:
                            p_stream->i_fourcc =
                                VLC_FOURCC( 'a', 'r', 'a', 'w' );
                            break;
                        case WAVE_FORMAT_MPEG:
                        case WAVE_FORMAT_MPEGLAYER3:
                            p_stream->i_fourcc =
                                VLC_FOURCC( 'm', 'p', 'g', 'a' );
                            break;
                        case WAVE_FORMAT_A52:
                            p_stream->i_fourcc =
                                VLC_FOURCC( 'a', '5', '2', ' ' );
                            break;
                        case WAVE_FORMAT_WMA1:
                            p_stream->i_fourcc =
                                VLC_FOURCC( 'w', 'm', 'a', '1' );
                            break;
                        case WAVE_FORMAT_WMA2:
                            p_stream->i_fourcc =
                                VLC_FOURCC( 'w', 'm', 'a', '2' );
                            break;
                        default:
                            p_stream->i_fourcc = VLC_FOURCC( 'm', 's',
                                ( p_stream->p_wf->wFormatTag >> 8 ) & 0xff,
                                p_stream->p_wf->wFormatTag & 0xff );
                        }

                        msg_Dbg( p_input, "found audio header of type: %.4s",
                                 (char *)&p_stream->i_fourcc );
                        msg_Dbg( p_input, "audio:0x%4.4x channels:%d %dHz "
                                 "%dbits/sample %dkb/s",
                                 p_stream->p_wf->wFormatTag,
                                 p_stream->p_wf->nChannels,
                                 p_stream->p_wf->nSamplesPerSec,
                                 p_stream->p_wf->wBitsPerSample,
                                 p_stream->p_wf->nAvgBytesPerSec * 8 / 1024 );
998 999 1000 1001 1002
                        {
                            char title[sizeof("Stream") + 10];
                            input_info_category_t *p_cat;
                            sprintf( title, "Stream %d", p_ogg->i_streams );
                            p_cat = input_InfoCategory( p_input, title );
1003 1004
                            input_AddInfo( p_cat, _("Type"), _("Audio") );
                            input_AddInfo( p_cat, _("Codec"), "%.4s", 
1005
                                           (char *)&p_stream->i_fourcc );
1006
                            input_AddInfo( p_cat, _("Sample Rate"), "%d",
1007
                                           p_stream->p_wf->nSamplesPerSec );
1008
                            input_AddInfo( p_cat, _("Bit Rate"), "%d",
1009 1010
                                           p_stream->p_wf->nAvgBytesPerSec * 8
                                              / 1024 );
1011
                            input_AddInfo( p_cat, _("Channels"), "%d",
1012
                                           p_stream->p_wf->nChannels );
1013
                            input_AddInfo( p_cat, _("Bits per Sample"), "%d",
1014 1015
                                           p_stream->p_wf->wBitsPerSample );
                        }
Gildas Bazin's avatar
 
Gildas Bazin committed
1016
                    }
Gildas Bazin's avatar
 
Gildas Bazin committed
1017 1018 1019
                    /* Check for text (subtitles) header */
                    else if( !strncmp(st->streamtype, "text", 4) )
                    {
Gildas Bazin's avatar
 
Gildas Bazin committed
1020 1021 1022
                        /* We need to get rid of the header packet */
                        ogg_stream_packetout( &p_stream->os, &oggpacket );

Gildas Bazin's avatar
 
Gildas Bazin committed
1023 1024 1025 1026
                        msg_Dbg( p_input, "found text subtitles header" );
                        p_stream->i_cat = SPU_ES;
                        p_stream->i_fourcc =
                            VLC_FOURCC( 's', 'u', 'b', 't' );
Gildas Bazin's avatar
 
Gildas Bazin committed
1027
                        p_stream->f_rate = 1000; /* granulepos is in milisec */
Gildas Bazin's avatar
 
Gildas Bazin committed
1028
                    }
Gildas Bazin's avatar
 
Gildas Bazin committed
1029 1030 1031 1032 1033 1034 1035 1036
                    else
                    {
                        msg_Dbg( p_input, "stream %d has a header marker "
                            "but is of an unknown type", p_ogg->i_streams-1 );
                        free( p_stream );
                        p_ogg->i_streams--;
                    }
                }
Gildas Bazin's avatar
 
Gildas Bazin committed
1037 1038
                else
                {
Gildas Bazin's avatar
 
Gildas Bazin committed
1039 1040
                    msg_Dbg( p_input, "stream %d is of unknown type",
                             p_ogg->i_streams-1 );
Gildas Bazin's avatar
 
Gildas Bazin committed
1041 1042
                    free( p_stream );
                    p_ogg->i_streams--;
Gildas Bazin's avatar
 
Gildas Bazin committed
1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 1111 1112 1113 1114 1115 1116 1117 1118 1119 1120 1121 1122 1123 1124 1125
                }

#undef p_stream

                if( Ogg_ReadPage( p_input, p_ogg, &oggpage ) != VLC_SUCCESS )
                    return VLC_EGENERIC;
            }

            /* This is the first data page, which means we are now finished
             * with the initial pages. We just need to store it in the relevant
             * bitstream. */
            for( i_stream = 0; i_stream < p_ogg->i_streams; i_stream++ )
            {
                if( ogg_stream_pagein( &p_ogg->pp_stream[i_stream]->os,
                                       &oggpage ) == 0 )
                {
                    break;
                }
            }
            return VLC_SUCCESS;
        }
    }
    return VLC_EGENERIC;
}

/*****************************************************************************
 * Activate: initializes ogg demux structures
 *****************************************************************************/
static int Activate( vlc_object_t * p_this )
{
    int i_stream, b_forced;
    demux_sys_t    *p_ogg;
    input_thread_t *p_input = (input_thread_t *)p_this;

    p_input->p_demux_data = NULL;
    b_forced = ( ( *p_input->psz_demux )&&
                 ( !strncmp( p_input->psz_demux, "ogg", 10 ) ) ) ? 1 : 0;

    /* Check if we are dealing with an ogg stream */
    if( !b_forced && ( Ogg_Check( p_input ) != VLC_SUCCESS ) )
        return -1;

    /* Allocate p_ogg */
    if( !( p_ogg = malloc( sizeof( demux_sys_t ) ) ) )
    {
        msg_Err( p_input, "out of memory" );
        goto error;
    }
    memset( p_ogg, 0, sizeof( demux_sys_t ) );
    p_input->p_demux_data = p_ogg;

    p_ogg->i_pcr  = 0;
    p_ogg->b_seekable = ( ( p_input->stream.b_seekable )
                        &&( p_input->stream.i_method == INPUT_METHOD_FILE ) );

    /* Initialize the Ogg physical bitstream parser */
    ogg_sync_init( &p_ogg->oy );

    /* Find the logical streams embedded in the physical stream and
     * initialize our p_ogg structure. */
    if( Ogg_FindLogicalStreams( p_input, p_ogg ) != VLC_SUCCESS )
    {
        msg_Err( p_input, "couldn't find an ogg logical stream" );
        goto error;
    }

    /* Set the demux function */
    p_input->pf_demux = Demux;

    /* Initialize access plug-in structures. */
    if( p_input->i_mtu == 0 )
    {
        /* Improve speed. */
        p_input->i_bufsize = INPUT_DEFAULT_BUFSIZE;
    }

    /* Create one program */
    vlc_mutex_lock( &p_input->stream.stream_lock );
    if( input_InitStream( p_input, 0 ) == -1)
    {
        vlc_mutex_unlock( &p_input->stream.stream_lock );
        msg_Err( p_input, "cannot init stream" );
        goto error;
Gildas Bazin's avatar
 
Gildas Bazin committed
1126
    }
Gildas Bazin's avatar
 
Gildas Bazin committed
1127 1128 1129 1130 1131 1132 1133
    if( input_AddProgram( p_input, 0, 0) == NULL )
    {
        vlc_mutex_unlock( &p_input->stream.stream_lock );
        msg_Err( p_input, "cannot add program" );
        goto error;
    }
    p_input->stream.p_selected_program = p_input->stream.pp_programs[0];
Gildas Bazin's avatar
 
Gildas Bazin committed
1134 1135
    p_input->stream.i_mux_rate = 0;
    vlc_mutex_unlock( &p_input->stream.stream_lock );
Gildas Bazin's avatar
 
Gildas Bazin committed
1136 1137 1138 1139 1140 1141 1142

    for( i_stream = 0 ; i_stream < p_ogg->i_streams; i_stream++ )
    {
#define p_stream p_ogg->pp_stream[i_stream]
        vlc_mutex_lock( &p_input->stream.stream_lock );
        p_stream->p_es = input_AddES( p_input,
                                      p_input->stream.p_selected_program,
Gildas Bazin's avatar
 
Gildas Bazin committed
1143 1144
                                      i_stream,
                                      p_stream->i_cat, NULL, 0 );
Gildas Bazin's avatar
 
Gildas Bazin committed
1145
        p_input->stream.i_mux_rate += (p_stream->i_bitrate / ( 8 * 50 ));
Gildas Bazin's avatar
 
Gildas Bazin committed
1146
        vlc_mutex_unlock( &p_input->stream.stream_lock );
Gildas Bazin's avatar
 
Gildas Bazin committed
1147
        p_stream->p_es->i_stream_id = i_stream;
Gildas Bazin's avatar
 
Gildas Bazin committed
1148
        p_stream->p_es->i_fourcc = p_stream->i_fourcc;
1149 1150
        p_stream->p_es->p_waveformatex      = (void*)p_stream->p_wf;
        p_stream->p_es->p_bitmapinfoheader  = (void*)p_stream->p_bih;
Gildas Bazin's avatar
 
Gildas Bazin committed
1151 1152 1153 1154 1155 1156 1157 1158 1159 1160 1161 1162 1163 1164 1165 1166 1167 1168
#undef p_stream
    }

    for( i_stream = 0; i_stream < p_ogg->i_streams; i_stream++ )
    {
#define p_stream  p_ogg->pp_stream[i_stream]
        switch( p_stream->p_es->i_cat )
        {
            case( VIDEO_ES ):
                if( (p_ogg->p_stream_video == NULL) )
                {
                    p_ogg->p_stream_video = p_stream;
                    /* TODO add test to see if a decoder has been found */
                    Ogg_StreamStart( p_input, p_ogg, i_stream );
                }
                break;

            case( AUDIO_ES ):
Gildas Bazin's avatar
 
Gildas Bazin committed
1169
                if( (p_ogg->p_stream_audio == NULL) )
Gildas Bazin's avatar
 
Gildas Bazin committed
1170
                {
Gildas Bazin's avatar
 
Gildas Bazin committed
1171 1172 1173 1174 1175 1176 1177 1178 1179 1180 1181 1182 1183 1184 1185 1186 1187 1188 1189 1190 1191 1192 1193 1194 1195 1196
                    int i_audio = config_GetInt( p_input, "audio-channel" );
                    if( i_audio == i_stream || i_audio <= 0 ||
                        i_audio >= p_ogg->i_streams ||
                        p_ogg->pp_stream[i_audio]->p_es->i_cat != AUDIO_ES )
                    {
                        p_ogg->p_stream_audio = p_stream;
                        Ogg_StreamStart( p_input, p_ogg, i_stream );
                    }
                }
                break;

            case( SPU_ES ):
                if( (p_ogg->p_stream_spu == NULL) )
                {
                    /* for spu, default is none */
                    int i_spu = config_GetInt( p_input, "spu-channel" );
                    if( i_spu < 0 || i_spu >= p_ogg->i_streams ||
                        p_ogg->pp_stream[i_spu]->p_es->i_cat != SPU_ES )
                    {
                        break;
                    }
                    else if( i_spu == i_stream )
                    {
                        p_ogg->p_stream_spu = p_stream;
                        Ogg_StreamStart( p_input, p_ogg, i_stream );
                    }
Gildas Bazin's avatar
 
Gildas Bazin committed
1197 1198 1199 1200 1201 1202 1203 1204 1205 1206 1207 1208 1209 1210 1211 1212 1213 1214 1215 1216 1217 1218
                }
                break;

            default:
                break;
        }
#undef p_stream
    }

    /* we select the first audio and video ES */
    vlc_mutex_lock( &p_input->stream.stream_lock );
    if( !p_ogg->p_stream_video )
    {
        msg_Warn( p_input, "no video stream found" );
    }
    if( !p_ogg->p_stream_audio )
    {
        msg_Warn( p_input, "no audio stream found!" );
    }
    p_input->stream.p_selected_program->b_is_ok = 1;
    vlc_mutex_unlock( &p_input->stream.stream_lock );

Gildas Bazin's avatar
 
Gildas Bazin committed
1219 1220 1221 1222 1223
    /* Call the pace control */
    input_ClockManageRef( p_input,
                          p_input->stream.p_selected_program,
                          p_ogg->i_pcr );

Gildas Bazin's avatar
 
Gildas Bazin committed
1224 1225 1226 1227 1228 1229 1230 1231 1232 1233 1234 1235 1236 1237 1238
    return 0;

 error:
    Deactivate( (vlc_object_t *)p_input );
    return -1;

}

/*****************************************************************************
 * Deactivate: frees unused data
 *****************************************************************************/
static void Deactivate( vlc_object_t *p_this )
{
    input_thread_t *p_input = (input_thread_t *)p_this;
    demux_sys_t *p_ogg = (demux_sys_t *)p_input->p_demux_data  ; 
Gildas Bazin's avatar
 
Gildas Bazin committed
1239
    int i, j;
Gildas Bazin's avatar
 
Gildas Bazin committed
1240 1241 1242 1243 1244 1245 1246 1247 1248

    if( p_ogg )
    {
        /* Cleanup the bitstream parser */
        ogg_sync_clear( &p_ogg->oy );

        for( i = 0; i < p_ogg->i_streams; i++ )
        {
            ogg_stream_clear( &p_ogg->pp_stream[i]->os );
Gildas Bazin's avatar
 
Gildas Bazin committed
1249 1250 1251 1252
            for( j = 0; j < p_ogg->pp_stream[i]->i_packets_backup; j++ )
            {
                free( p_ogg->pp_stream[i]->p_packets_backup[j].packet );
            }
Gildas Bazin's avatar
 
Gildas Bazin committed
1253 1254 1255 1256 1257 1258 1259 1260
            if( p_ogg->pp_stream[i]->p_packets_backup)
                free( p_ogg->pp_stream[i]->p_packets_backup );
#if 0 /* hmmm, it's already freed in input_DelES() */
            if( p_ogg->pp_stream[i]->p_bih )
                free( p_ogg->pp_stream[i]->p_bih );
            if( p_ogg->pp_stream[i]->p_wf )
                free( p_ogg->pp_stream[i]->p_wf );
#endif
Gildas Bazin's avatar
 
Gildas Bazin committed
1261 1262 1263 1264 1265 1266 1267 1268 1269 1270 1271 1272 1273 1274 1275
            free( p_ogg->pp_stream[i] );
        }
        if( p_ogg->pp_stream ) free( p_ogg->pp_stream );

        free( p_ogg );
    }
}

/*****************************************************************************
 * Demux: reads and demuxes data packets
 *****************************************************************************
 * Returns -1 in case of error, 0 in case of EOF, 1 otherwise
 *****************************************************************************/
static int Demux( input_thread_t * p_input )
{
Gildas Bazin's avatar
 
Gildas Bazin committed
1276
    int i, i_stream, b_eos = 0;
Gildas Bazin's avatar
 
Gildas Bazin committed
1277 1278 1279 1280 1281 1282 1283 1284 1285 1286 1287 1288 1289 1290 1291 1292 1293 1294 1295 1296 1297 1298 1299 1300
    ogg_page    oggpage;
    ogg_packet  oggpacket;
    demux_sys_t *p_ogg  = (demux_sys_t *)p_input->p_demux_data;

#define p_stream p_ogg->pp_stream[i_stream]
    /* detect new selected/unselected streams */
    for( i_stream = 0; i_stream < p_ogg->i_streams; i_stream++ )
    {
        if( p_stream->p_es )
        {
            if( p_stream->p_es->p_decoder_fifo &&
                !p_stream->i_activated )
            {
                Ogg_StreamStart( p_input, p_ogg, i_stream );
            }
            else
            if( !p_stream->p_es->p_decoder_fifo &&
                p_stream->i_activated )
            {
                Ogg_StreamStop( p_input, p_ogg, i_stream );
            }
        }
    }

Gildas Bazin's avatar
 
Gildas Bazin committed
1301
    /* search for new video and audio stream to select
Gildas Bazin's avatar
 
Gildas Bazin committed
1302 1303 1304 1305 1306 1307 1308 1309 1310 1311 1312 1313 1314 1315 1316 1317 1318 1319 1320 1321 1322 1323 1324 1325 1326 1327 1328 1329 1330 1331
     * if current have been unselected */
    if( ( !p_ogg->p_stream_video )
            || ( !p_ogg->p_stream_video->p_es->p_decoder_fifo ) )
    {
        p_ogg->p_stream_video = NULL;
        for( i_stream = 0; i_stream < p_ogg->i_streams; i_stream++ )
        {
            if( ( p_stream->i_cat == VIDEO_ES )
                  &&( p_stream->p_es->p_decoder_fifo ) )
            {
                p_ogg->p_stream_video = p_stream;
                break;
            }
        }
    }
    if( ( !p_ogg->p_stream_audio )
            ||( !p_ogg->p_stream_audio->p_es->p_decoder_fifo ) )
    {
        p_ogg->p_stream_audio = NULL;
        for( i_stream = 0; i_stream < p_ogg->i_streams; i_stream++ )
        {
            if( ( p_stream->i_cat == AUDIO_ES )
                  &&( p_stream->p_es->p_decoder_fifo ) )
            {
                p_ogg->p_stream_audio = p_stream;
                break;
            }
        }
    }

Gildas Bazin's avatar
 
Gildas Bazin committed
1332
    if( p_input->stream.p_selected_program->i_synchro_state == SYNCHRO_REINIT )
Gildas Bazin's avatar
 
Gildas Bazin committed
1333 1334
    {
        msg_Warn( p_input, "synchro reinit" );
Gildas Bazin's avatar
 
Gildas Bazin committed
1335 1336 1337 1338 1339 1340 1341 1342 1343

        /* An ogg packet does only contain the starting date of the next
         * packet, not its own starting date.
         * As a quick work around, we just skip an oggpage */

        for( i_stream = 0; i_stream < p_ogg->i_streams; i_stream++ )
        {
            /* we'll trash all the data until we find the next pcr */
            p_stream->b_reinit = 1;
Gildas Bazin's avatar
 
Gildas Bazin committed
1344 1345
            p_stream->i_pcr = -1;
            p_stream->i_interpolated_pcr = -1;
Gildas Bazin's avatar
 
Gildas Bazin committed
1346
        }
Gildas Bazin's avatar
 
Gildas Bazin committed
1347
        p_ogg->b_reinit = 1;
Gildas Bazin's avatar
 
Gildas Bazin committed
1348 1349 1350
    }


Gildas Bazin's avatar
 
Gildas Bazin committed
1351 1352 1353
    /*
     * Demux ogg pages from the stream
     */
Gildas Bazin's avatar
 
Gildas Bazin committed
1354
    for( i = 0; i < PAGES_READ_ONCE || p_ogg->b_reinit;  i++ )
Gildas Bazin's avatar
 
Gildas Bazin committed
1355
    {
Gildas Bazin's avatar
 
Gildas Bazin committed
1356
        if( Ogg_ReadPage( p_input, p_ogg, &oggpage ) != VLC_SUCCESS )
Gildas Bazin's avatar
 
Gildas Bazin committed
1357 1358 1359 1360 1361 1362 1363 1364 1365 1366 1367 1368
        {
            b_eos = 1;
            break;
        }

        for( i_stream = 0; i_stream < p_ogg->i_streams; i_stream++ )
        {
            if( ogg_stream_pagein( &p_stream->os, &oggpage ) != 0 )
                continue;

            while( ogg_stream_packetout( &p_stream->os, &oggpacket ) > 0 )
            {
Gildas Bazin's avatar
 
Gildas Bazin committed
1369
                if( !p_stream->p_es )
Gildas Bazin's avatar
 
Gildas Bazin committed
1370 1371 1372 1373
                {
                    break;
                }

Gildas Bazin's avatar
 
Gildas Bazin committed
1374 1375 1376 1377 1378 1379
                if( p_stream->b_reinit )
                {
                    if( oggpacket.granulepos >= 0 )
                    {
                        p_stream->b_reinit = 0;

Gildas Bazin's avatar
 
Gildas Bazin committed
1380 1381 1382 1383 1384 1385 1386 1387 1388 1389 1390 1391 1392 1393 1394 1395
                        /* Convert the next granulepos into a pcr */
                        Ogg_UpdatePCR( p_stream, &oggpacket );

                        /* Call the pace control to reinitialize
                         * the system clock */
                         input_ClockManageRef( p_input,
                             p_input->stream.p_selected_program,
                             p_stream->i_pcr );

                         if( (!p_ogg->p_stream_video ||
                              !p_ogg->p_stream_video->b_reinit) &&
                             (!p_ogg->p_stream_audio ||
                              !p_ogg->p_stream_audio->b_reinit) )
                         {
                             p_ogg->b_reinit = 0;
                         }
Gildas Bazin's avatar
 
Gildas Bazin committed
1396 1397 1398
                    }
                    continue;
                }
Gildas Bazin's avatar
 
Gildas Bazin committed
1399 1400

                Ogg_DecodePacket( p_input, p_stream, &oggpacket );
Gildas Bazin's avatar
 
Gildas Bazin committed
1401

Gildas Bazin's avatar
 
Gildas Bazin committed
1402 1403 1404 1405
            }
        }
    }

Gildas Bazin's avatar
 
Gildas Bazin committed
1406
    i_stream = 0;
Gildas Bazin's avatar
 
Gildas Bazin committed
1407
    p_ogg->i_old_pcr = p_ogg->i_pcr;
Gildas Bazin's avatar
 
Gildas Bazin committed
1408 1409
    p_ogg->i_pcr = p_stream->i_interpolated_pcr;
    for( ; i_stream < p_ogg->i_streams; i_stream++ )
Gildas Bazin's avatar
 
Gildas Bazin committed
1410 1411 1412 1413
    {
        if( p_stream->i_cat == SPU_ES )
            continue;

Gildas Bazin's avatar
 
Gildas Bazin committed
1414 1415
        if( p_stream->i_interpolated_pcr > 0
            && p_stream->i_interpolated_pcr < p_ogg->i_pcr )
Gildas Bazin's avatar
 
Gildas Bazin committed
1416 1417 1418 1419
            p_ogg->i_pcr = p_stream->i_interpolated_pcr;
    }
#undef p_stream

Gildas Bazin's avatar
 
Gildas Bazin committed
1420
    /* This is for streams where the granulepos of the header packets
Gildas Bazin's avatar
 
Gildas Bazin committed
1421
     * don't match these of the data packets (eg. ogg web radios). */
Gildas Bazin's avatar
 
Gildas Bazin committed
1422
    if( p_ogg->i_old_pcr == 0 && p_ogg->i_pcr > 3 * DEFAULT_PTS_DELAY * 9/100 )
Gildas Bazin's avatar
 
Gildas Bazin committed
1423
        p_input->stream.p_selected_program->i_synchro_state = SYNCHRO_REINIT;
Gildas Bazin's avatar
 
Gildas Bazin committed
1424

Gildas Bazin's avatar
 
Gildas Bazin committed
1425
    /* Call the pace control */
Gildas Bazin's avatar
 
Gildas Bazin committed
1426 1427
    input_ClockManageRef( p_input, p_input->stream.p_selected_program,
                          p_ogg->i_pcr );
Gildas Bazin's avatar
 
Gildas Bazin committed
1428

Gildas Bazin's avatar
 
Gildas Bazin committed
1429 1430 1431
    /* Did we reach the end of stream ? */
    return( b_eos ? 0 : 1 );
}