/*****************************************************************************
* ogg.c : ogg stream demux module for vlc
*****************************************************************************
- * Copyright (C) 2001-2007 the VideoLAN team
+ * Copyright (C) 2001-2007 VLC authors and VideoLAN
* $Id$
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
* Andre Pang <Andre.Pang@csiro.au> (Annodex support)
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/*****************************************************************************
#include <vlc_codecs.h>
#include <vlc_bits.h>
+#include "xiph.h"
+#include "xiph_metadata.h"
+#include "ogg.h"
+#include "oggseek.h"
/*****************************************************************************
* Module descriptor
/*****************************************************************************
* Definitions of structures and functions used by this plugins
*****************************************************************************/
-typedef struct logical_stream_s
-{
- ogg_stream_state os; /* logical stream of packets */
-
- es_format_t fmt;
- es_format_t fmt_old; /* format of old ES is reused */
- es_out_id_t *p_es;
- double f_rate;
-
- int i_serial_no;
-
- /* the header of some logical streams (eg vorbis) contain essential
- * data for the decoder. We back them up here in case we need to re-feed
- * them to the decoder. */
- int b_force_backup;
- int i_packets_backup;
- uint8_t *p_headers;
- int i_headers;
-
- /* program clock reference (in units of 90kHz) derived from the previous
- * granulepos */
- mtime_t i_pcr;
- mtime_t i_interpolated_pcr;
- mtime_t i_previous_pcr;
-
- /* Misc */
- bool b_reinit;
- int i_granule_shift;
-
- /* kate streams have the number of headers in the ID header */
- int i_kate_num_headers;
-
- /* for Annodex logical bitstreams */
- int i_secondary_header_packets;
-
-} logical_stream_t;
-
-struct demux_sys_t
-{
- ogg_sync_state oy; /* sync and verify incoming physical bitstream */
-
- int i_streams; /* number of logical bitstreams */
- logical_stream_t **pp_stream; /* pointer to an array of logical streams */
-
- logical_stream_t *p_old_stream; /* pointer to a old logical stream to avoid recreating it */
-
- /* program clock reference (in units of 90kHz) derived from the pcr of
- * the sub-streams */
- mtime_t i_pcr;
-
- /* stream state */
- int i_bos;
- int i_eos;
-
- /* bitrate */
- int i_bitrate;
-
- /* after reading all headers, the first data page is stuffed into the relevant stream, ready to use */
- bool b_page_waiting;
-};
/* OggDS headers for the new header format (used in ogm files) */
typedef struct
} sh;
} stream_header_t;
-#define OGG_BLOCK_SIZE 4096
/* Some defines from OggDS */
#define PACKET_TYPE_HEADER 0x01
static int Ogg_ReadPage ( demux_t *, ogg_page * );
static void Ogg_UpdatePCR ( logical_stream_t *, ogg_packet * );
static void Ogg_DecodePacket ( demux_t *, logical_stream_t *, ogg_packet * );
+static int Ogg_OpusPacketDuration( logical_stream_t *, ogg_packet * );
static int Ogg_BeginningOfStream( demux_t *p_demux );
static int Ogg_FindLogicalStreams( demux_t *p_demux );
static void Ogg_LogicalStreamDelete( demux_t *p_demux, logical_stream_t *p_stream );
static bool Ogg_LogicalStreamResetEsFormat( demux_t *p_demux, logical_stream_t *p_stream );
+/* */
+static void Ogg_ExtractMeta( demux_t *p_demux, vlc_fourcc_t i_codec, const uint8_t *p_headers, int i_headers );
+static int64_t Ogg_GetLastPacket( demux_t *p_demux, logical_stream_t *p_stream, double f_rate );
+
/* Logical bitstream headers */
-static void Ogg_ReadTheoraHeader( logical_stream_t *, ogg_packet * );
-static void Ogg_ReadVorbisHeader( logical_stream_t *, ogg_packet * );
+static void Ogg_ReadTheoraHeader( demux_t *, logical_stream_t *, ogg_packet * );
+static void Ogg_ReadVorbisHeader( demux_t *, logical_stream_t *, ogg_packet * );
static void Ogg_ReadSpeexHeader( logical_stream_t *, ogg_packet * );
+static void Ogg_ReadOpusHeader( demux_t *, logical_stream_t *, ogg_packet * );
static void Ogg_ReadKateHeader( logical_stream_t *, ogg_packet * );
static void Ogg_ReadFlacHeader( demux_t *, logical_stream_t *, ogg_packet * );
-static void Ogg_ReadAnnodexHeader( vlc_object_t *, logical_stream_t *, ogg_packet * );
-static void Ogg_ReadDiracHeader( logical_stream_t *, ogg_packet * );
+static void Ogg_ReadAnnodexHeader( demux_t *, logical_stream_t *, ogg_packet * );
+static bool Ogg_ReadDiracHeader( logical_stream_t *, ogg_packet * );
/*****************************************************************************
* Open: initializes ogg demux structures
demux_sys_t *p_sys;
const uint8_t *p_peek;
-
/* Check if we are dealing with an ogg stream */
if( stream_Peek( p_demux->s, &p_peek, 4 ) < 4 ) return VLC_EGENERIC;
if( !p_demux->b_force && memcmp( p_peek, "OggS", 4 ) )
return VLC_EGENERIC;
}
- /* Set exported functions */
- p_demux->pf_demux = Demux;
- p_demux->pf_control = Control;
- p_demux->p_sys = p_sys = malloc( sizeof( demux_sys_t ) );
+ /* */
+ p_demux->p_sys = p_sys = calloc( 1, sizeof( demux_sys_t ) );
if( !p_sys )
return VLC_ENOMEM;
- memset( p_sys, 0, sizeof( demux_sys_t ) );
- p_sys->i_bitrate = 0;
- p_sys->pp_stream = NULL;
- p_sys->p_old_stream = NULL;
+ p_sys->i_length = -1;
- /* Begnning of stream, tell the demux to look for elementary streams. */
- p_sys->i_bos = 0;
- p_sys->i_eos = 0;
+ /* Set exported functions */
+ p_demux->pf_demux = Demux;
+ p_demux->pf_control = Control;
/* Initialize the Ogg physical bitstream parser */
ogg_sync_init( &p_sys->oy );
- p_sys->b_page_waiting = false;
+
+ /* */
+ TAB_INIT( p_sys->i_seekpoints, p_sys->pp_seekpoints );
return VLC_SUCCESS;
}
if( p_sys->p_old_stream )
Ogg_LogicalStreamDelete( p_demux, p_sys->p_old_stream );
+ TAB_CLEAN( p_sys->i_seekpoints, p_sys->pp_seekpoints );
+
free( p_sys );
}
static int Demux( demux_t * p_demux )
{
demux_sys_t *p_sys = p_demux->p_sys;
- ogg_page oggpage;
ogg_packet oggpacket;
int i_stream;
+ bool b_skipping = false;
if( p_sys->i_eos == p_sys->i_streams )
return 0;
msg_Dbg( p_demux, "beginning of a group of logical streams" );
- es_out_Control( p_demux->out, ES_OUT_RESET_PCR );
+ es_out_Control( p_demux->out, ES_OUT_SET_PCR, VLC_TS_0 );
}
/*
/*
* Demux an ogg page from the stream
*/
- if( Ogg_ReadPage( p_demux, &oggpage ) != VLC_SUCCESS )
+ if( Ogg_ReadPage( p_demux, &p_sys->current_page ) != VLC_SUCCESS )
return 0; /* EOF */
/* Test for End of Stream */
- if( ogg_page_eos( &oggpage ) )
+ if( ogg_page_eos( &p_sys->current_page ) )
p_sys->i_eos++;
}
/* if we've just pulled page, look for the right logical stream */
if( !p_sys->b_page_waiting )
{
- if( ogg_stream_pagein( &p_stream->os, &oggpage ) != 0 )
+ if( p_sys->i_streams == 1 &&
+ ogg_page_serialno( &p_sys->current_page ) != p_stream->os.serialno )
+ {
+ msg_Err( p_demux, "Broken Ogg stream (serialno) mismatch" );
+ ogg_stream_reset_serialno( &p_stream->os, ogg_page_serialno( &p_sys->current_page ) );
+
+ p_stream->b_reinit = true;
+ p_stream->i_pcr = VLC_TS_0;
+ p_stream->i_interpolated_pcr = VLC_TS_0;
+ p_stream->i_previous_granulepos = -1;
+ es_out_Control( p_demux->out, ES_OUT_SET_PCR, VLC_TS_0);
+ }
+
+ if( ogg_stream_pagein( &p_stream->os, &p_sys->current_page ) != 0 )
+ {
continue;
+ }
+
}
while( ogg_stream_packetout( &p_stream->os, &oggpacket ) > 0 )
/* Read info from any secondary header packets, if there are any */
if( p_stream->i_secondary_header_packets > 0 )
{
- if( p_stream->fmt.i_codec == VLC_FOURCC('t','h','e','o') &&
+ if( p_stream->fmt.i_codec == VLC_CODEC_THEORA &&
oggpacket.bytes >= 7 &&
! memcmp( oggpacket.packet, "\x80theora", 7 ) )
{
- Ogg_ReadTheoraHeader( p_stream, &oggpacket );
+ Ogg_ReadTheoraHeader( p_demux, p_stream, &oggpacket );
p_stream->i_secondary_header_packets = 0;
}
- else if( p_stream->fmt.i_codec == VLC_FOURCC('v','o','r','b') &&
+ else if( p_stream->fmt.i_codec == VLC_CODEC_VORBIS &&
oggpacket.bytes >= 7 &&
! memcmp( oggpacket.packet, "\x01vorbis", 7 ) )
{
- Ogg_ReadVorbisHeader( p_stream, &oggpacket );
+ Ogg_ReadVorbisHeader( p_demux, p_stream, &oggpacket );
p_stream->i_secondary_header_packets = 0;
}
- else if( p_stream->fmt.i_codec == VLC_FOURCC('c','m','m','l') )
+ else if( p_stream->fmt.i_codec == VLC_CODEC_CMML )
{
p_stream->i_secondary_header_packets = 0;
}
+
+ /* update start of data pointer */
+ p_stream->i_data_start = stream_Tell( p_demux->s );
+
}
+ /* If any streams have i_skip_frames, only decode (pre-roll)
+ * for those streams */
+ if ( b_skipping && p_stream->i_skip_frames == 0 ) continue;
+
+
if( p_stream->b_reinit )
{
/* If synchro is re-initialized we need to drop all the packets
if( p_stream->i_pcr >= 0 )
{
p_stream->b_reinit = false;
+ /* For Opus, trash the first 80 ms of decoded output as
+ well, to avoid blowing out speakers if we get unlucky.
+ Opus predicts content from prior frames, which can go
+ badly if we seek right where the stream goes from very
+ quiet to very loud. It will converge after a bit. */
+ if( p_stream->fmt.i_codec == VLC_CODEC_OPUS )
+ {
+ ogg_int64_t start_time;
+ int duration;
+ p_stream->i_skip_frames = 80*48;
+ /* Make sure we never play audio from within the
+ pre-skip at the beginning of the stream. */
+ duration =
+ Ogg_OpusPacketDuration( p_stream, &oggpacket );
+ start_time = p_stream->i_previous_granulepos;
+ if( duration > 0 )
+ {
+ start_time = start_time > duration ?
+ start_time - duration : 0;
+ }
+ if( p_stream->i_pre_skip > start_time )
+ {
+ p_stream->i_skip_frames +=
+ p_stream->i_pre_skip - start_time;
+ }
+ }
}
else
{
p_stream->i_interpolated_pcr = -1;
+ p_stream->i_previous_granulepos = -1;
continue;
}
/* An Ogg/vorbis packet contains an end date granulepos */
- if( p_stream->fmt.i_codec == VLC_FOURCC( 'v','o','r','b' ) ||
- p_stream->fmt.i_codec == VLC_FOURCC( 's','p','x',' ' ) ||
- p_stream->fmt.i_codec == VLC_FOURCC( 'f','l','a','c' ) )
+ if( p_stream->fmt.i_codec == VLC_CODEC_VORBIS ||
+ p_stream->fmt.i_codec == VLC_CODEC_SPEEX ||
+ p_stream->fmt.i_codec == VLC_CODEC_OPUS ||
+ p_stream->fmt.i_codec == VLC_CODEC_FLAC )
{
if( ogg_stream_packetout( &p_stream->os, &oggpacket ) > 0 )
{
else
{
es_out_Control( p_demux->out, ES_OUT_SET_PCR,
- p_stream->i_pcr );
+ VLC_TS_0 + p_stream->i_pcr );
}
continue;
}
p_sys->i_pcr = p_stream->i_interpolated_pcr;
}
- if( p_sys->i_pcr >= 0 )
- es_out_Control( p_demux->out, ES_OUT_SET_PCR, p_sys->i_pcr );
+ if( p_sys->i_pcr >= 0 && ! b_skipping )
+ es_out_Control( p_demux->out, ES_OUT_SET_PCR, VLC_TS_0 + p_sys->i_pcr );
return 1;
}
+static void Ogg_ResetStreamHelper( demux_sys_t *p_sys )
+{
+ for( int i = 0; i < p_sys->i_streams; i++ )
+ {
+ logical_stream_t *p_stream = p_sys->pp_stream[i];
+
+ /* we'll trash all the data until we find the next pcr */
+ p_stream->b_reinit = true;
+ p_stream->i_pcr = -1;
+ p_stream->i_interpolated_pcr = -1;
+ p_stream->i_previous_granulepos = -1;
+ ogg_stream_reset( &p_stream->os );
+ }
+ ogg_sync_reset( &p_sys->oy );
+}
+
/*****************************************************************************
* Control:
*****************************************************************************/
static int Control( demux_t *p_demux, int i_query, va_list args )
{
demux_sys_t *p_sys = p_demux->p_sys;
+ vlc_meta_t *p_meta;
int64_t *pi64;
bool *pb_bool;
- int i;
switch( i_query )
{
+ case DEMUX_GET_META:
+ p_meta = (vlc_meta_t *)va_arg( args, vlc_meta_t* );
+ if( p_sys->p_meta )
+ vlc_meta_Merge( p_meta, p_sys->p_meta );
+ return VLC_SUCCESS;
+
case DEMUX_HAS_UNSUPPORTED_META:
pb_bool = (bool*)va_arg( args, bool* );
*pb_bool = true;
case DEMUX_SET_TIME:
return VLC_EGENERIC;
+ case DEMUX_GET_ATTACHMENTS:
+ {
+ input_attachment_t ***ppp_attach =
+ (input_attachment_t***)va_arg( args, input_attachment_t*** );
+ int *pi_int = (int*)va_arg( args, int * );
+
+ if( p_sys->i_attachments <= 0 )
+ return VLC_EGENERIC;
+
+ *pi_int = p_sys->i_attachments;
+ *ppp_attach = xmalloc( sizeof(input_attachment_t**) * p_sys->i_attachments );
+ for( int i = 0; i < p_sys->i_attachments; i++ )
+ (*ppp_attach)[i] = vlc_input_attachment_Duplicate( p_sys->attachments[i] );
+ return VLC_SUCCESS;
+ }
+
case DEMUX_SET_POSITION:
/* forbid seeking if we haven't initialized all logical bitstreams yet;
if we allowed, some headers would not get backed up and decoder init
return VLC_EGENERIC;
}
- for( i = 0; i < p_sys->i_streams; i++ )
- {
- logical_stream_t *p_stream = p_sys->pp_stream[i];
+ Ogg_ResetStreamHelper( p_sys );
+ return demux_vaControlHelper( p_demux->s, 0, -1, p_sys->i_bitrate,
+ 1, i_query, args );
+ case DEMUX_GET_LENGTH:
+ if ( p_sys->i_length < 0 )
+ return demux_vaControlHelper( p_demux->s, 0, -1, p_sys->i_bitrate,
+ 1, i_query, args );
+ pi64 = (int64_t*)va_arg( args, int64_t * );
+ *pi64 = p_sys->i_length * 1000000;
+ return VLC_SUCCESS;
- /* we'll trash all the data until we find the next pcr */
- p_stream->b_reinit = true;
- p_stream->i_pcr = -1;
- p_stream->i_interpolated_pcr = -1;
- ogg_stream_reset( &p_stream->os );
+ case DEMUX_GET_TITLE_INFO:
+ {
+ input_title_t ***ppp_title = (input_title_t***)va_arg( args, input_title_t*** );
+ int *pi_int = (int*)va_arg( args, int* );
+ int *pi_title_offset = (int*)va_arg( args, int* );
+ int *pi_seekpoint_offset = (int*)va_arg( args, int* );
+
+ if( p_sys->i_seekpoints > 0 )
+ {
+ *pi_int = 1;
+ *ppp_title = malloc( sizeof( input_title_t**) );
+ input_title_t *p_title = (*ppp_title)[0] = vlc_input_title_New();
+ for( int i = 0; i < p_sys->i_seekpoints; i++ )
+ {
+ TAB_APPEND( p_title->i_seekpoint, p_title->seekpoint, p_sys->pp_seekpoints[i] );
+ }
+ *pi_title_offset = 0;
+ *pi_seekpoint_offset = 0;
+ }
+ return VLC_SUCCESS;
+ }
+ case DEMUX_SET_TITLE:
+ {
+ const int i_title = (int)va_arg( args, int );
+ if( i_title > 1 )
+ return VLC_EGENERIC;
+ return VLC_SUCCESS;
+ }
+ case DEMUX_SET_SEEKPOINT:
+ {
+ const int i_seekpoint = (int)va_arg( args, int );
+ if( i_seekpoint > p_sys->i_seekpoints )
+ return VLC_EGENERIC;
+ if( p_sys->i_bos > 0 )
+ {
+ return VLC_EGENERIC;
}
- ogg_sync_reset( &p_sys->oy );
- /* XXX The break/return is missing on purpose as
- * demux_vaControlHelper will do the last part of the job */
+
+ Ogg_ResetStreamHelper( p_sys );
+ int64_t i_block = p_sys->pp_seekpoints[i_seekpoint]->i_time_offset * p_sys->i_bitrate / INT64_C(8000000);
+ if( stream_Seek( p_demux->s, i_block ) )
+ return VLC_EGENERIC;
+ return VLC_SUCCESS;
+ }
default:
return demux_vaControlHelper( p_demux->s, 0, -1, p_sys->i_bitrate,
while( ogg_sync_pageout( &p_ogg->oy, p_oggpage ) != 1 )
{
- p_buffer = ogg_sync_buffer( &p_ogg->oy, OGG_BLOCK_SIZE );
+ p_buffer = ogg_sync_buffer( &p_ogg->oy, OGGSEEK_BYTES_TO_READ );
- i_read = stream_Read( p_demux->s, p_buffer, OGG_BLOCK_SIZE );
+ i_read = stream_Read( p_demux->s, p_buffer, OGGSEEK_BYTES_TO_READ );
if( i_read <= 0 )
return VLC_EGENERIC;
static void Ogg_UpdatePCR( logical_stream_t *p_stream,
ogg_packet *p_oggpacket )
{
+ p_stream->i_end_trim = 0;
/* Convert the granulepos into a pcr */
if( p_oggpacket->granulepos >= 0 )
{
- if( p_stream->fmt.i_codec == VLC_FOURCC( 't','h','e','o' ) ||
- p_stream->fmt.i_codec == VLC_FOURCC( 'k','a','t','e' ) )
+ if( p_stream->fmt.i_codec == VLC_CODEC_THEORA ||
+ p_stream->fmt.i_codec == VLC_CODEC_KATE )
{
ogg_int64_t iframe = p_oggpacket->granulepos >>
p_stream->i_granule_shift;
ogg_int64_t pframe = p_oggpacket->granulepos -
( iframe << p_stream->i_granule_shift );
- p_stream->i_pcr = ( iframe + pframe ) * INT64_C(1000000)
- / p_stream->f_rate;
+ p_stream->i_pcr = ( iframe + pframe - p_stream->i_keyframe_offset )
+ * INT64_C(1000000) / p_stream->f_rate;
}
- else if( p_stream->fmt.i_codec == VLC_FOURCC( 'd','r','a','c' ) )
+ else if( p_stream->fmt.i_codec == VLC_CODEC_DIRAC )
{
ogg_int64_t i_dts = p_oggpacket->granulepos >> 31;
/* NB, OggDirac granulepos values are in units of 2*picturerate */
}
else
{
- p_stream->i_pcr = p_oggpacket->granulepos * INT64_C(1000000)
- / p_stream->f_rate;
+ ogg_int64_t sample;
+ sample = p_oggpacket->granulepos;
+ if( p_oggpacket->e_o_s &&
+ p_stream->fmt.i_codec == VLC_CODEC_OPUS &&
+ p_stream->i_previous_granulepos >= 0 )
+ {
+ int duration;
+ duration = Ogg_OpusPacketDuration( p_stream, p_oggpacket );
+ if( duration > 0 )
+ {
+ ogg_int64_t end_sample;
+ end_sample = p_stream->i_previous_granulepos + duration;
+ if( end_sample > sample )
+ p_stream->i_end_trim = (int)(end_sample - sample);
+ }
+ }
+ if (sample >= p_stream->i_pre_skip)
+ sample -= p_stream->i_pre_skip;
+ else
+ sample = 0;
+ p_stream->i_pcr = sample * INT64_C(1000000) / p_stream->f_rate;
}
+ p_stream->i_pcr += VLC_TS_0;
p_stream->i_interpolated_pcr = p_stream->i_pcr;
}
else
{
+ int duration;
p_stream->i_pcr = -1;
/* no granulepos available, try to interpolate the pcr.
if( p_stream->fmt.i_cat == VIDEO_ES )
/* 1 frame per packet */
p_stream->i_interpolated_pcr += (INT64_C(1000000) / p_stream->f_rate);
+ else if( p_stream->fmt.i_codec == VLC_CODEC_OPUS &&
+ p_stream->i_previous_granulepos >= 0 &&
+ ( duration =
+ Ogg_OpusPacketDuration( p_stream, p_oggpacket ) ) > 0 )
+ {
+ ogg_int64_t sample;
+ p_oggpacket->granulepos =
+ p_stream->i_previous_granulepos + duration;
+ sample = p_oggpacket->granulepos;
+ if (sample >= p_stream->i_pre_skip)
+ sample -= p_stream->i_pre_skip;
+ else
+ sample = 0;
+ p_stream->i_interpolated_pcr =
+ VLC_TS_0 + sample * INT64_C(1000000) / p_stream->f_rate;
+ }
else if( p_stream->fmt.i_bitrate )
+ {
p_stream->i_interpolated_pcr +=
( p_oggpacket->bytes * INT64_C(1000000) /
p_stream->fmt.i_bitrate / 8 );
+ }
}
+ p_stream->i_previous_granulepos = p_oggpacket->granulepos;
}
/****************************************************************************
mtime_t i_pts = -1, i_interpolated_pts;
demux_sys_t *p_ogg = p_demux->p_sys;
- /* Sanity check */
- if( !p_oggpacket->bytes )
- {
- msg_Dbg( p_demux, "discarding 0 sized packet" );
- return;
- }
-
if( p_oggpacket->bytes >= 7 &&
! memcmp ( p_oggpacket->packet, "Annodex", 7 ) )
{
return;
}
- if( p_stream->fmt.i_codec == VLC_FOURCC( 's','u','b','t' ) &&
+ if( p_stream->fmt.i_codec == VLC_CODEC_SUBT && p_oggpacket->bytes > 0 &&
p_oggpacket->packet[0] & PACKET_TYPE_BITS ) return;
/* Check the ES is selected */
if( p_stream->b_force_backup )
{
- uint8_t *p_sav;
- bool b_store_size = true;
- bool b_store_num_headers = false;
-
+ bool b_xiph;
p_stream->i_packets_backup++;
switch( p_stream->fmt.i_codec )
{
- case VLC_FOURCC( 'v','o','r','b' ):
- case VLC_FOURCC( 's','p','x',' ' ):
- case VLC_FOURCC( 't','h','e','o' ):
- if( p_stream->i_packets_backup == 3 ) p_stream->b_force_backup = 0;
+ case VLC_CODEC_VORBIS:
+ case VLC_CODEC_SPEEX:
+ case VLC_CODEC_THEORA:
+ if( p_stream->i_packets_backup == 3 )
+ p_stream->b_force_backup = false;
+ b_xiph = true;
break;
- case VLC_FOURCC( 'f','l','a','c' ):
+ case VLC_CODEC_OPUS:
+ if( p_stream->i_packets_backup == 2 )
+ p_stream->b_force_backup = false;
+ b_xiph = true;
+ break;
+
+ case VLC_CODEC_FLAC:
if( !p_stream->fmt.audio.i_rate && p_stream->i_packets_backup == 2 )
{
Ogg_ReadFlacHeader( p_demux, p_stream, p_oggpacket );
- p_stream->b_force_backup = 0;
+ p_stream->b_force_backup = false;
}
else if( p_stream->fmt.audio.i_rate )
{
- p_stream->b_force_backup = 0;
+ p_stream->b_force_backup = false;
if( p_oggpacket->bytes >= 9 )
{
p_oggpacket->packet += 9;
p_oggpacket->bytes -= 9;
}
}
- b_store_size = false;
+ b_xiph = false;
break;
- case VLC_FOURCC( 'k','a','t','e' ):
- if( p_stream->i_packets_backup == 1)
- b_store_num_headers = true;
- if( p_stream->i_packets_backup == p_stream->i_kate_num_headers ) p_stream->b_force_backup = 0;
+ case VLC_CODEC_KATE:
+ if( p_stream->i_packets_backup == p_stream->i_kate_num_headers )
+ p_stream->b_force_backup = false;
+ b_xiph = true;
break;
default:
- p_stream->b_force_backup = 0;
+ p_stream->b_force_backup = false;
+ b_xiph = false;
break;
}
/* Backup the ogg packet (likely an header packet) */
- p_stream->p_headers =
- realloc( p_sav = p_stream->p_headers, p_stream->i_headers +
- p_oggpacket->bytes + (b_store_size ? 2 : 0) + (b_store_num_headers ? 1 : 0) );
- if( p_stream->p_headers )
+ if( !b_xiph )
{
- uint8_t *p_extra = p_stream->p_headers + p_stream->i_headers;
-
- if( b_store_num_headers )
+ void *p_org = p_stream->p_headers;
+ p_stream->i_headers += p_oggpacket->bytes;
+ p_stream->p_headers = realloc( p_stream->p_headers, p_stream->i_headers );
+ if( p_stream->p_headers )
{
- /* Kate streams store the number of headers in the first header,
- so we can't just test for 3 as Vorbis/Theora */
- *(p_extra++) = p_stream->i_kate_num_headers;
+ memcpy( (unsigned char *)p_stream->p_headers + p_stream->i_headers - p_oggpacket->bytes,
+ p_oggpacket->packet, p_oggpacket->bytes );
}
- if( b_store_size )
+ else
{
- *(p_extra++) = p_oggpacket->bytes >> 8;
- *(p_extra++) = p_oggpacket->bytes & 0xFF;
+#warning Memory leak
+ p_stream->i_headers = 0;
+ p_stream->p_headers = NULL;
+ free( p_org );
}
- memcpy( p_extra, p_oggpacket->packet, p_oggpacket->bytes );
- p_stream->i_headers += p_oggpacket->bytes + (b_store_size ? 2 : 0) + (b_store_num_headers ? 1 : 0);
-
+ }
+ else if( xiph_AppendHeaders( &p_stream->i_headers, &p_stream->p_headers,
+ p_oggpacket->bytes, p_oggpacket->packet ) )
+ {
+ p_stream->i_headers = 0;
+ p_stream->p_headers = NULL;
+ }
+ if( p_stream->i_headers > 0 )
+ {
if( !p_stream->b_force_backup )
{
/* Last header received, commit changes */
es_out_Control( p_demux->out, ES_OUT_SET_ES_FMT,
p_stream->p_es, &p_stream->fmt );
+ if( p_stream->i_headers > 0 )
+ Ogg_ExtractMeta( p_demux, p_stream->fmt.i_codec,
+ p_stream->p_headers, p_stream->i_headers );
+
/* we're not at BOS anymore for this logical stream */
p_ogg->i_bos--;
}
}
- else
- {
- p_stream->p_headers = p_sav;
- }
b_selected = false; /* Discard the header packet */
}
/* Convert the pcr into a pts */
- if( p_stream->fmt.i_codec == VLC_FOURCC( 'v','o','r','b' ) ||
- p_stream->fmt.i_codec == VLC_FOURCC( 's','p','x',' ' ) ||
- p_stream->fmt.i_codec == VLC_FOURCC( 'f','l','a','c' ) )
+ if( p_stream->fmt.i_codec == VLC_CODEC_VORBIS ||
+ p_stream->fmt.i_codec == VLC_CODEC_SPEEX ||
+ p_stream->fmt.i_codec == VLC_CODEC_OPUS ||
+ p_stream->fmt.i_codec == VLC_CODEC_FLAC )
{
if( p_stream->i_pcr >= 0 )
{
if( p_stream->i_previous_pcr == 0 &&
p_stream->i_pcr > 3 * DEFAULT_PTS_DELAY )
{
- es_out_Control( p_demux->out, ES_OUT_RESET_PCR );
/* Call the pace control */
es_out_Control( p_demux->out, ES_OUT_SET_PCR,
- p_stream->i_pcr );
+ VLC_TS_0 + p_stream->i_pcr );
}
p_stream->i_previous_pcr = p_stream->i_pcr;
/* The granulepos is the end date of the sample */
- i_pts = p_stream->i_pcr;
+ i_pts = p_stream->i_pcr;
}
}
if( p_stream->i_previous_pcr == 0 &&
p_stream->i_pcr > 3 * DEFAULT_PTS_DELAY )
{
- es_out_Control( p_demux->out, ES_OUT_RESET_PCR );
/* Call the pace control */
- es_out_Control( p_demux->out, ES_OUT_SET_PCR, p_stream->i_pcr );
+ es_out_Control( p_demux->out, ES_OUT_SET_PCR, VLC_TS_0 + p_stream->i_pcr );
}
}
}
- if( p_stream->fmt.i_codec != VLC_FOURCC( 'v','o','r','b' ) &&
- p_stream->fmt.i_codec != VLC_FOURCC( 's','p','x',' ' ) &&
- p_stream->fmt.i_codec != VLC_FOURCC( 'f','l','a','c' ) &&
+ if( p_stream->fmt.i_codec != VLC_CODEC_VORBIS &&
+ p_stream->fmt.i_codec != VLC_CODEC_SPEEX &&
+ p_stream->fmt.i_codec != VLC_CODEC_OPUS &&
+ p_stream->fmt.i_codec != VLC_CODEC_FLAC &&
p_stream->i_pcr >= 0 )
{
p_stream->i_previous_pcr = p_stream->i_pcr;
return;
}
- if( p_oggpacket->bytes <= 0 )
- return;
+ if( !( p_block = block_Alloc( p_oggpacket->bytes ) ) ) return;
+
+
+ /* may need to preroll after a seek */
+ if ( p_stream->i_skip_frames > 0 )
+ {
+ if( p_stream->fmt.i_codec == VLC_CODEC_OPUS )
+ {
+ int duration;
+ duration = Ogg_OpusPacketDuration( p_stream, p_oggpacket );
+ if( p_stream->i_skip_frames > duration )
+ {
+ p_block->i_flags |= BLOCK_FLAG_PREROLL;
+ p_block->i_nb_samples = 0;
+ p_stream->i_skip_frames -= duration;
+ }
+ else
+ {
+ p_block->i_nb_samples = duration - p_stream->i_skip_frames;
+ if( p_stream->i_previous_granulepos >=
+ p_block->i_nb_samples + p_stream->i_pre_skip )
+ {
+ i_pts = VLC_TS_0 + (p_stream->i_previous_granulepos
+ - p_block->i_nb_samples - p_stream->i_pre_skip) *
+ INT64_C(1000000) / p_stream->f_rate;
+ }
+ p_stream->i_skip_frames = 0;
+ }
+ }
+ else
+ {
+ p_block->i_flags |= BLOCK_FLAG_PREROLL;
+ p_stream->i_skip_frames--;
+ }
+ }
+ else if( p_stream->fmt.i_codec == VLC_CODEC_OPUS )
+ p_block->i_nb_samples = Ogg_OpusPacketDuration( p_stream, p_oggpacket );
- if( !( p_block = block_New( p_demux, p_oggpacket->bytes ) ) ) return;
/* Normalize PTS */
- if( i_pts == 0 ) i_pts = 1;
- else if( i_pts == -1 && i_interpolated_pts == 0 ) i_pts = 1;
- else if( i_pts == -1 ) i_pts = 0;
+ if( i_pts == VLC_TS_INVALID ) i_pts = VLC_TS_0;
+ else if( i_pts == -1 && i_interpolated_pts == VLC_TS_INVALID )
+ i_pts = VLC_TS_0;
+ else if( i_pts == -1 && p_stream->fmt.i_cat == VIDEO_ES )
+ i_pts = i_interpolated_pts;
+ else if( i_pts == -1 ) i_pts = VLC_TS_INVALID;
if( p_stream->fmt.i_cat == AUDIO_ES )
+ {
p_block->i_dts = p_block->i_pts = i_pts;
+ /* Blatant abuse of the i_length field. */
+ p_block->i_length = p_stream->i_end_trim;
+ }
else if( p_stream->fmt.i_cat == SPU_ES )
{
p_block->i_dts = p_block->i_pts = i_pts;
p_block->i_length = 0;
}
- else if( p_stream->fmt.i_codec == VLC_FOURCC( 't','h','e','o' ) )
+ else if( p_stream->fmt.i_codec == VLC_CODEC_THEORA )
+ {
p_block->i_dts = p_block->i_pts = i_pts;
- else if( p_stream->fmt.i_codec == VLC_FOURCC( 'd','r','a','c' ) )
+ if( (p_oggpacket->granulepos & ((1<<p_stream->i_granule_shift)-1)) == 0 )
+ {
+ p_block->i_flags |= BLOCK_FLAG_TYPE_I;
+ }
+ }
+ else if( p_stream->fmt.i_codec == VLC_CODEC_DIRAC )
{
ogg_int64_t dts = p_oggpacket->granulepos >> 31;
ogg_int64_t delay = (p_oggpacket->granulepos >> 9) & 0x1fff;
uint64_t u_pnum = dts + delay;
p_block->i_dts = p_stream->i_pcr;
- p_block->i_pts = 0;
+ p_block->i_pts = VLC_TS_INVALID;
/* NB, OggDirac granulepos values are in units of 2*picturerate */
+
+ /* granulepos for dirac is possibly broken, this value should be ignored */
if( -1 != p_oggpacket->granulepos )
p_block->i_pts = u_pnum * INT64_C(1000000) / p_stream->f_rate / 2;
}
else
{
p_block->i_dts = i_pts;
- p_block->i_pts = 0;
+ p_block->i_pts = VLC_TS_INVALID;
}
- if( p_stream->fmt.i_codec != VLC_FOURCC( 'v','o','r','b' ) &&
- p_stream->fmt.i_codec != VLC_FOURCC( 's','p','x',' ' ) &&
- p_stream->fmt.i_codec != VLC_FOURCC( 'f','l','a','c' ) &&
- p_stream->fmt.i_codec != VLC_FOURCC( 't','a','r','k' ) &&
- p_stream->fmt.i_codec != VLC_FOURCC( 't','h','e','o' ) &&
- p_stream->fmt.i_codec != VLC_FOURCC( 'c','m','m','l' ) &&
- p_stream->fmt.i_codec != VLC_FOURCC( 'd','r','a','c' ) &&
- p_stream->fmt.i_codec != VLC_FOURCC( 'k','a','t','e' ) )
+ if( p_stream->fmt.i_codec != VLC_CODEC_VORBIS &&
+ p_stream->fmt.i_codec != VLC_CODEC_SPEEX &&
+ p_stream->fmt.i_codec != VLC_CODEC_OPUS &&
+ p_stream->fmt.i_codec != VLC_CODEC_FLAC &&
+ p_stream->fmt.i_codec != VLC_CODEC_TARKIN &&
+ p_stream->fmt.i_codec != VLC_CODEC_THEORA &&
+ p_stream->fmt.i_codec != VLC_CODEC_CMML &&
+ p_stream->fmt.i_codec != VLC_CODEC_DIRAC &&
+ p_stream->fmt.i_codec != VLC_CODEC_KATE )
{
+ if( p_oggpacket->bytes <= 0 )
+ {
+ msg_Dbg( p_demux, "discarding 0 sized packet" );
+ block_Release( p_block );
+ return;
+ }
/* We remove the header from the packet */
i_header_len = (*p_oggpacket->packet & PACKET_LEN_BITS01) >> 6;
i_header_len |= (*p_oggpacket->packet & PACKET_LEN_BITS2) << 1;
- if( p_stream->fmt.i_codec == VLC_FOURCC( 's','u','b','t' ))
+ if( p_stream->fmt.i_codec == VLC_CODEC_SUBT)
{
/* But with subtitles we need to retrieve the duration first */
int i, lenbytes = 0;
p_block->i_buffer = 0;
}
- if( p_stream->fmt.i_codec == VLC_FOURCC( 't','a','r','k' ) )
+ if( p_stream->fmt.i_codec == VLC_CODEC_TARKIN )
{
/* FIXME: the biggest hack I've ever done */
msg_Warn( p_demux, "tarkin pts: %"PRId64", granule: %"PRId64,
es_out_Send( p_demux->out, p_stream->p_es, p_block );
}
+/* Re-implemented to avoid linking against libopus from the demuxer. */
+static int Ogg_OpusPacketDuration( logical_stream_t *p_stream,
+ ogg_packet *p_oggpacket )
+{
+ static const int silk_fs_div[4] = { 6000, 3000, 1500, 1000 };
+ int toc;
+ int nframes;
+ int frame_size;
+ int nsamples;
+ int i_rate;
+ if( p_oggpacket->bytes < 1 )
+ return VLC_EGENERIC;
+ toc = p_oggpacket->packet[0];
+ switch( toc&3 )
+ {
+ case 0:
+ nframes = 1;
+ break;
+ case 1:
+ case 2:
+ nframes = 2;
+ break;
+ default:
+ if( p_oggpacket->bytes < 2 )
+ return VLC_EGENERIC;
+ nframes = p_oggpacket->packet[1]&0x3F;
+ break;
+ }
+ i_rate = (int)p_stream->fmt.audio.i_rate;
+ if( toc&0x80 )
+ frame_size = (i_rate << (toc >> 3 & 3)) / 400;
+ else if( ( toc&0x60 ) == 0x60 )
+ frame_size = i_rate/(100 >> (toc >> 3 & 1));
+ else
+ frame_size = i_rate*60 / silk_fs_div[toc >> 3 & 3];
+ nsamples = nframes*frame_size;
+ if( nsamples*25 > i_rate*3 )
+ return VLC_EGENERIC;
+ return nsamples;
+}
+
/****************************************************************************
* Ogg_FindLogicalStreams: Find the logical streams embedded in the physical
* stream and fill p_ogg.
{
demux_sys_t *p_ogg = p_demux->p_sys ;
ogg_packet oggpacket;
- ogg_page oggpage;
int i_stream;
- while( Ogg_ReadPage( p_demux, &oggpage ) == VLC_SUCCESS )
+ p_ogg->i_total_length = stream_Size ( p_demux->s );
+ msg_Dbg( p_demux, "File length is %"PRId64" bytes", p_ogg->i_total_length );
+
+
+ while( Ogg_ReadPage( p_demux, &p_ogg->current_page ) == VLC_SUCCESS )
{
- if( ogg_page_bos( &oggpage ) )
+
+ if( ogg_page_bos( &p_ogg->current_page ) )
{
/* All is wonderful in our fine fine little world.
* We found the beginning of our first logical stream. */
- while( ogg_page_bos( &oggpage ) )
+ while( ogg_page_bos( &p_ogg->current_page ) )
{
logical_stream_t *p_stream;
p_stream = malloc( sizeof(logical_stream_t) );
- if( !p_stream )
+ if( unlikely( !p_stream ) )
return VLC_ENOMEM;
TAB_APPEND( p_ogg->i_streams, p_ogg->pp_stream, p_stream );
p_stream->p_headers = 0;
p_stream->i_secondary_header_packets = 0;
+ p_stream->i_keyframe_offset = 0;
+ p_stream->i_skip_frames = 0;
+
+ p_stream->i_data_start = 0;
+
es_format_Init( &p_stream->fmt, 0, 0 );
es_format_Init( &p_stream->fmt_old, 0, 0 );
/* Setup the logical stream */
- p_stream->i_serial_no = ogg_page_serialno( &oggpage );
+ p_stream->i_serial_no = ogg_page_serialno( &p_ogg->current_page );
ogg_stream_init( &p_stream->os, p_stream->i_serial_no );
/* Extract the initial header from the first page and verify
* the codec type of this Ogg bitstream */
- if( ogg_stream_pagein( &p_stream->os, &oggpage ) < 0 )
+ if( ogg_stream_pagein( &p_stream->os, &p_ogg->current_page ) < 0 )
{
/* error. stream version mismatch perhaps */
msg_Err( p_demux, "error reading first page of "
if( oggpacket.bytes >= 7 &&
! memcmp( oggpacket.packet, "\x01vorbis", 7 ) )
{
- Ogg_ReadVorbisHeader( p_stream, &oggpacket );
+ Ogg_ReadVorbisHeader( p_demux, p_stream, &oggpacket );
msg_Dbg( p_demux, "found vorbis header" );
}
/* Check for Speex header */
p_stream->fmt.audio.i_channels,
(int)p_stream->f_rate, p_stream->fmt.i_bitrate );
}
+ /* Check for Opus header */
+ else if( oggpacket.bytes >= 8 &&
+ ! memcmp( oggpacket.packet, "OpusHead", 8 ) )
+ {
+ Ogg_ReadOpusHeader( p_demux, p_stream, &oggpacket );
+ msg_Dbg( p_demux, "found opus header, channels: %i, "
+ "pre-skip: %i",
+ p_stream->fmt.audio.i_channels,
+ (int)p_stream->i_pre_skip);
+ p_stream->i_skip_frames = p_stream->i_pre_skip;
+ }
/* Check for Flac header (< version 1.1.1) */
else if( oggpacket.bytes >= 4 &&
! memcmp( oggpacket.packet, "fLaC", 4 ) )
/* Grrrr!!!! Did they really have to put all the
* important info in the second header packet!!!
* (STREAMINFO metadata is in the following packet) */
- p_stream->b_force_backup = 1;
+ p_stream->b_force_backup = true;
p_stream->fmt.i_cat = AUDIO_ES;
- p_stream->fmt.i_codec = VLC_FOURCC( 'f','l','a','c' );
+ p_stream->fmt.i_codec = VLC_CODEC_FLAC;
}
/* Check for Flac header (>= version 1.1.1) */
else if( oggpacket.bytes >= 13 && oggpacket.packet[0] ==0x7F &&
oggpacket.packet[5], oggpacket.packet[6],
i_packets );
- p_stream->b_force_backup = 1;
+ p_stream->b_force_backup = true;
p_stream->fmt.i_cat = AUDIO_ES;
- p_stream->fmt.i_codec = VLC_FOURCC( 'f','l','a','c' );
+ p_stream->fmt.i_codec = VLC_CODEC_FLAC;
oggpacket.packet += 13; oggpacket.bytes -= 13;
Ogg_ReadFlacHeader( p_demux, p_stream, &oggpacket );
}
else if( oggpacket.bytes >= 7 &&
! memcmp( oggpacket.packet, "\x80theora", 7 ) )
{
- Ogg_ReadTheoraHeader( p_stream, &oggpacket );
+ Ogg_ReadTheoraHeader( p_demux, p_stream, &oggpacket );
msg_Dbg( p_demux,
"found theora header, bitrate: %i, rate: %f",
p_stream->fmt.i_bitrate, p_stream->f_rate );
}
/* Check for Dirac header */
- else if( oggpacket.bytes >= 5 &&
- ! memcmp( oggpacket.packet, "BBCD\x00", 5 ) )
+ else if( ( oggpacket.bytes >= 5 &&
+ ! memcmp( oggpacket.packet, "BBCD\x00", 5 ) ) ||
+ ( oggpacket.bytes >= 9 &&
+ ! memcmp( oggpacket.packet, "KW-DIRAC\x00", 9 ) ) )
{
- Ogg_ReadDiracHeader( p_stream, &oggpacket );
- msg_Dbg( p_demux, "found dirac header" );
+ if( Ogg_ReadDiracHeader( p_stream, &oggpacket ) )
+ msg_Dbg( p_demux, "found dirac header" );
+ else
+ {
+ msg_Warn( p_demux, "found dirac header isn't decodable" );
+ free( p_stream );
+ p_ogg->i_streams--;
+ }
}
/* Check for Tarkin header */
else if( oggpacket.bytes >= 7 &&
msg_Dbg( p_demux, "found tarkin header" );
p_stream->fmt.i_cat = VIDEO_ES;
- p_stream->fmt.i_codec = VLC_FOURCC( 't','a','r','k' );
+ p_stream->fmt.i_codec = VLC_CODEC_TARKIN;
/* Cheat and get additionnal info ;) */
oggpack_readinit( &opb, oggpacket.packet, oggpacket.bytes);
else if( oggpacket.bytes >= 7 &&
! memcmp( oggpacket.packet, "Annodex", 7 ) )
{
- Ogg_ReadAnnodexHeader( VLC_OBJECT(p_demux), p_stream,
- &oggpacket );
+ Ogg_ReadAnnodexHeader( p_demux, p_stream, &oggpacket );
/* kill annodex track */
free( p_stream );
p_ogg->i_streams--;
else if( oggpacket.bytes >= 7 &&
! memcmp( oggpacket.packet, "AnxData", 7 ) )
{
- Ogg_ReadAnnodexHeader( VLC_OBJECT(p_demux), p_stream,
- &oggpacket );
+ Ogg_ReadAnnodexHeader( p_demux, p_stream, &oggpacket );
}
/* Check for Kate header */
else if( oggpacket.bytes >= 8 &&
/* Check for audio header (old format) */
else if( GetDWLE((oggpacket.packet+96)) == 0x05589F81 )
{
- unsigned int i_extra_size;
+ int i_extra_size;
unsigned int i_format_tag;
p_stream->fmt.i_cat = AUDIO_ES;
p_ogg->i_streams--;
}
}
- else if( (*oggpacket.packet & PACKET_TYPE_BITS ) == PACKET_TYPE_HEADER &&
- oggpacket.bytes >= 56+1 )
+ else if( oggpacket.bytes >= 44+1 &&
+ (*oggpacket.packet & PACKET_TYPE_BITS ) == PACKET_TYPE_HEADER )
{
stream_header_t tmp;
stream_header_t *st = &tmp;
st->bits_per_sample = GetWLE( &oggpacket.packet[1+40] ); // (padding 2)
/* Check for video header (new format) */
- if( !strncmp( st->streamtype, "video", 5 ) )
+ if( !strncmp( st->streamtype, "video", 5 ) &&
+ oggpacket.bytes >= 52+1 )
{
st->sh.video.width = GetDWLE( &oggpacket.packet[1+44] );
st->sh.video.height = GetDWLE( &oggpacket.packet[1+48] );
p_stream->fmt.video.i_bits_per_pixel );
}
/* Check for audio header (new format) */
- else if( !strncmp( st->streamtype, "audio", 5 ) )
+ else if( !strncmp( st->streamtype, "audio", 5 ) &&
+ oggpacket.bytes >= 56+1 )
{
char p_buffer[5];
- unsigned int i_extra_size;
+ int i_extra_size;
int i_format_tag;
st->sh.audio.channels = GetWLE( &oggpacket.packet[1+44] );
/* We need to get rid of the header packet */
ogg_stream_packetout( &p_stream->os, &oggpacket );
- msg_Dbg( p_demux, "found text subtitles header" );
+ msg_Dbg( p_demux, "found text subtitle header" );
p_stream->fmt.i_cat = SPU_ES;
- p_stream->fmt.i_codec = VLC_FOURCC('s','u','b','t');
+ p_stream->fmt.i_codec = VLC_CODEC_SUBT;
p_stream->f_rate = 1000; /* granulepos is in millisec */
}
else
p_ogg->i_streams--;
}
- if( Ogg_ReadPage( p_demux, &oggpage ) != VLC_SUCCESS )
+ if( Ogg_ReadPage( p_demux, &p_ogg->current_page ) != VLC_SUCCESS )
return VLC_EGENERIC;
}
for( i_stream = 0; i_stream < p_ogg->i_streams; i_stream++ )
{
if( ogg_stream_pagein( &p_ogg->pp_stream[i_stream]->os,
- &oggpage ) == 0 )
+ &p_ogg->current_page ) == 0 )
{
p_ogg->b_page_waiting = true;
break;
p_stream->p_es = NULL;
+ /* initialise kframe index */
+ p_stream->idx=NULL;
+
/* Try first to reuse an old ES */
if( p_old_stream &&
p_old_stream->fmt.i_cat == p_stream->fmt.i_cat &&
}
if( !p_stream->p_es )
+ {
+ /* Better be safe than sorry when possible with ogm */
+ if( p_stream->fmt.i_codec == VLC_CODEC_MPGA ||
+ p_stream->fmt.i_codec == VLC_CODEC_A52 )
+ p_stream->fmt.b_packetized = false;
+
p_stream->p_es = es_out_Add( p_demux->out, &p_stream->fmt );
+ }
// TODO: something to do here ?
- if( p_stream->fmt.i_codec == VLC_FOURCC('c','m','m','l') )
+ if( p_stream->fmt.i_codec == VLC_CODEC_CMML )
{
/* Set the CMML stream active */
es_out_Control( p_demux->out, ES_OUT_SET_ES, p_stream->p_es );
Ogg_LogicalStreamDelete( p_demux, p_ogg->p_old_stream );
p_ogg->p_old_stream = NULL;
}
+
+
+ /* get total frame count for video stream; we will need this for seeking */
+ p_ogg->i_total_frames = 0;
+
return VLC_SUCCESS;
}
p_ogg->i_bitrate = 0;
p_ogg->i_streams = 0;
p_ogg->pp_stream = NULL;
+
+ /* */
+ if( p_ogg->p_meta )
+ vlc_meta_Delete( p_ogg->p_meta );
+ p_ogg->p_meta = NULL;
}
/**
es_format_Clean( &p_stream->fmt_old );
es_format_Clean( &p_stream->fmt );
+ if ( p_stream->idx != NULL)
+ {
+ oggseek_index_entries_free( p_stream->idx );
+ }
+
free( p_stream );
}
/**
*/
static bool Ogg_IsVorbisFormatCompatible( const es_format_t *p_new, const es_format_t *p_old )
{
- int i_new = 0;
- int i_old = 0;
- int i;
-
- for( i = 0; i < 3; i++ )
+ unsigned pi_new_size[XIPH_MAX_HEADER_COUNT];
+ void *pp_new_data[XIPH_MAX_HEADER_COUNT];
+ unsigned i_new_count;
+ if( xiph_SplitHeaders(pi_new_size, pp_new_data, &i_new_count, p_new->i_extra, p_new->p_extra ) )
+ i_new_count = 0;
+
+ unsigned pi_old_size[XIPH_MAX_HEADER_COUNT];
+ void *pp_old_data[XIPH_MAX_HEADER_COUNT];
+ unsigned i_old_count;
+ if( xiph_SplitHeaders(pi_old_size, pp_old_data, &i_old_count, p_old->i_extra, p_old->p_extra ) )
+ i_old_count = 0;
+
+ bool b_match = i_new_count == i_old_count;
+ for( unsigned i = 0; i < i_new_count && b_match; i++ )
{
- const uint8_t *p_new_extra = ( const uint8_t*)p_new->p_extra + i_new;
- const uint8_t *p_old_extra = ( const uint8_t*)p_old->p_extra + i_old;
-
- if( p_new->i_extra < i_new+2 || p_old->i_extra < i_old+2 )
- return false;
+ /* Ignore vorbis comment */
+ if( i == 1 )
+ continue;
+ if( pi_new_size[i] != pi_old_size[i] ||
+ memcmp( pp_new_data[i], pp_old_data[i], pi_new_size[i] ) )
+ b_match = false;
+ }
- const int i_new_size = GetWBE( &p_new_extra[0] );
- const int i_old_size = GetWBE( &p_old_extra[0] );
+ for( unsigned i = 0; i < i_new_count; i++ )
+ free( pp_new_data[i] );
+ for( unsigned i = 0; i < i_old_count; i++ )
+ free( pp_old_data[i] );
+ return b_match;
+}
- if( i != 1 ) /* Ignore vorbis comment */
+static bool Ogg_IsOpusFormatCompatible( const es_format_t *p_new,
+ const es_format_t *p_old )
+{
+ unsigned pi_new_size[XIPH_MAX_HEADER_COUNT];
+ void *pp_new_data[XIPH_MAX_HEADER_COUNT];
+ unsigned i_new_count;
+ if( xiph_SplitHeaders(pi_new_size, pp_new_data, &i_new_count, p_new->i_extra, p_new->p_extra ) )
+ i_new_count = 0;
+ unsigned pi_old_size[XIPH_MAX_HEADER_COUNT];
+ void *pp_old_data[XIPH_MAX_HEADER_COUNT];
+ unsigned i_old_count;
+ if( xiph_SplitHeaders(pi_old_size, pp_old_data, &i_old_count, p_old->i_extra, p_old->p_extra ) )
+ i_old_count = 0;
+ bool b_match = false;
+ if( i_new_count == i_old_count && i_new_count > 0 )
+ {
+ static const unsigned char default_map[2] = { 0, 1 };
+ unsigned char *p_old_head;
+ unsigned char *p_new_head;
+ const unsigned char *p_old_map;
+ const unsigned char *p_new_map;
+ int i_old_channel_count;
+ int i_new_channel_count;
+ int i_old_stream_count;
+ int i_new_stream_count;
+ int i_old_coupled_count;
+ int i_new_coupled_count;
+ p_old_head = (unsigned char *)pp_old_data[0];
+ i_old_channel_count = i_old_stream_count = i_old_coupled_count = 0;
+ p_old_map = default_map;
+ if( pi_old_size[0] >= 19 && p_old_head[8] <= 15 )
{
- if( i_new_size != i_old_size )
- return false;
- if( memcmp( &p_new_extra[2], &p_old_extra[2], i_new_size ) )
- return false;
+ i_old_channel_count = p_old_head[9];
+ switch( p_old_head[18] )
+ {
+ case 0:
+ i_old_stream_count = 1;
+ i_old_coupled_count = i_old_channel_count - 1;
+ break;
+ case 1:
+ if( pi_old_size[0] >= 21U + i_old_channel_count )
+ {
+ i_old_stream_count = p_old_head[19];
+ i_old_coupled_count = p_old_head[20];
+ p_old_map = p_old_head + 21;
+ }
+ break;
+ }
}
-
- i_new += 2 + i_new_size;
- i_old += 2 + i_old_size;
+ p_new_head = (unsigned char *)pp_new_data[0];
+ i_new_channel_count = i_new_stream_count = i_new_coupled_count = 0;
+ p_new_map = default_map;
+ if( pi_new_size[0] >= 19 && p_new_head[8] <= 15 )
+ {
+ i_new_channel_count = p_new_head[9];
+ switch( p_new_head[18] )
+ {
+ case 0:
+ i_new_stream_count = 1;
+ i_new_coupled_count = i_new_channel_count - 1;
+ break;
+ case 1:
+ if( pi_new_size[0] >= 21U + i_new_channel_count )
+ {
+ i_new_stream_count = p_new_head[19];
+ i_new_coupled_count = p_new_head[20];
+ p_new_map = p_new_head+21;
+ }
+ break;
+ }
+ }
+ b_match = i_old_channel_count == i_new_channel_count &&
+ i_old_stream_count == i_new_stream_count &&
+ i_old_coupled_count == i_new_coupled_count &&
+ memcmp(p_old_map, p_new_map,
+ i_new_channel_count*sizeof(*p_new_map)) == 0;
}
- return true;
+ for( unsigned i = 0; i < i_new_count; i++ )
+ free( pp_new_data[i] );
+ for( unsigned i = 0; i < i_old_count; i++ )
+ free( pp_old_data[i] );
+ return b_match;
}
+
static bool Ogg_LogicalStreamResetEsFormat( demux_t *p_demux, logical_stream_t *p_stream )
{
bool b_compatible = false;
if( !p_stream->fmt_old.i_cat || !p_stream->fmt_old.i_codec )
return true;
- /* Only vorbis is supported */
- if( p_stream->fmt.i_codec == VLC_FOURCC( 'v','o','r','b' ) )
+ /* Only Vorbis and Opus are supported. */
+ if( p_stream->fmt.i_codec == VLC_CODEC_VORBIS )
b_compatible = Ogg_IsVorbisFormatCompatible( &p_stream->fmt, &p_stream->fmt_old );
+ else if( p_stream->fmt.i_codec == VLC_CODEC_OPUS )
+ b_compatible = Ogg_IsOpusFormatCompatible( &p_stream->fmt, &p_stream->fmt_old );
if( !b_compatible )
msg_Warn( p_demux, "cannot reuse old stream, resetting the decoder" );
return !b_compatible;
}
+static void Ogg_ExtractXiphMeta( demux_t *p_demux, const void *p_headers, unsigned i_headers, unsigned i_skip )
+{
+ demux_sys_t *p_ogg = p_demux->p_sys;
+
+ unsigned pi_size[XIPH_MAX_HEADER_COUNT];
+ void *pp_data[XIPH_MAX_HEADER_COUNT];
+ unsigned i_count;
+ if( xiph_SplitHeaders( pi_size, pp_data, &i_count, i_headers, p_headers ) )
+ return;
+
+ /* TODO how to handle multiple comments properly ? */
+ if( i_count >= 2 && pi_size[1] > i_skip )
+ {
+ int i_cover_score = 0;
+ int i_cover_idx = 0;
+ vorbis_ParseComment( &p_ogg->p_meta, (uint8_t*)pp_data[1] + i_skip, pi_size[1] - i_skip,
+ &p_ogg->i_attachments, &p_ogg->attachments,
+ &i_cover_score, &i_cover_idx,
+ &p_ogg->i_seekpoints, &p_ogg->pp_seekpoints );
+ if( p_ogg->p_meta != NULL && i_cover_idx < p_ogg->i_attachments )
+ {
+ char psz_url[128];
+ snprintf( psz_url, sizeof(psz_url), "attachment://%s",
+ p_ogg->attachments[i_cover_idx]->psz_name );
+ vlc_meta_Set( p_ogg->p_meta, vlc_meta_ArtworkURL, psz_url );
+ }
+ }
-static void Ogg_ReadTheoraHeader( logical_stream_t *p_stream,
+ if( p_ogg->i_seekpoints > 1 )
+ {
+ p_demux->info.i_update |= INPUT_UPDATE_TITLE_LIST;
+ }
+
+ for( unsigned i = 0; i < i_count; i++ )
+ free( pp_data[i] );
+}
+static void Ogg_ExtractMeta( demux_t *p_demux, vlc_fourcc_t i_codec, const uint8_t *p_headers, int i_headers )
+{
+ demux_sys_t *p_ogg = p_demux->p_sys;
+
+ switch( i_codec )
+ {
+ /* 3 headers with the 2° one being the comments */
+ case VLC_CODEC_VORBIS:
+ case VLC_CODEC_THEORA:
+ Ogg_ExtractXiphMeta( p_demux, p_headers, i_headers, 1+6 );
+ break;
+ case VLC_CODEC_OPUS:
+ Ogg_ExtractXiphMeta( p_demux, p_headers, i_headers, 8 );
+ break;
+ case VLC_CODEC_SPEEX:
+ Ogg_ExtractXiphMeta( p_demux, p_headers, i_headers, 0 );
+ break;
+
+ /* N headers with the 2° one being the comments */
+ case VLC_CODEC_KATE:
+ /* 1 byte for header type, 7 bytes for magic, 1 reserved zero byte */
+ Ogg_ExtractXiphMeta( p_demux, p_headers, i_headers, 1+7+1 );
+ break;
+
+ /* TODO */
+ case VLC_CODEC_FLAC:
+ msg_Warn( p_demux, "Ogg_ExtractMeta does not support %4.4s", (const char*)&i_codec );
+ break;
+
+ /* No meta data */
+ case VLC_CODEC_CMML: /* CMML is XML text, doesn't have Vorbis comments */
+ case VLC_CODEC_DIRAC:
+ default:
+ break;
+ }
+ if( p_ogg->p_meta )
+ p_demux->info.i_update |= INPUT_UPDATE_META;
+}
+
+static int64_t Ogg_GetLastPacket( demux_t *p_demux, logical_stream_t *p_stream,
+ double f_rate )
+{
+ int64_t last_packet = oggseek_get_last_frame( p_demux, p_stream );
+ return ( last_packet >= 0 ) ? last_packet / f_rate : -1;
+}
+
+static void Ogg_ReadTheoraHeader( demux_t *p_demux, logical_stream_t *p_stream,
ogg_packet *p_oggpacket )
{
bs_t bitstream;
int i_fps_numerator;
int i_fps_denominator;
int i_keyframe_frequency_force;
+ int i_major;
+ int i_minor;
+ int i_subminor;
+ int i_version;
p_stream->fmt.i_cat = VIDEO_ES;
- p_stream->fmt.i_codec = VLC_FOURCC( 't','h','e','o' );
+ p_stream->fmt.i_codec = VLC_CODEC_THEORA;
/* Signal that we want to keep a backup of the theora
* stream headers. They will be used when switching between
* audio streams. */
- p_stream->b_force_backup = 1;
+ p_stream->b_force_backup = true;
/* Cheat and get additionnal info ;) */
bs_init( &bitstream, p_oggpacket->packet, p_oggpacket->bytes );
bs_skip( &bitstream, 56 );
- bs_read( &bitstream, 8 ); /* major version num */
- bs_read( &bitstream, 8 ); /* minor version num */
- bs_read( &bitstream, 8 ); /* subminor version num */
+
+ i_major = bs_read( &bitstream, 8 ); /* major version num */
+ i_minor = bs_read( &bitstream, 8 ); /* minor version num */
+ i_subminor = bs_read( &bitstream, 8 ); /* subminor version num */
+
bs_read( &bitstream, 16 ) /*<< 4*/; /* width */
bs_read( &bitstream, 16 ) /*<< 4*/; /* height */
bs_read( &bitstream, 24 ); /* frame width */
i_keyframe_frequency_force >>= 1;
}
+ i_version = i_major * 1000000 + i_minor * 1000 + i_subminor;
+ p_stream->i_keyframe_offset = 0;
p_stream->f_rate = ((float)i_fps_numerator) / i_fps_denominator;
+
+ if ( i_version >= 3002001 )
+ {
+ p_stream->i_keyframe_offset = 1;
+ }
+ if ( p_demux->p_sys->i_length < 0 )
+ {
+ int64_t last_packet = Ogg_GetLastPacket( p_demux, p_stream, p_stream->f_rate );
+ if ( last_packet >= 0 )
+ p_demux->p_sys->i_length = last_packet;
+ }
+
}
-static void Ogg_ReadVorbisHeader( logical_stream_t *p_stream,
+static void Ogg_ReadVorbisHeader( demux_t *p_demux, logical_stream_t *p_stream,
ogg_packet *p_oggpacket )
{
oggpack_buffer opb;
p_stream->fmt.i_cat = AUDIO_ES;
- p_stream->fmt.i_codec = VLC_FOURCC( 'v','o','r','b' );
+ p_stream->fmt.i_codec = VLC_CODEC_VORBIS;
/* Signal that we want to keep a backup of the vorbis
* stream headers. They will be used when switching between
* audio streams. */
- p_stream->b_force_backup = 1;
+ p_stream->b_force_backup = true;
/* Cheat and get additionnal info ;) */
oggpack_readinit( &opb, p_oggpacket->packet, p_oggpacket->bytes);
oggpack_read( &opb, 32 );
oggpack_adv( &opb, 32 );
p_stream->fmt.i_bitrate = oggpack_read( &opb, 32 );
+
+ if ( p_demux->p_sys->i_length < 0 )
+ {
+ int64_t last_packet = Ogg_GetLastPacket( p_demux, p_stream, p_stream->f_rate );
+ if ( last_packet >= 0 )
+ p_demux->p_sys->i_length = last_packet;
+ }
}
static void Ogg_ReadSpeexHeader( logical_stream_t *p_stream,
oggpack_buffer opb;
p_stream->fmt.i_cat = AUDIO_ES;
- p_stream->fmt.i_codec = VLC_FOURCC( 's','p','x',' ' );
+ p_stream->fmt.i_codec = VLC_CODEC_SPEEX;
/* Signal that we want to keep a backup of the speex
* stream headers. They will be used when switching between
* audio streams. */
- p_stream->b_force_backup = 1;
+ p_stream->b_force_backup = true;
/* Cheat and get additionnal info ;) */
oggpack_readinit( &opb, p_oggpacket->packet, p_oggpacket->bytes);
p_stream->fmt.i_bitrate = oggpack_read( &opb, 32 );
}
+static void Ogg_ReadOpusHeader( demux_t *p_demux,
+ logical_stream_t *p_stream,
+ ogg_packet *p_oggpacket )
+{
+ oggpack_buffer opb;
+
+ p_stream->fmt.i_cat = AUDIO_ES;
+ p_stream->fmt.i_codec = VLC_CODEC_OPUS;
+
+ /* Signal that we want to keep a backup of the opus
+ * stream headers. They will be used when switching between
+ * audio streams. */
+ p_stream->b_force_backup = true;
+
+ /* All OggOpus streams are timestamped at 48kHz and
+ * can be played at 48kHz. */
+ p_stream->f_rate = p_stream->fmt.audio.i_rate = 48000;
+ p_stream->fmt.i_bitrate = 0;
+
+ /* Cheat and get additional info ;) */
+ oggpack_readinit( &opb, p_oggpacket->packet, p_oggpacket->bytes);
+ oggpack_adv( &opb, 64 );
+ oggpack_adv( &opb, 8 ); /* version_id */
+ p_stream->fmt.audio.i_channels = oggpack_read( &opb, 8 );
+ p_stream->i_pre_skip = oggpack_read( &opb, 16 );
+
+ if ( p_demux->p_sys->i_length < 0 )
+ {
+ int64_t last_packet = Ogg_GetLastPacket( p_demux, p_stream, p_stream->f_rate );
+ if ( last_packet >= 0 )
+ p_demux->p_sys->i_length = last_packet;
+ }
+}
+
static void Ogg_ReadFlacHeader( demux_t *p_demux, logical_stream_t *p_stream,
ogg_packet *p_oggpacket )
{
bs_init( &s, p_oggpacket->packet, p_oggpacket->bytes );
bs_read( &s, 1 );
- if( bs_read( &s, 7 ) == 0 )
+ if( p_oggpacket->bytes > 0 && bs_read( &s, 7 ) != 0 )
{
- if( bs_read( &s, 24 ) >= 34 /*size STREAMINFO*/ )
- {
- bs_skip( &s, 80 );
- p_stream->f_rate = p_stream->fmt.audio.i_rate = bs_read( &s, 20 );
- p_stream->fmt.audio.i_channels = bs_read( &s, 3 ) + 1;
+ msg_Dbg( p_demux, "Invalid FLAC STREAMINFO metadata" );
+ return;
+ }
- msg_Dbg( p_demux, "FLAC header, channels: %i, rate: %i",
- p_stream->fmt.audio.i_channels, (int)p_stream->f_rate );
- }
- else
- {
- msg_Dbg( p_demux, "FLAC STREAMINFO metadata too short" );
- }
+ if( bs_read( &s, 24 ) >= 34 /*size STREAMINFO*/ )
+ {
+ bs_skip( &s, 80 );
+ p_stream->f_rate = p_stream->fmt.audio.i_rate = bs_read( &s, 20 );
+ p_stream->fmt.audio.i_channels = bs_read( &s, 3 ) + 1;
- /* Fake this as the last metadata block */
- *((uint8_t*)p_oggpacket->packet) |= 0x80;
+ msg_Dbg( p_demux, "FLAC header, channels: %i, rate: %i",
+ p_stream->fmt.audio.i_channels, (int)p_stream->f_rate );
}
else
{
- /* This ain't a STREAMINFO metadata */
- msg_Dbg( p_demux, "Invalid FLAC STREAMINFO metadata" );
+ msg_Dbg( p_demux, "FLAC STREAMINFO metadata too short" );
}
+
+ /* Fake this as the last metadata block */
+ *((uint8_t*)p_oggpacket->packet) |= 0x80;
}
static void Ogg_ReadKateHeader( logical_stream_t *p_stream,
int32_t gnum;
int32_t gden;
int n;
+ char *psz_desc;
p_stream->fmt.i_cat = SPU_ES;
- p_stream->fmt.i_codec = VLC_FOURCC( 'k','a','t','e' );
+ p_stream->fmt.i_codec = VLC_CODEC_KATE;
/* Signal that we want to keep a backup of the kate
* stream headers. They will be used when switching between
* kate streams. */
- p_stream->b_force_backup = 1;
+ p_stream->b_force_backup = true;
/* Cheat and get additionnal info ;) */
oggpack_readinit( &opb, p_oggpacket->packet, p_oggpacket->bytes);
p_stream->fmt.psz_language = malloc(16);
if( p_stream->fmt.psz_language )
{
- for( n = 0; n < 16; ++n )
+ for( n = 0; n < 16; n++ )
p_stream->fmt.psz_language[n] = oggpack_read(&opb,8);
p_stream->fmt.psz_language[15] = 0; /* just in case */
}
else
{
- for( n = 0; n < 16; ++n )
+ for( n = 0; n < 16; n++ )
oggpack_read(&opb,8);
}
p_stream->fmt.psz_description = malloc(16);
if( p_stream->fmt.psz_description )
{
- for( n = 0; n < 16; ++n )
+ for( n = 0; n < 16; n++ )
p_stream->fmt.psz_description[n] = oggpack_read(&opb,8);
p_stream->fmt.psz_description[15] = 0; /* just in case */
+
+ /* Now find a localized user readable description for this category */
+ psz_desc = strdup(FindKateCategoryName(p_stream->fmt.psz_description));
+ if( psz_desc )
+ {
+ free( p_stream->fmt.psz_description );
+ p_stream->fmt.psz_description = psz_desc;
+ }
}
else
{
- for( n = 0; n < 16; ++n )
+ for( n = 0; n < 16; n++ )
oggpack_read(&opb,8);
}
}
-static void Ogg_ReadAnnodexHeader( vlc_object_t *p_this,
+static void Ogg_ReadAnnodexHeader( demux_t *p_demux,
logical_stream_t *p_stream,
ogg_packet *p_oggpacket )
{
uint64_t timebase_numerator;
uint64_t timebase_denominator;
- Ogg_ReadTheoraHeader( p_stream, p_oggpacket );
+ Ogg_ReadTheoraHeader( p_demux, p_stream, p_oggpacket );
oggpack_readinit( &opb, p_oggpacket->packet, p_oggpacket->bytes);
oggpack_adv( &opb, 8*8 ); /* "Annodex\0" header */
minor_version = oggpack_read( &opb, 2*8 ); /* minor version */
timebase_numerator = GetQWLE( &p_oggpacket->packet[16] );
timebase_denominator = GetQWLE( &p_oggpacket->packet[24] );
+
+ msg_Dbg( p_demux, "Annodex info: version %"PRIu16".%"PRIu16" "
+ "Timebase %"PRId64" / %"PRId64,
+ major_version, minor_version,
+ timebase_numerator, timebase_denominator );
}
else if( p_oggpacket->bytes >= 42 &&
!memcmp( p_oggpacket->packet, "AnxData", 7 ) )
uint8_t *p = memchr( &p_oggpacket->packet[42], '\r',
p_oggpacket->bytes - 1 );
if( p && p[0] == '\r' && p[1] == '\n' )
- sscanf( (char*)(&p_oggpacket->packet[42]), "%1024s\r\n",
+ sscanf( (char*)(&p_oggpacket->packet[42]), "%1023s\r\n",
content_type_string );
}
- msg_Dbg( p_this, "AnxData packet info: %"PRId64" / %"PRId64", %d, ``%s''",
+ msg_Dbg( p_demux, "AnxData packet info: %"PRId64" / %"PRId64", %d, ``%s''",
granule_rate_numerator, granule_rate_denominator,
p_stream->i_secondary_header_packets, content_type_string );
else if( !strncmp(content_type_string, "audio/x-vorbis", 14) )
{
p_stream->fmt.i_cat = AUDIO_ES;
- p_stream->fmt.i_codec = VLC_FOURCC( 'v','o','r','b' );
+ p_stream->fmt.i_codec = VLC_CODEC_VORBIS;
- p_stream->b_force_backup = 1;
+ p_stream->b_force_backup = true;
}
- else if( !strncmp(content_type_string, "audio/x-speex", 14) )
+ else if( !strncmp(content_type_string, "audio/x-speex", 13) )
{
p_stream->fmt.i_cat = AUDIO_ES;
- p_stream->fmt.i_codec = VLC_FOURCC( 's','p','x',' ' );
+ p_stream->fmt.i_codec = VLC_CODEC_SPEEX;
- p_stream->b_force_backup = 1;
+ p_stream->b_force_backup = true;
}
else if( !strncmp(content_type_string, "video/x-theora", 14) )
{
p_stream->fmt.i_cat = VIDEO_ES;
- p_stream->fmt.i_codec = VLC_FOURCC( 't','h','e','o' );
+ p_stream->fmt.i_codec = VLC_CODEC_THEORA;
- p_stream->b_force_backup = 1;
+ p_stream->b_force_backup = true;
}
- else if( !strncmp(content_type_string, "video/x-xvid", 14) )
+ else if( !strncmp(content_type_string, "video/x-xvid", 12) )
{
p_stream->fmt.i_cat = VIDEO_ES;
p_stream->fmt.i_codec = VLC_FOURCC( 'x','v','i','d' );
- p_stream->b_force_backup = 1;
+ p_stream->b_force_backup = true;
}
- else if( !strncmp(content_type_string, "video/mpeg", 14) )
+ else if( !strncmp(content_type_string, "video/mpeg", 10) )
{
/* n.b. MPEG streams are unsupported right now */
p_stream->fmt.i_cat = VIDEO_ES;
- p_stream->fmt.i_codec = VLC_FOURCC( 'm','p','g','v' );
+ p_stream->fmt.i_codec = VLC_CODEC_MPGV;
}
else if( !strncmp(content_type_string, "text/x-cmml", 11) )
{
ogg_stream_packetout( &p_stream->os, p_oggpacket );
p_stream->fmt.i_cat = SPU_ES;
- p_stream->fmt.i_codec = VLC_FOURCC( 'c','m','m','l' );
+ p_stream->fmt.i_codec = VLC_CODEC_CMML;
}
}
}
return bs_read( p_bs, 1 );
}
-static void Ogg_ReadDiracHeader( logical_stream_t *p_stream,
+static bool Ogg_ReadDiracHeader( logical_stream_t *p_stream,
ogg_packet *p_oggpacket )
{
+ static const struct {
+ uint32_t u_n /* numerator */, u_d /* denominator */;
+ } p_dirac_frate_tbl[] = { /* table 10.3 */
+ {1,1}, /* this first value is never used */
+ {24000,1001}, {24,1}, {25,1}, {30000,1001}, {30,1},
+ {50,1}, {60000,1001}, {60,1}, {15000,1001}, {25,2},
+ };
+ static const size_t u_dirac_frate_tbl = sizeof(p_dirac_frate_tbl)/sizeof(*p_dirac_frate_tbl);
+
+ static const uint32_t pu_dirac_vidfmt_frate[] = { /* table C.1 */
+ 1, 9, 10, 9, 10, 9, 10, 4, 3, 7, 6, 4, 3, 7, 6, 2, 2, 7, 6, 7, 6,
+ };
+ static const size_t u_dirac_vidfmt_frate = sizeof(pu_dirac_vidfmt_frate)/sizeof(*pu_dirac_vidfmt_frate);
+
bs_t bs;
- p_stream->fmt.i_cat = VIDEO_ES;
- p_stream->fmt.i_codec = VLC_FOURCC( 'd','r','a','c' );
- p_stream->i_granule_shift = 32;
+ p_stream->i_granule_shift = 22; /* not 32 */
/* Backing up stream headers is not required -- seqhdrs are repeated
* thoughout the stream at suitable decoding start points */
- p_stream->b_force_backup = 0;
+ p_stream->b_force_backup = false;
/* read in useful bits from sequence header */
bs_init( &bs, p_oggpacket->packet, p_oggpacket->bytes );
dirac_uint( &bs ); /* level */
uint32_t u_video_format = dirac_uint( &bs ); /* index */
+ if( u_video_format >= u_dirac_vidfmt_frate )
+ {
+ /* don't know how to parse this ogg dirac stream */
+ return false;
+ }
if( dirac_bool( &bs ) )
{
dirac_uint( &bs ); /* scan_format */
}
- static const struct {
- uint32_t u_n /* numerator */, u_d /* denominator */;
- } p_dirac_frate_tbl[] = { /* table 10.3 */
- {1,1}, /* this first value is never used */
- {24000,1001}, {24,1}, {25,1}, {30000,1001}, {30,1},
- {50,1}, {60000,1001}, {60,1}, {15000,1001}, {25,2},
- };
- static const size_t u_dirac_frate_tbl = sizeof(p_dirac_frate_tbl)/sizeof(*p_dirac_frate_tbl);
-
- static const uint32_t pu_dirac_vidfmt_frate[] = { /* table C.1 */
- 1, 9, 10, 9, 10, 9, 10, 4, 3, 7, 6, 4, 3, 7, 6, 2, 2, 7, 6, 7, 6,
- };
- static const size_t u_dirac_vidfmt_frate = sizeof(pu_dirac_vidfmt_frate)/sizeof(*pu_dirac_vidfmt_frate);
-
- /* */
- if( u_video_format >= u_dirac_vidfmt_frate )
- u_video_format = 0;
-
uint32_t u_n = p_dirac_frate_tbl[pu_dirac_vidfmt_frate[u_video_format]].u_n;
uint32_t u_d = p_dirac_frate_tbl[pu_dirac_vidfmt_frate[u_video_format]].u_d;
if( dirac_bool( &bs ) )
{
uint32_t u_frame_rate_index = dirac_uint( &bs );
- if( u_frame_rate_index > u_dirac_frate_tbl )
- u_frame_rate_index = 0;
+ if( u_frame_rate_index >= u_dirac_frate_tbl )
+ {
+ /* something is wrong with this stream */
+ return false;
+ }
u_n = p_dirac_frate_tbl[u_frame_rate_index].u_n;
u_d = p_dirac_frate_tbl[u_frame_rate_index].u_d;
if( u_frame_rate_index == 0 )
}
}
p_stream->f_rate = (float) u_n / u_d;
+
+ /* probably is an ogg dirac es */
+ p_stream->fmt.i_cat = VIDEO_ES;
+ p_stream->fmt.i_codec = VLC_CODEC_DIRAC;
+
+ return true;
}
projects / vlc / blobdiff