ogg.c 61 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.39 2003/10/19 16:53:59 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
#define OGG_BLOCK_SIZE 4096

/*****************************************************************************
 * 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
54
    es_descriptor_t  *p_es;
Gildas Bazin's avatar
 
Gildas Bazin committed
55 56
    int              b_selected;                           /* newly selected */

Gildas Bazin's avatar
 
Gildas Bazin committed
57 58 59 60 61 62 63
    /* 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
64 65
    /* program clock reference (in units of 90kHz) derived from the previous
     * granulepos */
Gildas Bazin's avatar
 
Gildas Bazin committed
66
    mtime_t          i_pcr;
Gildas Bazin's avatar
 
Gildas Bazin committed
67
    mtime_t          i_interpolated_pcr;
Gildas Bazin's avatar
 
Gildas Bazin committed
68
    mtime_t          i_previous_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
    int     b_reinit;
Gildas Bazin's avatar
 
Gildas Bazin committed
99 100 101

    /* stream state */
    int     b_eos;
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
/*****************************************************************************
 * Local prototypes
 *****************************************************************************/
static int  Activate  ( vlc_object_t * );
static void Deactivate( vlc_object_t * );
static int  Demux     ( input_thread_t * );
Gildas Bazin's avatar
 
Gildas Bazin committed
154
static int  Control   ( input_thread_t *, int, va_list );
Gildas Bazin's avatar
 
Gildas Bazin committed
155 156

/* Stream managment */
Gildas Bazin's avatar
 
Gildas Bazin committed
157 158
static int  Ogg_ElemStreamStart  ( input_thread_t *, demux_sys_t *, int );
static void Ogg_ElemStreamStop   ( input_thread_t *, demux_sys_t *, int );
Gildas Bazin's avatar
 
Gildas Bazin committed
159 160 161 162

/* 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
163
static void Ogg_UpdatePCR    ( logical_stream_t *, ogg_packet * );
Gildas Bazin's avatar
 
Gildas Bazin committed
164
static void Ogg_DecodePacket ( input_thread_t *p_input,
Gildas Bazin's avatar
 
Gildas Bazin committed
165
                               logical_stream_t *p_stream, ogg_packet * );
Gildas Bazin's avatar
 
Gildas Bazin committed
166 167 168 169

static int Ogg_BeginningOfStream( input_thread_t *p_input, demux_sys_t *p_ogg);
static int Ogg_FindLogicalStreams( input_thread_t *p_input,demux_sys_t *p_ogg);
static void Ogg_EndOfStream( input_thread_t *p_input, demux_sys_t *p_ogg );
Gildas Bazin's avatar
 
Gildas Bazin committed
170 171 172 173 174

/*****************************************************************************
 * Module descriptor
 *****************************************************************************/
vlc_module_begin();
Gildas Bazin's avatar
 
Gildas Bazin committed
175
    set_description( _("ogg stream demuxer" ) );
Gildas Bazin's avatar
 
Gildas Bazin committed
176 177 178 179 180 181 182 183
    set_capability( "demux", 50 );
    set_callbacks( Activate, Deactivate );
    add_shortcut( "ogg" );
vlc_module_end();

/*****************************************************************************
 * Stream managment
 *****************************************************************************/
Gildas Bazin's avatar
 
Gildas Bazin committed
184 185
static int Ogg_ElemStreamStart( input_thread_t *p_input,
                                demux_sys_t *p_ogg, int i_stream )
Gildas Bazin's avatar
 
Gildas Bazin committed
186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206
{
#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
207 208 209 210 211 212
    /* 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++ )
        {
Gildas Bazin's avatar
 
Gildas Bazin committed
213 214 215
            /* Set correct starting date in header packets */
            p_stream->p_packets_backup[i].granulepos =
                p_stream->i_interpolated_pcr * p_stream->f_rate / 90000;
Gildas Bazin's avatar
 
Gildas Bazin committed
216

Gildas Bazin's avatar
 
Gildas Bazin committed
217 218 219 220 221
            Ogg_DecodePacket( p_input, p_stream,
                              &p_stream->p_packets_backup[i] );
        }
    }

Gildas Bazin's avatar
 
Gildas Bazin committed
222 223 224 225
    return( p_stream->i_activated );
#undef  p_stream
}

Gildas Bazin's avatar
 
Gildas Bazin committed
226 227
static void Ogg_ElemStreamStop( input_thread_t *p_input,
                                demux_sys_t *p_ogg, int i_stream )
Gildas Bazin's avatar
 
Gildas Bazin committed
228 229 230 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
{
#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
296 297 298 299 300 301 302
/****************************************************************************
 * 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 )
{
Gildas Bazin's avatar
 
Gildas Bazin committed
303
    /* Convert the granulepos into a pcr */
Gildas Bazin's avatar
 
Gildas Bazin committed
304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325
    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
    {
Gildas Bazin's avatar
 
Gildas Bazin committed
326
        p_stream->i_pcr = -1;
Gildas Bazin's avatar
 
Gildas Bazin committed
327

Gildas Bazin's avatar
 
Gildas Bazin committed
328 329
        /* 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
330 331 332 333
        if( p_stream->i_cat == VIDEO_ES )
            /* 1 frame per packet */
            p_stream->i_interpolated_pcr += (90000 / p_stream->f_rate);
        else if( p_stream->i_bitrate )
Gildas Bazin's avatar
 
Gildas Bazin committed
334 335 336 337 338
            p_stream->i_interpolated_pcr += ( p_oggpacket->bytes * 90000
                                              / p_stream->i_bitrate / 8 );
    }
}

Gildas Bazin's avatar
 
Gildas Bazin committed
339 340 341 342 343 344 345 346 347
/****************************************************************************
 * 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
348
    vlc_bool_t b_trash = VLC_FALSE;
Gildas Bazin's avatar
 
Gildas Bazin committed
349
    int i_header_len = 0;
Gildas Bazin's avatar
 
Gildas Bazin committed
350
    mtime_t i_pts;
Gildas Bazin's avatar
 
Gildas Bazin committed
351

Gildas Bazin's avatar
 
Gildas Bazin committed
352 353 354 355
    if( p_stream->b_force_backup )
    {
        ogg_packet *p_packet_backup;
        p_stream->i_packets_backup++;
Gildas Bazin's avatar
 
Gildas Bazin committed
356 357 358 359 360 361 362 363 364 365 366 367 368
        switch( p_stream->i_fourcc )
        {
        case VLC_FOURCC( 'v','o','r','b' ):
        case VLC_FOURCC( 't','h','e','o' ):
          if( p_stream->i_packets_backup == 3 ) p_stream->b_force_backup = 0;
          break;

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

        /* Backup the ogg packet (likely an header packet) */
Gildas Bazin's avatar
 
Gildas Bazin committed
369 370 371 372 373 374 375 376 377
        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;
Gildas Bazin's avatar
 
Gildas Bazin committed
378 379 380 381 382 383 384 385 386

        if( p_oggpacket->granulepos >= 0 )
        {
            /* Because of vorbis granulepos scheme we must set the pcr for the
             * 1st header packet so it doesn't get discarded in the
             * packetizer */
            Ogg_UpdatePCR( p_stream, p_oggpacket );
        }

Gildas Bazin's avatar
 
Gildas Bazin committed
387 388 389 390 391 392
        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 );
    }

Gildas Bazin's avatar
 
Gildas Bazin committed
393 394 395 396 397 398 399
    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 );

Gildas Bazin's avatar
 
Gildas Bazin committed
400
    /* Convert the pcr into a pts */
Gildas Bazin's avatar
 
Gildas Bazin committed
401
    if( p_stream->i_fourcc == VLC_FOURCC( 'v','o','r','b' ) )
Gildas Bazin's avatar
 
Gildas Bazin committed
402
    {
Gildas Bazin's avatar
 
Gildas Bazin committed
403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422
        if( p_stream->i_pcr >= 0 )
        {
            /* This is for streams where the granulepos of the header packets
             * doesn't match these of the data packets (eg. ogg web radios). */
            if( p_stream->i_previous_pcr == 0 &&
                p_stream->i_pcr  > 3 * DEFAULT_PTS_DELAY * 9/100 )
                p_input->stream.p_selected_program->i_synchro_state =
                    SYNCHRO_REINIT;

            p_stream->i_previous_pcr = p_stream->i_pcr;

            /* Call the pace control */
            if( p_input->stream.p_selected_program->i_synchro_state ==
                SYNCHRO_REINIT )
            input_ClockManageRef( p_input,
                                  p_input->stream.p_selected_program,
                                  p_stream->i_pcr );
        }

        /* The granulepos is the end date of the sample */
Gildas Bazin's avatar
 
Gildas Bazin committed
423
        i_pts = ( p_stream->i_pcr < 0 ) ? 0 :
Gildas Bazin's avatar
 
Gildas Bazin committed
424 425
            input_ClockGetTS( p_input, p_input->stream.p_selected_program,
                              p_stream->i_pcr );
Gildas Bazin's avatar
 
Gildas Bazin committed
426 427 428

        /* Convert the granulepos into the next pcr */
        Ogg_UpdatePCR( p_stream, p_oggpacket );
Gildas Bazin's avatar
 
Gildas Bazin committed
429 430 431
    }
    else
    {
Gildas Bazin's avatar
 
Gildas Bazin committed
432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454
        /* Convert the granulepos into the current pcr */
        Ogg_UpdatePCR( p_stream, p_oggpacket );

        if( p_stream->i_pcr >= 0 )
        {
            /* This is for streams where the granulepos of the header packets
             * doesn't match these of the data packets (eg. ogg web radios). */
            if( p_stream->i_previous_pcr == 0 &&
                p_stream->i_pcr  > 3 * DEFAULT_PTS_DELAY * 9/100 )
                p_input->stream.p_selected_program->i_synchro_state =
                    SYNCHRO_REINIT;

            p_stream->i_previous_pcr = p_stream->i_pcr;

            /* Call the pace control */
            if( p_input->stream.p_selected_program->i_synchro_state ==
                SYNCHRO_REINIT )
            input_ClockManageRef( p_input,
                                  p_input->stream.p_selected_program,
                                  p_stream->i_pcr );
        }

        /* The granulepos is the start date of the sample */
Gildas Bazin's avatar
 
Gildas Bazin committed
455
        i_pts = ( p_stream->i_pcr < 0 ) ? 0 :
Gildas Bazin's avatar
 
Gildas Bazin committed
456
            input_ClockGetTS( p_input, p_input->stream.p_selected_program,
Gildas Bazin's avatar
 
Gildas Bazin committed
457
                              p_stream->i_pcr );
Gildas Bazin's avatar
 
Gildas Bazin committed
458
    }
Gildas Bazin's avatar
 
Gildas Bazin committed
459

Gildas Bazin's avatar
 
Gildas Bazin committed
460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478
    if( !p_stream->p_es->p_decoder_fifo || b_trash )
    {
        /* This stream isn't currently selected so we don't need to decode it,
         * but we did need to store its pcr as it might be selected later on */
        return;
    }

    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;
    }
    p_data->p_payload_end = p_data->p_payload_start + p_oggpacket->bytes;

Gildas Bazin's avatar
 
Gildas Bazin committed
479
    p_pes->i_nb_data = 1;
Gildas Bazin's avatar
 
Gildas Bazin committed
480
    p_pes->i_dts = p_pes->i_pts = i_pts;
Gildas Bazin's avatar
 
Gildas Bazin committed
481 482 483
    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
484 485
    if( p_stream->i_cat == SPU_ES ) p_pes->i_dts = 0;

Gildas Bazin's avatar
 
Gildas Bazin committed
486 487
    if( p_stream->i_fourcc != VLC_FOURCC( 'v','o','r','b' ) &&
        p_stream->i_fourcc != VLC_FOURCC( 't','a','r','k' ) &&
488
        p_stream->i_fourcc != VLC_FOURCC( 't','h','e','o' ) )
Gildas Bazin's avatar
 
Gildas Bazin committed
489 490 491 492 493 494 495
    {
        /* 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
496 497 498 499 500
    }

    if( p_stream->i_fourcc == VLC_FOURCC( 't','a','r','k' ) )
    {
        /* FIXME: the biggest hack I've ever done */
501
        msg_Warn( p_input, "tark pts: "I64Fd", granule: "I64Fd,
Gildas Bazin's avatar
 
Gildas Bazin committed
502 503
                  p_pes->i_pts, p_pes->i_dts );
        msleep(10000);
Gildas Bazin's avatar
 
Gildas Bazin committed
504 505 506 507 508 509 510
    }

    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
511
    p_data->b_discard_payload = 0;
Gildas Bazin's avatar
 
Gildas Bazin committed
512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568

    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 */
569
                if( oggpacket.bytes >= 7 &&
Gildas Bazin's avatar
 
Gildas Bazin committed
570 571 572 573 574 575 576 577
                    ! 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
578 579 580 581 582
                    /* 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
583 584
                    /* Cheat and get additionnal info ;) */
                    oggpack_readinit( &opb, oggpacket.packet, oggpacket.bytes);
Gildas Bazin's avatar
 
Gildas Bazin committed
585 586
                    oggpack_adv( &opb, 88 );
                    p_stream->i_channels = oggpack_read( &opb, 8 );
Gildas Bazin's avatar
 
Gildas Bazin committed
587
                    p_stream->f_rate = oggpack_read( &opb, 32 );
Gildas Bazin's avatar
 
Gildas Bazin committed
588 589
                    oggpack_adv( &opb, 32 );
                    p_stream->i_bitrate = oggpack_read( &opb, 32 );
590 591 592 593 594
                    {
                        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 );
595 596 597
                        input_AddInfo( p_cat, _("Type"), _("Audio") );
                        input_AddInfo( p_cat, _("Codec"), _("Vorbis") );
                        input_AddInfo( p_cat, _("Sample Rate"), "%f",
598
                                       p_stream->f_rate );
Gildas Bazin's avatar
 
Gildas Bazin committed
599 600
                        input_AddInfo( p_cat, _("Channels"), "%d",
                                       p_stream->i_channels );
601
                        input_AddInfo( p_cat, _("Bit Rate"), "%d",
602 603
                                       p_stream->i_bitrate );
                    }
Gildas Bazin's avatar
 
Gildas Bazin committed
604
                }
Gildas Bazin's avatar
 
Gildas Bazin committed
605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620
                /* 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
621 622 623 624 625
                    /* 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
626 627 628 629 630 631 632 633
                    /* 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
634 635 636 637 638
                    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
639 640 641 642 643
                    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
644
                    oggpackB_read( &opb, 8 ); /* colorspace */
Gildas Bazin's avatar
 
Gildas Bazin committed
645
                    p_stream->i_bitrate = oggpackB_read( &opb, 24 );
Gildas Bazin's avatar
 
Gildas Bazin committed
646
                    oggpackB_read( &opb, 6 ); /* quality */
Gildas Bazin's avatar
 
Gildas Bazin committed
647 648 649 650 651 652 653 654 655 656

                    /* 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;
                    }

Gildas Bazin's avatar
 
Gildas Bazin committed
657
                    p_stream->f_rate = ((float)i_fps_numerator) /
Gildas Bazin's avatar
 
Gildas Bazin committed
658 659 660 661
                                                i_fps_denominator;
                    msg_Dbg( p_input,
                             "found theora header, bitrate: %i, rate: %f",
                             p_stream->i_bitrate, p_stream->f_rate );
662 663 664 665 666
                    {
                        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 );
667 668 669
                        input_AddInfo( p_cat, _("Type"), _("Video") );
                        input_AddInfo( p_cat, _("Codec"), _("Theora") );
                        input_AddInfo( p_cat, _("Frame Rate"), "%f",
670
                                       p_stream->f_rate );
671
                        input_AddInfo( p_cat, _("Bit Rate"), "%d",
672 673
                                       p_stream->i_bitrate );
                    }
Gildas Bazin's avatar
 
Gildas Bazin committed
674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700
#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--;
#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 );
701 702 703 704 705
                                        {
                        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 );
706 707 708
                        input_AddInfo( p_cat, _("Type"), _("Video") );
                        input_AddInfo( p_cat, _("Codec"), _("tarkin") );
                        input_AddInfo( p_cat, _("Sample Rate"), "%f",
709
                                       p_stream->f_rate );
710
                        input_AddInfo( p_cat, _("Bit Rate"), "%d",
711 712 713
                                       p_stream->i_bitrate );
                    }

Gildas Bazin's avatar
 
Gildas Bazin committed
714
                }
Gildas Bazin's avatar
 
Gildas Bazin committed
715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733
                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--;
Gildas Bazin's avatar
 
Gildas Bazin committed
734
                            break;
Gildas Bazin's avatar
 
Gildas Bazin committed
735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765
                        }
                        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);
766 767 768 769 770
                        {
                            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 );
771 772
                            input_AddInfo( p_cat, _("Type"), _("Video") );
                            input_AddInfo( p_cat, _("Codec"), "%.4s",
773
                                           (char *)&p_stream->i_fourcc );
774
                            input_AddInfo( p_cat, _("Frame Rate"), "%f",
775
                                           p_stream->f_rate );
776
                            input_AddInfo( p_cat, _("Bit Count"), "%d",
777
                                           p_stream->p_bih->biBitCount );
778
                            input_AddInfo( p_cat, _("Width"), "%d",
779
                                           p_stream->p_bih->biWidth );
780
                            input_AddInfo( p_cat, _("Height"), "%d",
781 782
                                           p_stream->p_bih->biHeight );
                        }
Gildas Bazin's avatar
 
Gildas Bazin committed
783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800
                        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--;
Gildas Bazin's avatar
 
Gildas Bazin committed
801
                            break;
Gildas Bazin's avatar
 
Gildas Bazin committed
802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860
                        }

                        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 );
861 862 863 864 865
                        {
                            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 );
866
                            input_AddInfo( p_cat, _("Type"), _("Audio") );
867
                            input_AddInfo( p_cat, _("Codec"), "%.4s", 
868
                                           (char *)&p_stream->i_fourcc );
869
                            input_AddInfo( p_cat, _("Sample Rate"), "%d",
870
                                           p_stream->p_wf->nSamplesPerSec );
871
                            input_AddInfo( p_cat, _("Bit Rate"), "%d",
872 873
                                           p_stream->p_wf->nAvgBytesPerSec * 8
                                              / 1024 );
874
                            input_AddInfo( p_cat, _("Channels"), "%d",
875
                                           p_stream->p_wf->nChannels );
876
                            input_AddInfo( p_cat, _("Bits per Sample"), "%d",
877 878 879
                                           p_stream->p_wf->wBitsPerSample );
                        }

Gildas Bazin's avatar
 
Gildas Bazin committed
880 881 882 883 884 885 886 887 888
                    }
                    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
889 890 891 892 893 894 895 896 897 898 899 900 901 902
                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
903 904 905 906 907 908 909
                        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--;
Gildas Bazin's avatar
 
Gildas Bazin committed
910
                            break;
Gildas Bazin's avatar
 
Gildas Bazin committed
911
                        }
Gildas Bazin's avatar
 
Gildas Bazin committed
912 913 914 915 916 917 918 919 920
                        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
921
                        p_stream->f_rate = 10000000.0 /
922
                            GetQWLE(&st->time_unit);
Gildas Bazin's avatar
 
Gildas Bazin committed
923
                        p_stream->p_bih->biBitCount =
924
                            GetWLE(&st->bits_per_sample);
Gildas Bazin's avatar
 
Gildas Bazin committed
925
                        p_stream->p_bih->biWidth =
926
                            GetDWLE(&st->sh.video.width);
Gildas Bazin's avatar
 
Gildas Bazin committed
927
                        p_stream->p_bih->biHeight =
928
                            GetDWLE(&st->sh.video.height);
Gildas Bazin's avatar
 
Gildas Bazin committed
929 930 931 932 933 934 935 936
                        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
937
                            p_stream->f_rate, p_stream->p_bih->biWidth,
Gildas Bazin's avatar
 
Gildas Bazin committed
938 939
                            p_stream->p_bih->biHeight,
                            p_stream->p_bih->biBitCount);
Gildas Bazin's avatar
 
Gildas Bazin committed
940

941 942 943 944 945
                        {
                            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 );
946 947
                            input_AddInfo( p_cat, _("Type"), _("Video") );
                            input_AddInfo( p_cat, _("Codec"), "%.4s",
948
                                           (char *)&p_stream->i_fourcc );
949
                            input_AddInfo( p_cat, _("Frame Rate"), "%f",
950
                                           p_stream->f_rate );
951
                            input_AddInfo( p_cat, _("Bit Count"), "%d",
952
                                           p_stream->p_bih->biBitCount );
953
                            input_AddInfo( p_cat, _("Width"), "%d",
954
                                           p_stream->p_bih->biWidth );
955
                            input_AddInfo( p_cat, _("Height"), "%d",
956 957
                                           p_stream->p_bih->biHeight );
                        }
Gildas Bazin's avatar
 
Gildas Bazin committed
958
                        p_stream->i_bitrate = 0;
Gildas Bazin's avatar
 
Gildas Bazin committed
959 960 961 962 963 964 965 966 967 968 969 970
                    }
                    /* 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
971 972 973 974 975 976
                            malloc( sizeof(WAVEFORMATEX) );
                        if( !p_stream->p_wf )
                        {
                            /* Mem allocation error, just ignore the stream */
                            free( p_stream );
                            p_ogg->i_streams--;
Gildas Bazin's avatar
 
Gildas Bazin committed
977
                            break;
Gildas Bazin's avatar
 
Gildas Bazin committed
978
                        }
Gildas Bazin's avatar
 
Gildas Bazin committed
979

Gildas Bazin's avatar
 
Gildas Bazin committed
980 981
                        memcpy( p_buffer, st->subtype, 4 );
                        p_buffer[4] = '\0';
Gildas Bazin's avatar
 
Gildas Bazin committed
982
                        p_stream->p_wf->wFormatTag = strtol(p_buffer,NULL,16);
Gildas Bazin's avatar
 
Gildas Bazin committed
983
                        p_stream->p_wf->nChannels =
984
                            GetWLE(&st->sh.audio.channels);
Gildas Bazin's avatar
 
Gildas Bazin committed
985
                        p_stream->f_rate = p_stream->p_wf->nSamplesPerSec =
986
                            GetQWLE(&st->samples_per_unit);
Gildas Bazin's avatar
 
Gildas Bazin committed
987
                        p_stream->i_bitrate = p_stream->p_wf->nAvgBytesPerSec =
988
                            GetDWLE(&st->sh.audio.avgbytespersec);
Gildas Bazin's avatar
 
Gildas Bazin committed
989
                        p_stream->i_bitrate *= 8;
Gildas Bazin's avatar
 
Gildas Bazin committed
990
                        p_stream->p_wf->nBlockAlign =
991
                            GetWLE(&st->sh.audio.blockalign);
Gildas Bazin's avatar
 
Gildas Bazin committed
992
                        p_stream->p_wf->wBitsPerSample =
993
                            GetWLE(&st->bits_per_sample);
Gildas Bazin's avatar
 
Gildas Bazin committed
994
                        p_stream->p_wf->cbSize = 0;
Gildas Bazin's avatar
 
Gildas Bazin committed
995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033

                        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 );
1034 1035 1036 1037 1038
                        {
                            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 );
1039 1040
                            input_AddInfo( p_cat, _("Type"), _("Audio") );
                            input_AddInfo( p_cat, _("Codec"), "%.4s", 
1041
                                           (char *)&p_stream->i_fourcc );
1042
                            input_AddInfo( p_cat, _("Sample Rate"), "%d",
1043
                                           p_stream->p_wf->nSamplesPerSec );
1044
                            input_AddInfo( p_cat, _("Bit Rate"), "%d",
1045 1046
                                           p_stream->p_wf->nAvgBytesPerSec * 8
                                              / 1024 );
1047
                            input_AddInfo( p_cat, _("Channels"), "%d",
1048
                                           p_stream->p_wf->nChannels );
1049
                            input_AddInfo( p_cat, _("Bits per Sample"), "%d",
1050 1051
                                           p_stream->p_wf->wBitsPerSample );
                        }
Gildas Bazin's avatar
 
Gildas Bazin committed
1052
                    }
Gildas Bazin's avatar
 
Gildas Bazin committed
1053 1054 1055
                    /* Check for text (subtitles) header */
                    else if( !strncmp(st->streamtype, "text", 4) )
                    {
Gildas Bazin's avatar
 
Gildas Bazin committed
1056 1057 1058
                        /* We need to get rid of the header packet */
                        ogg_stream_packetout( &p_stream->os, &oggpacket );

Gildas Bazin's avatar
 
Gildas Bazin committed
1059 1060 1061 1062
                        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
1063
                        p_stream->f_rate = 1000; /* granulepos is in milisec */
Gildas Bazin's avatar
 
Gildas Bazin committed
1064
                    }
Gildas Bazin's avatar
 
Gildas Bazin committed
1065 1066 1067 1068 1069 1070 1071 1072
                    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
1073 1074
                else
                {
Gildas Bazin's avatar
 
Gildas Bazin committed
1075 1076
                    msg_Dbg( p_input, "stream %d is of unknown type",
                             p_ogg->i_streams-1 );
Gildas Bazin's avatar
 
Gildas Bazin committed
1077 1078
                    free( p_stream );
                    p_ogg->i_streams--;
Gildas Bazin's avatar
 
Gildas Bazin committed
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
                }

#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 )
{
    input_thread_t *p_input = (input_thread_t *)p_this;
Gildas Bazin's avatar
 
Gildas Bazin committed
1110 1111
    demux_sys_t    *p_ogg;
    int            b_forced;
Gildas Bazin's avatar
 
Gildas Bazin committed
1112 1113 1114 1115 1116 1117 1118 1119 1120 1121 1122 1123 1124 1125 1126 1127 1128

    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;
Gildas Bazin's avatar
 
Gildas Bazin committed
1129 1130 1131 1132
    p_ogg->pp_stream = NULL;
    p_ogg->p_stream_video = NULL;
    p_ogg->p_stream_audio = NULL;
    p_ogg->p_stream_spu = NULL;
Gildas Bazin's avatar
 
Gildas Bazin committed
1133 1134 1135 1136

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

Gildas Bazin's avatar
 
Gildas Bazin committed
1137
    /*Set exported functions */
Gildas Bazin's avatar
 
Gildas Bazin committed
1138
    p_input->pf_demux = Demux;
Gildas Bazin's avatar
 
Gildas Bazin committed
1139
    p_input->pf_demux_control = Control;
Gildas Bazin's avatar
 
Gildas Bazin committed
1140 1141 1142 1143 1144 1145 1146 1147 1148 1149 1150 1151 1152 1153 1154

    /* 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
1155
    }
Gildas Bazin's avatar
 
Gildas Bazin committed
1156 1157 1158 1159 1160 1161 1162
    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
1163 1164 1165 1166 1167 1168 1169 1170 1171 1172 1173 1174 1175 1176
    vlc_mutex_unlock( &p_input->stream.stream_lock );

    /* Begnning of stream, tell the demux to look for elementary streams. */
    p_ogg->b_eos = VLC_TRUE;

    return 0;

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

}

/****************************************************************************
Gildas Bazin's avatar
 
Gildas Bazin committed
1177 1178
 * Ogg_BeginningOfStream: Look for Beginning of Stream ogg pages and add
 *                        Elementary streams.
Gildas Bazin's avatar
 
Gildas Bazin committed
1179 1180 1181 1182 1183 1184 1185 1186 1187 1188 1189 1190 1191 1192
 ****************************************************************************/
static int Ogg_BeginningOfStream( input_thread_t *p_input, demux_sys_t *p_ogg)
{
    int i_stream;

    /* 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_Warn( p_input, "couldn't find any ogg logical stream" );
        return VLC_EGENERIC;
    }

    vlc_mutex_lock( &p_input->stream.stream_lock );
Gildas Bazin's avatar
 
Gildas Bazin committed
1193 1194
    p_input->stream.i_mux_rate = 0;
    vlc_mutex_unlock( &p_input->stream.stream_lock );
Gildas Bazin's avatar
 
Gildas Bazin committed
1195 1196 1197 1198 1199 1200 1201

    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
1202 1203
                                      i_stream,
                                      p_stream->i_cat, NULL, 0 );
Gildas Bazin's avatar
 
Gildas Bazin committed
1204
        p_input->stream.i_mux_rate += (p_stream->i_bitrate / ( 8 * 50 ));
Gildas Bazin's avatar
 
Gildas Bazin committed
1205
        vlc_mutex_unlock( &p_input->stream.stream_lock );
Gildas Bazin's avatar
 
Gildas Bazin committed
1206
        p_stream->p_es->i_stream_id = i_stream;
Gildas Bazin's avatar
 
Gildas Bazin committed
1207
        p_stream->p_es->i_fourcc = p_stream->i_fourcc;
1208 1209
        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
1210 1211

        p_stream->i_pcr  = p_stream->i_previous_pcr = -1;
Gildas Bazin's avatar
 
Gildas Bazin committed
1212
        p_stream->b_reinit = 0;
Gildas Bazin's avatar
 
Gildas Bazin committed
1213 1214 1215 1216 1217 1218 1219 1220 1221 1222 1223 1224 1225
#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 */
Gildas Bazin's avatar
 
Gildas Bazin committed
1226
                    Ogg_ElemStreamStart( p_input, p_ogg, i_stream );
Gildas Bazin's avatar
 
Gildas Bazin committed
1227 1228 1229 1230
                }
                break;

            case( AUDIO_ES ):
Gildas Bazin's avatar
 
Gildas Bazin committed
1231
                if( (p_ogg->p_stream_audio == NULL) )
Gildas Bazin's avatar
 
Gildas Bazin committed
1232
                {
Gildas Bazin's avatar
 
Gildas Bazin committed
1233 1234 1235 1236 1237 1238
                    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;
Gildas Bazin's avatar
 
Gildas Bazin committed
1239
                        Ogg_ElemStreamStart( p_input, p_ogg, i_stream );
Gildas Bazin's avatar
 
Gildas Bazin committed
1240 1241 1242 1243 1244 1245 1246 1247 1248 1249 1250 1251 1252 1253 1254 1255 1256
                    }
                }
                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;
Gildas Bazin's avatar
 
Gildas Bazin committed
1257
                        Ogg_ElemStreamStart( p_input, p_ogg, i_stream );
Gildas Bazin's avatar
 
Gildas Bazin committed
1258
                    }
Gildas Bazin's avatar
 
Gildas Bazin committed
1259 1260 1261 1262 1263 1264 1265 1266 1267 1268 1269 1270 1271 1272 1273 1274 1275 1276 1277 1278 1279 1280
                }
                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
1281 1282
    return VLC_SUCCESS;
}
Gildas Bazin's avatar
 
Gildas Bazin committed
1283

Gildas Bazin's avatar
 
Gildas Bazin committed
1284 1285 1286 1287 1288 1289
/****************************************************************************
 * Ogg_EndOfStream: clean up the ES when an End of Stream is detected.
 ****************************************************************************/
static void Ogg_EndOfStream( input_thread_t *p_input, demux_sys_t *p_ogg )
{
    int i_stream, j;
Gildas Bazin's avatar
 
Gildas Bazin committed
1290

Gildas Bazin's avatar
 
Gildas Bazin committed
1291 1292 1293 1294 1295 1296 1297 1298 1299 1300 1301 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 1332 1333 1334
#define p_stream p_ogg->pp_stream[i_stream]
        vlc_mutex_lock( &p_input->stream.stream_lock );
        if( p_input->stream.i_pgrm_number )
        while( p_input->stream.p_selected_program->i_es_number )
        {
            input_DelES( p_input,
                         p_input->stream.p_selected_program->pp_es[0] );
        }
        vlc_mutex_unlock( &p_input->stream.stream_lock );
#undef p_stream

    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_input->stream.i_mux_rate -= (p_stream->i_bitrate / ( 8 * 50 ));
        vlc_mutex_unlock( &p_input->stream.stream_lock );
#undef p_stream

        ogg_stream_clear( &p_ogg->pp_stream[i_stream]->os );
        for( j = 0; j < p_ogg->pp_stream[i_stream]->i_packets_backup; j++ )
        {
            free( p_ogg->pp_stream[i_stream]->p_packets_backup[j].packet );
        }
        if( p_ogg->pp_stream[i_stream]->p_packets_backup)
            free( p_ogg->pp_stream[i_stream]->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

        free( p_ogg->pp_stream[i_stream] );
    }

    /* Reinit p_ogg */
    if( p_ogg->pp_stream ) free( p_ogg->pp_stream );
    p_ogg->pp_stream = NULL;
    p_ogg->i_streams = 0;
    p_ogg->p_stream_video = NULL;
    p_ogg->p_stream_audio = NULL;
    p_ogg->p_stream_spu = NULL;
Gildas Bazin's avatar
 
Gildas Bazin committed
1335 1336 1337 1338 1339 1340 1341 1342 1343 1344 1345 1346 1347 1348 1349
}

/*****************************************************************************
 * 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  ; 

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

Gildas Bazin's avatar
 
Gildas Bazin committed
1350
        Ogg_EndOfStream( p_input, p_ogg );
Gildas Bazin's avatar
 
Gildas Bazin committed
1351 1352 1353 1354 1355 1356 1357 1358 1359 1360 1361 1362

        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
1363
    demux_sys_t *p_ogg = (demux_sys_t *)p_input->p_demux_data;
Gildas Bazin's avatar
 
Gildas Bazin committed
1364 1365
    ogg_page    oggpage;
    ogg_packet  oggpacket;
Gildas Bazin's avatar
 
Gildas Bazin committed
1366 1367 1368 1369 1370 1371 1372 1373 1374 1375
    int         i_stream;

    if( p_ogg->b_eos )
    {
        if( Ogg_BeginningOfStream( p_input, p_ogg ) != VLC_SUCCESS ) return 0;
        p_ogg->b_eos = VLC_FALSE;

        msg_Dbg( p_input, "beginning of a group of logical streams" );

        p_input->stream.p_selected_program->i_synchro_state = SYNCHRO_REINIT;
Gildas Bazin's avatar
 
Gildas Bazin committed
1376
        input_ClockManageRef( p_input, p_input->stream.p_selected_program, 0 );
Gildas Bazin's avatar
 
Gildas Bazin committed
1377
    }
Gildas Bazin's avatar
 
Gildas Bazin committed
1378 1379

#define p_stream p_ogg->pp_stream[i_stream]
Gildas Bazin's avatar
 
Gildas Bazin committed
1380

Gildas Bazin's avatar
 
Gildas Bazin committed
1381 1382 1383 1384 1385 1386 1387 1388
    /* 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 )
            {
Gildas Bazin's avatar
 
Gildas Bazin committed
1389
                Ogg_ElemStreamStart( p_input, p_ogg, i_stream );
Gildas Bazin's avatar
 
Gildas Bazin committed
1390 1391 1392 1393 1394
            }
            else
            if( !p_stream->p_es->p_decoder_fifo &&
                p_stream->i_activated )
            {
Gildas Bazin's avatar
 
Gildas Bazin committed
1395
                Ogg_ElemStreamStop( p_input, p_ogg, i_stream );
Gildas Bazin's avatar
 
Gildas Bazin committed
1396 1397 1398 1399
            }
        }
    }

Gildas Bazin's avatar
 
Gildas Bazin committed
1400
    /* search for new video and audio stream to select
Gildas Bazin's avatar
 
Gildas Bazin committed
1401 1402 1403 1404 1405 1406 1407 1408 1409 1410 1411 1412 1413 1414 1415 1416 1417 1418 1419 1420 1421 1422 1423 1424 1425 1426 1427 1428 1429 1430
     * 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
1431
    if( p_input->stream.p_selected_program->i_synchro_state == SYNCHRO_REINIT )
Gildas Bazin's avatar
 
Gildas Bazin committed
1432 1433
    {
        msg_Warn( p_input, "synchro reinit" );
Gildas Bazin's avatar
 
Gildas Bazin committed
1434 1435 1436 1437 1438

        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
1439 1440
            p_stream->i_pcr = -1;
            p_stream->i_interpolated_pcr = -1;
Gildas Bazin's avatar
 
Gildas Bazin committed
1441
        }
Gildas Bazin's avatar
 
Gildas Bazin committed
1442 1443 1444
    }


Gildas Bazin's avatar
 
Gildas Bazin committed
1445
    /*
Gildas Bazin's avatar
 
Gildas Bazin committed
1446
     * Demux an ogg page from the stream
Gildas Bazin's avatar
 
Gildas Bazin committed
1447
     */
Gildas Bazin's avatar
 
Gildas Bazin committed
1448
    if( Ogg_ReadPage( p_input, p_ogg, &oggpage ) != VLC_SUCCESS )
Gildas Bazin's avatar
 
Gildas Bazin committed
1449
    {
Gildas Bazin's avatar
 
Gildas Bazin committed
1450 1451
        return 0; /* EOF */
    }
Gildas Bazin's avatar
 
Gildas Bazin committed
1452

Gildas Bazin's avatar
 
Gildas Bazin committed
1453 1454 1455 1456 1457 1458 1459 1460 1461 1462 1463 1464 1465 1466 1467 1468
    /* Test for End of Stream */
    if( ogg_page_eos( &oggpage ) )
    {
        msg_Dbg( p_input, "end of a group of logical streams" );

        Ogg_EndOfStream( p_input, p_ogg );
        p_ogg->b_eos = VLC_TRUE;
        return 1;
    }

    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
1469
        {
Gildas Bazin's avatar
 
Gildas Bazin committed
1470 1471 1472 1473
            if( !p_stream->p_es )
            {
                break;
            }
Gildas Bazin's avatar
 
Gildas Bazin committed
1474

Gildas Bazin's avatar
 
Gildas Bazin committed
1475
            if( p_stream->b_reinit )
Gildas Bazin's avatar
 
Gildas Bazin committed
1476
            {
Gildas Bazin's avatar
 
Gildas Bazin committed
1477 1478 1479 1480 1481
                /* If synchro is re-initialized we need to drop all the packets
                 * until we find a new dated one. */
                Ogg_UpdatePCR( p_stream, &oggpacket );

                if( p_stream->i_pcr >= 0 )
Gildas Bazin's avatar
 
Gildas Bazin committed
1482
                {
Gildas Bazin's avatar
 
Gildas Bazin committed
1483
                    p_stream->b_reinit = 0;
Gildas Bazin's avatar
 
Gildas Bazin committed
1484
                }
Gildas Bazin's avatar
 
Gildas Bazin committed
1485
                else
Gildas Bazin's avatar
 
Gildas Bazin committed
1486
                {
Gildas Bazin's avatar
 
Gildas Bazin committed
1487 1488 1489
                    p_stream->i_interpolated_pcr = -1;
                    continue;
                }
Gildas Bazin's avatar
 
Gildas Bazin committed
1490

Gildas Bazin's avatar
 
Gildas Bazin committed
1491 1492 1493 1494
                /* An Ogg/vorbis packet contains an end date granulepos */
                if( p_stream->i_fourcc == VLC_FOURCC( 'v','o','r','b' ) )
                {
                    if( ogg_stream_packetout( &p_stream->os, &oggpacket ) > 0 )
Gildas Bazin's avatar
 
Gildas Bazin committed
1495
                    {
Gildas Bazin's avatar
 
Gildas Bazin committed
1496
                        Ogg_DecodePacket( p_input, p_stream, &oggpacket );
Gildas Bazin's avatar
 
Gildas Bazin committed
1497
                    }
Gildas Bazin's avatar
 
Gildas Bazin committed
1498
                    continue;
Gildas Bazin's avatar
 
Gildas Bazin committed
1499
                }
Gildas Bazin's avatar
 
Gildas Bazin committed
1500
            }
Gildas Bazin's avatar
 
Gildas Bazin committed
1501 1502

            Ogg_DecodePacket( p_input, p_stream, &oggpacket );
Gildas Bazin's avatar
 
Gildas Bazin committed
1503
        }
Gildas Bazin's avatar
 
Gildas Bazin committed
1504
        break;
Gildas Bazin's avatar
 
Gildas Bazin committed
1505 1506
    }

Gildas Bazin's avatar
 
Gildas Bazin committed
1507
    i_stream = 0; p_ogg->i_pcr = -1;
Gildas Bazin's avatar
 
Gildas Bazin committed
1508
    for( ; i_stream < p_ogg->i_streams; i_stream++ )
Gildas Bazin's avatar
 
Gildas Bazin committed
1509 1510 1511
    {
        if( p_stream->i_cat == SPU_ES )
            continue;
Gildas Bazin's avatar
 
Gildas Bazin committed
1512 1513
        if( p_stream->i_interpolated_pcr < 0 )
            continue;
Gildas Bazin's avatar
 
Gildas Bazin committed
1514

Gildas Bazin's avatar
 
Gildas Bazin committed
1515
        if( p_ogg->i_pcr < 0 || p_stream->i_interpolated_pcr < p_ogg->i_pcr )
Gildas Bazin's avatar
 
Gildas Bazin committed
1516 1517 1518
            p_ogg->i_pcr = p_stream->i_interpolated_pcr;
    }

Gildas Bazin's avatar
 
Gildas Bazin committed
1519
    if( p_input->stream.p_selected_program->i_synchro_state != SYNCHRO_REINIT )
Gildas Bazin's avatar
 
Gildas Bazin committed
1520 1521 1522 1523
    {
        input_ClockManageRef( p_input, p_input->stream.p_selected_program,
                              p_ogg->i_pcr );
    }
Gildas Bazin's avatar
 
Gildas Bazin committed
1524

Gildas Bazin's avatar
 
Gildas Bazin committed
1525
#undef p_stream
Gildas Bazin's avatar
 
Gildas Bazin committed
1526

Gildas Bazin's avatar
 
Gildas Bazin committed
1527
    return 1;
Gildas Bazin's avatar
 
Gildas Bazin committed
1528
}
Gildas Bazin's avatar
 
Gildas Bazin committed
1529 1530 1531 1532 1533 1534 1535

/*****************************************************************************
 * Control:
 *****************************************************************************/
static int Control( input_thread_t *p_input, int i_query, va_list args )
{
    demux_sys_t *p_ogg  = (demux_sys_t *)p_input->p_demux_data;
Gildas Bazin's avatar
 
Gildas Bazin committed
1536
    int64_t *pi64;
Gildas Bazin's avatar
 
Gildas Bazin committed
1537 1538 1539 1540 1541 1542 1543 1544 1545 1546 1547 1548

    switch( i_query )
    {
        case DEMUX_GET_TIME:
            pi64 = (int64_t*)va_arg( args, int64_t * );
            *pi64 = p_ogg->i_pcr * 100 / 9;
            return VLC_SUCCESS;

        default:
            return demux_vaControlDefault( p_input, i_query, args );
    }
}