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-2007 the VideoLAN team
   5  * $Id$
   6  *
   7  * Authors: Gildas Bazin <gbazin@netcourrier.com>
   8  *          Andre Pang <Andre.Pang@csiro.au> (Annodex support)
   9  *
  10  * This program is free software; you can redistribute it and/or modify
  11  * it under the terms of the GNU General Public License as published by
  12  * the Free Software Foundation; either version 2 of the License, or
  13  * (at your option) any later version.
  14  *
  15  * This program is distributed in the hope that it will be useful,
  16  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  17  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  18  * GNU General Public License for more details.
  19  *
  20  * You should have received a copy of the GNU General Public License
  21  * along with this program; if not, write to the Free Software
  22  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  23  *****************************************************************************/
  24
  25 /*****************************************************************************
  26  * Preamble
  27  *****************************************************************************/
  28 #ifdef HAVE_CONFIG_H
  29 # include "config.h"
  30 #endif
  31
  32 #include <vlc_common.h>
  33 #include <vlc_plugin.h>
  34 #include <vlc_demux.h>
  35 #include <vlc_meta.h>
  36 #include <vlc_input.h>
  37
  38 #include <ogg/ogg.h>
  39
  40 #include <vlc_codecs.h>
  41 #include <vlc_bits.h>
  42 #include "xiph.h"
  43 #include "vorbis.h"
  44 #include "kate_categories.h"
  45 #include "ogg.h"
  46 #include "oggseek.h"
  47
  48 /*****************************************************************************
  49  * Module descriptor
  50  *****************************************************************************/
  51 static int  Open ( vlc_object_t * );
  52 static void Close( vlc_object_t * );
  53
  54 vlc_module_begin ()
  55     set_shortname ( "OGG" )
  56     set_description( N_("OGG demuxer" ) )
  57     set_category( CAT_INPUT )
  58     set_subcategory( SUBCAT_INPUT_DEMUX )
  59     set_capability( "demux", 50 )
  60     set_callbacks( Open, Close )
  61     add_shortcut( "ogg" )
  62 vlc_module_end ()
  63
  64
  65 /*****************************************************************************
  66  * Definitions of structures and functions used by this plugins
  67  *****************************************************************************/
  68
  69 /* OggDS headers for the new header format (used in ogm files) */
  70 typedef struct
  71 {
  72     ogg_int32_t width;
  73     ogg_int32_t height;
  74 } stream_header_video_t;
  75
  76 typedef struct
  77 {
  78     ogg_int16_t channels;
  79     ogg_int16_t padding;
  80     ogg_int16_t blockalign;
  81     ogg_int32_t avgbytespersec;
  82 } stream_header_audio_t;
  83
  84 typedef struct
  85 {
  86     char        streamtype[8];
  87     char        subtype[4];
  88
  89     ogg_int32_t size;                               /* size of the structure */
  90
  91     ogg_int64_t time_unit;                              /* in reference time */
  92     ogg_int64_t samples_per_unit;
  93     ogg_int32_t default_len;                                /* in media time */
  94
  95     ogg_int32_t buffersize;
  96     ogg_int16_t bits_per_sample;
  97     ogg_int16_t padding;
  98
  99     union
 100     {
 101         /* Video specific */
 102         stream_header_video_t video;
 103         /* Audio specific */
 104         stream_header_audio_t audio;
 105     } sh;
 106 } stream_header_t;
 107
 108
 109 /* Some defines from OggDS */
 110 #define PACKET_TYPE_HEADER   0x01
 111 #define PACKET_TYPE_BITS     0x07
 112 #define PACKET_LEN_BITS01    0xc0
 113 #define PACKET_LEN_BITS2     0x02
 114 #define PACKET_IS_SYNCPOINT  0x08
 115
 116 /*****************************************************************************
 117  * Local prototypes
 118  *****************************************************************************/
 119 static int  Demux  ( demux_t * );
 120 static int  Control( demux_t *, int, va_list );
 121
 122 /* Bitstream manipulation */
 123 static int  Ogg_ReadPage     ( demux_t *, ogg_page * );
 124 static void Ogg_UpdatePCR    ( logical_stream_t *, ogg_packet * );
 125 static void Ogg_DecodePacket ( demux_t *, logical_stream_t *, ogg_packet * );
 126
 127 static int Ogg_BeginningOfStream( demux_t *p_demux );
 128 static int Ogg_FindLogicalStreams( demux_t *p_demux );
 129 static void Ogg_EndOfStream( demux_t *p_demux );
 130
 131 /* */
 132 static void Ogg_LogicalStreamDelete( demux_t *p_demux, logical_stream_t *p_stream );
 133 static bool Ogg_LogicalStreamResetEsFormat( demux_t *p_demux, logical_stream_t *p_stream );
 134
 135 /* */
 136 static void Ogg_ExtractMeta( demux_t *p_demux, vlc_fourcc_t i_codec, const uint8_t *p_headers, int i_headers );
 137
 138 /* Logical bitstream headers */
 139 static void Ogg_ReadTheoraHeader( logical_stream_t *, ogg_packet * );
 140 static void Ogg_ReadVorbisHeader( logical_stream_t *, ogg_packet * );
 141 static void Ogg_ReadSpeexHeader( logical_stream_t *, ogg_packet * );
 142 static void Ogg_ReadKateHeader( logical_stream_t *, ogg_packet * );
 143 static void Ogg_ReadFlacHeader( demux_t *, logical_stream_t *, ogg_packet * );
 144 static void Ogg_ReadAnnodexHeader( vlc_object_t *, logical_stream_t *, ogg_packet * );
 145 static bool Ogg_ReadDiracHeader( logical_stream_t *, ogg_packet * );
 146
 147 /*****************************************************************************
 148  * Open: initializes ogg demux structures
 149  *****************************************************************************/
 150 static int Open( vlc_object_t * p_this )
 151 {
 152     demux_t *p_demux = (demux_t *)p_this;
 153     demux_sys_t    *p_sys;
 154     const uint8_t  *p_peek;
 155
 156
 157     /* Check if we are dealing with an ogg stream */
 158     if( stream_Peek( p_demux->s, &p_peek, 4 ) < 4 ) return VLC_EGENERIC;
 159     if( !p_demux->b_force && memcmp( p_peek, "OggS", 4 ) )
 160     {
 161         return VLC_EGENERIC;
 162     }
 163
 164     /* Set exported functions */
 165     p_demux->pf_demux = Demux;
 166     p_demux->pf_control = Control;
 167     p_demux->p_sys = p_sys = malloc( sizeof( demux_sys_t ) );
 168     if( !p_sys )
 169         return VLC_ENOMEM;
 170
 171     memset( p_sys, 0, sizeof( demux_sys_t ) );
 172     p_sys->i_bitrate = 0;
 173     p_sys->pp_stream = NULL;
 174     p_sys->p_old_stream = NULL;
 175
 176     /* Begnning of stream, tell the demux to look for elementary streams. */
 177     p_sys->i_bos = 0;
 178     p_sys->i_eos = 0;
 179
 180     /* Initialize the Ogg physical bitstream parser */
 181     ogg_sync_init( &p_sys->oy );
 182     p_sys->b_page_waiting = false;
 183
 184     /* */
 185     p_sys->p_meta = NULL;
 186
 187     return VLC_SUCCESS;
 188 }
 189
 190 /*****************************************************************************
 191  * Close: frees unused data
 192  *****************************************************************************/
 193 static void Close( vlc_object_t *p_this )
 194 {
 195     demux_t *p_demux = (demux_t *)p_this;
 196     demux_sys_t *p_sys = p_demux->p_sys  ;
 197
 198     /* Cleanup the bitstream parser */
 199     ogg_sync_clear( &p_sys->oy );
 200
 201     Ogg_EndOfStream( p_demux );
 202
 203     if( p_sys->p_old_stream )
 204         Ogg_LogicalStreamDelete( p_demux, p_sys->p_old_stream );
 205
 206     free( p_sys );
 207 }
 208
 209 /*****************************************************************************
 210  * Demux: reads and demuxes data packets
 211  *****************************************************************************
 212  * Returns -1 in case of error, 0 in case of EOF, 1 otherwise
 213  *****************************************************************************/
 214 static int Demux( demux_t * p_demux )
 215 {
 216     demux_sys_t *p_sys = p_demux->p_sys;
 217     ogg_packet  oggpacket;
 218     int         i_stream;
 219     bool b_skipping = false;
 220
 221
 222     if( p_sys->i_eos == p_sys->i_streams )
 223     {
 224         if( p_sys->i_eos )
 225         {
 226             msg_Dbg( p_demux, "end of a group of logical streams" );
 227             /* We keep the ES to try reusing it in Ogg_BeginningOfStream
 228              * only 1 ES is supported (common case for ogg web radio) */
 229             if( p_sys->i_streams == 1 )
 230             {
 231                 p_sys->p_old_stream = p_sys->pp_stream[0];
 232                 TAB_CLEAN( p_sys->i_streams, p_sys->pp_stream );
 233             }
 234             Ogg_EndOfStream( p_demux );
 235         }
 236
 237         p_sys->i_eos = 0;
 238         if( Ogg_BeginningOfStream( p_demux ) != VLC_SUCCESS )
 239             return 0;
 240
 241         msg_Dbg( p_demux, "beginning of a group of logical streams" );
 242         es_out_Control( p_demux->out, ES_OUT_RESET_PCR );
 243     }
 244
 245     /*
 246      * The first data page of a physical stream is stored in the relevant logical stream
 247      * in Ogg_FindLogicalStreams. Therefore, we must not read a page and only update the
 248      * stream it belongs to if we haven't processed this first page yet. If we do, we
 249      * will only process that first page whenever we find the second page for this stream.
 250      * While this is fine for Vorbis and Theora, which are continuous codecs, which means
 251      * the second page will arrive real quick, this is not fine for Kate, whose second
 252      * data page will typically arrive much later.
 253      * This means it is now possible to seek right at the start of a stream where the last
 254      * logical stream is Kate, without having to wait for the second data page to unblock
 255      * the first one, which is the one that triggers the 'no more headers to backup' code.
 256      * And, as we all know, seeking without having backed up all headers is bad, since the
 257      * codec will fail to initialize if it's missing its headers.
 258      */
 259     if( !p_sys->b_page_waiting)
 260     {
 261         /*
 262          * Demux an ogg page from the stream
 263          */
 264         if( Ogg_ReadPage( p_demux, &p_sys->current_page ) != VLC_SUCCESS )
 265             return 0; /* EOF */
 266
 267         /* Test for End of Stream */
 268         if( ogg_page_eos( &p_sys->current_page ) )
 269             p_sys->i_eos++;
 270     }
 271
 272
 273     for( i_stream = 0; i_stream < p_sys->i_streams; i_stream++ )
 274     {
 275         logical_stream_t *p_stream = p_sys->pp_stream[i_stream];
 276
 277         /* if we've just pulled page, look for the right logical stream */
 278         if( !p_sys->b_page_waiting )
 279         {
 280             if( p_sys->i_streams == 1 &&
 281                 ogg_page_serialno( &p_sys->current_page ) != p_stream->os.serialno )
 282             {
 283                 msg_Err( p_demux, "Broken Ogg stream (serialno) mismatch" );
 284                 ogg_stream_reset_serialno( &p_stream->os, ogg_page_serialno( &p_sys->current_page ) );
 285
 286                 p_stream->b_reinit = true;
 287                 p_stream->i_pcr = -1;
 288                 p_stream->i_interpolated_pcr = -1;
 289                 es_out_Control( p_demux->out, ES_OUT_RESET_PCR );
 290             }
 291
 292             if( ogg_stream_pagein( &p_stream->os, &p_sys->current_page ) != 0 )
 293             {
 294                 continue;
 295             }
 296
 297         }
 298
 299         while( ogg_stream_packetout( &p_stream->os, &oggpacket ) > 0 )
 300         {
 301             /* Read info from any secondary header packets, if there are any */
 302             if( p_stream->i_secondary_header_packets > 0 )
 303             {
 304                 if( p_stream->fmt.i_codec == VLC_CODEC_THEORA &&
 305                         oggpacket.bytes >= 7 &&
 306                         ! memcmp( oggpacket.packet, "\x80theora", 7 ) )
 307                 {
 308                     Ogg_ReadTheoraHeader( p_stream, &oggpacket );
 309                     p_stream->i_secondary_header_packets = 0;
 310                 }
 311                 else if( p_stream->fmt.i_codec == VLC_CODEC_VORBIS &&
 312                         oggpacket.bytes >= 7 &&
 313                         ! memcmp( oggpacket.packet, "\x01vorbis", 7 ) )
 314                 {
 315                     Ogg_ReadVorbisHeader( p_stream, &oggpacket );
 316                     p_stream->i_secondary_header_packets = 0;
 317                 }
 318                 else if( p_stream->fmt.i_codec == VLC_CODEC_CMML )
 319                 {
 320                     p_stream->i_secondary_header_packets = 0;
 321                 }
 322
 323                 /* update start of data pointer */
 324                 p_stream->i_data_start = stream_Tell( p_demux->s );
 325
 326             }
 327
 328             /* If any streams have i_skip_frames, only decode (pre-roll)
 329              *  for those streams */
 330             if ( b_skipping && p_stream->i_skip_frames == 0 ) continue;
 331
 332
 333             if( p_stream->b_reinit )
 334             {
 335                 /* If synchro is re-initialized we need to drop all the packets
 336                  * until we find a new dated one. */
 337                 Ogg_UpdatePCR( p_stream, &oggpacket );
 338
 339                 if( p_stream->i_pcr >= 0 )
 340                 {
 341                     p_stream->b_reinit = false;
 342                 }
 343                 else
 344                 {
 345                     p_stream->i_interpolated_pcr = -1;
 346                     continue;
 347                 }
 348
 349                 /* An Ogg/vorbis packet contains an end date granulepos */
 350                 if( p_stream->fmt.i_codec == VLC_CODEC_VORBIS ||
 351                     p_stream->fmt.i_codec == VLC_CODEC_SPEEX ||
 352                     p_stream->fmt.i_codec == VLC_CODEC_FLAC )
 353                 {
 354                     if( ogg_stream_packetout( &p_stream->os, &oggpacket ) > 0 )
 355                     {
 356                         Ogg_DecodePacket( p_demux, p_stream, &oggpacket );
 357                     }
 358                     else
 359                     {
 360                         es_out_Control( p_demux->out, ES_OUT_SET_PCR,
 361                                         VLC_TS_0 + p_stream->i_pcr );
 362                     }
 363                     continue;
 364                 }
 365             }
 366
 367             Ogg_DecodePacket( p_demux, p_stream, &oggpacket );
 368         }
 369
 370         if( !p_sys->b_page_waiting )
 371             break;
 372     }
 373
 374     /* if a page was waiting, it's now processed */
 375     p_sys->b_page_waiting = false;
 376
 377     p_sys->i_pcr = -1;
 378     for( i_stream = 0; i_stream < p_sys->i_streams; i_stream++ )
 379     {
 380         logical_stream_t *p_stream = p_sys->pp_stream[i_stream];
 381
 382         if( p_stream->fmt.i_cat == SPU_ES )
 383             continue;
 384         if( p_stream->i_interpolated_pcr < 0 )
 385             continue;
 386
 387         if( p_sys->i_pcr < 0 || p_stream->i_interpolated_pcr < p_sys->i_pcr )
 388             p_sys->i_pcr = p_stream->i_interpolated_pcr;
 389     }
 390
 391     if( p_sys->i_pcr >= 0 && ! b_skipping )
 392         es_out_Control( p_demux->out, ES_OUT_SET_PCR, VLC_TS_0 + p_sys->i_pcr );
 393
 394     return 1;
 395 }
 396
 397 /*****************************************************************************
 398  * Control:
 399  *****************************************************************************/
 400 static int Control( demux_t *p_demux, int i_query, va_list args )
 401 {
 402     demux_sys_t *p_sys  = p_demux->p_sys;
 403     vlc_meta_t *p_meta;
 404     int64_t *pi64;
 405     bool *pb_bool;
 406     int i;
 407
 408     switch( i_query )
 409     {
 410         case DEMUX_GET_META:
 411             p_meta = (vlc_meta_t *)va_arg( args, vlc_meta_t* );
 412             if( p_sys->p_meta )
 413                 vlc_meta_Merge( p_meta, p_sys->p_meta );
 414             return VLC_SUCCESS;
 415
 416         case DEMUX_HAS_UNSUPPORTED_META:
 417             pb_bool = (bool*)va_arg( args, bool* );
 418             *pb_bool = true;
 419             return VLC_SUCCESS;
 420
 421         case DEMUX_GET_TIME:
 422             pi64 = (int64_t*)va_arg( args, int64_t * );
 423             *pi64 = p_sys->i_pcr;
 424             return VLC_SUCCESS;
 425
 426         case DEMUX_SET_TIME:
 427             return VLC_EGENERIC;
 428
 429         case DEMUX_GET_ATTACHMENTS:
 430         {
 431             input_attachment_t ***ppp_attach =
 432                 (input_attachment_t***)va_arg( args, input_attachment_t*** );
 433             int *pi_int = (int*)va_arg( args, int * );
 434
 435             if( p_sys->i_attachments <= 0 )
 436                 return VLC_EGENERIC;
 437
 438             *pi_int = p_sys->i_attachments;
 439             *ppp_attach = xmalloc( sizeof(input_attachment_t**) * p_sys->i_attachments );
 440             for( int i = 0; i < p_sys->i_attachments; i++ )
 441                 (*ppp_attach)[i] = vlc_input_attachment_Duplicate( p_sys->attachments[i] );
 442             return VLC_SUCCESS;
 443         }
 444
 445         case DEMUX_SET_POSITION:
 446             /* forbid seeking if we haven't initialized all logical bitstreams yet;
 447                if we allowed, some headers would not get backed up and decoder init
 448                would fail, making that logical stream unusable */
 449             if( p_sys->i_bos > 0 )
 450             {
 451                 return VLC_EGENERIC;
 452             }
 453
 454             for( i = 0; i < p_sys->i_streams; i++ )
 455             {
 456                 logical_stream_t *p_stream = p_sys->pp_stream[i];
 457
 458                 /* we'll trash all the data until we find the next pcr */
 459                 p_stream->b_reinit = true;
 460                 p_stream->i_pcr = -1;
 461                 p_stream->i_interpolated_pcr = -1;
 462                 ogg_stream_reset( &p_stream->os );
 463             }
 464             ogg_sync_reset( &p_sys->oy );
 465             /* XXX The break/return is missing on purpose as
 466              * demux_vaControlHelper will do the last part of the job */
 467
 468         default:
 469             return demux_vaControlHelper( p_demux->s, 0, -1, p_sys->i_bitrate,
 470                                            1, i_query, args );
 471     }
 472 }
 473
 474 /****************************************************************************
 475  * Ogg_ReadPage: Read a full Ogg page from the physical bitstream.
 476  ****************************************************************************
 477  * Returns VLC_SUCCESS if a page has been read. An error might happen if we
 478  * are at the end of stream.
 479  ****************************************************************************/
 480 static int Ogg_ReadPage( demux_t *p_demux, ogg_page *p_oggpage )
 481 {
 482     demux_sys_t *p_ogg = p_demux->p_sys  ;
 483     int i_read = 0;
 484     char *p_buffer;
 485
 486     while( ogg_sync_pageout( &p_ogg->oy, p_oggpage ) != 1 )
 487     {
 488         p_buffer = ogg_sync_buffer( &p_ogg->oy, OGGSEEK_BYTES_TO_READ );
 489
 490         i_read = stream_Read( p_demux->s, p_buffer, OGGSEEK_BYTES_TO_READ );
 491         if( i_read <= 0 )
 492             return VLC_EGENERIC;
 493
 494         ogg_sync_wrote( &p_ogg->oy, i_read );
 495     }
 496
 497     return VLC_SUCCESS;
 498 }
 499
 500 /****************************************************************************
 501  * Ogg_UpdatePCR: update the PCR (90kHz program clock reference) for the
 502  *                current stream.
 503  ****************************************************************************/
 504 static void Ogg_UpdatePCR( logical_stream_t *p_stream,
 505                            ogg_packet *p_oggpacket )
 506 {
 507     /* Convert the granulepos into a pcr */
 508     if( p_oggpacket->granulepos >= 0 )
 509     {
 510         if( p_stream->fmt.i_codec == VLC_CODEC_THEORA ||
 511             p_stream->fmt.i_codec == VLC_CODEC_KATE )
 512         {
 513             ogg_int64_t iframe = p_oggpacket->granulepos >>
 514               p_stream->i_granule_shift;
 515             ogg_int64_t pframe = p_oggpacket->granulepos -
 516               ( iframe << p_stream->i_granule_shift );
 517
 518             p_stream->i_pcr = ( iframe + pframe - p_stream->i_keyframe_offset )
 519               * INT64_C(1000000) / p_stream->f_rate;
 520         }
 521         else if( p_stream->fmt.i_codec == VLC_CODEC_DIRAC )
 522         {
 523             ogg_int64_t i_dts = p_oggpacket->granulepos >> 31;
 524             /* NB, OggDirac granulepos values are in units of 2*picturerate */
 525             p_stream->i_pcr = (i_dts/2) * INT64_C(1000000) / p_stream->f_rate;
 526         }
 527         else
 528         {
 529             p_stream->i_pcr = p_oggpacket->granulepos * INT64_C(1000000)
 530                               / p_stream->f_rate;
 531         }
 532
 533         p_stream->i_pcr += 1;
 534         p_stream->i_interpolated_pcr = p_stream->i_pcr;
 535     }
 536     else
 537     {
 538         p_stream->i_pcr = -1;
 539
 540         /* no granulepos available, try to interpolate the pcr.
 541          * If we can't then don't touch the old value. */
 542         if( p_stream->fmt.i_cat == VIDEO_ES )
 543             /* 1 frame per packet */
 544             p_stream->i_interpolated_pcr += (INT64_C(1000000) / p_stream->f_rate);
 545         else if( p_stream->fmt.i_bitrate )
 546             p_stream->i_interpolated_pcr +=
 547                 ( p_oggpacket->bytes * INT64_C(1000000) /
 548                   p_stream->fmt.i_bitrate / 8 );
 549     }
 550 }
 551
 552 /****************************************************************************
 553  * Ogg_DecodePacket: Decode an Ogg packet.
 554  ****************************************************************************/
 555 static void Ogg_DecodePacket( demux_t *p_demux,
 556                               logical_stream_t *p_stream,
 557                               ogg_packet *p_oggpacket )
 558 {
 559     block_t *p_block;
 560     bool b_selected;
 561     int i_header_len = 0;
 562     mtime_t i_pts = -1, i_interpolated_pts;
 563     demux_sys_t *p_ogg = p_demux->p_sys;
 564
 565     /* Sanity check */
 566     if( !p_oggpacket->bytes )
 567     {
 568         msg_Dbg( p_demux, "discarding 0 sized packet" );
 569         return;
 570     }
 571
 572     if( p_oggpacket->bytes >= 7 &&
 573         ! memcmp ( p_oggpacket->packet, "Annodex", 7 ) )
 574     {
 575         /* it's an Annodex packet -- skip it (do nothing) */
 576         return;
 577     }
 578     else if( p_oggpacket->bytes >= 7 &&
 579         ! memcmp ( p_oggpacket->packet, "AnxData", 7 ) )
 580     {
 581         /* it's an AnxData packet -- skip it (do nothing) */
 582         return;
 583     }
 584
 585     if( p_stream->fmt.i_codec == VLC_CODEC_SUBT &&
 586         p_oggpacket->packet[0] & PACKET_TYPE_BITS ) return;
 587
 588     /* Check the ES is selected */
 589     es_out_Control( p_demux->out, ES_OUT_GET_ES_STATE,
 590                     p_stream->p_es, &b_selected );
 591
 592     if( p_stream->b_force_backup )
 593     {
 594         bool b_xiph;
 595         p_stream->i_packets_backup++;
 596         switch( p_stream->fmt.i_codec )
 597         {
 598         case VLC_CODEC_VORBIS:
 599         case VLC_CODEC_SPEEX:
 600         case VLC_CODEC_THEORA:
 601             if( p_stream->i_packets_backup == 3 ) p_stream->b_force_backup = 0;
 602             b_xiph = true;
 603             break;
 604
 605         case VLC_CODEC_FLAC:
 606             if( !p_stream->fmt.audio.i_rate && p_stream->i_packets_backup == 2 )
 607             {
 608                 Ogg_ReadFlacHeader( p_demux, p_stream, p_oggpacket );
 609                 p_stream->b_force_backup = 0;
 610             }
 611             else if( p_stream->fmt.audio.i_rate )
 612             {
 613                 p_stream->b_force_backup = 0;
 614                 if( p_oggpacket->bytes >= 9 )
 615                 {
 616                     p_oggpacket->packet += 9;
 617                     p_oggpacket->bytes -= 9;
 618                 }
 619             }
 620             b_xiph = false;
 621             break;
 622
 623         case VLC_CODEC_KATE:
 624             if( p_stream->i_packets_backup == p_stream->i_kate_num_headers ) p_stream->b_force_backup = 0;
 625             b_xiph = true;
 626             break;
 627
 628         default:
 629             p_stream->b_force_backup = 0;
 630             b_xiph = false;
 631             break;
 632         }
 633
 634         /* Backup the ogg packet (likely an header packet) */
 635         if( !b_xiph )
 636         {
 637             void *p_org = p_stream->p_headers;
 638             p_stream->i_headers += p_oggpacket->bytes;
 639             p_stream->p_headers = realloc( p_stream->p_headers, p_stream->i_headers );
 640             if( p_stream->p_headers )
 641             {
 642                 memcpy( (unsigned char *)p_stream->p_headers + p_stream->i_headers - p_oggpacket->bytes,
 643                         p_oggpacket->packet, p_oggpacket->bytes );
 644             }
 645             else
 646             {
 647 #warning Memory leak
 648                 p_stream->i_headers = 0;
 649                 p_stream->p_headers = NULL;
 650                 free( p_org );
 651             }
 652         }
 653         else if( xiph_AppendHeaders( &p_stream->i_headers, &p_stream->p_headers,
 654                                      p_oggpacket->bytes, p_oggpacket->packet ) )
 655         {
 656             p_stream->i_headers = 0;
 657             p_stream->p_headers = NULL;
 658         }
 659         if( p_stream->i_headers > 0 )
 660         {
 661             if( !p_stream->b_force_backup )
 662             {
 663                 /* Last header received, commit changes */
 664                 free( p_stream->fmt.p_extra );
 665
 666                 p_stream->fmt.i_extra = p_stream->i_headers;
 667                 p_stream->fmt.p_extra = malloc( p_stream->i_headers );
 668                 if( p_stream->fmt.p_extra )
 669                     memcpy( p_stream->fmt.p_extra, p_stream->p_headers,
 670                             p_stream->i_headers );
 671                 else
 672                     p_stream->fmt.i_extra = 0;
 673
 674                 if( Ogg_LogicalStreamResetEsFormat( p_demux, p_stream ) )
 675                     es_out_Control( p_demux->out, ES_OUT_SET_ES_FMT,
 676                                     p_stream->p_es, &p_stream->fmt );
 677
 678                 if( p_stream->i_headers > 0 )
 679                     Ogg_ExtractMeta( p_demux, p_stream->fmt.i_codec,
 680                                      p_stream->p_headers, p_stream->i_headers );
 681
 682                 /* we're not at BOS anymore for this logical stream */
 683                 p_ogg->i_bos--;
 684             }
 685         }
 686
 687         b_selected = false; /* Discard the header packet */
 688     }
 689
 690     /* Convert the pcr into a pts */
 691     if( p_stream->fmt.i_codec == VLC_CODEC_VORBIS ||
 692         p_stream->fmt.i_codec == VLC_CODEC_SPEEX ||
 693         p_stream->fmt.i_codec == VLC_CODEC_FLAC )
 694     {
 695         if( p_stream->i_pcr >= 0 )
 696         {
 697             /* This is for streams where the granulepos of the header packets
 698              * doesn't match these of the data packets (eg. ogg web radios). */
 699             if( p_stream->i_previous_pcr == 0 &&
 700                 p_stream->i_pcr  > 3 * DEFAULT_PTS_DELAY )
 701             {
 702                 es_out_Control( p_demux->out, ES_OUT_RESET_PCR );
 703
 704                 /* Call the pace control */
 705                 es_out_Control( p_demux->out, ES_OUT_SET_PCR,
 706                                 VLC_TS_0 + p_stream->i_pcr );
 707             }
 708
 709             p_stream->i_previous_pcr = p_stream->i_pcr;
 710
 711             /* The granulepos is the end date of the sample */
 712             i_pts =  p_stream->i_pcr;
 713         }
 714     }
 715
 716     /* Convert the granulepos into the next pcr */
 717     i_interpolated_pts = p_stream->i_interpolated_pcr;
 718     Ogg_UpdatePCR( p_stream, p_oggpacket );
 719
 720     /* SPU streams are typically discontinuous, do not mind large gaps */
 721     if( p_stream->fmt.i_cat != SPU_ES )
 722     {
 723         if( p_stream->i_pcr >= 0 )
 724         {
 725             /* This is for streams where the granulepos of the header packets
 726              * doesn't match these of the data packets (eg. ogg web radios). */
 727             if( p_stream->i_previous_pcr == 0 &&
 728                 p_stream->i_pcr  > 3 * DEFAULT_PTS_DELAY )
 729             {
 730                 es_out_Control( p_demux->out, ES_OUT_RESET_PCR );
 731
 732                 /* Call the pace control */
 733                 es_out_Control( p_demux->out, ES_OUT_SET_PCR, VLC_TS_0 + p_stream->i_pcr );
 734             }
 735         }
 736     }
 737
 738     if( p_stream->fmt.i_codec != VLC_CODEC_VORBIS &&
 739         p_stream->fmt.i_codec != VLC_CODEC_SPEEX &&
 740         p_stream->fmt.i_codec != VLC_CODEC_FLAC &&
 741         p_stream->i_pcr >= 0 )
 742     {
 743         p_stream->i_previous_pcr = p_stream->i_pcr;
 744
 745         /* The granulepos is the start date of the sample */
 746         i_pts = p_stream->i_pcr;
 747     }
 748
 749     if( !b_selected )
 750     {
 751         /* This stream isn't currently selected so we don't need to decode it,
 752          * but we did need to store its pcr as it might be selected later on */
 753         return;
 754     }
 755
 756     if( p_oggpacket->bytes <= 0 )
 757         return;
 758
 759     if( !( p_block = block_New( p_demux, p_oggpacket->bytes ) ) ) return;
 760
 761
 762     /* may need to preroll video frames after a seek */
 763     if ( p_stream->i_skip_frames > 0 )
 764     {
 765         p_block->i_flags |= BLOCK_FLAG_PREROLL;
 766         p_stream->i_skip_frames--;
 767     }
 768
 769
 770     /* Normalize PTS */
 771     if( i_pts == 0 ) i_pts = VLC_TS_0;
 772     else if( i_pts == -1 && i_interpolated_pts == 0 ) i_pts = VLC_TS_0;
 773     else if( i_pts == -1 ) i_pts = VLC_TS_INVALID;
 774
 775     if( p_stream->fmt.i_cat == AUDIO_ES )
 776         p_block->i_dts = p_block->i_pts = i_pts;
 777     else if( p_stream->fmt.i_cat == SPU_ES )
 778     {
 779         p_block->i_dts = p_block->i_pts = i_pts;
 780         p_block->i_length = 0;
 781     }
 782     else if( p_stream->fmt.i_codec == VLC_CODEC_THEORA )
 783     {
 784         p_block->i_dts = p_block->i_pts = i_pts;
 785         if( (p_oggpacket->granulepos & ((1<<p_stream->i_granule_shift)-1)) == 0 )
 786         {
 787             p_block->i_flags |= BLOCK_FLAG_TYPE_I;
 788         }
 789     }
 790     else if( p_stream->fmt.i_codec == VLC_CODEC_DIRAC )
 791     {
 792         ogg_int64_t dts = p_oggpacket->granulepos >> 31;
 793         ogg_int64_t delay = (p_oggpacket->granulepos >> 9) & 0x1fff;
 794
 795         uint64_t u_pnum = dts + delay;
 796
 797         p_block->i_dts = p_stream->i_pcr;
 798         p_block->i_pts = VLC_TS_INVALID;
 799         /* NB, OggDirac granulepos values are in units of 2*picturerate */
 800
 801         /* granulepos for dirac is possibly broken, this value should be ignored */
 802         if( -1 != p_oggpacket->granulepos )
 803             p_block->i_pts = u_pnum * INT64_C(1000000) / p_stream->f_rate / 2;
 804     }
 805     else
 806     {
 807         p_block->i_dts = i_pts;
 808         p_block->i_pts = VLC_TS_INVALID;
 809     }
 810
 811     if( p_stream->fmt.i_codec != VLC_CODEC_VORBIS &&
 812         p_stream->fmt.i_codec != VLC_CODEC_SPEEX &&
 813         p_stream->fmt.i_codec != VLC_CODEC_FLAC &&
 814         p_stream->fmt.i_codec != VLC_CODEC_TARKIN &&
 815         p_stream->fmt.i_codec != VLC_CODEC_THEORA &&
 816         p_stream->fmt.i_codec != VLC_CODEC_CMML &&
 817         p_stream->fmt.i_codec != VLC_CODEC_DIRAC &&
 818         p_stream->fmt.i_codec != VLC_CODEC_KATE )
 819     {
 820         /* We remove the header from the packet */
 821         i_header_len = (*p_oggpacket->packet & PACKET_LEN_BITS01) >> 6;
 822         i_header_len |= (*p_oggpacket->packet & PACKET_LEN_BITS2) << 1;
 823
 824         if( p_stream->fmt.i_codec == VLC_CODEC_SUBT)
 825         {
 826             /* But with subtitles we need to retrieve the duration first */
 827             int i, lenbytes = 0;
 828
 829             if( i_header_len > 0 && p_oggpacket->bytes >= i_header_len + 1 )
 830             {
 831                 for( i = 0, lenbytes = 0; i < i_header_len; i++ )
 832                 {
 833                     lenbytes = lenbytes << 8;
 834                     lenbytes += *(p_oggpacket->packet + i_header_len - i);
 835                 }
 836             }
 837             if( p_oggpacket->bytes - 1 - i_header_len > 2 ||
 838                 ( p_oggpacket->packet[i_header_len + 1] != ' ' &&
 839                   p_oggpacket->packet[i_header_len + 1] != 0 &&
 840                   p_oggpacket->packet[i_header_len + 1] != '\n' &&
 841                   p_oggpacket->packet[i_header_len + 1] != '\r' ) )
 842             {
 843                 p_block->i_length = (mtime_t)lenbytes * 1000;
 844             }
 845         }
 846
 847         i_header_len++;
 848         if( p_block->i_buffer >= (unsigned int)i_header_len )
 849             p_block->i_buffer -= i_header_len;
 850         else
 851             p_block->i_buffer = 0;
 852     }
 853
 854     if( p_stream->fmt.i_codec == VLC_CODEC_TARKIN )
 855     {
 856         /* FIXME: the biggest hack I've ever done */
 857         msg_Warn( p_demux, "tarkin pts: %"PRId64", granule: %"PRId64,
 858                   p_block->i_pts, p_block->i_dts );
 859         msleep(10000);
 860     }
 861
 862     memcpy( p_block->p_buffer, p_oggpacket->packet + i_header_len,
 863             p_oggpacket->bytes - i_header_len );
 864
 865     es_out_Send( p_demux->out, p_stream->p_es, p_block );
 866 }
 867
 868 /****************************************************************************
 869  * Ogg_FindLogicalStreams: Find the logical streams embedded in the physical
 870  *                         stream and fill p_ogg.
 871  *****************************************************************************
 872  * The initial page of a logical stream is marked as a 'bos' page.
 873  * Furthermore, the Ogg specification mandates that grouped bitstreams begin
 874  * together and all of the initial pages must appear before any data pages.
 875  *
 876  * On success this function returns VLC_SUCCESS.
 877  ****************************************************************************/
 878 static int Ogg_FindLogicalStreams( demux_t *p_demux )
 879 {
 880     demux_sys_t *p_ogg = p_demux->p_sys  ;
 881     ogg_packet oggpacket;
 882     int i_stream;
 883
 884     p_ogg->i_total_length = stream_Size ( p_demux->s );
 885     msg_Dbg( p_demux, "File length is %"PRId64" bytes", p_ogg->i_total_length );
 886
 887
 888     while( Ogg_ReadPage( p_demux, &p_ogg->current_page ) == VLC_SUCCESS )
 889     {
 890
 891         if( ogg_page_bos( &p_ogg->current_page ) )
 892         {
 893
 894             /* All is wonderful in our fine fine little world.
 895              * We found the beginning of our first logical stream. */
 896             while( ogg_page_bos( &p_ogg->current_page ) )
 897             {
 898                 logical_stream_t *p_stream;
 899
 900                 p_stream = malloc( sizeof(logical_stream_t) );
 901                 if( !p_stream )
 902                     return VLC_ENOMEM;
 903
 904                 TAB_APPEND( p_ogg->i_streams, p_ogg->pp_stream, p_stream );
 905
 906                 memset( p_stream, 0, sizeof(logical_stream_t) );
 907                 p_stream->p_headers = 0;
 908                 p_stream->i_secondary_header_packets = 0;
 909
 910                 p_stream->i_keyframe_offset = 0;
 911                 p_stream->i_skip_frames = 0;
 912
 913                 p_stream->i_data_start = 0;
 914
 915                 es_format_Init( &p_stream->fmt, 0, 0 );
 916                 es_format_Init( &p_stream->fmt_old, 0, 0 );
 917
 918                 /* Setup the logical stream */
 919                 p_stream->i_serial_no = ogg_page_serialno( &p_ogg->current_page );
 920                 ogg_stream_init( &p_stream->os, p_stream->i_serial_no );
 921
 922                 /* Extract the initial header from the first page and verify
 923                  * the codec type of this Ogg bitstream */
 924                 if( ogg_stream_pagein( &p_stream->os, &p_ogg->current_page ) < 0 )
 925                 {
 926                     /* error. stream version mismatch perhaps */
 927                     msg_Err( p_demux, "error reading first page of "
 928                              "Ogg bitstream data" );
 929                     return VLC_EGENERIC;
 930                 }
 931
 932                 /* FIXME: check return value */
 933                 ogg_stream_packetpeek( &p_stream->os, &oggpacket );
 934
 935                 /* Check for Vorbis header */
 936                 if( oggpacket.bytes >= 7 &&
 937                     ! memcmp( oggpacket.packet, "\x01vorbis", 7 ) )
 938                 {
 939                     Ogg_ReadVorbisHeader( p_stream, &oggpacket );
 940                     msg_Dbg( p_demux, "found vorbis header" );
 941                 }
 942                 /* Check for Speex header */
 943                 else if( oggpacket.bytes >= 5 &&
 944                     ! memcmp( oggpacket.packet, "Speex", 5 ) )
 945                 {
 946                     Ogg_ReadSpeexHeader( p_stream, &oggpacket );
 947                     msg_Dbg( p_demux, "found speex header, channels: %i, "
 948                              "rate: %i,  bitrate: %i",
 949                              p_stream->fmt.audio.i_channels,
 950                              (int)p_stream->f_rate, p_stream->fmt.i_bitrate );
 951                 }
 952                 /* Check for Flac header (< version 1.1.1) */
 953                 else if( oggpacket.bytes >= 4 &&
 954                     ! memcmp( oggpacket.packet, "fLaC", 4 ) )
 955                 {
 956                     msg_Dbg( p_demux, "found FLAC header" );
 957
 958                     /* Grrrr!!!! Did they really have to put all the
 959                      * important info in the second header packet!!!
 960                      * (STREAMINFO metadata is in the following packet) */
 961                     p_stream->b_force_backup = 1;
 962
 963                     p_stream->fmt.i_cat = AUDIO_ES;
 964                     p_stream->fmt.i_codec = VLC_CODEC_FLAC;
 965                 }
 966                 /* Check for Flac header (>= version 1.1.1) */
 967                 else if( oggpacket.bytes >= 13 && oggpacket.packet[0] ==0x7F &&
 968                     ! memcmp( &oggpacket.packet[1], "FLAC", 4 ) &&
 969                     ! memcmp( &oggpacket.packet[9], "fLaC", 4 ) )
 970                 {
 971                     int i_packets = ((int)oggpacket.packet[7]) << 8 |
 972                         oggpacket.packet[8];
 973                     msg_Dbg( p_demux, "found FLAC header version %i.%i "
 974                              "(%i header packets)",
 975                              oggpacket.packet[5], oggpacket.packet[6],
 976                              i_packets );
 977
 978                     p_stream->b_force_backup = 1;
 979
 980                     p_stream->fmt.i_cat = AUDIO_ES;
 981                     p_stream->fmt.i_codec = VLC_CODEC_FLAC;
 982                     oggpacket.packet += 13; oggpacket.bytes -= 13;
 983                     Ogg_ReadFlacHeader( p_demux, p_stream, &oggpacket );
 984                 }
 985                 /* Check for Theora header */
 986                 else if( oggpacket.bytes >= 7 &&
 987                          ! memcmp( oggpacket.packet, "\x80theora", 7 ) )
 988                 {
 989                     Ogg_ReadTheoraHeader( p_stream, &oggpacket );
 990
 991                     msg_Dbg( p_demux,
 992                              "found theora header, bitrate: %i, rate: %f",
 993                              p_stream->fmt.i_bitrate, p_stream->f_rate );
 994                 }
 995                 /* Check for Dirac header */
 996                 else if( ( oggpacket.bytes >= 5 &&
 997                            ! memcmp( oggpacket.packet, "BBCD\x00", 5 ) ) ||
 998                          ( oggpacket.bytes >= 9 &&
 999                            ! memcmp( oggpacket.packet, "KW-DIRAC\x00", 9 ) ) )
1000                 {
1001                     if( Ogg_ReadDiracHeader( p_stream, &oggpacket ) )
1002                         msg_Dbg( p_demux, "found dirac header" );
1003                     else
1004                     {
1005                         msg_Warn( p_demux, "found dirac header isn't decodable" );
1006                         free( p_stream );
1007                         p_ogg->i_streams--;
1008                     }
1009                 }
1010                 /* Check for Tarkin header */
1011                 else if( oggpacket.bytes >= 7 &&
1012                          ! memcmp( &oggpacket.packet[1], "tarkin", 6 ) )
1013                 {
1014                     oggpack_buffer opb;
1015
1016                     msg_Dbg( p_demux, "found tarkin header" );
1017                     p_stream->fmt.i_cat = VIDEO_ES;
1018                     p_stream->fmt.i_codec = VLC_CODEC_TARKIN;
1019
1020                     /* Cheat and get additionnal info ;) */
1021                     oggpack_readinit( &opb, oggpacket.packet, oggpacket.bytes);
1022                     oggpack_adv( &opb, 88 );
1023                     oggpack_adv( &opb, 104 );
1024                     p_stream->fmt.i_bitrate = oggpack_read( &opb, 32 );
1025                     p_stream->f_rate = 2; /* FIXME */
1026                     msg_Dbg( p_demux,
1027                              "found tarkin header, bitrate: %i, rate: %f",
1028                              p_stream->fmt.i_bitrate, p_stream->f_rate );
1029                 }
1030                 /* Check for Annodex header */
1031                 else if( oggpacket.bytes >= 7 &&
1032                          ! memcmp( oggpacket.packet, "Annodex", 7 ) )
1033                 {
1034                     Ogg_ReadAnnodexHeader( VLC_OBJECT(p_demux), p_stream,
1035                                            &oggpacket );
1036                     /* kill annodex track */
1037                     free( p_stream );
1038                     p_ogg->i_streams--;
1039                 }
1040                 /* Check for Annodex header */
1041                 else if( oggpacket.bytes >= 7 &&
1042                          ! memcmp( oggpacket.packet, "AnxData", 7 ) )
1043                 {
1044                     Ogg_ReadAnnodexHeader( VLC_OBJECT(p_demux), p_stream,
1045                                            &oggpacket );
1046                 }
1047                 /* Check for Kate header */
1048                 else if( oggpacket.bytes >= 8 &&
1049                     ! memcmp( &oggpacket.packet[1], "kate\0\0\0", 7 ) )
1050                 {
1051                     Ogg_ReadKateHeader( p_stream, &oggpacket );
1052                     msg_Dbg( p_demux, "found kate header" );
1053                 }
1054                 else if( oggpacket.bytes >= 142 &&
1055                          !memcmp( &oggpacket.packet[1],
1056                                    "Direct Show Samples embedded in Ogg", 35 ))
1057                 {
1058                     /* Old header type */
1059
1060                     /* Check for video header (old format) */
1061                     if( GetDWLE((oggpacket.packet+96)) == 0x05589f80 &&
1062                         oggpacket.bytes >= 184 )
1063                     {
1064                         p_stream->fmt.i_cat = VIDEO_ES;
1065                         p_stream->fmt.i_codec =
1066                             VLC_FOURCC( oggpacket.packet[68],
1067                                         oggpacket.packet[69],
1068                                         oggpacket.packet[70],
1069                                         oggpacket.packet[71] );
1070                         msg_Dbg( p_demux, "found video header of type: %.4s",
1071                                  (char *)&p_stream->fmt.i_codec );
1072
1073                         p_stream->fmt.video.i_frame_rate = 10000000;
1074                         p_stream->fmt.video.i_frame_rate_base =
1075                             GetQWLE((oggpacket.packet+164));
1076                         p_stream->f_rate = 10000000.0 /
1077                             GetQWLE((oggpacket.packet+164));
1078                         p_stream->fmt.video.i_bits_per_pixel =
1079                             GetWLE((oggpacket.packet+182));
1080                         if( !p_stream->fmt.video.i_bits_per_pixel )
1081                             /* hack, FIXME */
1082                             p_stream->fmt.video.i_bits_per_pixel = 24;
1083                         p_stream->fmt.video.i_width =
1084                             GetDWLE((oggpacket.packet+176));
1085                         p_stream->fmt.video.i_height =
1086                             GetDWLE((oggpacket.packet+180));
1087
1088                         msg_Dbg( p_demux,
1089                                  "fps: %f, width:%i; height:%i, bitcount:%i",
1090                                  p_stream->f_rate,
1091                                  p_stream->fmt.video.i_width,
1092                                  p_stream->fmt.video.i_height,
1093                                  p_stream->fmt.video.i_bits_per_pixel);
1094
1095                     }
1096                     /* Check for audio header (old format) */
1097                     else if( GetDWLE((oggpacket.packet+96)) == 0x05589F81 )
1098                     {
1099                         int i_extra_size;
1100                         unsigned int i_format_tag;
1101
1102                         p_stream->fmt.i_cat = AUDIO_ES;
1103
1104                         i_extra_size = GetWLE((oggpacket.packet+140));
1105                         if( i_extra_size > 0 && i_extra_size < oggpacket.bytes - 142 )
1106                         {
1107                             p_stream->fmt.i_extra = i_extra_size;
1108                             p_stream->fmt.p_extra = malloc( i_extra_size );
1109                             if( p_stream->fmt.p_extra )
1110                                 memcpy( p_stream->fmt.p_extra,
1111                                         oggpacket.packet + 142, i_extra_size );
1112                             else
1113                                 p_stream->fmt.i_extra = 0;
1114                         }
1115
1116                         i_format_tag = GetWLE((oggpacket.packet+124));
1117                         p_stream->fmt.audio.i_channels =
1118                             GetWLE((oggpacket.packet+126));
1119                         p_stream->f_rate = p_stream->fmt.audio.i_rate =
1120                             GetDWLE((oggpacket.packet+128));
1121                         p_stream->fmt.i_bitrate =
1122                             GetDWLE((oggpacket.packet+132)) * 8;
1123                         p_stream->fmt.audio.i_blockalign =
1124                             GetWLE((oggpacket.packet+136));
1125                         p_stream->fmt.audio.i_bitspersample =
1126                             GetWLE((oggpacket.packet+138));
1127
1128                         wf_tag_to_fourcc( i_format_tag,
1129                                           &p_stream->fmt.i_codec, 0 );
1130
1131                         if( p_stream->fmt.i_codec ==
1132                             VLC_FOURCC('u','n','d','f') )
1133                         {
1134                             p_stream->fmt.i_codec = VLC_FOURCC( 'm', 's',
1135                                 ( i_format_tag >> 8 ) & 0xff,
1136                                 i_format_tag & 0xff );
1137                         }
1138
1139                         msg_Dbg( p_demux, "found audio header of type: %.4s",
1140                                  (char *)&p_stream->fmt.i_codec );
1141                         msg_Dbg( p_demux, "audio:0x%4.4x channels:%d %dHz "
1142                                  "%dbits/sample %dkb/s",
1143                                  i_format_tag,
1144                                  p_stream->fmt.audio.i_channels,
1145                                  p_stream->fmt.audio.i_rate,
1146                                  p_stream->fmt.audio.i_bitspersample,
1147                                  p_stream->fmt.i_bitrate / 1024 );
1148
1149                     }
1150                     else
1151                     {
1152                         msg_Dbg( p_demux, "stream %d has an old header "
1153                             "but is of an unknown type", p_ogg->i_streams-1 );
1154                         free( p_stream );
1155                         p_ogg->i_streams--;
1156                     }
1157                 }
1158                 else if( (*oggpacket.packet & PACKET_TYPE_BITS ) == PACKET_TYPE_HEADER &&
1159                          oggpacket.bytes >= 44+1 )
1160                 {
1161                     stream_header_t tmp;
1162                     stream_header_t *st = &tmp;
1163
1164                     memcpy( st->streamtype, &oggpacket.packet[1+0], 8 );
1165                     memcpy( st->subtype, &oggpacket.packet[1+8], 4 );
1166                     st->size = GetDWLE( &oggpacket.packet[1+12] );
1167                     st->time_unit = GetQWLE( &oggpacket.packet[1+16] );
1168                     st->samples_per_unit = GetQWLE( &oggpacket.packet[1+24] );
1169                     st->default_len = GetDWLE( &oggpacket.packet[1+32] );
1170                     st->buffersize = GetDWLE( &oggpacket.packet[1+36] );
1171                     st->bits_per_sample = GetWLE( &oggpacket.packet[1+40] ); // (padding 2)
1172
1173                     /* Check for video header (new format) */
1174                     if( !strncmp( st->streamtype, "video", 5 ) &&
1175                         oggpacket.bytes >= 52+1 )
1176                     {
1177                         st->sh.video.width = GetDWLE( &oggpacket.packet[1+44] );
1178                         st->sh.video.height = GetDWLE( &oggpacket.packet[1+48] );
1179
1180                         p_stream->fmt.i_cat = VIDEO_ES;
1181
1182                         /* We need to get rid of the header packet */
1183                         ogg_stream_packetout( &p_stream->os, &oggpacket );
1184
1185                         p_stream->fmt.i_codec =
1186                             VLC_FOURCC( st->subtype[0], st->subtype[1],
1187                                         st->subtype[2], st->subtype[3] );
1188                         msg_Dbg( p_demux, "found video header of type: %.4s",
1189                                  (char *)&p_stream->fmt.i_codec );
1190
1191                         p_stream->fmt.video.i_frame_rate = 10000000;
1192                         p_stream->fmt.video.i_frame_rate_base = st->time_unit;
1193                         if( st->time_unit <= 0 )
1194                             st->time_unit = 400000;
1195                         p_stream->f_rate = 10000000.0 / st->time_unit;
1196                         p_stream->fmt.video.i_bits_per_pixel = st->bits_per_sample;
1197                         p_stream->fmt.video.i_width = st->sh.video.width;
1198                         p_stream->fmt.video.i_height = st->sh.video.height;
1199
1200                         msg_Dbg( p_demux,
1201                                  "fps: %f, width:%i; height:%i, bitcount:%i",
1202                                  p_stream->f_rate,
1203                                  p_stream->fmt.video.i_width,
1204                                  p_stream->fmt.video.i_height,
1205                                  p_stream->fmt.video.i_bits_per_pixel );
1206                     }
1207                     /* Check for audio header (new format) */
1208                     else if( !strncmp( st->streamtype, "audio", 5 ) &&
1209                              oggpacket.bytes >= 56+1 )
1210                     {
1211                         char p_buffer[5];
1212                         int i_extra_size;
1213                         int i_format_tag;
1214
1215                         st->sh.audio.channels = GetWLE( &oggpacket.packet[1+44] );
1216                         st->sh.audio.blockalign = GetWLE( &oggpacket.packet[1+48] );
1217                         st->sh.audio.avgbytespersec = GetDWLE( &oggpacket.packet[1+52] );
1218
1219                         p_stream->fmt.i_cat = AUDIO_ES;
1220
1221                         /* We need to get rid of the header packet */
1222                         ogg_stream_packetout( &p_stream->os, &oggpacket );
1223
1224                         i_extra_size = st->size - 56;
1225
1226                         if( i_extra_size > 0 &&
1227                             i_extra_size < oggpacket.bytes - 1 - 56 )
1228                         {
1229                             p_stream->fmt.i_extra = i_extra_size;
1230                             p_stream->fmt.p_extra = malloc( p_stream->fmt.i_extra );
1231                             if( p_stream->fmt.p_extra )
1232                                 memcpy( p_stream->fmt.p_extra, st + 1,
1233                                         p_stream->fmt.i_extra );
1234                             else
1235                                 p_stream->fmt.i_extra = 0;
1236                         }
1237
1238                         memcpy( p_buffer, st->subtype, 4 );
1239                         p_buffer[4] = '\0';
1240                         i_format_tag = strtol(p_buffer,NULL,16);
1241                         p_stream->fmt.audio.i_channels = st->sh.audio.channels;
1242                         if( st->time_unit <= 0 )
1243                             st->time_unit = 10000000;
1244                         p_stream->f_rate = p_stream->fmt.audio.i_rate = st->samples_per_unit * 10000000 / st->time_unit;
1245                         p_stream->fmt.i_bitrate = st->sh.audio.avgbytespersec * 8;
1246                         p_stream->fmt.audio.i_blockalign = st->sh.audio.blockalign;
1247                         p_stream->fmt.audio.i_bitspersample = st->bits_per_sample;
1248
1249                         wf_tag_to_fourcc( i_format_tag,
1250                                           &p_stream->fmt.i_codec, 0 );
1251
1252                         if( p_stream->fmt.i_codec ==
1253                             VLC_FOURCC('u','n','d','f') )
1254                         {
1255                             p_stream->fmt.i_codec = VLC_FOURCC( 'm', 's',
1256                                 ( i_format_tag >> 8 ) & 0xff,
1257                                 i_format_tag & 0xff );
1258                         }
1259
1260                         msg_Dbg( p_demux, "found audio header of type: %.4s",
1261                                  (char *)&p_stream->fmt.i_codec );
1262                         msg_Dbg( p_demux, "audio:0x%4.4x channels:%d %dHz "
1263                                  "%dbits/sample %dkb/s",
1264                                  i_format_tag,
1265                                  p_stream->fmt.audio.i_channels,
1266                                  p_stream->fmt.audio.i_rate,
1267                                  p_stream->fmt.audio.i_bitspersample,
1268                                  p_stream->fmt.i_bitrate / 1024 );
1269                     }
1270                     /* Check for text (subtitles) header */
1271                     else if( !strncmp(st->streamtype, "text", 4) )
1272                     {
1273                         /* We need to get rid of the header packet */
1274                         ogg_stream_packetout( &p_stream->os, &oggpacket );
1275
1276                         msg_Dbg( p_demux, "found text subtitles header" );
1277                         p_stream->fmt.i_cat = SPU_ES;
1278                         p_stream->fmt.i_codec = VLC_CODEC_SUBT;
1279                         p_stream->f_rate = 1000; /* granulepos is in millisec */
1280                     }
1281                     else
1282                     {
1283                         msg_Dbg( p_demux, "stream %d has a header marker "
1284                             "but is of an unknown type", p_ogg->i_streams-1 );
1285                         free( p_stream );
1286                         p_ogg->i_streams--;
1287                     }
1288                 }
1289                 else if( oggpacket.bytes >= 7 &&
1290                              ! memcmp( oggpacket.packet, "fishead", 7 ) )
1291
1292                 {
1293                     /* Skeleton */
1294                     msg_Dbg( p_demux, "stream %d is a skeleton",
1295                                 p_ogg->i_streams-1 );
1296                     /* FIXME: https://trac.videolan.org/vlc/ticket/1412 */
1297                 }
1298                 else
1299                 {
1300                     msg_Dbg( p_demux, "stream %d is of unknown type",
1301                              p_ogg->i_streams-1 );
1302                     free( p_stream );
1303                     p_ogg->i_streams--;
1304                 }
1305
1306                 if( Ogg_ReadPage( p_demux, &p_ogg->current_page ) != VLC_SUCCESS )
1307                     return VLC_EGENERIC;
1308             }
1309
1310             /* we'll need to get all headers for all of those streams
1311                that we have to backup headers for */
1312             p_ogg->i_bos = 0;
1313             for( i_stream = 0; i_stream < p_ogg->i_streams; i_stream++ )
1314             {
1315                 if( p_ogg->pp_stream[i_stream]->b_force_backup )
1316                     p_ogg->i_bos++;
1317             }
1318
1319
1320             /* This is the first data page, which means we are now finished
1321              * with the initial pages. We just need to store it in the relevant
1322              * bitstream. */
1323             for( i_stream = 0; i_stream < p_ogg->i_streams; i_stream++ )
1324             {
1325                 if( ogg_stream_pagein( &p_ogg->pp_stream[i_stream]->os,
1326                                        &p_ogg->current_page ) == 0 )
1327                 {
1328                     p_ogg->b_page_waiting = true;
1329                     break;
1330                 }
1331             }
1332
1333             return VLC_SUCCESS;
1334         }
1335     }
1336
1337     return VLC_EGENERIC;
1338 }
1339
1340 /****************************************************************************
1341  * Ogg_BeginningOfStream: Look for Beginning of Stream ogg pages and add
1342  *                        Elementary streams.
1343  ****************************************************************************/
1344 static int Ogg_BeginningOfStream( demux_t *p_demux )
1345 {
1346     demux_sys_t *p_ogg = p_demux->p_sys  ;
1347     logical_stream_t *p_old_stream = p_ogg->p_old_stream;
1348     int i_stream;
1349
1350     /* Find the logical streams embedded in the physical stream and
1351      * initialize our p_ogg structure. */
1352     if( Ogg_FindLogicalStreams( p_demux ) != VLC_SUCCESS )
1353     {
1354         msg_Warn( p_demux, "couldn't find any ogg logical stream" );
1355         return VLC_EGENERIC;
1356     }
1357
1358     p_ogg->i_bitrate = 0;
1359
1360     for( i_stream = 0 ; i_stream < p_ogg->i_streams; i_stream++ )
1361     {
1362         logical_stream_t *p_stream = p_ogg->pp_stream[i_stream];
1363
1364         p_stream->p_es = NULL;
1365
1366         /* initialise kframe index */
1367         p_stream->idx=NULL;
1368
1369         /* Try first to reuse an old ES */
1370         if( p_old_stream &&
1371             p_old_stream->fmt.i_cat == p_stream->fmt.i_cat &&
1372             p_old_stream->fmt.i_codec == p_stream->fmt.i_codec )
1373         {
1374             msg_Dbg( p_demux, "will reuse old stream to avoid glitch" );
1375
1376             p_stream->p_es = p_old_stream->p_es;
1377             es_format_Copy( &p_stream->fmt_old, &p_old_stream->fmt );
1378
1379             p_old_stream->p_es = NULL;
1380             p_old_stream = NULL;
1381         }
1382
1383         if( !p_stream->p_es )
1384         {
1385             /* Better be safe than sorry when possible with ogm */
1386             if( p_stream->fmt.i_codec == VLC_CODEC_MPGA ||
1387                 p_stream->fmt.i_codec == VLC_CODEC_A52 )
1388                 p_stream->fmt.b_packetized = false;
1389
1390             p_stream->p_es = es_out_Add( p_demux->out, &p_stream->fmt );
1391         }
1392
1393         // TODO: something to do here ?
1394         if( p_stream->fmt.i_codec == VLC_CODEC_CMML )
1395         {
1396             /* Set the CMML stream active */
1397             es_out_Control( p_demux->out, ES_OUT_SET_ES, p_stream->p_es );
1398         }
1399
1400         p_ogg->i_bitrate += p_stream->fmt.i_bitrate;
1401
1402         p_stream->i_pcr = p_stream->i_previous_pcr =
1403             p_stream->i_interpolated_pcr = -1;
1404         p_stream->b_reinit = false;
1405     }
1406
1407     if( p_ogg->p_old_stream )
1408     {
1409         if( p_ogg->p_old_stream->p_es )
1410             msg_Dbg( p_demux, "old stream not reused" );
1411         Ogg_LogicalStreamDelete( p_demux, p_ogg->p_old_stream );
1412         p_ogg->p_old_stream = NULL;
1413     }
1414
1415
1416     /* get total frame count for video stream; we will need this for seeking */
1417     p_ogg->i_total_frames = 0;
1418
1419     return VLC_SUCCESS;
1420 }
1421
1422 /****************************************************************************
1423  * Ogg_EndOfStream: clean up the ES when an End of Stream is detected.
1424  ****************************************************************************/
1425 static void Ogg_EndOfStream( demux_t *p_demux )
1426 {
1427     demux_sys_t *p_ogg = p_demux->p_sys  ;
1428     int i_stream;
1429
1430     for( i_stream = 0 ; i_stream < p_ogg->i_streams; i_stream++ )
1431         Ogg_LogicalStreamDelete( p_demux, p_ogg->pp_stream[i_stream] );
1432     free( p_ogg->pp_stream );
1433
1434     /* Reinit p_ogg */
1435     p_ogg->i_bitrate = 0;
1436     p_ogg->i_streams = 0;
1437     p_ogg->pp_stream = NULL;
1438
1439     /* */
1440     if( p_ogg->p_meta )
1441         vlc_meta_Delete( p_ogg->p_meta );
1442     p_ogg->p_meta = NULL;
1443 }
1444
1445 /**
1446  * This function delete and release all data associated to a logical_stream_t
1447  */
1448 static void Ogg_LogicalStreamDelete( demux_t *p_demux, logical_stream_t *p_stream )
1449 {
1450     if( p_stream->p_es )
1451         es_out_Del( p_demux->out, p_stream->p_es );
1452
1453     ogg_stream_clear( &p_stream->os );
1454     free( p_stream->p_headers );
1455
1456     es_format_Clean( &p_stream->fmt_old );
1457     es_format_Clean( &p_stream->fmt );
1458
1459     if ( p_stream->idx != NULL)
1460     {
1461         oggseek_index_entries_free( p_stream->idx );
1462     }
1463
1464     free( p_stream );
1465 }
1466 /**
1467  * This function check if a we need to reset a decoder in case we are
1468  * reusing an old ES
1469  */
1470 static bool Ogg_IsVorbisFormatCompatible( const es_format_t *p_new, const es_format_t *p_old )
1471 {
1472     unsigned pi_new_size[XIPH_MAX_HEADER_COUNT];
1473     void     *pp_new_data[XIPH_MAX_HEADER_COUNT];
1474     unsigned i_new_count;
1475     if( xiph_SplitHeaders(pi_new_size, pp_new_data, &i_new_count, p_new->i_extra, p_new->p_extra ) )
1476         i_new_count = 0;
1477
1478     unsigned pi_old_size[XIPH_MAX_HEADER_COUNT];
1479     void     *pp_old_data[XIPH_MAX_HEADER_COUNT];
1480     unsigned i_old_count;
1481     if( xiph_SplitHeaders(pi_old_size, pp_old_data, &i_old_count, p_old->i_extra, p_old->p_extra ) )
1482         i_old_count = 0;
1483
1484     bool b_match = i_new_count == i_old_count;
1485     for( unsigned i = 0; i < i_new_count && b_match; i++ )
1486     {
1487         /* Ignore vorbis comment */
1488         if( i == 1 )
1489             continue;
1490         if( pi_new_size[i] != pi_old_size[i] ||
1491             memcmp( pp_new_data[i], pp_old_data[i], pi_new_size[i] ) )
1492             b_match = false;
1493     }
1494
1495     for( unsigned i = 0; i < i_new_count; i++ )
1496         free( pp_new_data[i] );
1497     for( unsigned i = 0; i < i_old_count; i++ )
1498         free( pp_old_data[i] );
1499     return b_match;
1500 }
1501 static bool Ogg_LogicalStreamResetEsFormat( demux_t *p_demux, logical_stream_t *p_stream )
1502 {
1503     bool b_compatible = false;
1504     if( !p_stream->fmt_old.i_cat || !p_stream->fmt_old.i_codec )
1505         return true;
1506
1507     /* Only vorbis is supported */
1508     if( p_stream->fmt.i_codec == VLC_CODEC_VORBIS )
1509         b_compatible = Ogg_IsVorbisFormatCompatible( &p_stream->fmt, &p_stream->fmt_old );
1510
1511     if( !b_compatible )
1512         msg_Warn( p_demux, "cannot reuse old stream, resetting the decoder" );
1513
1514     return !b_compatible;
1515 }
1516 static void Ogg_ExtractXiphMeta( demux_t *p_demux, const void *p_headers, unsigned i_headers, unsigned i_skip )
1517 {
1518     demux_sys_t *p_ogg = p_demux->p_sys;
1519
1520     unsigned pi_size[XIPH_MAX_HEADER_COUNT];
1521     void     *pp_data[XIPH_MAX_HEADER_COUNT];
1522     unsigned i_count;
1523     if( xiph_SplitHeaders( pi_size, pp_data, &i_count, i_headers, p_headers ) )
1524         return;
1525
1526     /* TODO how to handle multiple comments properly ? */
1527     if( i_count >= 2 && pi_size[1] > i_skip )
1528         vorbis_ParseComment( &p_ogg->p_meta, (uint8_t*)pp_data[1] + i_skip, pi_size[1] - i_skip,
1529                              &p_ogg->i_attachments, &p_ogg->attachments );
1530
1531     for( unsigned i = 0; i < i_count; i++ )
1532         free( pp_data[i] );
1533 }
1534 static void Ogg_ExtractMeta( demux_t *p_demux, vlc_fourcc_t i_codec, const uint8_t *p_headers, int i_headers )
1535 {
1536     demux_sys_t *p_ogg = p_demux->p_sys;
1537
1538     switch( i_codec )
1539     {
1540     /* 3 headers with the 2° one being the comments */
1541     case VLC_CODEC_VORBIS:
1542         Ogg_ExtractXiphMeta( p_demux, p_headers, i_headers, 1+6 );
1543         break;
1544     case VLC_CODEC_THEORA:
1545         Ogg_ExtractXiphMeta( p_demux, p_headers, i_headers, 1+6 );
1546         break;
1547     case VLC_CODEC_SPEEX:
1548         Ogg_ExtractXiphMeta( p_demux, p_headers, i_headers, 0 );
1549         break;
1550
1551     /* N headers with the 2° one being the comments */
1552     case VLC_CODEC_KATE:
1553         /* 1 byte for header type, 7 bytes for magic, 1 reserved zero byte */
1554         Ogg_ExtractXiphMeta( p_demux, p_headers, i_headers, 1+7+1 );
1555         break;
1556
1557     /* TODO */
1558     case VLC_CODEC_FLAC:
1559         msg_Warn( p_demux, "Ogg_ExtractMeta does not support %4.4s", (const char*)&i_codec );
1560         break;
1561
1562     /* No meta data */
1563     case VLC_CODEC_CMML: /* CMML is XML text, doesn't have Vorbis comments */
1564     case VLC_CODEC_DIRAC:
1565     default:
1566         break;
1567     }
1568     if( p_ogg->p_meta )
1569         p_demux->info.i_update |= INPUT_UPDATE_META;
1570 }
1571
1572 static void Ogg_ReadTheoraHeader( logical_stream_t *p_stream,
1573                                   ogg_packet *p_oggpacket )
1574 {
1575     bs_t bitstream;
1576     int i_fps_numerator;
1577     int i_fps_denominator;
1578     int i_keyframe_frequency_force;
1579     int i_major;
1580     int i_minor;
1581     int i_subminor;
1582     int i_version;
1583
1584     p_stream->fmt.i_cat = VIDEO_ES;
1585     p_stream->fmt.i_codec = VLC_CODEC_THEORA;
1586
1587     /* Signal that we want to keep a backup of the theora
1588      * stream headers. They will be used when switching between
1589      * audio streams. */
1590     p_stream->b_force_backup = 1;
1591
1592     /* Cheat and get additionnal info ;) */
1593     bs_init( &bitstream, p_oggpacket->packet, p_oggpacket->bytes );
1594     bs_skip( &bitstream, 56 );
1595
1596     i_major = bs_read( &bitstream, 8 ); /* major version num */
1597     i_minor = bs_read( &bitstream, 8 ); /* minor version num */
1598     i_subminor = bs_read( &bitstream, 8 ); /* subminor version num */
1599
1600     bs_read( &bitstream, 16 ) /*<< 4*/; /* width */
1601     bs_read( &bitstream, 16 ) /*<< 4*/; /* height */
1602     bs_read( &bitstream, 24 ); /* frame width */
1603     bs_read( &bitstream, 24 ); /* frame height */
1604     bs_read( &bitstream, 8 ); /* x offset */
1605     bs_read( &bitstream, 8 ); /* y offset */
1606
1607     i_fps_numerator = bs_read( &bitstream, 32 );
1608     i_fps_denominator = bs_read( &bitstream, 32 );
1609     bs_read( &bitstream, 24 ); /* aspect_numerator */
1610     bs_read( &bitstream, 24 ); /* aspect_denominator */
1611
1612     p_stream->fmt.video.i_frame_rate = i_fps_numerator;
1613     p_stream->fmt.video.i_frame_rate_base = i_fps_denominator;
1614
1615     bs_read( &bitstream, 8 ); /* colorspace */
1616     p_stream->fmt.i_bitrate = bs_read( &bitstream, 24 );
1617     bs_read( &bitstream, 6 ); /* quality */
1618
1619     i_keyframe_frequency_force = 1 << bs_read( &bitstream, 5 );
1620
1621     /* granule_shift = i_log( frequency_force -1 ) */
1622     p_stream->i_granule_shift = 0;
1623     i_keyframe_frequency_force--;
1624     while( i_keyframe_frequency_force )
1625     {
1626         p_stream->i_granule_shift++;
1627         i_keyframe_frequency_force >>= 1;
1628     }
1629
1630     i_version = i_major * 1000000 + i_minor * 1000 + i_subminor;
1631     p_stream->i_keyframe_offset = 0;
1632
1633     if ( i_version >= 3002001 )
1634     {
1635         p_stream->i_keyframe_offset = 1;
1636     }
1637
1638     p_stream->f_rate = ((float)i_fps_numerator) / i_fps_denominator;
1639 }
1640
1641 static void Ogg_ReadVorbisHeader( logical_stream_t *p_stream,
1642                                   ogg_packet *p_oggpacket )
1643 {
1644     oggpack_buffer opb;
1645
1646     p_stream->fmt.i_cat = AUDIO_ES;
1647     p_stream->fmt.i_codec = VLC_CODEC_VORBIS;
1648
1649     /* Signal that we want to keep a backup of the vorbis
1650      * stream headers. They will be used when switching between
1651      * audio streams. */
1652     p_stream->b_force_backup = 1;
1653
1654     /* Cheat and get additionnal info ;) */
1655     oggpack_readinit( &opb, p_oggpacket->packet, p_oggpacket->bytes);
1656     oggpack_adv( &opb, 88 );
1657     p_stream->fmt.audio.i_channels = oggpack_read( &opb, 8 );
1658     p_stream->f_rate = p_stream->fmt.audio.i_rate =
1659         oggpack_read( &opb, 32 );
1660     oggpack_adv( &opb, 32 );
1661     p_stream->fmt.i_bitrate = oggpack_read( &opb, 32 );
1662 }
1663
1664 static void Ogg_ReadSpeexHeader( logical_stream_t *p_stream,
1665                                  ogg_packet *p_oggpacket )
1666 {
1667     oggpack_buffer opb;
1668
1669     p_stream->fmt.i_cat = AUDIO_ES;
1670     p_stream->fmt.i_codec = VLC_CODEC_SPEEX;
1671
1672     /* Signal that we want to keep a backup of the speex
1673      * stream headers. They will be used when switching between
1674      * audio streams. */
1675     p_stream->b_force_backup = 1;
1676
1677     /* Cheat and get additionnal info ;) */
1678     oggpack_readinit( &opb, p_oggpacket->packet, p_oggpacket->bytes);
1679     oggpack_adv( &opb, 224 );
1680     oggpack_adv( &opb, 32 ); /* speex_version_id */
1681     oggpack_adv( &opb, 32 ); /* header_size */
1682     p_stream->f_rate = p_stream->fmt.audio.i_rate = oggpack_read( &opb, 32 );
1683     oggpack_adv( &opb, 32 ); /* mode */
1684     oggpack_adv( &opb, 32 ); /* mode_bitstream_version */
1685     p_stream->fmt.audio.i_channels = oggpack_read( &opb, 32 );
1686     p_stream->fmt.i_bitrate = oggpack_read( &opb, 32 );
1687 }
1688
1689 static void Ogg_ReadFlacHeader( demux_t *p_demux, logical_stream_t *p_stream,
1690                                 ogg_packet *p_oggpacket )
1691 {
1692     /* Parse the STREAMINFO metadata */
1693     bs_t s;
1694
1695     bs_init( &s, p_oggpacket->packet, p_oggpacket->bytes );
1696
1697     bs_read( &s, 1 );
1698     if( bs_read( &s, 7 ) == 0 )
1699     {
1700         if( bs_read( &s, 24 ) >= 34 /*size STREAMINFO*/ )
1701         {
1702             bs_skip( &s, 80 );
1703             p_stream->f_rate = p_stream->fmt.audio.i_rate = bs_read( &s, 20 );
1704             p_stream->fmt.audio.i_channels = bs_read( &s, 3 ) + 1;
1705
1706             msg_Dbg( p_demux, "FLAC header, channels: %i, rate: %i",
1707                      p_stream->fmt.audio.i_channels, (int)p_stream->f_rate );
1708         }
1709         else
1710         {
1711             msg_Dbg( p_demux, "FLAC STREAMINFO metadata too short" );
1712         }
1713
1714         /* Fake this as the last metadata block */
1715         *((uint8_t*)p_oggpacket->packet) |= 0x80;
1716     }
1717     else
1718     {
1719         /* This ain't a STREAMINFO metadata */
1720         msg_Dbg( p_demux, "Invalid FLAC STREAMINFO metadata" );
1721     }
1722 }
1723
1724 static void Ogg_ReadKateHeader( logical_stream_t *p_stream,
1725                                 ogg_packet *p_oggpacket )
1726 {
1727     oggpack_buffer opb;
1728     int32_t gnum;
1729     int32_t gden;
1730     int n;
1731     char *psz_desc;
1732
1733     p_stream->fmt.i_cat = SPU_ES;
1734     p_stream->fmt.i_codec = VLC_CODEC_KATE;
1735
1736     /* Signal that we want to keep a backup of the kate
1737      * stream headers. They will be used when switching between
1738      * kate streams. */
1739     p_stream->b_force_backup = 1;
1740
1741     /* Cheat and get additionnal info ;) */
1742     oggpack_readinit( &opb, p_oggpacket->packet, p_oggpacket->bytes);
1743     oggpack_adv( &opb, 11*8 ); /* packet type, kate magic, version */
1744     p_stream->i_kate_num_headers = oggpack_read( &opb, 8 );
1745     oggpack_adv( &opb, 3*8 );
1746     p_stream->i_granule_shift = oggpack_read( &opb, 8 );
1747     oggpack_adv( &opb, 8*8 ); /* reserved */
1748     gnum = oggpack_read( &opb, 32 );
1749     gden = oggpack_read( &opb, 32 );
1750     p_stream->f_rate = (double)gnum/gden;
1751
1752     p_stream->fmt.psz_language = malloc(16);
1753     if( p_stream->fmt.psz_language )
1754     {
1755         for( n = 0; n < 16; n++ )
1756             p_stream->fmt.psz_language[n] = oggpack_read(&opb,8);
1757         p_stream->fmt.psz_language[15] = 0; /* just in case */
1758     }
1759     else
1760     {
1761         for( n = 0; n < 16; n++ )
1762             oggpack_read(&opb,8);
1763     }
1764     p_stream->fmt.psz_description = malloc(16);
1765     if( p_stream->fmt.psz_description )
1766     {
1767         for( n = 0; n < 16; n++ )
1768             p_stream->fmt.psz_description[n] = oggpack_read(&opb,8);
1769         p_stream->fmt.psz_description[15] = 0; /* just in case */
1770
1771         /* Now find a localized user readable description for this category */
1772         psz_desc = strdup(FindKateCategoryName(p_stream->fmt.psz_description));
1773         if( psz_desc )
1774         {
1775             free( p_stream->fmt.psz_description );
1776             p_stream->fmt.psz_description = psz_desc;
1777         }
1778     }
1779     else
1780     {
1781         for( n = 0; n < 16; n++ )
1782             oggpack_read(&opb,8);
1783     }
1784 }
1785
1786 static void Ogg_ReadAnnodexHeader( vlc_object_t *p_this,
1787                                    logical_stream_t *p_stream,
1788                                    ogg_packet *p_oggpacket )
1789 {
1790     if( p_oggpacket->bytes >= 28 &&
1791         !memcmp( p_oggpacket->packet, "Annodex", 7 ) )
1792     {
1793         oggpack_buffer opb;
1794
1795         uint16_t major_version;
1796         uint16_t minor_version;
1797         uint64_t timebase_numerator;
1798         uint64_t timebase_denominator;
1799
1800         Ogg_ReadTheoraHeader( p_stream, p_oggpacket );
1801
1802         oggpack_readinit( &opb, p_oggpacket->packet, p_oggpacket->bytes);
1803         oggpack_adv( &opb, 8*8 ); /* "Annodex\0" header */
1804         major_version = oggpack_read( &opb, 2*8 ); /* major version */
1805         minor_version = oggpack_read( &opb, 2*8 ); /* minor version */
1806         timebase_numerator = GetQWLE( &p_oggpacket->packet[16] );
1807         timebase_denominator = GetQWLE( &p_oggpacket->packet[24] );
1808     }
1809     else if( p_oggpacket->bytes >= 42 &&
1810              !memcmp( p_oggpacket->packet, "AnxData", 7 ) )
1811     {
1812         uint64_t granule_rate_numerator;
1813         uint64_t granule_rate_denominator;
1814         char content_type_string[1024];
1815
1816         /* Read in Annodex header fields */
1817
1818         granule_rate_numerator = GetQWLE( &p_oggpacket->packet[8] );
1819         granule_rate_denominator = GetQWLE( &p_oggpacket->packet[16] );
1820         p_stream->i_secondary_header_packets =
1821             GetDWLE( &p_oggpacket->packet[24] );
1822
1823         /* we are guaranteed that the first header field will be
1824          * the content-type (by the Annodex standard) */
1825         content_type_string[0] = '\0';
1826         if( !strncasecmp( (char*)(&p_oggpacket->packet[28]), "Content-Type: ", 14 ) )
1827         {
1828             uint8_t *p = memchr( &p_oggpacket->packet[42], '\r',
1829                                  p_oggpacket->bytes - 1 );
1830             if( p && p[0] == '\r' && p[1] == '\n' )
1831                 sscanf( (char*)(&p_oggpacket->packet[42]), "%1023s\r\n",
1832                         content_type_string );
1833         }
1834
1835         msg_Dbg( p_this, "AnxData packet info: %"PRId64" / %"PRId64", %d, ``%s''",
1836                  granule_rate_numerator, granule_rate_denominator,
1837                  p_stream->i_secondary_header_packets, content_type_string );
1838
1839         p_stream->f_rate = (float) granule_rate_numerator /
1840             (float) granule_rate_denominator;
1841
1842         /* What type of file do we have?
1843          * strcmp is safe to use here because we've extracted
1844          * content_type_string from the stream manually */
1845         if( !strncmp(content_type_string, "audio/x-wav", 11) )
1846         {
1847             /* n.b. WAVs are unsupported right now */
1848             p_stream->fmt.i_cat = UNKNOWN_ES;
1849         }
1850         else if( !strncmp(content_type_string, "audio/x-vorbis", 14) )
1851         {
1852             p_stream->fmt.i_cat = AUDIO_ES;
1853             p_stream->fmt.i_codec = VLC_CODEC_VORBIS;
1854
1855             p_stream->b_force_backup = 1;
1856         }
1857         else if( !strncmp(content_type_string, "audio/x-speex", 13) )
1858         {
1859             p_stream->fmt.i_cat = AUDIO_ES;
1860             p_stream->fmt.i_codec = VLC_CODEC_SPEEX;
1861
1862             p_stream->b_force_backup = 1;
1863         }
1864         else if( !strncmp(content_type_string, "video/x-theora", 14) )
1865         {
1866             p_stream->fmt.i_cat = VIDEO_ES;
1867             p_stream->fmt.i_codec = VLC_CODEC_THEORA;
1868
1869             p_stream->b_force_backup = 1;
1870         }
1871         else if( !strncmp(content_type_string, "video/x-xvid", 12) )
1872         {
1873             p_stream->fmt.i_cat = VIDEO_ES;
1874             p_stream->fmt.i_codec = VLC_FOURCC( 'x','v','i','d' );
1875
1876             p_stream->b_force_backup = 1;
1877         }
1878         else if( !strncmp(content_type_string, "video/mpeg", 10) )
1879         {
1880             /* n.b. MPEG streams are unsupported right now */
1881             p_stream->fmt.i_cat = VIDEO_ES;
1882             p_stream->fmt.i_codec = VLC_CODEC_MPGV;
1883         }
1884         else if( !strncmp(content_type_string, "text/x-cmml", 11) )
1885         {
1886             ogg_stream_packetout( &p_stream->os, p_oggpacket );
1887             p_stream->fmt.i_cat = SPU_ES;
1888             p_stream->fmt.i_codec = VLC_CODEC_CMML;
1889         }
1890     }
1891 }
1892
1893 static uint32_t dirac_uint( bs_t *p_bs )
1894 {
1895     uint32_t u_count = 0, u_value = 0;
1896
1897     while( !bs_eof( p_bs ) && !bs_read( p_bs, 1 ) )
1898     {
1899         u_count++;
1900         u_value <<= 1;
1901         u_value |= bs_read( p_bs, 1 );
1902     }
1903
1904     return (1<<u_count) - 1 + u_value;
1905 }
1906
1907 static int dirac_bool( bs_t *p_bs )
1908 {
1909     return bs_read( p_bs, 1 );
1910 }
1911
1912 static bool Ogg_ReadDiracHeader( logical_stream_t *p_stream,
1913                                  ogg_packet *p_oggpacket )
1914 {
1915     static const struct {
1916         uint32_t u_n /* numerator */, u_d /* denominator */;
1917     } p_dirac_frate_tbl[] = { /* table 10.3 */
1918         {1,1}, /* this first value is never used */
1919         {24000,1001}, {24,1}, {25,1}, {30000,1001}, {30,1},
1920         {50,1}, {60000,1001}, {60,1}, {15000,1001}, {25,2},
1921     };
1922     static const size_t u_dirac_frate_tbl = sizeof(p_dirac_frate_tbl)/sizeof(*p_dirac_frate_tbl);
1923
1924     static const uint32_t pu_dirac_vidfmt_frate[] = { /* table C.1 */
1925         1, 9, 10, 9, 10, 9, 10, 4, 3, 7, 6, 4, 3, 7, 6, 2, 2, 7, 6, 7, 6,
1926     };
1927     static const size_t u_dirac_vidfmt_frate = sizeof(pu_dirac_vidfmt_frate)/sizeof(*pu_dirac_vidfmt_frate);
1928
1929     bs_t bs;
1930
1931     p_stream->i_granule_shift = 22; /* not 32 */
1932
1933     /* Backing up stream headers is not required -- seqhdrs are repeated
1934      * thoughout the stream at suitable decoding start points */
1935     p_stream->b_force_backup = 0;
1936
1937     /* read in useful bits from sequence header */
1938     bs_init( &bs, p_oggpacket->packet, p_oggpacket->bytes );
1939     bs_skip( &bs, 13*8); /* parse_info_header */
1940     dirac_uint( &bs ); /* major_version */
1941     dirac_uint( &bs ); /* minor_version */
1942     dirac_uint( &bs ); /* profile */
1943     dirac_uint( &bs ); /* level */
1944
1945     uint32_t u_video_format = dirac_uint( &bs ); /* index */
1946     if( u_video_format >= u_dirac_vidfmt_frate )
1947     {
1948         /* don't know how to parse this ogg dirac stream */
1949         return false;
1950     }
1951
1952     if( dirac_bool( &bs ) )
1953     {
1954         dirac_uint( &bs ); /* frame_width */
1955         dirac_uint( &bs ); /* frame_height */
1956     }
1957
1958     if( dirac_bool( &bs ) )
1959     {
1960         dirac_uint( &bs ); /* chroma_format */
1961     }
1962
1963     if( dirac_bool( &bs ) )
1964     {
1965         dirac_uint( &bs ); /* scan_format */
1966     }
1967
1968     uint32_t u_n = p_dirac_frate_tbl[pu_dirac_vidfmt_frate[u_video_format]].u_n;
1969     uint32_t u_d = p_dirac_frate_tbl[pu_dirac_vidfmt_frate[u_video_format]].u_d;
1970     if( dirac_bool( &bs ) )
1971     {
1972         uint32_t u_frame_rate_index = dirac_uint( &bs );
1973         if( u_frame_rate_index >= u_dirac_frate_tbl )
1974         {
1975             /* something is wrong with this stream */
1976             return false;
1977         }
1978         u_n = p_dirac_frate_tbl[u_frame_rate_index].u_n;
1979         u_d = p_dirac_frate_tbl[u_frame_rate_index].u_d;
1980         if( u_frame_rate_index == 0 )
1981         {
1982             u_n = dirac_uint( &bs ); /* frame_rate_numerator */
1983             u_d = dirac_uint( &bs ); /* frame_rate_denominator */
1984         }
1985     }
1986     p_stream->f_rate = (float) u_n / u_d;
1987
1988     /* probably is an ogg dirac es */
1989     p_stream->fmt.i_cat = VIDEO_ES;
1990     p_stream->fmt.i_codec = VLC_CODEC_DIRAC;
1991
1992     return true;
1993 }