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