git.sesse.net Git - vlc/blob - modules/demux/ogg.c

   1 /*****************************************************************************
   2  * ogg.c : ogg stream input module for vlc
   3  *****************************************************************************
   4  * Copyright (C) 2001 VideoLAN
   5  * $Id: ogg.c,v 1.24 2003/04/14 03:23:30 fenrir Exp $
   6  *
   7  * Authors: Gildas Bazin <gbazin@netcourrier.com>
   8  *
   9  * This program is free software; you can redistribute it and/or modify
  10  * it under the terms of the GNU General Public License as published by
  11  * the Free Software Foundation; either version 2 of the License, or
  12  * (at your option) any later version.
  13  *
  14  * This program is distributed in the hope that it will be useful,
  15  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  16  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  17  * GNU General Public License for more details.
  18  *
  19  * You should have received a copy of the GNU General Public License
  20  * along with this program; if not, write to the Free Software
  21  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  22  *****************************************************************************/
  23
  24 /*****************************************************************************
  25  * Preamble
  26  *****************************************************************************/
  27 #include <stdlib.h>                                      /* malloc(), free() */
  28 #include <string.h>
  29
  30 #include <vlc/vlc.h>
  31 #include <vlc/input.h>
  32
  33 #include <sys/types.h>
  34
  35 #include <ogg/ogg.h>
  36
  37 #include <codecs.h>                        /* BITMAPINFOHEADER, WAVEFORMATEX */
  38
  39 #define OGG_BLOCK_SIZE 4096
  40 #define PAGES_READ_ONCE 1
  41
  42 /*****************************************************************************
  43  * Definitions of structures and functions used by this plugins
  44  *****************************************************************************/
  45 typedef struct logical_stream_s
  46 {
  47     ogg_stream_state os;                        /* logical stream of packets */
  48
  49     int              i_serial_no;
  50     int              i_cat;                            /* AUDIO_ES, VIDEO_ES */
  51     int              i_activated;
  52     vlc_fourcc_t     i_fourcc;
  53     vlc_fourcc_t     i_codec;
  54
  55     es_descriptor_t  *p_es;
  56     int              b_selected;                           /* newly selected */
  57
  58     /* the header of some logical streams (eg vorbis) contain essential
  59      * data for the decoder. We back them up here in case we need to re-feed
  60      * them to the decoder. */
  61     int              b_force_backup;
  62     int              i_packets_backup;
  63     ogg_packet       *p_packets_backup;
  64
  65     /* program clock reference (in units of 90kHz) derived from the previous
  66      * granulepos */
  67     mtime_t          i_pcr;
  68     mtime_t          i_interpolated_pcr;
  69
  70     /* info from logical streams */
  71     double f_rate;
  72     int i_bitrate;
  73     int b_reinit;
  74
  75     /* codec specific stuff */
  76     BITMAPINFOHEADER *p_bih;
  77     WAVEFORMATEX *p_wf;
  78     int i_theora_keyframe_granule_shift;
  79
  80 } logical_stream_t;
  81
  82 struct demux_sys_t
  83 {
  84     ogg_sync_state oy;        /* sync and verify incoming physical bitstream */
  85
  86     int i_streams;                           /* number of logical bitstreams */
  87     logical_stream_t **pp_stream;  /* pointer to an array of logical streams */
  88
  89     /* current audio and video es */
  90     logical_stream_t *p_stream_video;
  91     logical_stream_t *p_stream_audio;
  92     logical_stream_t *p_stream_spu;
  93
  94     /* program clock reference (in units of 90kHz) derived from the pcr of
  95      * the sub-streams */
  96     mtime_t i_pcr;
  97     mtime_t i_old_pcr;
  98
  99     int     b_seekable;
 100     int     b_reinit;
 101 };
 102
 103 /* OggDS headers for the new header format (used in ogm files) */
 104 typedef struct stream_header_video
 105 {
 106     ogg_int32_t width;
 107     ogg_int32_t height;
 108 } stream_header_video;
 109
 110 typedef struct stream_header_audio
 111 {
 112     ogg_int16_t channels;
 113     ogg_int16_t blockalign;
 114     ogg_int32_t avgbytespersec;
 115 } stream_header_audio;
 116
 117 typedef struct stream_header
 118 {
 119     char        streamtype[8];
 120     char        subtype[4];
 121
 122     ogg_int32_t size;                               /* size of the structure */
 123
 124     ogg_int64_t time_unit;                              /* in reference time */
 125     ogg_int64_t samples_per_unit;
 126     ogg_int32_t default_len;                                /* in media time */
 127
 128     ogg_int32_t buffersize;
 129     ogg_int16_t bits_per_sample;
 130
 131     union
 132     {
 133         /* Video specific */
 134         stream_header_video video;
 135         /* Audio specific */
 136         stream_header_audio audio;
 137     } sh;
 138 } stream_header;
 139
 140 /* Some defines from OggDS */
 141 #define PACKET_TYPE_HEADER   0x01
 142 #define PACKET_TYPE_BITS     0x07
 143 #define PACKET_LEN_BITS01    0xc0
 144 #define PACKET_LEN_BITS2     0x02
 145 #define PACKET_IS_SYNCPOINT  0x08
 146
 147 /* Some functions to manipulate memory */
 148 static uint16_t GetWLE( uint8_t *p_buff )
 149 {
 150     return( (p_buff[0]) + ( p_buff[1] <<8 ) );
 151 }
 152
 153 static uint32_t GetDWLE( uint8_t *p_buff )
 154 {
 155     return( p_buff[0] + ( p_buff[1] <<8 ) +
 156             ( p_buff[2] <<16 ) + ( p_buff[3] <<24 ) );
 157 }
 158
 159 static uint64_t GetQWLE( uint8_t *p_buff )
 160 {
 161     return( GetDWLE( p_buff ) + ( ((uint64_t)GetDWLE( p_buff + 4 )) << 32 ) );
 162 }
 163 /*****************************************************************************
 164  * Local prototypes
 165  *****************************************************************************/
 166 static int  Activate  ( vlc_object_t * );
 167 static void Deactivate( vlc_object_t * );
 168 static int  Demux     ( input_thread_t * );
 169
 170 /* Stream managment */
 171 static int  Ogg_StreamStart  ( input_thread_t *, demux_sys_t *, int );
 172 static void Ogg_StreamStop   ( input_thread_t *, demux_sys_t *, int );
 173
 174 /* Bitstream manipulation */
 175 static int  Ogg_Check        ( input_thread_t *p_input );
 176 static int  Ogg_ReadPage     ( input_thread_t *, demux_sys_t *, ogg_page * );
 177 static void Ogg_UpdatePCR    ( logical_stream_t *, ogg_packet * );
 178 static void Ogg_DecodePacket ( input_thread_t *p_input,
 179                                logical_stream_t *p_stream, ogg_packet * );
 180 static int  Ogg_FindLogicalStreams( input_thread_t *p_input,
 181                                     demux_sys_t *p_ogg );
 182
 183 /*****************************************************************************
 184  * Module descriptor
 185  *****************************************************************************/
 186 vlc_module_begin();
 187     set_description( _("ogg stream demuxer" ) );
 188     set_capability( "demux", 50 );
 189     set_callbacks( Activate, Deactivate );
 190     add_shortcut( "ogg" );
 191 vlc_module_end();
 192
 193 /*****************************************************************************
 194  * Stream managment
 195  *****************************************************************************/
 196 static int Ogg_StreamStart( input_thread_t *p_input,
 197                             demux_sys_t *p_ogg, int i_stream )
 198 {
 199 #define p_stream p_ogg->pp_stream[i_stream]
 200     if( !p_stream->p_es )
 201     {
 202         msg_Warn( p_input, "stream[%d] unselectable", i_stream );
 203         return( 0 );
 204     }
 205     if( p_stream->i_activated )
 206     {
 207         msg_Warn( p_input, "stream[%d] already selected", i_stream );
 208         return( 1 );
 209     }
 210
 211     if( !p_stream->p_es->p_decoder_fifo )
 212     {
 213         vlc_mutex_lock( &p_input->stream.stream_lock );
 214         input_SelectES( p_input, p_stream->p_es );
 215         vlc_mutex_unlock( &p_input->stream.stream_lock );
 216     }
 217     p_stream->i_activated = p_stream->p_es->p_decoder_fifo ? 1 : 0;
 218
 219     /* Feed the backup header to the decoder */
 220     if( !p_stream->b_force_backup )
 221     {
 222         int i;
 223         for( i = 0; i < p_stream->i_packets_backup; i++ )
 224         {
 225             Ogg_DecodePacket( p_input, p_stream,
 226                               &p_stream->p_packets_backup[i] );
 227         }
 228     }
 229
 230     return( p_stream->i_activated );
 231 #undef  p_stream
 232 }
 233
 234 static void Ogg_StreamStop( input_thread_t *p_input,
 235                             demux_sys_t *p_ogg, int i_stream )
 236 {
 237 #define p_stream    p_ogg->pp_stream[i_stream]
 238
 239     if( !p_stream->i_activated )
 240     {
 241         msg_Warn( p_input, "stream[%d] already unselected", i_stream );
 242         return;
 243     }
 244
 245     if( p_stream->p_es->p_decoder_fifo )
 246     {
 247         vlc_mutex_lock( &p_input->stream.stream_lock );
 248         input_UnselectES( p_input, p_stream->p_es );
 249         vlc_mutex_unlock( &p_input->stream.stream_lock );
 250     }
 251
 252     p_stream->i_activated = 0;
 253
 254 #undef  p_stream
 255 }
 256
 257 /****************************************************************************
 258  * Ogg_Check: Check we are dealing with an ogg stream.
 259  ****************************************************************************/
 260 static int Ogg_Check( input_thread_t *p_input )
 261 {
 262     u8 *p_peek;
 263     int i_size = input_Peek( p_input, &p_peek, 4 );
 264
 265     /* Check for the Ogg capture pattern */
 266     if( !(i_size>3) || !(p_peek[0] == 'O') || !(p_peek[1] == 'g') ||
 267         !(p_peek[2] == 'g') || !(p_peek[3] == 'S') )
 268         return VLC_EGENERIC;
 269
 270     /* FIXME: Capture pattern might not be enough so we can also check for the
 271      * the first complete page */
 272
 273     return VLC_SUCCESS;
 274 }
 275
 276 /****************************************************************************
 277  * Ogg_ReadPage: Read a full Ogg page from the physical bitstream.
 278  ****************************************************************************
 279  * Returns VLC_SUCCESS if a page has been read. An error might happen if we
 280  * are at the end of stream.
 281  ****************************************************************************/
 282 static int Ogg_ReadPage( input_thread_t *p_input, demux_sys_t *p_ogg,
 283                          ogg_page *p_oggpage )
 284 {
 285     int i_read = 0;
 286     data_packet_t *p_data;
 287     byte_t *p_buffer;
 288
 289     while( ogg_sync_pageout( &p_ogg->oy, p_oggpage ) != 1 )
 290     {
 291         i_read = input_SplitBuffer( p_input, &p_data, OGG_BLOCK_SIZE );
 292         if( i_read <= 0 )
 293             return VLC_EGENERIC;
 294
 295         p_buffer = ogg_sync_buffer( &p_ogg->oy, i_read );
 296         p_input->p_vlc->pf_memcpy( p_buffer, p_data->p_payload_start, i_read );
 297         ogg_sync_wrote( &p_ogg->oy, i_read );
 298         input_DeletePacket( p_input->p_method_data, p_data );
 299     }
 300
 301     return VLC_SUCCESS;
 302 }
 303
 304 /****************************************************************************
 305  * Ogg_UpdatePCR: update the PCR (90kHz program clock reference) for the
 306  *                current stream.
 307  ****************************************************************************/
 308 static void Ogg_UpdatePCR( logical_stream_t *p_stream,
 309                            ogg_packet *p_oggpacket )
 310 {
 311
 312     /* Convert the next granulepos into a pcr */
 313     if( p_oggpacket->granulepos >= 0 )
 314     {
 315         if( p_stream->i_fourcc != VLC_FOURCC( 't','h','e','o' ) )
 316         {
 317             p_stream->i_pcr = p_oggpacket->granulepos * 90000
 318                               / p_stream->f_rate;
 319         }
 320         else
 321         {
 322             ogg_int64_t iframe = p_oggpacket->granulepos >>
 323               p_stream->i_theora_keyframe_granule_shift;
 324             ogg_int64_t pframe = p_oggpacket->granulepos -
 325               ( iframe << p_stream->i_theora_keyframe_granule_shift );
 326
 327             p_stream->i_pcr = ( iframe + pframe ) * 90000
 328                               / p_stream->f_rate;
 329         }
 330
 331         p_stream->i_interpolated_pcr = p_stream->i_pcr;
 332     }
 333     else
 334     {
 335         /* FIXME: ffmpeg doesn't like null pts */
 336         if( p_stream->i_cat == VIDEO_ES )
 337             /* 1 frame per packet */
 338             p_stream->i_pcr += (90000 / p_stream->f_rate);
 339         else
 340             p_stream->i_pcr = -1;
 341
 342         /* no granulepos available, try to interpolate the pcr.
 343          * If we can't then don't touch the old value. */
 344         if( p_stream->i_bitrate )
 345             p_stream->i_interpolated_pcr += ( p_oggpacket->bytes * 90000
 346                                               / p_stream->i_bitrate / 8 );
 347     }
 348 }
 349
 350 /****************************************************************************
 351  * Ogg_DecodePacket: Decode an Ogg packet.
 352  ****************************************************************************/
 353 static void Ogg_DecodePacket( input_thread_t *p_input,
 354                               logical_stream_t *p_stream,
 355                               ogg_packet *p_oggpacket )
 356 {
 357     pes_packet_t  *p_pes;
 358     data_packet_t *p_data;
 359     vlc_bool_t b_trash = VLC_FALSE;
 360     int i_header_len = 0;
 361
 362     if( p_stream->b_force_backup )
 363     {
 364         /* Backup the ogg packet (likely an header packet) */
 365         ogg_packet *p_packet_backup;
 366         p_stream->i_packets_backup++;
 367         p_stream->p_packets_backup =
 368             realloc( p_stream->p_packets_backup, p_stream->i_packets_backup *
 369                      sizeof(ogg_packet) );
 370
 371         p_packet_backup =
 372             &p_stream->p_packets_backup[p_stream->i_packets_backup - 1];
 373
 374         p_packet_backup->bytes = p_oggpacket->bytes;
 375         p_packet_backup->granulepos = p_oggpacket->granulepos;
 376         p_packet_backup->packet = malloc( p_oggpacket->bytes );
 377         if( !p_packet_backup->packet ) return;
 378         memcpy( p_packet_backup->packet, p_oggpacket->packet,
 379                 p_oggpacket->bytes );
 380
 381         switch( p_stream->i_fourcc )
 382         {
 383         case VLC_FOURCC( 'v','o','r','b' ):
 384           if( p_stream->i_packets_backup == 3 ) p_stream->b_force_backup = 0;
 385           break;
 386
 387         default:
 388           p_stream->b_force_backup = 0;
 389           break;
 390         }
 391     }
 392
 393     vlc_mutex_lock( &p_input->stream.control.control_lock );
 394     if( p_stream->i_cat == AUDIO_ES && p_input->stream.control.b_mute )
 395     {
 396         b_trash = VLC_TRUE;
 397     }
 398     vlc_mutex_unlock( &p_input->stream.control.control_lock );
 399
 400     if( !p_stream->p_es->p_decoder_fifo || b_trash )
 401     {
 402         /* This stream isn't currently selected so we don't need to decode it,
 403          * but we do need to store its pcr as it might be selected later on. */
 404         Ogg_UpdatePCR( p_stream, p_oggpacket );
 405
 406         return;
 407     }
 408
 409     if( !( p_pes = input_NewPES( p_input->p_method_data ) ) )
 410     {
 411         return;
 412     }
 413     if( !( p_data = input_NewPacket( p_input->p_method_data,
 414                                      p_oggpacket->bytes ) ) )
 415     {
 416         input_DeletePES( p_input->p_method_data, p_pes );
 417         return;
 418     }
 419     p_data->p_payload_end = p_data->p_payload_start + p_oggpacket->bytes;
 420
 421     /* Convert the pcr into a pts */
 422     if( p_stream->i_cat != SPU_ES )
 423     {
 424         p_pes->i_pts = ( p_stream->i_pcr < 0 ) ? 0 :
 425             input_ClockGetTS( p_input, p_input->stream.p_selected_program,
 426                               p_stream->i_pcr );
 427     }
 428     else
 429     {
 430         /* Of course subtitles had to be different! */
 431         p_pes->i_pts = ( p_oggpacket->granulepos < 0 ) ? 0 :
 432             input_ClockGetTS( p_input, p_input->stream.p_selected_program,
 433                               p_oggpacket->granulepos * 90000 /
 434                               p_stream->f_rate );
 435     }
 436
 437     /* Convert the next granulepos into a pcr */
 438     Ogg_UpdatePCR( p_stream, p_oggpacket );
 439
 440     p_pes->i_nb_data = 1;
 441     p_pes->i_dts = p_oggpacket->granulepos;
 442     p_pes->p_first = p_pes->p_last = p_data;
 443     p_pes->i_pes_size = p_oggpacket->bytes;
 444
 445     if( p_stream->i_fourcc != VLC_FOURCC( 'v','o','r','b' ) &&
 446         p_stream->i_fourcc != VLC_FOURCC( 't','a','r','k' ) &&
 447         p_stream->i_fourcc != VLC_FOURCC( 't','h','e','o' ) )
 448     {
 449         /* Remove the header from the packet */
 450         i_header_len = (*p_oggpacket->packet & PACKET_LEN_BITS01) >> 6;
 451         i_header_len |= (*p_oggpacket->packet & PACKET_LEN_BITS2) << 1;
 452         i_header_len++;
 453
 454         p_pes->i_pes_size -= i_header_len;
 455         p_pes->i_dts = 0;
 456     }
 457
 458     if( p_stream->i_fourcc == VLC_FOURCC( 't','a','r','k' ) )
 459     {
 460         /* FIXME: the biggest hack I've ever done */
 461         msg_Warn( p_input, "tark pts: "I64Fd", granule: "I64Fd,
 462                   p_pes->i_pts, p_pes->i_dts );
 463         msleep(10000);
 464     }
 465
 466     memcpy( p_data->p_payload_start,
 467             p_oggpacket->packet + i_header_len,
 468             p_oggpacket->bytes - i_header_len );
 469
 470     p_data->p_payload_end = p_data->p_payload_start + p_pes->i_pes_size;
 471     p_data->b_discard_payload = 0;
 472
 473     input_DecodePES( p_stream->p_es->p_decoder_fifo, p_pes );
 474 }
 475
 476 /****************************************************************************
 477  * Ogg_FindLogicalStreams: Find the logical streams embedded in the physical
 478  *                         stream and fill p_ogg.
 479  *****************************************************************************
 480  * The initial page of a logical stream is marked as a 'bos' page.
 481  * Furthermore, the Ogg specification mandates that grouped bitstreams begin
 482  * together and all of the initial pages must appear before any data pages.
 483  *
 484  * On success this function returns VLC_SUCCESS.
 485  ****************************************************************************/
 486 static int Ogg_FindLogicalStreams( input_thread_t *p_input, demux_sys_t *p_ogg)
 487 {
 488     ogg_packet oggpacket;
 489     ogg_page oggpage;
 490     int i_stream;
 491
 492     while( Ogg_ReadPage( p_input, p_ogg, &oggpage ) == VLC_SUCCESS )
 493     {
 494         if( ogg_page_bos( &oggpage ) )
 495         {
 496
 497             /* All is wonderful in our fine fine little world.
 498              * We found the beginning of our first logical stream. */
 499             while( ogg_page_bos( &oggpage ) )
 500             {
 501                 p_ogg->i_streams++;
 502                 p_ogg->pp_stream =
 503                     realloc( p_ogg->pp_stream, p_ogg->i_streams *
 504                              sizeof(logical_stream_t *) );
 505
 506 #define p_stream p_ogg->pp_stream[p_ogg->i_streams - 1]
 507
 508                 p_stream = malloc( sizeof(logical_stream_t) );
 509                 memset( p_stream, 0, sizeof(logical_stream_t) );
 510
 511                 /* Setup the logical stream */
 512                 p_stream->i_serial_no = ogg_page_serialno( &oggpage );
 513                 ogg_stream_init( &p_stream->os, p_stream->i_serial_no );
 514
 515                 /* Extract the initial header from the first page and verify
 516                  * the codec type of tis Ogg bitstream */
 517                 if( ogg_stream_pagein( &p_stream->os, &oggpage ) < 0 )
 518                 {
 519                     /* error. stream version mismatch perhaps */
 520                     msg_Err( p_input, "Error reading first page of "
 521                              "Ogg bitstream data" );
 522                     return VLC_EGENERIC;
 523                 }
 524
 525                 /* FIXME: check return value */
 526                 ogg_stream_packetpeek( &p_stream->os, &oggpacket );
 527
 528                 /* Check for Vorbis header */
 529                 if( oggpacket.bytes >= 7 &&
 530                     ! strncmp( &oggpacket.packet[1], "vorbis", 6 ) )
 531                 {
 532                     oggpack_buffer opb;
 533
 534                     msg_Dbg( p_input, "found vorbis header" );
 535                     p_stream->i_cat = AUDIO_ES;
 536                     p_stream->i_fourcc = VLC_FOURCC( 'v','o','r','b' );
 537
 538                     /* Signal that we want to keep a backup of the vorbis
 539                      * stream headers. They will be used when switching between
 540                      * audio streams. */
 541                     p_stream->b_force_backup = 1;
 542
 543                     /* Cheat and get additionnal info ;) */
 544                     oggpack_readinit( &opb, oggpacket.packet, oggpacket.bytes);
 545                     oggpack_adv( &opb, 96 );
 546                     p_stream->f_rate = oggpack_read( &opb, 32 );
 547                     oggpack_adv( &opb, 32 );
 548                     p_stream->i_bitrate = oggpack_read( &opb, 32 );
 549                     {
 550                         char title[sizeof("Stream") + 10];
 551                         input_info_category_t *p_cat;
 552                         sprintf( title, "Stream %d", p_ogg->i_streams );
 553                         p_cat = input_InfoCategory( p_input, title );
 554                         input_AddInfo( p_cat, _("Type"), _("Audio") );
 555                         input_AddInfo( p_cat, _("Codec"), _("Vorbis") );
 556                         input_AddInfo( p_cat, _("Sample Rate"), "%f",
 557                                        p_stream->f_rate );
 558                         input_AddInfo( p_cat, _("Bit Rate"), "%d",
 559                                        p_stream->i_bitrate );
 560                     }
 561                 }
 562                 /* Check for Theora header */
 563                 else if( oggpacket.bytes >= 7 &&
 564                          ! strncmp( &oggpacket.packet[1], "theora", 6 ) )
 565                 {
 566 #ifdef HAVE_OGGPACKB
 567                     oggpack_buffer opb;
 568                     int i_fps_numerator;
 569                     int i_fps_denominator;
 570                     int i_keyframe_frequency_force;
 571 #endif
 572
 573                     msg_Dbg( p_input, "found theora header" );
 574 #ifdef HAVE_OGGPACKB
 575                     p_stream->i_cat = VIDEO_ES;
 576                     p_stream->i_fourcc = VLC_FOURCC( 't','h','e','o' );
 577
 578                     /* Cheat and get additionnal info ;) */
 579                     oggpackB_readinit(&opb, oggpacket.packet, oggpacket.bytes);
 580                     oggpackB_adv( &opb, 56 );
 581                     oggpackB_read( &opb, 8 ); /* major version num */
 582                     oggpackB_read( &opb, 8 ); /* minor version num */
 583                     oggpackB_read( &opb, 8 ); /* subminor version num */
 584                     oggpackB_read( &opb, 16 ) /*<< 4*/; /* width */
 585                     oggpackB_read( &opb, 16 ) /*<< 4*/; /* height */
 586                     i_fps_numerator = oggpackB_read( &opb, 32 );
 587                     i_fps_denominator = oggpackB_read( &opb, 32 );
 588                     oggpackB_read( &opb, 24 ); /* aspect_numerator */
 589                     oggpackB_read( &opb, 24 ); /* aspect_denominator */
 590                     i_keyframe_frequency_force = 1 << oggpackB_read( &opb, 5 );
 591                     p_stream->i_bitrate = oggpackB_read( &opb, 24 );
 592                     oggpackB_read(&opb,6); /* quality */
 593
 594                     /* granule_shift = i_log( frequency_force -1 ) */
 595                     p_stream->i_theora_keyframe_granule_shift = 0;
 596                     i_keyframe_frequency_force--;
 597                     while( i_keyframe_frequency_force )
 598                     {
 599                         p_stream->i_theora_keyframe_granule_shift++;
 600                         i_keyframe_frequency_force >>= 1;
 601                     }
 602
 603                     p_stream->f_rate = (float)i_fps_numerator /
 604                                                 i_fps_denominator;
 605                     msg_Dbg( p_input,
 606                              "found theora header, bitrate: %i, rate: %f",
 607                              p_stream->i_bitrate, p_stream->f_rate );
 608                     {
 609                         char title[sizeof("Stream") + 10];
 610                         input_info_category_t *p_cat;
 611                         sprintf( title, "Stream %d", p_ogg->i_streams );
 612                         p_cat = input_InfoCategory( p_input, title );
 613                         input_AddInfo( p_cat, _("Type"), _("Video") );
 614                         input_AddInfo( p_cat, _("Codec"), _("Theora") );
 615                         input_AddInfo( p_cat, _("Frame Rate"), "%f",
 616                                        p_stream->f_rate );
 617                         input_AddInfo( p_cat, _("Bit Rate"), "%d",
 618                                        p_stream->i_bitrate );
 619                     }
 620 #else /* HAVE_OGGPACKB */
 621                     msg_Dbg( p_input, "the ogg demuxer has been compiled "
 622                              "without support for the oggpackB extension."
 623                              "The theora stream won't be decoded." );
 624                     free( p_stream );
 625                     p_ogg->i_streams--;
 626                     continue;
 627 #endif /* HAVE_OGGPACKB */
 628                 }
 629                 /* Check for Tarkin header */
 630                 else if( oggpacket.bytes >= 7 &&
 631                          ! strncmp( &oggpacket.packet[1], "tarkin", 6 ) )
 632                 {
 633                     oggpack_buffer opb;
 634
 635                     msg_Dbg( p_input, "found tarkin header" );
 636                     p_stream->i_cat = VIDEO_ES;
 637                     p_stream->i_fourcc = VLC_FOURCC( 't','a','r','k' );
 638
 639                     /* Cheat and get additionnal info ;) */
 640                     oggpack_readinit( &opb, oggpacket.packet, oggpacket.bytes);
 641                     oggpack_adv( &opb, 88 );
 642                     oggpack_adv( &opb, 104 );
 643                     p_stream->i_bitrate = oggpack_read( &opb, 32 );
 644                     p_stream->f_rate = 2; /* FIXME */
 645                     msg_Dbg( p_input,
 646                              "found tarkin header, bitrate: %i, rate: %f",
 647                              p_stream->i_bitrate, p_stream->f_rate );
 648                                         {
 649                         char title[sizeof("Stream") + 10];
 650                         input_info_category_t *p_cat;
 651                         sprintf( title, "Stream %d", p_ogg->i_streams );
 652                         p_cat = input_InfoCategory( p_input, title );
 653                         input_AddInfo( p_cat, _("Type"), _("Video") );
 654                         input_AddInfo( p_cat, _("Codec"), _("tarkin") );
 655                         input_AddInfo( p_cat, _("Sample Rate"), "%f",
 656                                        p_stream->f_rate );
 657                         input_AddInfo( p_cat, _("Bit Rate"), "%d",
 658                                        p_stream->i_bitrate );
 659                     }
 660
 661                 }
 662                 else if( oggpacket.bytes >= 142 &&
 663                          !strncmp( &oggpacket.packet[1],
 664                                    "Direct Show Samples embedded in Ogg", 35 ))
 665                 {
 666                     /* Old header type */
 667
 668                     /* Check for video header (old format) */
 669                     if( GetDWLE((oggpacket.packet+96)) == 0x05589f80 &&
 670                         oggpacket.bytes >= 184 )
 671                     {
 672                         p_stream->i_cat = VIDEO_ES;
 673
 674                         p_stream->p_bih = (BITMAPINFOHEADER *)
 675                             malloc( sizeof(BITMAPINFOHEADER) );
 676                         if( !p_stream->p_bih )
 677                         {
 678                             /* Mem allocation error, just ignore the stream */
 679                             free( p_stream );
 680                             p_ogg->i_streams--;
 681                             continue;
 682                         }
 683                         p_stream->p_bih->biSize = sizeof(BITMAPINFOHEADER);
 684                         p_stream->p_bih->biCompression= p_stream->i_fourcc =
 685                             VLC_FOURCC( oggpacket.packet[68],
 686                                         oggpacket.packet[69],
 687                                         oggpacket.packet[70],
 688                                         oggpacket.packet[71] );
 689                         msg_Dbg( p_input, "found video header of type: %.4s",
 690                                  (char *)&p_stream->i_fourcc );
 691
 692                         p_stream->f_rate = 10000000.0 /
 693                             GetQWLE((oggpacket.packet+164));
 694                         p_stream->p_bih->biBitCount =
 695                             GetWLE((oggpacket.packet+182));
 696                         if( !p_stream->p_bih->biBitCount )
 697                             p_stream->p_bih->biBitCount=24; // hack, FIXME
 698                         p_stream->p_bih->biWidth =
 699                             GetDWLE((oggpacket.packet+176));
 700                         p_stream->p_bih->biHeight =
 701                             GetDWLE((oggpacket.packet+180));
 702                         p_stream->p_bih->biPlanes= 1 ;
 703                         p_stream->p_bih->biSizeImage =
 704                             (p_stream->p_bih->biBitCount >> 3) *
 705                             p_stream->p_bih->biWidth *
 706                             p_stream->p_bih->biHeight;
 707
 708                         msg_Dbg( p_input,
 709                              "fps: %f, width:%i; height:%i, bitcount:%i",
 710                             p_stream->f_rate, p_stream->p_bih->biWidth,
 711                             p_stream->p_bih->biHeight,
 712                             p_stream->p_bih->biBitCount);
 713                         {
 714                             char title[sizeof("Stream") + 10];
 715                             input_info_category_t *p_cat;
 716                             sprintf( title, "Stream %d", p_ogg->i_streams );
 717                             p_cat = input_InfoCategory( p_input, title );
 718                             input_AddInfo( p_cat, _("Type"), _("Video") );
 719                             input_AddInfo( p_cat, _("Codec"), "%.4s",
 720                                            (char *)&p_stream->i_fourcc );
 721                             input_AddInfo( p_cat, _("Frame Rate"), "%f",
 722                                            p_stream->f_rate );
 723                             input_AddInfo( p_cat, _("Bit Count"), "%d",
 724                                            p_stream->p_bih->biBitCount );
 725                             input_AddInfo( p_cat, _("Width"), "%d",
 726                                            p_stream->p_bih->biWidth );
 727                             input_AddInfo( p_cat, _("Height"), "%d",
 728                                            p_stream->p_bih->biHeight );
 729                         }
 730                         p_stream->i_bitrate = 0;
 731                     }
 732                     /* Check for audio header (old format) */
 733                     else if( GetDWLE((oggpacket.packet+96)) == 0x05589F81 )
 734                     {
 735                         unsigned int i_extra_size;
 736
 737                         p_stream->i_cat = AUDIO_ES;
 738
 739                         i_extra_size = GetWLE((oggpacket.packet+140));
 740
 741                         p_stream->p_wf = (WAVEFORMATEX *)
 742                             malloc( sizeof(WAVEFORMATEX) + i_extra_size );
 743                         if( !p_stream->p_wf )
 744                         {
 745                             /* Mem allocation error, just ignore the stream */
 746                             free( p_stream );
 747                             p_ogg->i_streams--;
 748                             continue;
 749                         }
 750
 751                         p_stream->p_wf->wFormatTag =
 752                             GetWLE((oggpacket.packet+124));
 753                         p_stream->p_wf->nChannels =
 754                             GetWLE((oggpacket.packet+126));
 755                         p_stream->f_rate = p_stream->p_wf->nSamplesPerSec =
 756                             GetDWLE((oggpacket.packet+128));
 757                         p_stream->i_bitrate = p_stream->p_wf->nAvgBytesPerSec =
 758                             GetDWLE((oggpacket.packet+132));
 759                         p_stream->i_bitrate *= 8;
 760                         p_stream->p_wf->nBlockAlign =
 761                             GetWLE((oggpacket.packet+136));
 762                         p_stream->p_wf->wBitsPerSample =
 763                             GetWLE((oggpacket.packet+138));
 764                         p_stream->p_wf->cbSize = i_extra_size;
 765
 766                         if( i_extra_size > 0 )
 767                             memcpy( p_stream->p_wf+sizeof(WAVEFORMATEX),
 768                                     oggpacket.packet+142, i_extra_size );
 769
 770                         switch( p_stream->p_wf->wFormatTag )
 771                         {
 772                         case WAVE_FORMAT_PCM:
 773                             p_stream->i_fourcc =
 774                                 VLC_FOURCC( 'a', 'r', 'a', 'w' );
 775                             break;
 776                         case WAVE_FORMAT_MPEG:
 777                         case WAVE_FORMAT_MPEGLAYER3:
 778                             p_stream->i_fourcc =
 779                                 VLC_FOURCC( 'm', 'p', 'g', 'a' );
 780                             break;
 781                         case WAVE_FORMAT_A52:
 782                             p_stream->i_fourcc =
 783                                 VLC_FOURCC( 'a', '5', '2', ' ' );
 784                             break;
 785                         case WAVE_FORMAT_WMA1:
 786                             p_stream->i_fourcc =
 787                                 VLC_FOURCC( 'w', 'm', 'a', '1' );
 788                             break;
 789                         case WAVE_FORMAT_WMA2:
 790                             p_stream->i_fourcc =
 791                                 VLC_FOURCC( 'w', 'm', 'a', '2' );
 792                             break;
 793                         default:
 794                             p_stream->i_fourcc = VLC_FOURCC( 'm', 's',
 795                                 ( p_stream->p_wf->wFormatTag >> 8 ) & 0xff,
 796                                 p_stream->p_wf->wFormatTag & 0xff );
 797                         }
 798
 799                         msg_Dbg( p_input, "found audio header of type: %.4s",
 800                                  (char *)&p_stream->i_fourcc );
 801                         msg_Dbg( p_input, "audio:0x%4.4x channels:%d %dHz "
 802                                  "%dbits/sample %dkb/s",
 803                                  p_stream->p_wf->wFormatTag,
 804                                  p_stream->p_wf->nChannels,
 805                                  p_stream->p_wf->nSamplesPerSec,
 806                                  p_stream->p_wf->wBitsPerSample,
 807                                  p_stream->p_wf->nAvgBytesPerSec * 8 / 1024 );
 808                         {
 809                             char title[sizeof("Stream") + 10];
 810                             input_info_category_t *p_cat;
 811                             sprintf( title, "Stream %d", p_ogg->i_streams );
 812                             p_cat = input_InfoCategory( p_input, title );
 813                             input_AddInfo( p_cat, _("Type"), _("Audio") );
 814                             input_AddInfo( p_cat, _("Codec"), "%.4s",
 815                                            (char *)&p_stream->i_fourcc );
 816                             input_AddInfo( p_cat, _("Sample Rate"), "%d",
 817                                            p_stream->p_wf->nSamplesPerSec );
 818                             input_AddInfo( p_cat, _("Bit Rate"), "%d",
 819                                            p_stream->p_wf->nAvgBytesPerSec * 8
 820                                               / 1024 );
 821                             input_AddInfo( p_cat, _("Channels"), "%d",
 822                                            p_stream->p_wf->nChannels );
 823                             input_AddInfo( p_cat, _("Bits per Sample"), "%d",
 824                                            p_stream->p_wf->wBitsPerSample );
 825                         }
 826
 827                     }
 828                     else
 829                     {
 830                         msg_Dbg( p_input, "stream %d has an old header "
 831                             "but is of an unknown type", p_ogg->i_streams-1 );
 832                         free( p_stream );
 833                         p_ogg->i_streams--;
 834                     }
 835                 }
 836                 else if( (*oggpacket.packet & PACKET_TYPE_BITS )
 837                          == PACKET_TYPE_HEADER &&
 838                          oggpacket.bytes >= (int)sizeof(stream_header)+1 )
 839                 {
 840                     stream_header *st = (stream_header *)(oggpacket.packet+1);
 841
 842                     /* Check for video header (new format) */
 843                     if( !strncmp( st->streamtype, "video", 5 ) )
 844                     {
 845                         p_stream->i_cat = VIDEO_ES;
 846
 847                         /* We need to get rid of the header packet */
 848                         ogg_stream_packetout( &p_stream->os, &oggpacket );
 849
 850                         p_stream->p_bih = (BITMAPINFOHEADER *)
 851                             malloc( sizeof(BITMAPINFOHEADER) );
 852                         if( !p_stream->p_bih )
 853                         {
 854                             /* Mem allocation error, just ignore the stream */
 855                             free( p_stream );
 856                             p_ogg->i_streams--;
 857                             continue;
 858                         }
 859                         p_stream->p_bih->biSize = sizeof(BITMAPINFOHEADER);
 860                         p_stream->p_bih->biCompression=
 861                             p_stream->i_fourcc = VLC_FOURCC( st->subtype[0],
 862                                                              st->subtype[1],
 863                                                              st->subtype[2],
 864                                                              st->subtype[3] );
 865                         msg_Dbg( p_input, "found video header of type: %.4s",
 866                                  (char *)&p_stream->i_fourcc );
 867
 868                         p_stream->f_rate = 10000000.0 /
 869                             GetQWLE((uint8_t *)&st->time_unit);
 870                         p_stream->p_bih->biBitCount =
 871                             GetWLE((uint8_t *)&st->bits_per_sample);
 872                         p_stream->p_bih->biWidth =
 873                             GetDWLE((uint8_t *)&st->sh.video.width);
 874                         p_stream->p_bih->biHeight =
 875                             GetDWLE((uint8_t *)&st->sh.video.height);
 876                         p_stream->p_bih->biPlanes= 1 ;
 877                         p_stream->p_bih->biSizeImage =
 878                             (p_stream->p_bih->biBitCount >> 3) *
 879                             p_stream->p_bih->biWidth *
 880                             p_stream->p_bih->biHeight;
 881
 882                         msg_Dbg( p_input,
 883                              "fps: %f, width:%i; height:%i, bitcount:%i",
 884                             p_stream->f_rate, p_stream->p_bih->biWidth,
 885                             p_stream->p_bih->biHeight,
 886                             p_stream->p_bih->biBitCount);
 887
 888                         {
 889                             char title[sizeof("Stream") + 10];
 890                             input_info_category_t *p_cat;
 891                             sprintf( title, "Stream %d", p_ogg->i_streams );
 892                             p_cat = input_InfoCategory( p_input, title );
 893                             input_AddInfo( p_cat, _("Type"), _("Video") );
 894                             input_AddInfo( p_cat, _("Codec"), "%.4s",
 895                                            (char *)&p_stream->i_fourcc );
 896                             input_AddInfo( p_cat, _("Frame Rate"), "%f",
 897                                            p_stream->f_rate );
 898                             input_AddInfo( p_cat, _("Bit Count"), "%d",
 899                                            p_stream->p_bih->biBitCount );
 900                             input_AddInfo( p_cat, _("Width"), "%d",
 901                                            p_stream->p_bih->biWidth );
 902                             input_AddInfo( p_cat, _("Height"), "%d",
 903                                            p_stream->p_bih->biHeight );
 904                         }
 905                         p_stream->i_bitrate = 0;
 906                     }
 907                     /* Check for audio header (new format) */
 908                     else if( !strncmp( st->streamtype, "audio", 5 ) )
 909                     {
 910                         char p_buffer[5];
 911
 912                         p_stream->i_cat = AUDIO_ES;
 913
 914                         /* We need to get rid of the header packet */
 915                         ogg_stream_packetout( &p_stream->os, &oggpacket );
 916
 917                         p_stream->p_wf = (WAVEFORMATEX *)
 918                             malloc( sizeof(WAVEFORMATEX) );
 919                         if( !p_stream->p_wf )
 920                         {
 921                             /* Mem allocation error, just ignore the stream */
 922                             free( p_stream );
 923                             p_ogg->i_streams--;
 924                             continue;
 925                         }
 926
 927                         memcpy( p_buffer, st->subtype, 4 );
 928                         p_buffer[4] = '\0';
 929                         p_stream->p_wf->wFormatTag = strtol(p_buffer,NULL,16);
 930                         p_stream->p_wf->nChannels =
 931                             GetWLE((uint8_t *)&st->sh.audio.channels);
 932                         p_stream->f_rate = p_stream->p_wf->nSamplesPerSec =
 933                             GetQWLE((uint8_t *)&st->samples_per_unit);
 934                         p_stream->i_bitrate = p_stream->p_wf->nAvgBytesPerSec =
 935                             GetDWLE((uint8_t *)&st->sh.audio.avgbytespersec);
 936                         p_stream->i_bitrate *= 8;
 937                         p_stream->p_wf->nBlockAlign =
 938                             GetWLE((uint8_t *)&st->sh.audio.blockalign);
 939                         p_stream->p_wf->wBitsPerSample =
 940                             GetWLE((uint8_t *)&st->bits_per_sample);
 941                         p_stream->p_wf->cbSize = 0;
 942
 943                         switch( p_stream->p_wf->wFormatTag )
 944                         {
 945                         case WAVE_FORMAT_PCM:
 946                             p_stream->i_fourcc =
 947                                 VLC_FOURCC( 'a', 'r', 'a', 'w' );
 948                             break;
 949                         case WAVE_FORMAT_MPEG:
 950                         case WAVE_FORMAT_MPEGLAYER3:
 951                             p_stream->i_fourcc =
 952                                 VLC_FOURCC( 'm', 'p', 'g', 'a' );
 953                             break;
 954                         case WAVE_FORMAT_A52:
 955                             p_stream->i_fourcc =
 956                                 VLC_FOURCC( 'a', '5', '2', ' ' );
 957                             break;
 958                         case WAVE_FORMAT_WMA1:
 959                             p_stream->i_fourcc =
 960                                 VLC_FOURCC( 'w', 'm', 'a', '1' );
 961                             break;
 962                         case WAVE_FORMAT_WMA2:
 963                             p_stream->i_fourcc =
 964                                 VLC_FOURCC( 'w', 'm', 'a', '2' );
 965                             break;
 966                         default:
 967                             p_stream->i_fourcc = VLC_FOURCC( 'm', 's',
 968                                 ( p_stream->p_wf->wFormatTag >> 8 ) & 0xff,
 969                                 p_stream->p_wf->wFormatTag & 0xff );
 970                         }
 971
 972                         msg_Dbg( p_input, "found audio header of type: %.4s",
 973                                  (char *)&p_stream->i_fourcc );
 974                         msg_Dbg( p_input, "audio:0x%4.4x channels:%d %dHz "
 975                                  "%dbits/sample %dkb/s",
 976                                  p_stream->p_wf->wFormatTag,
 977                                  p_stream->p_wf->nChannels,
 978                                  p_stream->p_wf->nSamplesPerSec,
 979                                  p_stream->p_wf->wBitsPerSample,
 980                                  p_stream->p_wf->nAvgBytesPerSec * 8 / 1024 );
 981                         {
 982                             char title[sizeof("Stream") + 10];
 983                             input_info_category_t *p_cat;
 984                             sprintf( title, "Stream %d", p_ogg->i_streams );
 985                             p_cat = input_InfoCategory( p_input, title );
 986                             input_AddInfo( p_cat, _("Type"), _("Audio") );
 987                             input_AddInfo( p_cat, _("Codec"), "%.4s",
 988                                            (char *)&p_stream->i_fourcc );
 989                             input_AddInfo( p_cat, _("Sample Rate"), "%d",
 990                                            p_stream->p_wf->nSamplesPerSec );
 991                             input_AddInfo( p_cat, _("Bit Rate"), "%d",
 992                                            p_stream->p_wf->nAvgBytesPerSec * 8
 993                                               / 1024 );
 994                             input_AddInfo( p_cat, _("Channels"), "%d",
 995                                            p_stream->p_wf->nChannels );
 996                             input_AddInfo( p_cat, _("Bits per Sample"), "%d",
 997                                            p_stream->p_wf->wBitsPerSample );
 998                         }
 999                     }
1000                     /* Check for text (subtitles) header */
1001                     else if( !strncmp(st->streamtype, "text", 4) )
1002                     {
1003                         /* We need to get rid of the header packet */
1004                         ogg_stream_packetout( &p_stream->os, &oggpacket );
1005
1006                         msg_Dbg( p_input, "found text subtitles header" );
1007                         p_stream->i_cat = SPU_ES;
1008                         p_stream->i_fourcc =
1009                             VLC_FOURCC( 's', 'u', 'b', 't' );
1010                         p_stream->f_rate = 1000; /* granulepos is in milisec */
1011                     }
1012                     else
1013                     {
1014                         msg_Dbg( p_input, "stream %d has a header marker "
1015                             "but is of an unknown type", p_ogg->i_streams-1 );
1016                         free( p_stream );
1017                         p_ogg->i_streams--;
1018                     }
1019                 }
1020                 else
1021                 {
1022                     msg_Dbg( p_input, "stream %d is of unknown type",
1023                              p_ogg->i_streams-1 );
1024                     free( p_stream );
1025                     p_ogg->i_streams--;
1026                 }
1027
1028 #undef p_stream
1029
1030                 if( Ogg_ReadPage( p_input, p_ogg, &oggpage ) != VLC_SUCCESS )
1031                     return VLC_EGENERIC;
1032             }
1033
1034             /* This is the first data page, which means we are now finished
1035              * with the initial pages. We just need to store it in the relevant
1036              * bitstream. */
1037             for( i_stream = 0; i_stream < p_ogg->i_streams; i_stream++ )
1038             {
1039                 if( ogg_stream_pagein( &p_ogg->pp_stream[i_stream]->os,
1040                                        &oggpage ) == 0 )
1041                 {
1042                     break;
1043                 }
1044             }
1045             return VLC_SUCCESS;
1046         }
1047     }
1048     return VLC_EGENERIC;
1049 }
1050
1051 /*****************************************************************************
1052  * Activate: initializes ogg demux structures
1053  *****************************************************************************/
1054 static int Activate( vlc_object_t * p_this )
1055 {
1056     int i_stream, b_forced;
1057     demux_sys_t    *p_ogg;
1058     input_thread_t *p_input = (input_thread_t *)p_this;
1059
1060     p_input->p_demux_data = NULL;
1061     b_forced = ( ( *p_input->psz_demux )&&
1062                  ( !strncmp( p_input->psz_demux, "ogg", 10 ) ) ) ? 1 : 0;
1063
1064     /* Check if we are dealing with an ogg stream */
1065     if( !b_forced && ( Ogg_Check( p_input ) != VLC_SUCCESS ) )
1066         return -1;
1067
1068     /* Allocate p_ogg */
1069     if( !( p_ogg = malloc( sizeof( demux_sys_t ) ) ) )
1070     {
1071         msg_Err( p_input, "out of memory" );
1072         goto error;
1073     }
1074     memset( p_ogg, 0, sizeof( demux_sys_t ) );
1075     p_input->p_demux_data = p_ogg;
1076
1077     p_ogg->i_pcr  = 0;
1078     p_ogg->b_seekable = ( ( p_input->stream.b_seekable )
1079                         &&( p_input->stream.i_method == INPUT_METHOD_FILE ) );
1080
1081     /* Initialize the Ogg physical bitstream parser */
1082     ogg_sync_init( &p_ogg->oy );
1083
1084     /* Find the logical streams embedded in the physical stream and
1085      * initialize our p_ogg structure. */
1086     if( Ogg_FindLogicalStreams( p_input, p_ogg ) != VLC_SUCCESS )
1087     {
1088         msg_Err( p_input, "couldn't find an ogg logical stream" );
1089         goto error;
1090     }
1091
1092     /* Set the demux function */
1093     p_input->pf_demux = Demux;
1094
1095     /* Initialize access plug-in structures. */
1096     if( p_input->i_mtu == 0 )
1097     {
1098         /* Improve speed. */
1099         p_input->i_bufsize = INPUT_DEFAULT_BUFSIZE;
1100     }
1101
1102     /* Create one program */
1103     vlc_mutex_lock( &p_input->stream.stream_lock );
1104     if( input_InitStream( p_input, 0 ) == -1)
1105     {
1106         vlc_mutex_unlock( &p_input->stream.stream_lock );
1107         msg_Err( p_input, "cannot init stream" );
1108         goto error;
1109     }
1110     if( input_AddProgram( p_input, 0, 0) == NULL )
1111     {
1112         vlc_mutex_unlock( &p_input->stream.stream_lock );
1113         msg_Err( p_input, "cannot add program" );
1114         goto error;
1115     }
1116     p_input->stream.p_selected_program = p_input->stream.pp_programs[0];
1117     p_input->stream.i_mux_rate = 0;
1118     vlc_mutex_unlock( &p_input->stream.stream_lock );
1119
1120     for( i_stream = 0 ; i_stream < p_ogg->i_streams; i_stream++ )
1121     {
1122 #define p_stream p_ogg->pp_stream[i_stream]
1123         vlc_mutex_lock( &p_input->stream.stream_lock );
1124         p_stream->p_es = input_AddES( p_input,
1125                                       p_input->stream.p_selected_program,
1126                                       p_ogg->i_streams + 1, 0 );
1127         p_input->stream.i_mux_rate += (p_stream->i_bitrate / ( 8 * 50 ));
1128         vlc_mutex_unlock( &p_input->stream.stream_lock );
1129         p_stream->p_es->i_stream_id = p_stream->p_es->i_id = i_stream;
1130         p_stream->p_es->i_fourcc = p_stream->i_fourcc;
1131         p_stream->p_es->i_cat = p_stream->i_cat;
1132         p_stream->p_es->p_waveformatex      = (void*)p_stream->p_wf;
1133         p_stream->p_es->p_bitmapinfoheader  = (void*)p_stream->p_bih;
1134 #undef p_stream
1135     }
1136
1137     for( i_stream = 0; i_stream < p_ogg->i_streams; i_stream++ )
1138     {
1139 #define p_stream  p_ogg->pp_stream[i_stream]
1140         switch( p_stream->p_es->i_cat )
1141         {
1142             case( VIDEO_ES ):
1143                 if( (p_ogg->p_stream_video == NULL) )
1144                 {
1145                     p_ogg->p_stream_video = p_stream;
1146                     /* TODO add test to see if a decoder has been found */
1147                     Ogg_StreamStart( p_input, p_ogg, i_stream );
1148                 }
1149                 break;
1150
1151             case( AUDIO_ES ):
1152                 if( (p_ogg->p_stream_audio == NULL) )
1153                 {
1154                     int i_audio = config_GetInt( p_input, "audio-channel" );
1155                     if( i_audio == i_stream || i_audio <= 0 ||
1156                         i_audio >= p_ogg->i_streams ||
1157                         p_ogg->pp_stream[i_audio]->p_es->i_cat != AUDIO_ES )
1158                     {
1159                         p_ogg->p_stream_audio = p_stream;
1160                         Ogg_StreamStart( p_input, p_ogg, i_stream );
1161                     }
1162                 }
1163                 break;
1164
1165             case( SPU_ES ):
1166                 if( (p_ogg->p_stream_spu == NULL) )
1167                 {
1168                     /* for spu, default is none */
1169                     int i_spu = config_GetInt( p_input, "spu-channel" );
1170                     if( i_spu < 0 || i_spu >= p_ogg->i_streams ||
1171                         p_ogg->pp_stream[i_spu]->p_es->i_cat != SPU_ES )
1172                     {
1173                         break;
1174                     }
1175                     else if( i_spu == i_stream )
1176                     {
1177                         p_ogg->p_stream_spu = p_stream;
1178                         Ogg_StreamStart( p_input, p_ogg, i_stream );
1179                     }
1180                 }
1181                 break;
1182
1183             default:
1184                 break;
1185         }
1186 #undef p_stream
1187     }
1188
1189     /* we select the first audio and video ES */
1190     vlc_mutex_lock( &p_input->stream.stream_lock );
1191     if( !p_ogg->p_stream_video )
1192     {
1193         msg_Warn( p_input, "no video stream found" );
1194     }
1195     if( !p_ogg->p_stream_audio )
1196     {
1197         msg_Warn( p_input, "no audio stream found!" );
1198     }
1199     p_input->stream.p_selected_program->b_is_ok = 1;
1200     vlc_mutex_unlock( &p_input->stream.stream_lock );
1201
1202     /* Call the pace control */
1203     input_ClockManageRef( p_input,
1204                           p_input->stream.p_selected_program,
1205                           p_ogg->i_pcr );
1206
1207     return 0;
1208
1209  error:
1210     Deactivate( (vlc_object_t *)p_input );
1211     return -1;
1212
1213 }
1214
1215 /*****************************************************************************
1216  * Deactivate: frees unused data
1217  *****************************************************************************/
1218 static void Deactivate( vlc_object_t *p_this )
1219 {
1220     input_thread_t *p_input = (input_thread_t *)p_this;
1221     demux_sys_t *p_ogg = (demux_sys_t *)p_input->p_demux_data  ;
1222     int i, j;
1223
1224     if( p_ogg )
1225     {
1226         /* Cleanup the bitstream parser */
1227         ogg_sync_clear( &p_ogg->oy );
1228
1229         for( i = 0; i < p_ogg->i_streams; i++ )
1230         {
1231             ogg_stream_clear( &p_ogg->pp_stream[i]->os );
1232             for( j = 0; j < p_ogg->pp_stream[i]->i_packets_backup; j++ )
1233             {
1234                 free( p_ogg->pp_stream[i]->p_packets_backup[j].packet );
1235             }
1236             if( p_ogg->pp_stream[i]->p_packets_backup)
1237                 free( p_ogg->pp_stream[i]->p_packets_backup );
1238 #if 0 /* hmmm, it's already freed in input_DelES() */
1239             if( p_ogg->pp_stream[i]->p_bih )
1240                 free( p_ogg->pp_stream[i]->p_bih );
1241             if( p_ogg->pp_stream[i]->p_wf )
1242                 free( p_ogg->pp_stream[i]->p_wf );
1243 #endif
1244             free( p_ogg->pp_stream[i] );
1245         }
1246         if( p_ogg->pp_stream ) free( p_ogg->pp_stream );
1247
1248         free( p_ogg );
1249     }
1250 }
1251
1252 /*****************************************************************************
1253  * Demux: reads and demuxes data packets
1254  *****************************************************************************
1255  * Returns -1 in case of error, 0 in case of EOF, 1 otherwise
1256  *****************************************************************************/
1257 static int Demux( input_thread_t * p_input )
1258 {
1259     int i, i_stream, b_eos = 0;
1260     ogg_page    oggpage;
1261     ogg_packet  oggpacket;
1262     demux_sys_t *p_ogg  = (demux_sys_t *)p_input->p_demux_data;
1263
1264 #define p_stream p_ogg->pp_stream[i_stream]
1265     /* detect new selected/unselected streams */
1266     for( i_stream = 0; i_stream < p_ogg->i_streams; i_stream++ )
1267     {
1268         if( p_stream->p_es )
1269         {
1270             if( p_stream->p_es->p_decoder_fifo &&
1271                 !p_stream->i_activated )
1272             {
1273                 Ogg_StreamStart( p_input, p_ogg, i_stream );
1274             }
1275             else
1276             if( !p_stream->p_es->p_decoder_fifo &&
1277                 p_stream->i_activated )
1278             {
1279                 Ogg_StreamStop( p_input, p_ogg, i_stream );
1280             }
1281         }
1282     }
1283
1284     /* search for new video and audio stream to select
1285      * if current have been unselected */
1286     if( ( !p_ogg->p_stream_video )
1287             || ( !p_ogg->p_stream_video->p_es->p_decoder_fifo ) )
1288     {
1289         p_ogg->p_stream_video = NULL;
1290         for( i_stream = 0; i_stream < p_ogg->i_streams; i_stream++ )
1291         {
1292             if( ( p_stream->i_cat == VIDEO_ES )
1293                   &&( p_stream->p_es->p_decoder_fifo ) )
1294             {
1295                 p_ogg->p_stream_video = p_stream;
1296                 break;
1297             }
1298         }
1299     }
1300     if( ( !p_ogg->p_stream_audio )
1301             ||( !p_ogg->p_stream_audio->p_es->p_decoder_fifo ) )
1302     {
1303         p_ogg->p_stream_audio = NULL;
1304         for( i_stream = 0; i_stream < p_ogg->i_streams; i_stream++ )
1305         {
1306             if( ( p_stream->i_cat == AUDIO_ES )
1307                   &&( p_stream->p_es->p_decoder_fifo ) )
1308             {
1309                 p_ogg->p_stream_audio = p_stream;
1310                 break;
1311             }
1312         }
1313     }
1314
1315     if( p_input->stream.p_selected_program->i_synchro_state == SYNCHRO_REINIT )
1316     {
1317         msg_Warn( p_input, "synchro reinit" );
1318
1319         /* An ogg packet does only contain the starting date of the next
1320          * packet, not its own starting date.
1321          * As a quick work around, we just skip an oggpage */
1322
1323         for( i_stream = 0; i_stream < p_ogg->i_streams; i_stream++ )
1324         {
1325             /* we'll trash all the data until we find the next pcr */
1326             p_stream->b_reinit = 1;
1327             p_stream->i_pcr = -1;
1328             p_stream->i_interpolated_pcr = -1;
1329         }
1330         p_ogg->b_reinit = 1;
1331     }
1332
1333
1334     /*
1335      * Demux ogg pages from the stream
1336      */
1337     for( i = 0; i < PAGES_READ_ONCE || p_ogg->b_reinit;  i++ )
1338     {
1339         if( Ogg_ReadPage( p_input, p_ogg, &oggpage ) != VLC_SUCCESS )
1340         {
1341             b_eos = 1;
1342             break;
1343         }
1344
1345         for( i_stream = 0; i_stream < p_ogg->i_streams; i_stream++ )
1346         {
1347             if( ogg_stream_pagein( &p_stream->os, &oggpage ) != 0 )
1348                 continue;
1349
1350             while( ogg_stream_packetout( &p_stream->os, &oggpacket ) > 0 )
1351             {
1352                 if( !p_stream->p_es )
1353                 {
1354                     break;
1355                 }
1356
1357                 if( p_stream->b_reinit )
1358                 {
1359                     if( oggpacket.granulepos >= 0 )
1360                     {
1361                         p_stream->b_reinit = 0;
1362
1363                         /* Convert the next granulepos into a pcr */
1364                         Ogg_UpdatePCR( p_stream, &oggpacket );
1365
1366                         /* Call the pace control to reinitialize
1367                          * the system clock */
1368                          input_ClockManageRef( p_input,
1369                              p_input->stream.p_selected_program,
1370                              p_stream->i_pcr );
1371
1372                          if( (!p_ogg->p_stream_video ||
1373                               !p_ogg->p_stream_video->b_reinit) &&
1374                              (!p_ogg->p_stream_audio ||
1375                               !p_ogg->p_stream_audio->b_reinit) )
1376                          {
1377                              p_ogg->b_reinit = 0;
1378                          }
1379                     }
1380                     continue;
1381                 }
1382
1383                 Ogg_DecodePacket( p_input, p_stream, &oggpacket );
1384
1385             }
1386         }
1387     }
1388
1389     i_stream = 0;
1390     p_ogg->i_old_pcr = p_ogg->i_pcr;
1391     p_ogg->i_pcr = p_stream->i_interpolated_pcr;
1392     for( ; i_stream < p_ogg->i_streams; i_stream++ )
1393     {
1394         if( p_stream->i_cat == SPU_ES )
1395             continue;
1396
1397         if( p_stream->i_interpolated_pcr > 0
1398             && p_stream->i_interpolated_pcr < p_ogg->i_pcr )
1399             p_ogg->i_pcr = p_stream->i_interpolated_pcr;
1400     }
1401 #undef p_stream
1402
1403     /* Sanity check for streams where the granulepos of the header packets
1404      * don't match these of the data packets (eg. ogg web radios). */
1405     if( p_ogg->i_old_pcr == 0 && p_ogg->i_pcr > 1000000 )
1406         p_input->stream.p_selected_program->i_synchro_state = SYNCHRO_REINIT;
1407
1408     /* Call the pace control */
1409     input_ClockManageRef( p_input, p_input->stream.p_selected_program,
1410                           p_ogg->i_pcr );
1411
1412     /* Did we reach the end of stream ? */
1413     return( b_eos ? 0 : 1 );
1414 }