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

   1 /*****************************************************************************
   2  * ogg.c : ogg stream demux module for vlc
   3  *****************************************************************************
   4  * Copyright (C) 2001-2003 VideoLAN
   5  * $Id: ogg.c,v 1.57 2004/02/10 02:57:18 hartman 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 = 0;
 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             /* The granulepos is the end date of the sample */
 414             i_pts =  input_ClockGetTS( p_input,
 415                                        p_input->stream.p_selected_program,
 416                                        p_stream->i_pcr );
 417         }
 418     }
 419
 420     /* Convert the granulepos into the next pcr */
 421     Ogg_UpdatePCR( p_stream, p_oggpacket );
 422
 423     if( p_stream->i_pcr >= 0 )
 424     {
 425         /* This is for streams where the granulepos of the header packets
 426          * doesn't match these of the data packets (eg. ogg web radios). */
 427         if( p_stream->i_previous_pcr == 0 &&
 428             p_stream->i_pcr  > 3 * DEFAULT_PTS_DELAY * 9/100 )
 429             p_input->stream.p_selected_program->i_synchro_state =
 430                 SYNCHRO_REINIT;
 431
 432         /* Call the pace control */
 433         if( p_input->stream.p_selected_program->i_synchro_state ==
 434             SYNCHRO_REINIT )
 435           input_ClockManageRef( p_input, p_input->stream.p_selected_program,
 436                                 p_stream->i_pcr );
 437     }
 438
 439     if( !p_stream->fmt.i_codec == VLC_FOURCC( 'v','o','r','b' ) &&
 440         !p_stream->fmt.i_codec == VLC_FOURCC( 's','p','x',' ' ) &&
 441         !p_stream->fmt.i_codec == VLC_FOURCC( 'f','l','a','c' ) &&
 442         p_stream->i_pcr >= 0 )
 443     {
 444         p_stream->i_previous_pcr = p_stream->i_pcr;
 445
 446         /* The granulepos is the start date of the sample */
 447         i_pts = input_ClockGetTS( p_input, p_input->stream.p_selected_program,
 448                                   p_stream->i_pcr );
 449     }
 450
 451     if( !b_selected )
 452     {
 453         /* This stream isn't currently selected so we don't need to decode it,
 454          * but we did need to store its pcr as it might be selected later on */
 455         p_stream->b_activated = VLC_FALSE;
 456         return;
 457     }
 458
 459     if( !( p_block = block_New( p_input, p_oggpacket->bytes ) ) )
 460     {
 461         return;
 462     }
 463
 464     if( p_stream->fmt.i_cat == AUDIO_ES )
 465         p_block->i_dts = p_block->i_pts = i_pts;
 466     else if( p_stream->fmt.i_cat == SPU_ES )
 467     {
 468         p_block->i_pts = i_pts;
 469         p_block->i_dts = 0;
 470     }
 471     else if( p_stream->fmt.i_codec == VLC_FOURCC( 't','h','e','o' ) )
 472         p_block->i_dts = p_block->i_pts = i_pts;
 473     else
 474     {
 475         p_block->i_dts = i_pts;
 476         p_block->i_pts = 0;
 477     }
 478
 479     if( p_stream->fmt.i_codec != VLC_FOURCC( 'v','o','r','b' ) &&
 480         p_stream->fmt.i_codec != VLC_FOURCC( 's','p','x',' ' ) &&
 481         p_stream->fmt.i_codec != VLC_FOURCC( 'f','l','a','c' ) &&
 482         p_stream->fmt.i_codec != VLC_FOURCC( 't','a','r','k' ) &&
 483         p_stream->fmt.i_codec != VLC_FOURCC( 't','h','e','o' ) )
 484     {
 485         /* We remove the header from the packet */
 486         i_header_len = (*p_oggpacket->packet & PACKET_LEN_BITS01) >> 6;
 487         i_header_len |= (*p_oggpacket->packet & PACKET_LEN_BITS2) << 1;
 488
 489         if( p_stream->fmt.i_codec == VLC_FOURCC( 's','u','b','t' ))
 490         {
 491             /* But with subtitles we need to retrieve the duration first */
 492             int i;
 493             long lenbytes = 0;
 494
 495             if( ( i_header_len > 0 ) && ( p_oggpacket->bytes >= ( i_header_len + 1 ) ) )
 496             {
 497                 for( i = 0, lenbytes = 0; i < i_header_len; i++ )
 498                 {
 499                     lenbytes = lenbytes << 8;
 500                     lenbytes += *((unsigned char *)p_oggpacket->packet + i_header_len - i);
 501                 }
 502             }
 503             if (((p_oggpacket->bytes - 1 - i_header_len) > 2) ||
 504                 ((p_oggpacket->packet[i_header_len + 1] != ' ') &&
 505                  (p_oggpacket->packet[i_header_len + 1] != 0) &&
 506                  (p_oggpacket->packet[i_header_len + 1] != '\n') &&
 507                  (p_oggpacket->packet[i_header_len + 1] != '\r')))
 508             {
 509                 p_block->i_dts = p_block->i_pts + (mtime_t)lenbytes*1000;
 510             }
 511         }
 512
 513         i_header_len++;
 514         p_block->i_buffer -= i_header_len;
 515     }
 516
 517     if( p_stream->fmt.i_codec == VLC_FOURCC( 't','a','r','k' ) )
 518     {
 519         /* FIXME: the biggest hack I've ever done */
 520         msg_Warn( p_input, "tarkin pts: "I64Fd", granule: "I64Fd,
 521                   p_block->i_pts, p_block->i_dts );
 522         msleep(10000);
 523     }
 524
 525     memcpy( p_block->p_buffer, p_oggpacket->packet + i_header_len,
 526             p_oggpacket->bytes - i_header_len );
 527
 528     es_out_Send( p_input->p_es_out, p_stream->p_es, p_block );
 529 }
 530
 531 /****************************************************************************
 532  * Ogg_FindLogicalStreams: Find the logical streams embedded in the physical
 533  *                         stream and fill p_ogg.
 534  *****************************************************************************
 535  * The initial page of a logical stream is marked as a 'bos' page.
 536  * Furthermore, the Ogg specification mandates that grouped bitstreams begin
 537  * together and all of the initial pages must appear before any data pages.
 538  *
 539  * On success this function returns VLC_SUCCESS.
 540  ****************************************************************************/
 541 static int Ogg_FindLogicalStreams( input_thread_t *p_input, demux_sys_t *p_ogg)
 542 {
 543     ogg_packet oggpacket;
 544     ogg_page oggpage;
 545     int i_stream;
 546
 547 #define p_stream p_ogg->pp_stream[p_ogg->i_streams - 1]
 548
 549     while( Ogg_ReadPage( p_input, p_ogg, &oggpage ) == VLC_SUCCESS )
 550     {
 551         if( ogg_page_bos( &oggpage ) )
 552         {
 553
 554             /* All is wonderful in our fine fine little world.
 555              * We found the beginning of our first logical stream. */
 556             while( ogg_page_bos( &oggpage ) )
 557             {
 558                 p_ogg->i_streams++;
 559                 p_ogg->pp_stream =
 560                     realloc( p_ogg->pp_stream, p_ogg->i_streams *
 561                              sizeof(logical_stream_t *) );
 562
 563                 p_stream = malloc( sizeof(logical_stream_t) );
 564                 memset( p_stream, 0, sizeof(logical_stream_t) );
 565
 566                 es_format_Init( &p_stream->fmt, 0, 0 );
 567                 p_stream->b_activated = VLC_TRUE;
 568
 569                 /* Setup the logical stream */
 570                 p_stream->i_serial_no = ogg_page_serialno( &oggpage );
 571                 ogg_stream_init( &p_stream->os, p_stream->i_serial_no );
 572
 573                 /* Extract the initial header from the first page and verify
 574                  * the codec type of tis Ogg bitstream */
 575                 if( ogg_stream_pagein( &p_stream->os, &oggpage ) < 0 )
 576                 {
 577                     /* error. stream version mismatch perhaps */
 578                     msg_Err( p_input, "error reading first page of "
 579                              "Ogg bitstream data" );
 580                     return VLC_EGENERIC;
 581                 }
 582
 583                 /* FIXME: check return value */
 584                 ogg_stream_packetpeek( &p_stream->os, &oggpacket );
 585
 586                 /* Check for Vorbis header */
 587                 if( oggpacket.bytes >= 7 &&
 588                     ! strncmp( &oggpacket.packet[1], "vorbis", 6 ) )
 589                 {
 590                     oggpack_buffer opb;
 591
 592                     msg_Dbg( p_input, "found vorbis header" );
 593                     p_stream->fmt.i_cat = AUDIO_ES;
 594                     p_stream->fmt.i_codec = VLC_FOURCC( 'v','o','r','b' );
 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, 88 );
 604                     p_stream->fmt.audio.i_channels = oggpack_read( &opb, 8 );
 605                     p_stream->f_rate = p_stream->fmt.audio.i_rate =
 606                         oggpack_read( &opb, 32 );
 607                     oggpack_adv( &opb, 32 );
 608                     p_stream->fmt.i_bitrate = oggpack_read( &opb, 32 );
 609                 }
 610                 /* Check for Speex header */
 611                 else if( oggpacket.bytes >= 7 &&
 612                     ! strncmp( &oggpacket.packet[0], "Speex", 5 ) )
 613                 {
 614                     oggpack_buffer opb;
 615
 616                     p_stream->fmt.i_cat = AUDIO_ES;
 617                     p_stream->fmt.i_codec = VLC_FOURCC( 's','p','x',' ' );
 618
 619                     /* Signal that we want to keep a backup of the vorbis
 620                      * stream headers. They will be used when switching between
 621                      * audio streams. */
 622                     p_stream->b_force_backup = 1;
 623
 624                     /* Cheat and get additionnal info ;) */
 625                     oggpack_readinit( &opb, oggpacket.packet, oggpacket.bytes);
 626                     oggpack_adv( &opb, 224 );
 627                     oggpack_adv( &opb, 32 ); /* speex_version_id */
 628                     oggpack_adv( &opb, 32 ); /* header_size */
 629                     p_stream->f_rate = p_stream->fmt.audio.i_rate =
 630                         oggpack_read( &opb, 32 );
 631                     oggpack_adv( &opb, 32 ); /* mode */
 632                     oggpack_adv( &opb, 32 ); /* mode_bitstream_version */
 633                     p_stream->fmt.audio.i_channels = oggpack_read( &opb, 32 );
 634                     p_stream->fmt.i_bitrate = oggpack_read( &opb, 32 );
 635
 636                     msg_Dbg( p_input, "found speex header, channels: %i, "
 637                              "rate: %i,  bitrate: %i",
 638                              p_stream->fmt.audio.i_channels,
 639                              (int)p_stream->f_rate, p_stream->fmt.i_bitrate );
 640                 }
 641                 /* Check for Flac header */
 642                 else if( oggpacket.bytes >= 4 &&
 643                     ! strncmp( &oggpacket.packet[0], "fLaC", 4 ) )
 644                 {
 645                     msg_Dbg( p_input, "found FLAC header" );
 646
 647                     /* Grrrr!!!! Did they really have to put all the
 648                      * important info in the second header packet!!!
 649                      * (STREAMINFO metadata is in the following packet) */
 650                     p_stream->b_force_backup = 1;
 651
 652                     p_stream->fmt.i_cat = AUDIO_ES;
 653                     p_stream->fmt.i_codec = VLC_FOURCC( 'f','l','a','c' );
 654                 }
 655                 /* Check for Theora header */
 656                 else if( oggpacket.bytes >= 7 &&
 657                          ! strncmp( &oggpacket.packet[1], "theora", 6 ) )
 658                 {
 659                     bs_t bitstream;
 660                     int i_fps_numerator;
 661                     int i_fps_denominator;
 662                     int i_keyframe_frequency_force;
 663
 664                     msg_Dbg( p_input, "found theora header" );
 665                     p_stream->fmt.i_cat = VIDEO_ES;
 666                     p_stream->fmt.i_codec = VLC_FOURCC( 't','h','e','o' );
 667
 668                     /* Signal that we want to keep a backup of the vorbis
 669                      * stream headers. They will be used when switching between
 670                      * audio streams. */
 671                     p_stream->b_force_backup = 1;
 672
 673                     /* Cheat and get additionnal info ;) */
 674                     bs_init( &bitstream, oggpacket.packet, oggpacket.bytes );
 675                     bs_skip( &bitstream, 56 );
 676                     bs_read( &bitstream, 8 ); /* major version num */
 677                     bs_read( &bitstream, 8 ); /* minor version num */
 678                     bs_read( &bitstream, 8 ); /* subminor version num */
 679                     bs_read( &bitstream, 16 ) /*<< 4*/; /* width */
 680                     bs_read( &bitstream, 16 ) /*<< 4*/; /* height */
 681                     bs_read( &bitstream, 24 ); /* frame width */
 682                     bs_read( &bitstream, 24 ); /* frame height */
 683                     bs_read( &bitstream, 8 ); /* x offset */
 684                     bs_read( &bitstream, 8 ); /* y offset */
 685
 686                     i_fps_numerator = bs_read( &bitstream, 32 );
 687                     i_fps_denominator = bs_read( &bitstream, 32 );
 688                     bs_read( &bitstream, 24 ); /* aspect_numerator */
 689                     bs_read( &bitstream, 24 ); /* aspect_denominator */
 690                     i_keyframe_frequency_force = 1 << bs_read( &bitstream, 5 );
 691                     bs_read( &bitstream, 8 ); /* colorspace */
 692                     p_stream->fmt.i_bitrate = bs_read( &bitstream, 24 );
 693                     bs_read( &bitstream, 6 ); /* quality */
 694
 695                     /* granule_shift = i_log( frequency_force -1 ) */
 696                     p_stream->i_theora_keyframe_granule_shift = 0;
 697                     i_keyframe_frequency_force--;
 698                     while( i_keyframe_frequency_force )
 699                     {
 700                         p_stream->i_theora_keyframe_granule_shift++;
 701                         i_keyframe_frequency_force >>= 1;
 702                     }
 703
 704                     p_stream->f_rate = ((float)i_fps_numerator) /
 705                                                 i_fps_denominator;
 706                     msg_Dbg( p_input,
 707                              "found theora header, bitrate: %i, rate: %f",
 708                              p_stream->fmt.i_bitrate, p_stream->f_rate );
 709
 710                     /* Save this data in p_extra for ffmpeg */
 711                     p_stream->fmt.i_extra = oggpacket.bytes;
 712                     p_stream->fmt.p_extra = malloc( oggpacket.bytes );
 713                     memcpy( p_stream->fmt.p_extra,
 714                             oggpacket.packet, oggpacket.bytes );
 715                 }
 716                 /* Check for Tarkin header */
 717                 else if( oggpacket.bytes >= 7 &&
 718                          ! strncmp( &oggpacket.packet[1], "tarkin", 6 ) )
 719                 {
 720                     oggpack_buffer opb;
 721
 722                     msg_Dbg( p_input, "found tarkin header" );
 723                     p_stream->fmt.i_cat = VIDEO_ES;
 724                     p_stream->fmt.i_codec = VLC_FOURCC( 't','a','r','k' );
 725
 726                     /* Cheat and get additionnal info ;) */
 727                     oggpack_readinit( &opb, oggpacket.packet, oggpacket.bytes);
 728                     oggpack_adv( &opb, 88 );
 729                     oggpack_adv( &opb, 104 );
 730                     p_stream->fmt.i_bitrate = oggpack_read( &opb, 32 );
 731                     p_stream->f_rate = 2; /* FIXME */
 732                     msg_Dbg( p_input,
 733                              "found tarkin header, bitrate: %i, rate: %f",
 734                              p_stream->fmt.i_bitrate, p_stream->f_rate );
 735                 }
 736                 else if( oggpacket.bytes >= 142 &&
 737                          !strncmp( &oggpacket.packet[1],
 738                                    "Direct Show Samples embedded in Ogg", 35 ))
 739                 {
 740                     /* Old header type */
 741
 742                     /* Check for video header (old format) */
 743                     if( GetDWLE((oggpacket.packet+96)) == 0x05589f80 &&
 744                         oggpacket.bytes >= 184 )
 745                     {
 746                         p_stream->fmt.i_cat = VIDEO_ES;
 747                         p_stream->fmt.i_codec =
 748                             VLC_FOURCC( oggpacket.packet[68],
 749                                         oggpacket.packet[69],
 750                                         oggpacket.packet[70],
 751                                         oggpacket.packet[71] );
 752                         msg_Dbg( p_input, "found video header of type: %.4s",
 753                                  (char *)&p_stream->fmt.i_codec );
 754
 755                         p_stream->f_rate = 10000000.0 /
 756                             GetQWLE((oggpacket.packet+164));
 757                         p_stream->fmt.video.i_bits_per_pixel =
 758                             GetWLE((oggpacket.packet+182));
 759                         if( !p_stream->fmt.video.i_bits_per_pixel )
 760                             /* hack, FIXME */
 761                             p_stream->fmt.video.i_bits_per_pixel = 24;
 762                         p_stream->fmt.video.i_width =
 763                             GetDWLE((oggpacket.packet+176));
 764                         p_stream->fmt.video.i_height =
 765                             GetDWLE((oggpacket.packet+180));
 766
 767                         msg_Dbg( p_input,
 768                                  "fps: %f, width:%i; height:%i, bitcount:%i",
 769                                  p_stream->f_rate,
 770                                  p_stream->fmt.video.i_width,
 771                                  p_stream->fmt.video.i_height,
 772                                  p_stream->fmt.video.i_bits_per_pixel);
 773
 774                     }
 775                     /* Check for audio header (old format) */
 776                     else if( GetDWLE((oggpacket.packet+96)) == 0x05589F81 )
 777                     {
 778                         unsigned int i_extra_size;
 779                         unsigned int i_format_tag;
 780
 781                         p_stream->fmt.i_cat = AUDIO_ES;
 782
 783                         i_extra_size = GetWLE((oggpacket.packet+140));
 784                         if( i_extra_size )
 785                         {
 786                             p_stream->fmt.i_extra = i_extra_size;
 787                             p_stream->fmt.p_extra = malloc( i_extra_size );
 788                             memcpy( p_stream->fmt.p_extra,
 789                                     oggpacket.packet + 142, i_extra_size );
 790                         }
 791
 792                         i_format_tag = GetWLE((oggpacket.packet+124));
 793                         p_stream->fmt.audio.i_channels =
 794                             GetWLE((oggpacket.packet+126));
 795                         p_stream->f_rate = p_stream->fmt.audio.i_rate =
 796                             GetDWLE((oggpacket.packet+128));
 797                         p_stream->fmt.i_bitrate =
 798                             GetDWLE((oggpacket.packet+132)) * 8;
 799                         p_stream->fmt.audio.i_blockalign =
 800                             GetWLE((oggpacket.packet+136));
 801                         p_stream->fmt.audio.i_bitspersample =
 802                             GetWLE((oggpacket.packet+138));
 803
 804                         switch( i_format_tag )
 805                         {
 806                         case WAVE_FORMAT_PCM:
 807                             p_stream->fmt.i_codec =
 808                                 VLC_FOURCC( 'a', 'r', 'a', 'w' );
 809                             break;
 810                         case WAVE_FORMAT_MPEG:
 811                         case WAVE_FORMAT_MPEGLAYER3:
 812                             p_stream->fmt.i_codec =
 813                                 VLC_FOURCC( 'm', 'p', 'g', 'a' );
 814                             break;
 815                         case WAVE_FORMAT_A52:
 816                             p_stream->fmt.i_codec =
 817                                 VLC_FOURCC( 'a', '5', '2', ' ' );
 818                             break;
 819                         case WAVE_FORMAT_WMA1:
 820                             p_stream->fmt.i_codec =
 821                                 VLC_FOURCC( 'w', 'm', 'a', '1' );
 822                             break;
 823                         case WAVE_FORMAT_WMA2:
 824                             p_stream->fmt.i_codec =
 825                                 VLC_FOURCC( 'w', 'm', 'a', '2' );
 826                             break;
 827                         default:
 828                             p_stream->fmt.i_codec = VLC_FOURCC( 'm', 's',
 829                                 ( i_format_tag >> 8 ) & 0xff,
 830                                 i_format_tag & 0xff );
 831                         }
 832
 833                         msg_Dbg( p_input, "found audio header of type: %.4s",
 834                                  (char *)&p_stream->fmt.i_codec );
 835                         msg_Dbg( p_input, "audio:0x%4.4x channels:%d %dHz "
 836                                  "%dbits/sample %dkb/s",
 837                                  i_format_tag,
 838                                  p_stream->fmt.audio.i_channels,
 839                                  p_stream->fmt.audio.i_rate,
 840                                  p_stream->fmt.audio.i_bitspersample,
 841                                  p_stream->fmt.i_bitrate / 1024 );
 842
 843                     }
 844                     else
 845                     {
 846                         msg_Dbg( p_input, "stream %d has an old header "
 847                             "but is of an unknown type", p_ogg->i_streams-1 );
 848                         free( p_stream );
 849                         p_ogg->i_streams--;
 850                     }
 851                 }
 852                 else if( (*oggpacket.packet & PACKET_TYPE_BITS )
 853                          == PACKET_TYPE_HEADER &&
 854                          oggpacket.bytes >= (int)sizeof(stream_header)+1 )
 855                 {
 856                     stream_header *st = (stream_header *)(oggpacket.packet+1);
 857
 858                     /* Check for video header (new format) */
 859                     if( !strncmp( st->streamtype, "video", 5 ) )
 860                     {
 861                         p_stream->fmt.i_cat = VIDEO_ES;
 862
 863                         /* We need to get rid of the header packet */
 864                         ogg_stream_packetout( &p_stream->os, &oggpacket );
 865
 866                         p_stream->fmt.i_codec =
 867                             VLC_FOURCC( st->subtype[0], st->subtype[1],
 868                                         st->subtype[2], st->subtype[3] );
 869                         msg_Dbg( p_input, "found video header of type: %.4s",
 870                                  (char *)&p_stream->fmt.i_codec );
 871
 872                         p_stream->f_rate = 10000000.0 /
 873                             GetQWLE(&st->time_unit);
 874                         p_stream->fmt.video.i_bits_per_pixel =
 875                             GetWLE(&st->bits_per_sample);
 876                         p_stream->fmt.video.i_width =
 877                             GetDWLE(&st->sh.video.width);
 878                         p_stream->fmt.video.i_height =
 879                             GetDWLE(&st->sh.video.height);
 880
 881                         msg_Dbg( p_input,
 882                                  "fps: %f, width:%i; height:%i, bitcount:%i",
 883                                  p_stream->f_rate,
 884                                  p_stream->fmt.video.i_width,
 885                                  p_stream->fmt.video.i_height,
 886                                  p_stream->fmt.video.i_bits_per_pixel );
 887                     }
 888                     /* Check for audio header (new format) */
 889                     else if( !strncmp( st->streamtype, "audio", 5 ) )
 890                     {
 891                         char p_buffer[5];
 892                         int i_format_tag;
 893
 894                         p_stream->fmt.i_cat = AUDIO_ES;
 895
 896                         /* We need to get rid of the header packet */
 897                         ogg_stream_packetout( &p_stream->os, &oggpacket );
 898
 899                         memcpy( p_buffer, st->subtype, 4 );
 900                         p_buffer[4] = '\0';
 901                         i_format_tag = strtol(p_buffer,NULL,16);
 902                         p_stream->fmt.audio.i_channels =
 903                             GetWLE(&st->sh.audio.channels);
 904                         p_stream->f_rate = p_stream->fmt.audio.i_rate =
 905                             GetQWLE(&st->samples_per_unit);
 906                         p_stream->fmt.i_bitrate =
 907                             GetDWLE(&st->sh.audio.avgbytespersec) * 8;
 908                         p_stream->fmt.audio.i_blockalign =
 909                             GetWLE(&st->sh.audio.blockalign);
 910                         p_stream->fmt.audio.i_bitspersample =
 911                             GetWLE(&st->bits_per_sample);
 912
 913                         switch( i_format_tag )
 914                         {
 915                         case WAVE_FORMAT_PCM:
 916                             p_stream->fmt.i_codec =
 917                                 VLC_FOURCC( 'a', 'r', 'a', 'w' );
 918                             break;
 919                         case WAVE_FORMAT_MPEG:
 920                         case WAVE_FORMAT_MPEGLAYER3:
 921                             p_stream->fmt.i_codec =
 922                                 VLC_FOURCC( 'm', 'p', 'g', 'a' );
 923                             break;
 924                         case WAVE_FORMAT_A52:
 925                             p_stream->fmt.i_codec =
 926                                 VLC_FOURCC( 'a', '5', '2', ' ' );
 927                             break;
 928                         case WAVE_FORMAT_WMA1:
 929                             p_stream->fmt.i_codec =
 930                                 VLC_FOURCC( 'w', 'm', 'a', '1' );
 931                             break;
 932                         case WAVE_FORMAT_WMA2:
 933                             p_stream->fmt.i_codec =
 934                                 VLC_FOURCC( 'w', 'm', 'a', '2' );
 935                             break;
 936                         default:
 937                             p_stream->fmt.i_codec = VLC_FOURCC( 'm', 's',
 938                                 ( i_format_tag >> 8 ) & 0xff,
 939                                 i_format_tag & 0xff );
 940                         }
 941
 942                         msg_Dbg( p_input, "found audio header of type: %.4s",
 943                                  (char *)&p_stream->fmt.i_codec );
 944                         msg_Dbg( p_input, "audio:0x%4.4x channels:%d %dHz "
 945                                  "%dbits/sample %dkb/s",
 946                                  i_format_tag,
 947                                  p_stream->fmt.audio.i_channels,
 948                                  p_stream->fmt.audio.i_rate,
 949                                  p_stream->fmt.audio.i_bitspersample,
 950                                  p_stream->fmt.i_bitrate / 1024 );
 951                     }
 952                     /* Check for text (subtitles) header */
 953                     else if( !strncmp(st->streamtype, "text", 4) )
 954                     {
 955                         /* We need to get rid of the header packet */
 956                         ogg_stream_packetout( &p_stream->os, &oggpacket );
 957
 958                         msg_Dbg( p_input, "found text subtitles header" );
 959                         p_stream->fmt.i_cat = SPU_ES;
 960                         p_stream->fmt.i_codec = VLC_FOURCC('s','u','b','t');
 961                         p_stream->f_rate = 1000; /* granulepos is in milisec */
 962                     }
 963                     else
 964                     {
 965                         msg_Dbg( p_input, "stream %d has a header marker "
 966                             "but is of an unknown type", p_ogg->i_streams-1 );
 967                         free( p_stream );
 968                         p_ogg->i_streams--;
 969                     }
 970                 }
 971                 else
 972                 {
 973                     msg_Dbg( p_input, "stream %d is of unknown type",
 974                              p_ogg->i_streams-1 );
 975                     free( p_stream );
 976                     p_ogg->i_streams--;
 977                 }
 978
 979                 if( Ogg_ReadPage( p_input, p_ogg, &oggpage ) != VLC_SUCCESS )
 980                     return VLC_EGENERIC;
 981             }
 982
 983             /* This is the first data page, which means we are now finished
 984              * with the initial pages. We just need to store it in the relevant
 985              * bitstream. */
 986             for( i_stream = 0; i_stream < p_ogg->i_streams; i_stream++ )
 987             {
 988                 if( ogg_stream_pagein( &p_ogg->pp_stream[i_stream]->os,
 989                                        &oggpage ) == 0 )
 990                 {
 991                     break;
 992                 }
 993             }
 994
 995             return VLC_SUCCESS;
 996         }
 997     }
 998 #undef p_stream
 999
1000     return VLC_EGENERIC;
1001 }
1002
1003 /*****************************************************************************
1004  * Activate: initializes ogg demux structures
1005  *****************************************************************************/
1006 static int Activate( vlc_object_t * p_this )
1007 {
1008     input_thread_t *p_input = (input_thread_t *)p_this;
1009     demux_sys_t    *p_ogg;
1010     int            b_forced;
1011
1012     p_input->p_demux_data = NULL;
1013     b_forced = ( ( *p_input->psz_demux )&&
1014                  ( !strncmp( p_input->psz_demux, "ogg", 10 ) ) ) ? 1 : 0;
1015
1016     /* Check if we are dealing with an ogg stream */
1017     if( !b_forced && ( Ogg_Check( p_input ) != VLC_SUCCESS ) )
1018         return -1;
1019
1020     /* Allocate p_ogg */
1021     if( !( p_ogg = malloc( sizeof( demux_sys_t ) ) ) )
1022     {
1023         msg_Err( p_input, "out of memory" );
1024         goto error;
1025     }
1026     memset( p_ogg, 0, sizeof( demux_sys_t ) );
1027     p_input->p_demux_data = p_ogg;
1028     p_ogg->pp_stream = NULL;
1029
1030     /* Initialize the Ogg physical bitstream parser */
1031     ogg_sync_init( &p_ogg->oy );
1032
1033     /* Set exported functions */
1034     p_input->pf_demux = Demux;
1035     p_input->pf_demux_control = Control;
1036
1037     /* Initialize access plug-in structures. */
1038     if( p_input->i_mtu == 0 )
1039     {
1040         /* Improve speed. */
1041         p_input->i_bufsize = INPUT_DEFAULT_BUFSIZE;
1042     }
1043
1044     /* Create one program */
1045     vlc_mutex_lock( &p_input->stream.stream_lock );
1046     if( input_InitStream( p_input, 0 ) == -1)
1047     {
1048         vlc_mutex_unlock( &p_input->stream.stream_lock );
1049         msg_Err( p_input, "cannot init stream" );
1050         goto error;
1051     }
1052     if( input_AddProgram( p_input, 0, 0) == NULL )
1053     {
1054         vlc_mutex_unlock( &p_input->stream.stream_lock );
1055         msg_Err( p_input, "cannot add program" );
1056         goto error;
1057     }
1058     p_input->stream.p_selected_program = p_input->stream.pp_programs[0];
1059     vlc_mutex_unlock( &p_input->stream.stream_lock );
1060
1061     /* Begnning of stream, tell the demux to look for elementary streams. */
1062     p_ogg->i_eos = 0;
1063
1064     p_ogg->i_old_synchro_state = !SYNCHRO_REINIT;
1065
1066     return 0;
1067
1068  error:
1069     Deactivate( (vlc_object_t *)p_input );
1070     return -1;
1071
1072 }
1073
1074 /****************************************************************************
1075  * Ogg_BeginningOfStream: Look for Beginning of Stream ogg pages and add
1076  *                        Elementary streams.
1077  ****************************************************************************/
1078 static int Ogg_BeginningOfStream( input_thread_t *p_input, demux_sys_t *p_ogg)
1079 {
1080     int i_stream;
1081
1082     /* Find the logical streams embedded in the physical stream and
1083      * initialize our p_ogg structure. */
1084     if( Ogg_FindLogicalStreams( p_input, p_ogg ) != VLC_SUCCESS )
1085     {
1086         msg_Warn( p_input, "couldn't find any ogg logical stream" );
1087         return VLC_EGENERIC;
1088     }
1089
1090     vlc_mutex_lock( &p_input->stream.stream_lock );
1091     p_input->stream.i_mux_rate = 0;
1092     vlc_mutex_unlock( &p_input->stream.stream_lock );
1093
1094     for( i_stream = 0 ; i_stream < p_ogg->i_streams; i_stream++ )
1095     {
1096 #define p_stream p_ogg->pp_stream[i_stream]
1097         if( p_stream->fmt.i_codec != VLC_FOURCC('f','l','a','c') )
1098             p_stream->p_es = es_out_Add( p_input->p_es_out, &p_stream->fmt );
1099
1100         vlc_mutex_lock( &p_input->stream.stream_lock );
1101         p_input->stream.i_mux_rate += (p_stream->fmt.i_bitrate / ( 8 * 50 ));
1102         vlc_mutex_unlock( &p_input->stream.stream_lock );
1103
1104         p_stream->i_pcr = p_stream->i_previous_pcr =
1105             p_stream->i_interpolated_pcr = -1;
1106         p_stream->b_reinit = 0;
1107 #undef p_stream
1108     }
1109
1110     return VLC_SUCCESS;
1111 }
1112
1113 /****************************************************************************
1114  * Ogg_EndOfStream: clean up the ES when an End of Stream is detected.
1115  ****************************************************************************/
1116 static void Ogg_EndOfStream( input_thread_t *p_input, demux_sys_t *p_ogg )
1117 {
1118     int i_stream, j;
1119
1120 #define p_stream p_ogg->pp_stream[i_stream]
1121     for( i_stream = 0 ; i_stream < p_ogg->i_streams; i_stream++ )
1122     {
1123         if( p_stream->p_es )
1124             es_out_Del( p_input->p_es_out, p_stream->p_es );
1125
1126         vlc_mutex_lock( &p_input->stream.stream_lock );
1127         p_input->stream.i_mux_rate -= (p_stream->fmt.i_bitrate / ( 8 * 50 ));
1128         vlc_mutex_unlock( &p_input->stream.stream_lock );
1129
1130         ogg_stream_clear( &p_ogg->pp_stream[i_stream]->os );
1131         for( j = 0; j < p_ogg->pp_stream[i_stream]->i_packets_backup; j++ )
1132         {
1133             free( p_ogg->pp_stream[i_stream]->p_packets_backup[j].packet );
1134         }
1135         if( p_ogg->pp_stream[i_stream]->p_packets_backup)
1136             free( p_ogg->pp_stream[i_stream]->p_packets_backup );
1137
1138         es_format_Clean( &p_stream->fmt );
1139
1140         free( p_ogg->pp_stream[i_stream] );
1141     }
1142 #undef p_stream
1143
1144     /* Reinit p_ogg */
1145     if( p_ogg->pp_stream ) free( p_ogg->pp_stream );
1146     p_ogg->pp_stream = NULL;
1147     p_ogg->i_streams = 0;
1148 }
1149
1150 /*****************************************************************************
1151  * Deactivate: frees unused data
1152  *****************************************************************************/
1153 static void Deactivate( vlc_object_t *p_this )
1154 {
1155     input_thread_t *p_input = (input_thread_t *)p_this;
1156     demux_sys_t *p_ogg = (demux_sys_t *)p_input->p_demux_data  ;
1157
1158     if( p_ogg )
1159     {
1160         /* Cleanup the bitstream parser */
1161         ogg_sync_clear( &p_ogg->oy );
1162
1163         Ogg_EndOfStream( p_input, p_ogg );
1164
1165         free( p_ogg );
1166     }
1167 }
1168
1169 /*****************************************************************************
1170  * Demux: reads and demuxes data packets
1171  *****************************************************************************
1172  * Returns -1 in case of error, 0 in case of EOF, 1 otherwise
1173  *****************************************************************************/
1174 static int Demux( input_thread_t * p_input )
1175 {
1176     demux_sys_t *p_ogg = (demux_sys_t *)p_input->p_demux_data;
1177     ogg_page    oggpage;
1178     ogg_packet  oggpacket;
1179     int         i_stream;
1180
1181 #define p_stream p_ogg->pp_stream[i_stream]
1182
1183     if( p_ogg->i_eos == p_ogg->i_streams )
1184     {
1185         if( p_ogg->i_eos )
1186         {
1187             msg_Dbg( p_input, "end of a group of logical streams" );
1188             Ogg_EndOfStream( p_input, p_ogg );
1189         }
1190
1191         if( Ogg_BeginningOfStream( p_input, p_ogg ) != VLC_SUCCESS ) return 0;
1192         p_ogg->i_eos = 0;
1193
1194         msg_Dbg( p_input, "beginning of a group of logical streams" );
1195
1196         p_input->stream.p_selected_program->i_synchro_state = SYNCHRO_REINIT;
1197         input_ClockManageRef( p_input, p_input->stream.p_selected_program, 0 );
1198     }
1199
1200     if( p_input->stream.p_selected_program->i_synchro_state == SYNCHRO_REINIT )
1201     {
1202         msg_Warn( p_input, "synchro reinit" );
1203
1204         if( p_ogg->i_old_synchro_state != SYNCHRO_REINIT )
1205         for( i_stream = 0; i_stream < p_ogg->i_streams; i_stream++ )
1206         {
1207             /* we'll trash all the data until we find the next pcr */
1208             p_stream->b_reinit = 1;
1209             p_stream->i_pcr = -1;
1210             p_stream->i_interpolated_pcr = -1;
1211             ogg_stream_reset( &p_stream->os );
1212         }
1213         if( p_ogg->i_old_synchro_state != SYNCHRO_REINIT )
1214         ogg_sync_reset( &p_ogg->oy );
1215     }
1216
1217     /*
1218      * Demux an ogg page from the stream
1219      */
1220     if( Ogg_ReadPage( p_input, p_ogg, &oggpage ) != VLC_SUCCESS )
1221     {
1222         return 0; /* EOF */
1223     }
1224
1225     /* Test for End of Stream */
1226     if( ogg_page_eos( &oggpage ) ) p_ogg->i_eos++;
1227
1228
1229     for( i_stream = 0; i_stream < p_ogg->i_streams; i_stream++ )
1230     {
1231         if( ogg_stream_pagein( &p_stream->os, &oggpage ) != 0 )
1232             continue;
1233
1234         while( ogg_stream_packetout( &p_stream->os, &oggpacket ) > 0 )
1235         {
1236             if( p_stream->b_reinit )
1237             {
1238                 /* If synchro is re-initialized we need to drop all the packets
1239                  * until we find a new dated one. */
1240                 Ogg_UpdatePCR( p_stream, &oggpacket );
1241
1242                 if( p_stream->i_pcr >= 0 )
1243                 {
1244                     p_stream->b_reinit = 0;
1245                 }
1246                 else
1247                 {
1248                     p_stream->i_interpolated_pcr = -1;
1249                     continue;
1250                 }
1251
1252                 /* An Ogg/vorbis packet contains an end date granulepos */
1253                 if( p_stream->fmt.i_codec == VLC_FOURCC( 'v','o','r','b' ) ||
1254                     p_stream->fmt.i_codec == VLC_FOURCC( 's','p','x',' ' ) ||
1255                     p_stream->fmt.i_codec == VLC_FOURCC( 'f','l','a','c' ) )
1256                 {
1257                     if( ogg_stream_packetout( &p_stream->os, &oggpacket ) > 0 )
1258                     {
1259                         Ogg_DecodePacket( p_input, p_stream, &oggpacket );
1260                     }
1261                     else
1262                     {
1263                         input_ClockManageRef( p_input,
1264                                       p_input->stream.p_selected_program,
1265                                       p_stream->i_pcr );
1266                     }
1267                     continue;
1268                 }
1269             }
1270
1271             Ogg_DecodePacket( p_input, p_stream, &oggpacket );
1272         }
1273         break;
1274     }
1275
1276     i_stream = 0; p_ogg->i_pcr = -1;
1277     for( ; i_stream < p_ogg->i_streams; i_stream++ )
1278     {
1279         if( p_stream->fmt.i_cat == SPU_ES )
1280             continue;
1281         if( p_stream->i_interpolated_pcr < 0 )
1282             continue;
1283
1284         if( p_ogg->i_pcr < 0 || p_stream->i_interpolated_pcr < p_ogg->i_pcr )
1285             p_ogg->i_pcr = p_stream->i_interpolated_pcr;
1286     }
1287
1288     if( p_ogg->i_pcr >= 0 )
1289     {
1290         input_ClockManageRef( p_input, p_input->stream.p_selected_program,
1291                               p_ogg->i_pcr );
1292     }
1293
1294 #undef p_stream
1295
1296     p_ogg->i_old_synchro_state =
1297         p_input->stream.p_selected_program->i_synchro_state;
1298
1299     return 1;
1300 }
1301
1302 /*****************************************************************************
1303  * Control:
1304  *****************************************************************************/
1305 static int Control( input_thread_t *p_input, int i_query, va_list args )
1306 {
1307     demux_sys_t *p_ogg  = (demux_sys_t *)p_input->p_demux_data;
1308     int64_t *pi64;
1309
1310     switch( i_query )
1311     {
1312         case DEMUX_GET_TIME:
1313             pi64 = (int64_t*)va_arg( args, int64_t * );
1314             *pi64 = p_ogg->i_pcr * 100 / 9;
1315             return VLC_SUCCESS;
1316
1317         default:
1318             return demux_vaControlDefault( p_input, i_query, args );
1319     }
1320 }