ogg.c 52.7 KB
Newer Older
Gildas Bazin's avatar
 
Gildas Bazin committed
1
/*****************************************************************************
Derk-Jan Hartman's avatar
Derk-Jan Hartman committed
2
 * ogg.c : ogg stream demux module for vlc
Gildas Bazin's avatar
 
Gildas Bazin committed
3
 *****************************************************************************
4
 * Copyright (C) 2001-2003 the VideoLAN team
5
 * $Id$
Gildas Bazin's avatar
 
Gildas Bazin committed
6
 *
7 8
 * Authors: Gildas Bazin <gbazin@netcourrier.com>
 *          Andre Pang <Andre.Pang@csiro.au> (Annodex support)
Sam Hocevar's avatar
Sam Hocevar committed
9
 *
Gildas Bazin's avatar
 
Gildas Bazin committed
10 11 12 13
 * 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.
Sam Hocevar's avatar
Sam Hocevar committed
14
 *
Gildas Bazin's avatar
 
Gildas Bazin committed
15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32
 * 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 <vlc/vlc.h>
#include <vlc/input.h>

#include <ogg/ogg.h>

Gildas Bazin's avatar
 
Gildas Bazin committed
33 34
#include "codecs.h"
#include "vlc_bits.h"
Gildas Bazin's avatar
 
Gildas Bazin committed
35

36 37 38 39 40 41 42 43
/*****************************************************************************
 * Module descriptor
 *****************************************************************************/
static int  Open ( vlc_object_t * );
static void Close( vlc_object_t * );

vlc_module_begin();
    set_description( _("Ogg stream demuxer" ) );
Clément Stenac's avatar
Clément Stenac committed
44 45
    set_category( CAT_INPUT );
    set_subcategory( SUBCAT_INPUT_DEMUX );
46
    set_capability( "demux2", 50 );
47 48 49 50
    set_callbacks( Open, Close );
    add_shortcut( "ogg" );
vlc_module_end();

Gildas Bazin's avatar
 
Gildas Bazin committed
51 52

/*****************************************************************************
Sam Hocevar's avatar
Sam Hocevar committed
53
 * Definitions of structures and functions used by this plugins
Gildas Bazin's avatar
 
Gildas Bazin committed
54 55 56 57 58
 *****************************************************************************/
typedef struct logical_stream_s
{
    ogg_stream_state os;                        /* logical stream of packets */

Gildas Bazin's avatar
 
Gildas Bazin committed
59 60 61
    es_format_t      fmt;
    es_out_id_t      *p_es;
    double           f_rate;
Gildas Bazin's avatar
 
Gildas Bazin committed
62

Gildas Bazin's avatar
 
Gildas Bazin committed
63
    int              i_serial_no;
Gildas Bazin's avatar
 
Gildas Bazin committed
64

Gildas Bazin's avatar
 
Gildas Bazin committed
65 66 67 68 69
    /* 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;
70 71
    uint8_t          *p_headers;
    int              i_headers;
Gildas Bazin's avatar
 
Gildas Bazin committed
72

Gildas Bazin's avatar
 
Gildas Bazin committed
73 74
    /* program clock reference (in units of 90kHz) derived from the previous
     * granulepos */
Gildas Bazin's avatar
 
Gildas Bazin committed
75
    mtime_t          i_pcr;
Gildas Bazin's avatar
 
Gildas Bazin committed
76
    mtime_t          i_interpolated_pcr;
Gildas Bazin's avatar
 
Gildas Bazin committed
77
    mtime_t          i_previous_pcr;
Gildas Bazin's avatar
 
Gildas Bazin committed
78

Gildas Bazin's avatar
 
Gildas Bazin committed
79
    /* Misc */
Gildas Bazin's avatar
 
Gildas Bazin committed
80
    int b_reinit;
Gildas Bazin's avatar
 
Gildas Bazin committed
81
    int i_theora_keyframe_granule_shift;
Gildas Bazin's avatar
 
Gildas Bazin committed
82

83 84 85
    /* for Annodex logical bitstreams */
    int secondary_header_packets;

Gildas Bazin's avatar
 
Gildas Bazin committed
86 87 88 89 90 91 92 93 94
} 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 */

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 99

    /* stream state */
Gildas Bazin's avatar
 
Gildas Bazin committed
100
    int     i_eos;
101 102 103

    /* bitrate */
    int     i_bitrate;
Gildas Bazin's avatar
 
Gildas Bazin committed
104 105
};

Gildas Bazin's avatar
 
Gildas Bazin committed
106 107 108 109 110 111
/* 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;
Sam Hocevar's avatar
Sam Hocevar committed
112

Gildas Bazin's avatar
 
Gildas Bazin committed
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
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;

143 144
#define OGG_BLOCK_SIZE 4096

Gildas Bazin's avatar
 
Gildas Bazin committed
145 146 147 148 149 150 151
/* 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
152 153 154
/*****************************************************************************
 * Local prototypes
 *****************************************************************************/
155 156
static int  Demux  ( demux_t * );
static int  Control( demux_t *, int, va_list );
Gildas Bazin's avatar
 
Gildas Bazin committed
157 158

/* Bitstream manipulation */
159
static int  Ogg_ReadPage     ( demux_t *, ogg_page * );
Gildas Bazin's avatar
 
Gildas Bazin committed
160
static void Ogg_UpdatePCR    ( logical_stream_t *, ogg_packet * );
161
static void Ogg_DecodePacket ( demux_t *, logical_stream_t *, ogg_packet * );
Gildas Bazin's avatar
 
Gildas Bazin committed
162

163 164 165
static int Ogg_BeginningOfStream( demux_t *p_demux );
static int Ogg_FindLogicalStreams( demux_t *p_demux );
static void Ogg_EndOfStream( demux_t *p_demux );
Gildas Bazin's avatar
 
Gildas Bazin committed
166

167
/* Logical bitstream headers */
168 169 170 171 172
static void Ogg_ReadTheoraHeader( logical_stream_t *, ogg_packet * );
static void Ogg_ReadVorbisHeader( logical_stream_t *, ogg_packet * );
static void Ogg_ReadSpeexHeader( logical_stream_t *, ogg_packet * );
static void Ogg_ReadFlacHeader( demux_t *, logical_stream_t *, ogg_packet * );
static void Ogg_ReadAnnodexHeader( vlc_object_t *, logical_stream_t *, ogg_packet * );
173

Gildas Bazin's avatar
 
Gildas Bazin committed
174
/*****************************************************************************
175
 * Open: initializes ogg demux structures
Gildas Bazin's avatar
 
Gildas Bazin committed
176
 *****************************************************************************/
177
static int Open( vlc_object_t * p_this )
Gildas Bazin's avatar
 
Gildas Bazin committed
178
{
179
    demux_t *p_demux = (demux_t *)p_this;
180 181
    demux_sys_t    *p_sys;
    uint8_t        *p_peek;
Gildas Bazin's avatar
 
Gildas Bazin committed
182

183 184

    /* Check if we are dealing with an ogg stream */
185
    if( stream_Peek( p_demux->s, &p_peek, 4 ) < 4 ) return VLC_EGENERIC;
186
    if( strcmp( p_demux->psz_demux, "ogg" ) && memcmp( p_peek, "OggS", 4 ) )
187 188 189
    {
        return VLC_EGENERIC;
    }
Gildas Bazin's avatar
 
Gildas Bazin committed
190

191
    /* Set exported functions */
192 193 194
    p_demux->pf_demux = Demux;
    p_demux->pf_control = Control;
    p_demux->p_sys = p_sys = malloc( sizeof( demux_sys_t ) );
195 196

    memset( p_sys, 0, sizeof( demux_sys_t ) );
197
    p_sys->i_bitrate = 0;
198 199 200 201 202 203 204
    p_sys->pp_stream = NULL;

    /* Begnning of stream, tell the demux to look for elementary streams. */
    p_sys->i_eos = 0;

    /* Initialize the Ogg physical bitstream parser */
    ogg_sync_init( &p_sys->oy );
Gildas Bazin's avatar
 
Gildas Bazin committed
205 206 207 208

    return VLC_SUCCESS;
}

209 210 211 212 213
/*****************************************************************************
 * Close: frees unused data
 *****************************************************************************/
static void Close( vlc_object_t *p_this )
{
214 215
    demux_t *p_demux = (demux_t *)p_this;
    demux_sys_t *p_sys = p_demux->p_sys  ;
216 217 218 219

    /* Cleanup the bitstream parser */
    ogg_sync_clear( &p_sys->oy );

220
    Ogg_EndOfStream( p_demux );
221 222 223 224 225 226 227 228 229

    free( p_sys );
}

/*****************************************************************************
 * Demux: reads and demuxes data packets
 *****************************************************************************
 * Returns -1 in case of error, 0 in case of EOF, 1 otherwise
 *****************************************************************************/
230
static int Demux( demux_t * p_demux )
231
{
232
    demux_sys_t *p_sys = p_demux->p_sys;
233 234 235 236 237 238 239 240 241
    ogg_page    oggpage;
    ogg_packet  oggpacket;
    int         i_stream;


    if( p_sys->i_eos == p_sys->i_streams )
    {
        if( p_sys->i_eos )
        {
242 243
            msg_Dbg( p_demux, "end of a group of logical streams" );
            Ogg_EndOfStream( p_demux );
244 245 246
        }

        p_sys->i_eos = 0;
247
        if( Ogg_BeginningOfStream( p_demux ) != VLC_SUCCESS ) return 0;
248

249 250
        msg_Dbg( p_demux, "beginning of a group of logical streams" );
        es_out_Control( p_demux->out, ES_OUT_RESET_PCR );
251 252 253 254 255
    }

    /*
     * Demux an ogg page from the stream
     */
256
    if( Ogg_ReadPage( p_demux, &oggpage ) != VLC_SUCCESS )
257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276
    {
        return 0; /* EOF */
    }

    /* Test for End of Stream */
    if( ogg_page_eos( &oggpage ) ) p_sys->i_eos++;


    for( i_stream = 0; i_stream < p_sys->i_streams; i_stream++ )
    {
        logical_stream_t *p_stream = p_sys->pp_stream[i_stream];

        if( ogg_stream_pagein( &p_stream->os, &oggpage ) != 0 )
            continue;

        while( ogg_stream_packetout( &p_stream->os, &oggpacket ) > 0 )
        {
            /* Read info from any secondary header packets, if there are any */
            if( p_stream->secondary_header_packets > 0 )
            {
277
                if( p_stream->fmt.i_codec == VLC_FOURCC('t','h','e','o') &&
278
                        oggpacket.bytes >= 7 &&
279
                        ! memcmp( &oggpacket.packet[1], "theora", 6 ) )
280 281 282 283
                {
                    Ogg_ReadTheoraHeader( p_stream, &oggpacket );
                    p_stream->secondary_header_packets = 0;
                }
284
                else if( p_stream->fmt.i_codec == VLC_FOURCC('v','o','r','b') &&
285
                        oggpacket.bytes >= 7 &&
286
                        ! memcmp( &oggpacket.packet[1], "vorbis", 6 ) )
287 288 289 290
                {
                    Ogg_ReadVorbisHeader( p_stream, &oggpacket );
                    p_stream->secondary_header_packets = 0;
                }
291
                else if ( p_stream->fmt.i_codec == VLC_FOURCC('c','m','m','l') )
292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319
                {
                    p_stream->secondary_header_packets = 0;
                }
            }

            if( p_stream->b_reinit )
            {
                /* 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 )
                {
                    p_stream->b_reinit = 0;
                }
                else
                {
                    p_stream->i_interpolated_pcr = -1;
                    continue;
                }

                /* An Ogg/vorbis packet contains an end date granulepos */
                if( p_stream->fmt.i_codec == VLC_FOURCC( 'v','o','r','b' ) ||
                    p_stream->fmt.i_codec == VLC_FOURCC( 's','p','x',' ' ) ||
                    p_stream->fmt.i_codec == VLC_FOURCC( 'f','l','a','c' ) )
                {
                    if( ogg_stream_packetout( &p_stream->os, &oggpacket ) > 0 )
                    {
320
                        Ogg_DecodePacket( p_demux, p_stream, &oggpacket );
321 322 323
                    }
                    else
                    {
324 325
                        es_out_Control( p_demux->out, ES_OUT_SET_PCR,
                                        p_stream->i_pcr );
326 327 328 329 330
                    }
                    continue;
                }
            }

331
            Ogg_DecodePacket( p_demux, p_stream, &oggpacket );
332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351
        }
        break;
    }

    i_stream = 0; p_sys->i_pcr = -1;
    for( ; i_stream < p_sys->i_streams; i_stream++ )
    {
        logical_stream_t *p_stream = p_sys->pp_stream[i_stream];

        if( p_stream->fmt.i_cat == SPU_ES )
            continue;
        if( p_stream->i_interpolated_pcr < 0 )
            continue;

        if( p_sys->i_pcr < 0 || p_stream->i_interpolated_pcr < p_sys->i_pcr )
            p_sys->i_pcr = p_stream->i_interpolated_pcr;
    }

    if( p_sys->i_pcr >= 0 )
    {
352
        es_out_Control( p_demux->out, ES_OUT_SET_PCR, p_sys->i_pcr );
353 354 355 356 357 358 359 360 361
    }


    return 1;
}

/*****************************************************************************
 * Control:
 *****************************************************************************/
362
static int Control( demux_t *p_demux, int i_query, va_list args )
363
{
364
    demux_sys_t *p_sys  = p_demux->p_sys;
365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391
    int64_t *pi64;
    int i;

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

        case DEMUX_SET_TIME:
            return VLC_EGENERIC;

        case DEMUX_SET_POSITION:
            for( i = 0; i < p_sys->i_streams; i++ )
            {
                logical_stream_t *p_stream = p_sys->pp_stream[i];

                /* we'll trash all the data until we find the next pcr */
                p_stream->b_reinit = 1;
                p_stream->i_pcr = -1;
                p_stream->i_interpolated_pcr = -1;
                ogg_stream_reset( &p_stream->os );
            }
            ogg_sync_reset( &p_sys->oy );

        default:
392 393
            return demux2_vaControlHelper( p_demux->s, 0, -1, p_sys->i_bitrate,
                                           1, i_query, args );
394 395 396
    }
}

Gildas Bazin's avatar
 
Gildas Bazin committed
397 398 399 400 401 402
/****************************************************************************
 * 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.
 ****************************************************************************/
403
static int Ogg_ReadPage( demux_t *p_demux, ogg_page *p_oggpage )
Gildas Bazin's avatar
 
Gildas Bazin committed
404
{
405
    demux_sys_t *p_ogg = p_demux->p_sys  ;
Gildas Bazin's avatar
 
Gildas Bazin committed
406
    int i_read = 0;
407
    char *p_buffer;
Gildas Bazin's avatar
 
Gildas Bazin committed
408 409 410

    while( ogg_sync_pageout( &p_ogg->oy, p_oggpage ) != 1 )
    {
411 412 413
        p_buffer = ogg_sync_buffer( &p_ogg->oy, OGG_BLOCK_SIZE );

        i_read = stream_Read( p_demux->s, p_buffer, OGG_BLOCK_SIZE );
Gildas Bazin's avatar
 
Gildas Bazin committed
414 415 416 417 418 419 420 421 422
        if( i_read <= 0 )
            return VLC_EGENERIC;

        ogg_sync_wrote( &p_ogg->oy, i_read );
    }

    return VLC_SUCCESS;
}

Gildas Bazin's avatar
 
Gildas Bazin committed
423 424 425 426 427 428 429
/****************************************************************************
 * 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
430
    /* Convert the granulepos into a pcr */
Gildas Bazin's avatar
 
Gildas Bazin committed
431 432
    if( p_oggpacket->granulepos >= 0 )
    {
Gildas Bazin's avatar
 
Gildas Bazin committed
433
        if( p_stream->fmt.i_codec != VLC_FOURCC( 't','h','e','o' ) )
Gildas Bazin's avatar
 
Gildas Bazin committed
434
        {
435
            p_stream->i_pcr = p_oggpacket->granulepos * I64C(1000000)
Gildas Bazin's avatar
 
Gildas Bazin committed
436 437 438 439 440 441 442 443 444
                              / 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 );

445
            p_stream->i_pcr = ( iframe + pframe ) * I64C(1000000)
Gildas Bazin's avatar
 
Gildas Bazin committed
446 447 448 449 450 451 452
                              / p_stream->f_rate;
        }

        p_stream->i_interpolated_pcr = p_stream->i_pcr;
    }
    else
    {
Gildas Bazin's avatar
 
Gildas Bazin committed
453
        p_stream->i_pcr = -1;
Gildas Bazin's avatar
 
Gildas Bazin committed
454

Gildas Bazin's avatar
 
Gildas Bazin committed
455 456
        /* 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
457
        if( p_stream->fmt.i_cat == VIDEO_ES )
Gildas Bazin's avatar
 
Gildas Bazin committed
458
            /* 1 frame per packet */
459
            p_stream->i_interpolated_pcr += (I64C(1000000) / p_stream->f_rate);
Gildas Bazin's avatar
 
Gildas Bazin committed
460
        else if( p_stream->fmt.i_bitrate )
461 462 463
            p_stream->i_interpolated_pcr +=
                ( p_oggpacket->bytes * I64C(1000000) /
                  p_stream->fmt.i_bitrate / 8 );
Gildas Bazin's avatar
 
Gildas Bazin committed
464 465 466
    }
}

Gildas Bazin's avatar
 
Gildas Bazin committed
467 468 469
/****************************************************************************
 * Ogg_DecodePacket: Decode an Ogg packet.
 ****************************************************************************/
470
static void Ogg_DecodePacket( demux_t *p_demux,
Gildas Bazin's avatar
 
Gildas Bazin committed
471 472 473
                              logical_stream_t *p_stream,
                              ogg_packet *p_oggpacket )
{
Gildas Bazin's avatar
 
Gildas Bazin committed
474 475
    block_t *p_block;
    vlc_bool_t b_selected;
Gildas Bazin's avatar
 
Gildas Bazin committed
476
    int i_header_len = 0;
477
    mtime_t i_pts = -1, i_interpolated_pts;
Gildas Bazin's avatar
 
Gildas Bazin committed
478

Gildas Bazin's avatar
 
Gildas Bazin committed
479 480 481
    /* Sanity check */
    if( !p_oggpacket->bytes )
    {
482
        msg_Dbg( p_demux, "discarding 0 sized packet" );
Gildas Bazin's avatar
 
Gildas Bazin committed
483 484 485
        return;
    }

486
    if( p_oggpacket->bytes >= 7 &&
487
        ! memcmp ( &p_oggpacket->packet[0], "Annodex", 7 ) )
488 489 490 491 492
    {
        /* it's an Annodex packet -- skip it (do nothing) */
        return; 
    }
    else if( p_oggpacket->bytes >= 7 &&
493
        ! memcmp ( &p_oggpacket->packet[0], "AnxData", 7 ) )
494 495 496 497 498
    {
        /* it's an AnxData packet -- skip it (do nothing) */
        return; 
    }

499 500 501
    if( p_stream->fmt.i_codec == VLC_FOURCC( 's','u','b','t' ) &&
        p_oggpacket->packet[0] & PACKET_TYPE_BITS ) return;

502 503 504 505
    /* Check the ES is selected */
    es_out_Control( p_demux->out, ES_OUT_GET_ES_STATE,
                    p_stream->p_es, &b_selected );

Gildas Bazin's avatar
 
Gildas Bazin committed
506 507
    if( p_stream->b_force_backup )
    {
508
        uint8_t *p_extra;
509
        vlc_bool_t b_store_size = VLC_TRUE;
510

Gildas Bazin's avatar
 
Gildas Bazin committed
511
        p_stream->i_packets_backup++;
Gildas Bazin's avatar
 
Gildas Bazin committed
512
        switch( p_stream->fmt.i_codec )
Gildas Bazin's avatar
 
Gildas Bazin committed
513 514
        {
        case VLC_FOURCC( 'v','o','r','b' ):
Gildas Bazin's avatar
 
Gildas Bazin committed
515
        case VLC_FOURCC( 's','p','x',' ' ):
Gildas Bazin's avatar
 
Gildas Bazin committed
516 517 518 519
        case VLC_FOURCC( 't','h','e','o' ):
          if( p_stream->i_packets_backup == 3 ) p_stream->b_force_backup = 0;
          break;

Gildas Bazin's avatar
 
Gildas Bazin committed
520
        case VLC_FOURCC( 'f','l','a','c' ):
521
          if( !p_stream->fmt.audio.i_rate && p_stream->i_packets_backup == 2 )
Gildas Bazin's avatar
 
Gildas Bazin committed
522
          {
523
              Ogg_ReadFlacHeader( p_demux, p_stream, p_oggpacket );
Gildas Bazin's avatar
 
Gildas Bazin committed
524 525
              p_stream->b_force_backup = 0;
          }
526 527 528 529 530
          else if( p_stream->fmt.audio.i_rate )
          {
              p_stream->b_force_backup = 0;
              p_oggpacket->packet += 9; p_oggpacket->bytes -= 9;
          }
531
          b_store_size = VLC_FALSE;
Gildas Bazin's avatar
 
Gildas Bazin committed
532 533
          break;

Gildas Bazin's avatar
 
Gildas Bazin committed
534 535 536 537 538 539
        default:
          p_stream->b_force_backup = 0;
          break;
        }

        /* Backup the ogg packet (likely an header packet) */
540 541 542 543 544
        p_stream->p_headers =
            realloc( p_stream->p_headers, p_stream->i_headers +
                     p_oggpacket->bytes + (b_store_size ? 2 : 0) );
        p_extra = p_stream->p_headers + p_stream->i_headers;
        if( b_store_size )
Gildas Bazin's avatar
 
Gildas Bazin committed
545
        {
546 547
            *(p_extra++) = p_oggpacket->bytes >> 8;
            *(p_extra++) = p_oggpacket->bytes & 0xFF;
Gildas Bazin's avatar
 
Gildas Bazin committed
548
        }
549 550
        memcpy( p_extra, p_oggpacket->packet, p_oggpacket->bytes );
        p_stream->i_headers += p_oggpacket->bytes + (b_store_size ? 2 : 0);
Gildas Bazin's avatar
 
Gildas Bazin committed
551

Gildas Bazin's avatar
 
Gildas Bazin committed
552 553
        if( !p_stream->b_force_backup )
        {
554 555 556 557
            /* Last header received, commit changes */
            p_stream->fmt.i_extra = p_stream->i_headers;
            p_stream->fmt.p_extra =
                realloc( p_stream->fmt.p_extra, p_stream->i_headers );
558 559
            memcpy( p_stream->fmt.p_extra, p_stream->p_headers,
                    p_stream->i_headers );
560 561
            es_out_Control( p_demux->out, ES_OUT_SET_FMT,
                            p_stream->p_es, &p_stream->fmt );
Gildas Bazin's avatar
 
Gildas Bazin committed
562
        }
563 564

        b_selected = VLC_FALSE; /* Discard the header packet */
Gildas Bazin's avatar
 
Gildas Bazin committed
565 566
    }

Gildas Bazin's avatar
 
Gildas Bazin committed
567
    /* Convert the pcr into a pts */
Gildas Bazin's avatar
 
Gildas Bazin committed
568 569 570
    if( p_stream->fmt.i_codec == VLC_FOURCC( 'v','o','r','b' ) ||
        p_stream->fmt.i_codec == VLC_FOURCC( 's','p','x',' ' ) ||
        p_stream->fmt.i_codec == VLC_FOURCC( 'f','l','a','c' ) )
Gildas Bazin's avatar
 
Gildas Bazin committed
571
    {
Gildas Bazin's avatar
 
Gildas Bazin committed
572 573 574 575 576
        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 &&
577 578
                p_stream->i_pcr  > 3 * DEFAULT_PTS_DELAY )
            {
579
                es_out_Control( p_demux->out, ES_OUT_RESET_PCR );
Gildas Bazin's avatar
 
Gildas Bazin committed
580

581
                /* Call the pace control */
582 583
                es_out_Control( p_demux->out, ES_OUT_SET_PCR,
                                p_stream->i_pcr );
584
            }
Gildas Bazin's avatar
 
Gildas Bazin committed
585

586
            p_stream->i_previous_pcr = p_stream->i_pcr;
Gildas Bazin's avatar
 
Gildas Bazin committed
587

Gildas Bazin's avatar
 
Gildas Bazin committed
588
            /* The granulepos is the end date of the sample */
589
            i_pts =  p_stream->i_pcr;
Gildas Bazin's avatar
 
Gildas Bazin committed
590
        }
Gildas Bazin's avatar
 
Gildas Bazin committed
591
    }
Gildas Bazin's avatar
 
Gildas Bazin committed
592

Gildas Bazin's avatar
 
Gildas Bazin committed
593
    /* Convert the granulepos into the next pcr */
594
    i_interpolated_pts = p_stream->i_interpolated_pcr;
Gildas Bazin's avatar
 
Gildas Bazin committed
595
    Ogg_UpdatePCR( p_stream, p_oggpacket );
Gildas Bazin's avatar
 
Gildas Bazin committed
596

Gildas Bazin's avatar
 
Gildas Bazin committed
597 598 599 600 601
    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 &&
602 603
            p_stream->i_pcr  > 3 * DEFAULT_PTS_DELAY )
        {
604
            es_out_Control( p_demux->out, ES_OUT_RESET_PCR );
605 606

            /* Call the pace control */
607
            es_out_Control( p_demux->out, ES_OUT_SET_PCR, p_stream->i_pcr );
608
        }
Gildas Bazin's avatar
 
Gildas Bazin committed
609
    }
Gildas Bazin's avatar
 
Gildas Bazin committed
610

Gildas Bazin's avatar
 
Gildas Bazin committed
611 612 613
    if( p_stream->fmt.i_codec != VLC_FOURCC( 'v','o','r','b' ) &&
        p_stream->fmt.i_codec != VLC_FOURCC( 's','p','x',' ' ) &&
        p_stream->fmt.i_codec != VLC_FOURCC( 'f','l','a','c' ) &&
Gildas Bazin's avatar
 
Gildas Bazin committed
614 615 616
        p_stream->i_pcr >= 0 )
    {
        p_stream->i_previous_pcr = p_stream->i_pcr;
Gildas Bazin's avatar
 
Gildas Bazin committed
617 618

        /* The granulepos is the start date of the sample */
619
        i_pts = p_stream->i_pcr;
Gildas Bazin's avatar
 
Gildas Bazin committed
620
    }
Gildas Bazin's avatar
 
Gildas Bazin committed
621

Gildas Bazin's avatar
 
Gildas Bazin committed
622
    if( !b_selected )
Gildas Bazin's avatar
 
Gildas Bazin committed
623 624 625 626 627 628
    {
        /* 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;
    }

629
    if( !( p_block = block_New( p_demux, p_oggpacket->bytes ) ) ) return;
Gildas Bazin's avatar
 
Gildas Bazin committed
630

631 632 633 634 635
    /* Normalize PTS */
    if( i_pts == 0 ) i_pts = 1;
    else if( i_pts == -1 && i_interpolated_pts == 0 ) i_pts = 1;
    else if( i_pts == -1 ) i_pts = 0;

Gildas Bazin's avatar
 
Gildas Bazin committed
636 637 638 639
    if( p_stream->fmt.i_cat == AUDIO_ES )
        p_block->i_dts = p_block->i_pts = i_pts;
    else if( p_stream->fmt.i_cat == SPU_ES )
    {
640 641
        p_block->i_dts = p_block->i_pts = i_pts;
        p_block->i_length = 0;
Gildas Bazin's avatar
 
Gildas Bazin committed
642 643 644 645 646 647 648 649
    }
    else if( p_stream->fmt.i_codec == VLC_FOURCC( 't','h','e','o' ) )
        p_block->i_dts = p_block->i_pts = i_pts;
    else
    {
        p_block->i_dts = i_pts;
        p_block->i_pts = 0;
    }
Gildas Bazin's avatar
 
Gildas Bazin committed
650

Gildas Bazin's avatar
 
Gildas Bazin committed
651 652 653 654
    if( p_stream->fmt.i_codec != VLC_FOURCC( 'v','o','r','b' ) &&
        p_stream->fmt.i_codec != VLC_FOURCC( 's','p','x',' ' ) &&
        p_stream->fmt.i_codec != VLC_FOURCC( 'f','l','a','c' ) &&
        p_stream->fmt.i_codec != VLC_FOURCC( 't','a','r','k' ) &&
655 656
        p_stream->fmt.i_codec != VLC_FOURCC( 't','h','e','o' ) &&
        p_stream->fmt.i_codec != VLC_FOURCC( 'c','m','m','l' ) )
Gildas Bazin's avatar
 
Gildas Bazin committed
657
    {
658
        /* We remove the header from the packet */
Gildas Bazin's avatar
 
Gildas Bazin committed
659 660
        i_header_len = (*p_oggpacket->packet & PACKET_LEN_BITS01) >> 6;
        i_header_len |= (*p_oggpacket->packet & PACKET_LEN_BITS2) << 1;
661

662 663 664
        if( p_stream->fmt.i_codec == VLC_FOURCC( 's','u','b','t' ))
        {
            /* But with subtitles we need to retrieve the duration first */
Gildas Bazin's avatar
 
Gildas Bazin committed
665
            int i, lenbytes = 0;
666
        
Gildas Bazin's avatar
 
Gildas Bazin committed
667
            if( i_header_len > 0 && p_oggpacket->bytes >= i_header_len + 1 )
668 669 670 671
            {
                for( i = 0, lenbytes = 0; i < i_header_len; i++ )
                {
                    lenbytes = lenbytes << 8;
Gildas Bazin's avatar
 
Gildas Bazin committed
672
                    lenbytes += *(p_oggpacket->packet + i_header_len - i);
673 674
                }
            }
Gildas Bazin's avatar
 
Gildas Bazin committed
675 676 677 678 679
            if( p_oggpacket->bytes - 1 - i_header_len > 2 ||
                ( p_oggpacket->packet[i_header_len + 1] != ' ' &&
                  p_oggpacket->packet[i_header_len + 1] != 0 && 
                  p_oggpacket->packet[i_header_len + 1] != '\n' &&
                  p_oggpacket->packet[i_header_len + 1] != '\r' ) )
680
            {
681
                p_block->i_length = (mtime_t)lenbytes * 1000;
682 683
            }
        }
Gildas Bazin's avatar
 
Gildas Bazin committed
684

685
        i_header_len++;
Gildas Bazin's avatar
 
Gildas Bazin committed
686
        p_block->i_buffer -= i_header_len;
Gildas Bazin's avatar
 
Gildas Bazin committed
687 688
    }

Gildas Bazin's avatar
 
Gildas Bazin committed
689
    if( p_stream->fmt.i_codec == VLC_FOURCC( 't','a','r','k' ) )
Gildas Bazin's avatar
 
Gildas Bazin committed
690 691
    {
        /* FIXME: the biggest hack I've ever done */
692
        msg_Warn( p_demux, "tarkin pts: "I64Fd", granule: "I64Fd,
Gildas Bazin's avatar
 
Gildas Bazin committed
693
                  p_block->i_pts, p_block->i_dts );
Gildas Bazin's avatar
 
Gildas Bazin committed
694
        msleep(10000);
Gildas Bazin's avatar
 
Gildas Bazin committed
695 696
    }

Gildas Bazin's avatar
 
Gildas Bazin committed
697
    memcpy( p_block->p_buffer, p_oggpacket->packet + i_header_len,
Gildas Bazin's avatar
 
Gildas Bazin committed
698 699
            p_oggpacket->bytes - i_header_len );

700
    es_out_Send( p_demux->out, p_stream->p_es, p_block );
Gildas Bazin's avatar
 
Gildas Bazin committed
701 702 703 704 705 706 707 708 709 710 711 712
}

/****************************************************************************
 * 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.
 ****************************************************************************/
713
static int Ogg_FindLogicalStreams( demux_t *p_demux )
Gildas Bazin's avatar
 
Gildas Bazin committed
714
{
715
    demux_sys_t *p_ogg = p_demux->p_sys  ;
Gildas Bazin's avatar
 
Gildas Bazin committed
716 717 718 719
    ogg_packet oggpacket;
    ogg_page oggpage;
    int i_stream;

Gildas Bazin's avatar
 
Gildas Bazin committed
720 721
#define p_stream p_ogg->pp_stream[p_ogg->i_streams - 1]

722
    while( Ogg_ReadPage( p_demux, &oggpage ) == VLC_SUCCESS )
Gildas Bazin's avatar
 
Gildas Bazin committed
723 724 725 726 727 728 729 730 731 732 733 734 735 736 737
    {
        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 *) );

                p_stream = malloc( sizeof(logical_stream_t) );
                memset( p_stream, 0, sizeof(logical_stream_t) );
738
                p_stream->p_headers = 0;
739
                p_stream->secondary_header_packets = 0;
Gildas Bazin's avatar
 
Gildas Bazin committed
740

Gildas Bazin's avatar
 
Gildas Bazin committed
741 742
                es_format_Init( &p_stream->fmt, 0, 0 );

Gildas Bazin's avatar
 
Gildas Bazin committed
743 744 745 746 747 748 749 750 751
                /* 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 */
752
                    msg_Err( p_demux, "error reading first page of "
Gildas Bazin's avatar
 
Gildas Bazin committed
753 754 755 756 757 758 759 760
                             "Ogg bitstream data" );
                    return VLC_EGENERIC;
                }

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

                /* Check for Vorbis header */
761
                if( oggpacket.bytes >= 7 &&
762
                    ! memcmp( &oggpacket.packet[1], "vorbis", 6 ) )
Gildas Bazin's avatar
 
Gildas Bazin committed
763
                {
764
                    Ogg_ReadVorbisHeader( p_stream, &oggpacket );
765
                    msg_Dbg( p_demux, "found vorbis header" );
Gildas Bazin's avatar
 
Gildas Bazin committed
766
                }
Gildas Bazin's avatar
 
Gildas Bazin committed
767
                /* Check for Speex header */
Gildas Bazin's avatar
 
Gildas Bazin committed
768
                else if( oggpacket.bytes >= 7 &&
769
                    ! memcmp( &oggpacket.packet[0], "Speex", 5 ) )
Gildas Bazin's avatar
 
Gildas Bazin committed
770
                {
771
                    Ogg_ReadSpeexHeader( p_stream, &oggpacket );
772
                    msg_Dbg( p_demux, "found speex header, channels: %i, "
Gildas Bazin's avatar
 
Gildas Bazin committed
773 774 775
                             "rate: %i,  bitrate: %i",
                             p_stream->fmt.audio.i_channels,
                             (int)p_stream->f_rate, p_stream->fmt.i_bitrate );
Gildas Bazin's avatar
 
Gildas Bazin committed
776
                }
777
                /* Check for Flac header (< version 1.1.1) */
Gildas Bazin's avatar
 
Gildas Bazin committed
778
                else if( oggpacket.bytes >= 4 &&
779
                    ! memcmp( &oggpacket.packet[0], "fLaC", 4 ) )
Gildas Bazin's avatar
 
Gildas Bazin committed
780
                {
781
                    msg_Dbg( p_demux, "found FLAC header" );
Gildas Bazin's avatar
 
Gildas Bazin committed
782 783 784 785 786 787

                    /* Grrrr!!!! Did they really have to put all the
                     * important info in the second header packet!!!
                     * (STREAMINFO metadata is in the following packet) */
                    p_stream->b_force_backup = 1;

Gildas Bazin's avatar
 
Gildas Bazin committed
788 789
                    p_stream->fmt.i_cat = AUDIO_ES;
                    p_stream->fmt.i_codec = VLC_FOURCC( 'f','l','a','c' );
Gildas Bazin's avatar
 
Gildas Bazin committed
790
                }
791 792
                /* Check for Flac header (>= version 1.1.1) */
                else if( oggpacket.bytes >= 13 && oggpacket.packet[0] ==0x7F &&
793 794
                    ! memcmp( &oggpacket.packet[1], "FLAC", 4 ) &&
                    ! memcmp( &oggpacket.packet[9], "fLaC", 4 ) )
795 796 797 798 799 800 801 802 803 804 805 806 807 808 809
                {
                    int i_packets = ((int)oggpacket.packet[7]) << 8 |
                        oggpacket.packet[8];
                    msg_Dbg( p_demux, "found FLAC header version %i.%i "
                             "(%i header packets)",
                             oggpacket.packet[5], oggpacket.packet[6],
                             i_packets );

                    p_stream->b_force_backup = 1;

                    p_stream->fmt.i_cat = AUDIO_ES;
                    p_stream->fmt.i_codec = VLC_FOURCC( 'f','l','a','c' );
                    oggpacket.packet += 13; oggpacket.bytes -= 13;
                    Ogg_ReadFlacHeader( p_demux, p_stream, &oggpacket );
                }
Gildas Bazin's avatar
 
Gildas Bazin committed
810 811
                /* Check for Theora header */
                else if( oggpacket.bytes >= 7 &&
812
                         ! memcmp( &oggpacket.packet[1], "theora", 6 ) )
Gildas Bazin's avatar
 
Gildas Bazin committed
813
                {
814
                    Ogg_ReadTheoraHeader( p_stream, &oggpacket );
Gildas Bazin's avatar
 
Gildas Bazin committed
815

816
                    msg_Dbg( p_demux,
Gildas Bazin's avatar
 
Gildas Bazin committed
817
                             "found theora header, bitrate: %i, rate: %f",
Gildas Bazin's avatar
 
Gildas Bazin committed
818
                             p_stream->fmt.i_bitrate, p_stream->f_rate );
Gildas Bazin's avatar
 
Gildas Bazin committed
819 820 821
                }
                /* Check for Tarkin header */
                else if( oggpacket.bytes >= 7 &&
822
                         ! memcmp( &oggpacket.packet[1], "tarkin", 6 ) )
Gildas Bazin's avatar
 
Gildas Bazin committed
823 824 825
                {
                    oggpack_buffer opb;

826
                    msg_Dbg( p_demux, "found tarkin header" );
Gildas Bazin's avatar
 
Gildas Bazin committed
827 828
                    p_stream->fmt.i_cat = VIDEO_ES;
                    p_stream->fmt.i_codec = VLC_FOURCC( 't','a','r','k' );
Gildas Bazin's avatar
 
Gildas Bazin committed
829 830 831 832 833

                    /* Cheat and get additionnal info ;) */
                    oggpack_readinit( &opb, oggpacket.packet, oggpacket.bytes);
                    oggpack_adv( &opb, 88 );
                    oggpack_adv( &opb, 104 );
Gildas Bazin's avatar
 
Gildas Bazin committed
834
                    p_stream->fmt.i_bitrate = oggpack_read( &opb, 32 );
Gildas Bazin's avatar
 
Gildas Bazin committed
835
                    p_stream->f_rate = 2; /* FIXME */
836
                    msg_Dbg( p_demux,
Gildas Bazin's avatar
 
Gildas Bazin committed
837
                             "found tarkin header, bitrate: %i, rate: %f",
Gildas Bazin's avatar
 
Gildas Bazin committed
838
                             p_stream->fmt.i_bitrate, p_stream->f_rate );
Gildas Bazin's avatar
 
Gildas Bazin committed
839
                }
840 841
                /* Check for Annodex header */
                else if( oggpacket.bytes >= 7 &&
842
                         ! memcmp( &oggpacket.packet[0], "Annodex", 7 ) )
843
                {
844
                    Ogg_ReadAnnodexHeader( VLC_OBJECT(p_demux), p_stream,
845 846 847 848 849 850 851
                                           &oggpacket );
                    /* kill annodex track */
                    free( p_stream );
                    p_ogg->i_streams--;
                }
                /* Check for Annodex header */
                else if( oggpacket.bytes >= 7 &&
852
                         ! memcmp( &oggpacket.packet[0], "AnxData", 7 ) )
853
                {
854
                    Ogg_ReadAnnodexHeader( VLC_OBJECT(p_demux), p_stream,
855 856
                                           &oggpacket );
                }
Gildas Bazin's avatar
 
Gildas Bazin committed
857
                else if( oggpacket.bytes >= 142 &&
858
                         !memcmp( &oggpacket.packet[1],
Gildas Bazin's avatar
 
Gildas Bazin committed
859 860 861 862 863 864 865 866
                                   "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 )
                    {
Gildas Bazin's avatar
 
Gildas Bazin committed
867 868
                        p_stream->fmt.i_cat = VIDEO_ES;
                        p_stream->fmt.i_codec =
Gildas Bazin's avatar
 
Gildas Bazin committed
869 870 871 872
                            VLC_FOURCC( oggpacket.packet[68],
                                        oggpacket.packet[69],
                                        oggpacket.packet[70],
                                        oggpacket.packet[71] );
873
                        msg_Dbg( p_demux, "found video header of type: %.4s",
Gildas Bazin's avatar
 
Gildas Bazin committed
874
                                 (char *)&p_stream->fmt.i_codec );
Gildas Bazin's avatar
 
Gildas Bazin committed
875

876 877 878
                        p_stream->fmt.video.i_frame_rate = 10000000;
                        p_stream->fmt.video.i_frame_rate_base =
                            GetQWLE((oggpacket.packet+164));
Gildas Bazin's avatar
 
Gildas Bazin committed
879 880
                        p_stream->f_rate = 10000000.0 /
                            GetQWLE((oggpacket.packet+164));
Gildas Bazin's avatar
 
Gildas Bazin committed
881
                        p_stream->fmt.video.i_bits_per_pixel =
Gildas Bazin's avatar
 
Gildas Bazin committed
882
                            GetWLE((oggpacket.packet+182));
Gildas Bazin's avatar
 
Gildas Bazin committed
883 884 885 886
                        if( !p_stream->fmt.video.i_bits_per_pixel )
                            /* hack, FIXME */
                            p_stream->fmt.video.i_bits_per_pixel = 24;
                        p_stream->fmt.video.i_width =
Gildas Bazin's avatar
 
Gildas Bazin committed
887
                            GetDWLE((oggpacket.packet+176));
Gildas Bazin's avatar
 
Gildas Bazin committed
888
                        p_stream->fmt.video.i_height =
Gildas Bazin's avatar
 
Gildas Bazin committed
889 890
                            GetDWLE((oggpacket.packet+180));

891
                        msg_Dbg( p_demux,
Gildas Bazin's avatar
 
Gildas Bazin committed
892 893 894 895 896 897
                                 "fps: %f, width:%i; height:%i, bitcount:%i",
                                 p_stream->f_rate,
                                 p_stream->fmt.video.i_width,
                                 p_stream->fmt.video.i_height,
                                 p_stream->fmt.video.i_bits_per_pixel);

Gildas Bazin's avatar
 
Gildas Bazin committed
898 899 900 901 902
                    }
                    /* Check for audio header (old format) */
                    else if( GetDWLE((oggpacket.packet+96)) == 0x05589F81 )
                    {
                        unsigned int i_extra_size;
Gildas Bazin's avatar
 
Gildas Bazin committed
903
                        unsigned int i_format_tag;
Gildas Bazin's avatar
 
Gildas Bazin committed
904

Gildas Bazin's avatar
 
Gildas Bazin committed
905
                        p_stream->fmt.i_cat = AUDIO_ES;
Gildas Bazin's avatar
 
Gildas Bazin committed
906 907

                        i_extra_size = GetWLE((oggpacket.packet+140));
Gildas Bazin's avatar
 
Gildas Bazin committed
908
                        if( i_extra_size )
Gildas Bazin's avatar
 
Gildas Bazin committed
909
                        {
Gildas Bazin's avatar
 
Gildas Bazin committed
910 911 912 913
                            p_stream->fmt.i_extra = i_extra_size;
                            p_stream->fmt.p_extra = malloc( i_extra_size );
                            memcpy( p_stream->fmt.p_extra,
                                    oggpacket.packet + 142, i_extra_size );
Gildas Bazin's avatar
 
Gildas Bazin committed
914 915
                        }

Gildas Bazin's avatar
 
Gildas Bazin committed
916 917
                        i_format_tag = GetWLE((oggpacket.packet+124));
                        p_stream->fmt.audio.i_channels =
Gildas Bazin's avatar
 
Gildas Bazin committed
918
                            GetWLE((oggpacket.packet+126));
Gildas Bazin's avatar
 
Gildas Bazin committed
919
                        p_stream->f_rate = p_stream->fmt.audio.i_rate =
Gildas Bazin's avatar
 
Gildas Bazin committed
920
                            GetDWLE((oggpacket.packet+128));
Gildas Bazin's avatar
 
Gildas Bazin committed
921 922 923
                        p_stream->fmt.i_bitrate =
                            GetDWLE((oggpacket.packet+132)) * 8;
                        p_stream->fmt.audio.i_blockalign =
Gildas Bazin's avatar
 
Gildas Bazin committed
924
                            GetWLE((oggpacket.packet+136));
Gildas Bazin's avatar
 
Gildas Bazin committed
925
                        p_stream->fmt.audio.i_bitspersample =
Gildas Bazin's avatar
 
Gildas Bazin committed
926 927
                            GetWLE((oggpacket.packet+138));

928 929 930 931 932
                        wf_tag_to_fourcc( i_format_tag,
                                          &p_stream->fmt.i_codec, 0 );

                        if( p_stream->fmt.i_codec ==
                            VLC_FOURCC('u','n','d','f') )
Gildas Bazin's avatar
 
Gildas Bazin committed
933
                        {
Gildas Bazin's avatar
 
Gildas Bazin committed
934 935 936
                            p_stream->fmt.i_codec = VLC_FOURCC( 'm', 's',
                                ( i_format_tag >> 8 ) & 0xff,
                                i_format_tag & 0xff );
Gildas Bazin's avatar
 
Gildas Bazin committed
937 938
                        }

939
                        msg_Dbg( p_demux, "found audio header of type: %.4s",
Gildas Bazin's avatar
 
Gildas Bazin committed
940
                                 (char *)&p_stream->fmt.i_codec );
941
                        msg_Dbg( p_demux, "audio:0x%4.4x channels:%d %dHz "
Gildas Bazin's avatar
 
Gildas Bazin committed
942
                                 "%dbits/sample %dkb/s",
Gildas Bazin's avatar
 
Gildas Bazin committed
943 944 945 946 947
                                 i_format_tag,
                                 p_stream->fmt.audio.i_channels,
                                 p_stream->fmt.audio.i_rate,
                                 p_stream->fmt.audio.i_bitspersample,
                                 p_stream->fmt.i_bitrate / 1024 );
948

Gildas Bazin's avatar
 
Gildas Bazin committed
949 950 951
                    }
                    else
                    {
952
                        msg_Dbg( p_demux, "stream %d has an old header "
Gildas Bazin's avatar
 
Gildas Bazin committed
953 954 955 956 957
                            "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
958
                else if( (*oggpacket.packet & PACKET_TYPE_BITS )
Sam Hocevar's avatar
Sam Hocevar committed
959
                         == PACKET_TYPE_HEADER &&
Gildas Bazin's avatar
 
Gildas Bazin committed
960 961 962 963 964 965 966
                         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 ) )
                    {
Gildas Bazin's avatar
 
Gildas Bazin committed
967
                        p_stream->fmt.i_cat = VIDEO_ES;
Gildas Bazin's avatar
 
Gildas Bazin committed
968 969 970 971

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

Gildas Bazin's avatar
 
Gildas Bazin committed
972 973 974
                        p_stream->fmt.i_codec =
                            VLC_FOURCC( st->subtype[0], st->subtype[1],
                                        st->subtype[2], st->subtype[3] );
975
                        msg_Dbg( p_demux, "found video header of type: %.4s",
Gildas Bazin's avatar
 
Gildas Bazin committed
976
                                 (char *)&p_stream->fmt.i_codec );
Gildas Bazin's avatar
 
Gildas Bazin committed
977

978 979 980
                        p_stream->fmt.video.i_frame_rate = 10000000;
                        p_stream->fmt.video.i_frame_rate_base =
                            GetQWLE(&st->time_unit);
Gildas Bazin's avatar
 
Gildas Bazin committed
981
                        p_stream->f_rate = 10000000.0 /
982
                            GetQWLE(&st->time_unit);
Gildas Bazin's avatar
 
Gildas Bazin committed
983
                        p_stream->fmt.video.i_bits_per_pixel =
984
                            GetWLE(&st->bits_per_sample);
Gildas Bazin's avatar
 
Gildas Bazin committed
985
                        p_stream->fmt.video.i_width =
986
                            GetDWLE(&st->sh.video.width);
Gildas Bazin's avatar
 
Gildas Bazin committed
987
                        p_stream->fmt.video.i_height =
988
                            GetDWLE(&st->sh.video.height);
Gildas Bazin's avatar
 
Gildas Bazin committed
989

990
                        msg_Dbg( p_demux,
Gildas Bazin's avatar
 
Gildas Bazin committed
991 992 993 994 995
                                 "fps: %f, width:%i; height:%i, bitcount:%i",
                                 p_stream->f_rate,
                                 p_stream->fmt.video.i_width,
                                 p_stream->fmt.video.i_height,
                                 p_stream->fmt.video.i_bits_per_pixel );
Gildas Bazin's avatar
 
Gildas Bazin committed
996 997 998 999 1000
                    }
                    /* Check for audio header (new format) */
                    else if( !strncmp( st->streamtype, "audio", 5 ) )
                    {
                        char p_buffer[5];
Gildas Bazin's avatar
 
Gildas Bazin committed
1001
                        int i_format_tag;
Gildas Bazin's avatar
 
Gildas Bazin committed
1002

Gildas Bazin's avatar
 
Gildas Bazin committed
1003
                        p_stream->fmt.i_cat = AUDIO_ES;
Gildas Bazin's avatar
 
Gildas Bazin committed
1004 1005 1006 1007

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

1008 1009 1010 1011 1012 1013 1014 1015 1016 1017
                        p_stream->fmt.i_extra = GetQWLE(&st->size) -
                            sizeof(stream_header);
                        if( p_stream->fmt.i_extra )
                        {
                            p_stream->fmt.p_extra =
                                malloc( p_stream->fmt.i_extra );
                            memcpy( p_stream->fmt.p_extra, st + 1,
                                    p_stream->fmt.i_extra );
                        }

Gildas Bazin's avatar
 
Gildas Bazin committed
1018 1019
                        memcpy( p_buffer, st->subtype, 4 );
                        p_buffer[4] = '\0';
Gildas Bazin's avatar
 
Gildas Bazin committed
1020 1021
                        i_format_tag = strtol(p_buffer,NULL,16);
                        p_stream->fmt.audio.i_channels =
1022
                            GetWLE(&st->sh.audio.channels);
Gildas Bazin's avatar
 
Gildas Bazin committed
1023
                        p_stream->f_rate = p_stream->fmt.audio.i_rate =
1024
                            GetQWLE(&st->samples_per_unit);
Gildas Bazin's avatar
 
Gildas Bazin committed
1025 1026 1027
                        p_stream->fmt.i_bitrate =
                            GetDWLE(&st->sh.audio.avgbytespersec) * 8;
                        p_stream->fmt.audio.i_blockalign =
1028
                            GetWLE(&st->sh.audio.blockalign);
Gildas Bazin's avatar
 
Gildas Bazin committed
1029
                        p_stream->fmt.audio.i_bitspersample =
1030
                            GetWLE(&st->bits_per_sample);
Gildas Bazin's avatar
 
Gildas Bazin committed
1031

1032 1033 1034 1035 1036
                        wf_tag_to_fourcc( i_format_tag,
                                          &p_stream->fmt.i_codec, 0 );

                        if( p_stream->fmt.i_codec ==
                            VLC_FOURCC('u','n','d','f') )
Gildas Bazin's avatar
 
Gildas Bazin committed
1037
                        {
Gildas Bazin's avatar
 
Gildas Bazin committed
1038 1039 1040
                            p_stream->fmt.i_codec = VLC_FOURCC( 'm', 's',
                                ( i_format_tag >> 8 ) & 0xff,
                                i_format_tag & 0xff );
Gildas Bazin's avatar
 
Gildas Bazin committed
1041 1042
                        }

1043
                        msg_Dbg( p_demux, "found audio header of type: %.4s",
Gildas Bazin's avatar
 
Gildas Bazin committed
1044
                                 (char *)&p_stream->fmt.i_codec );
1045
                        msg_Dbg( p_demux, "audio:0x%4.4x channels:%d %dHz "
Gildas Bazin's avatar
 
Gildas Bazin committed
1046
                                 "%dbits/sample %dkb/s",
Gildas Bazin's avatar
 
Gildas Bazin committed
1047 1048 1049 1050 1051
                                 i_format_tag,
                                 p_stream->fmt.audio.i_channels,
                                 p_stream->fmt.audio.i_rate,
                                 p_stream->fmt.audio.i_bitspersample,
                                 p_stream->fmt.i_bitrate / 1024 );
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 );

1059
                        msg_Dbg( p_demux, "found text subtitles header" );
Gildas Bazin's avatar
 
Gildas Bazin committed
1060 1061
                        p_stream->fmt.i_cat = SPU_ES;
                        p_stream->fmt.i_codec = VLC_FOURCC('s','u','b','t');
Gildas Bazin's avatar
 
Gildas Bazin committed
1062
                        p_stream->f_rate = 1000; /* granulepos is in milisec */
Gildas Bazin's avatar
 
Gildas Bazin committed
1063
                    }
Gildas Bazin's avatar
 
Gildas Bazin committed
1064 1065
                    else
                    {
1066
                        msg_Dbg( p_demux, "stream %d has a header marker "
Gildas Bazin's avatar
 
Gildas Bazin committed
1067 1068 1069 1070 1071
                            "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
1072 1073
                else
                {
1074
                    msg_Dbg( p_demux, "stream %d is of unknown type",
Gildas Bazin's avatar
 
Gildas Bazin committed
1075
                             p_ogg->i_streams-1 );
Gildas Bazin's avatar
 
Gildas Bazin committed
1076 1077
                    free( p_stream );
                    p_ogg->i_streams--;
Gildas Bazin's avatar
 
Gildas Bazin committed
1078 1079
                }

1080
                if( Ogg_ReadPage( p_demux, &oggpage ) != VLC_SUCCESS )
Gildas Bazin's avatar
 
Gildas Bazin committed
1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094
                    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;
                }
            }
Gildas Bazin's avatar
 
Gildas Bazin committed
1095

Gildas Bazin's avatar
 
Gildas Bazin committed
1096 1097 1098
            return VLC_SUCCESS;
        }
    }
Gildas Bazin's avatar
 
Gildas Bazin committed
1099 1100
#undef p_stream

Gildas Bazin's avatar
 
Gildas Bazin committed
1101 1102 1103
    return VLC_EGENERIC;
}

Gildas Bazin's avatar
 
Gildas Bazin committed
1104
/****************************************************************************
Gildas Bazin's avatar
 
Gildas Bazin committed
1105 1106
 * Ogg_BeginningOfStream: Look for Beginning of Stream ogg pages and add
 *                        Elementary streams.
Gildas Bazin's avatar
 
Gildas Bazin committed
1107
 ****************************************************************************/