/*****************************************************************************
* demux.c: demuxer using ffmpeg (libavformat).
*****************************************************************************
- * Copyright (C) 2004 VideoLAN
+ * Copyright (C) 2004 the VideoLAN team
* $Id$
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
* 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., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/*****************************************************************************
#include "vlc_meta.h"
/* ffmpeg header */
-#ifdef HAVE_FFMPEG_AVCODEC_H
+#ifdef HAVE_FFMPEG_AVFORMAT_H
# include <ffmpeg/avformat.h>
#else
# include <avformat.h>
//#define AVFORMAT_DEBUG 1
/* Version checking */
-#if (LIBAVFORMAT_BUILD >= 4611) && defined(HAVE_LIBAVFORMAT)
-
-#if LIBAVFORMAT_BUILD >= 4619
-# define av_seek_frame(a,b,c) av_seek_frame(a,b,c,AVSEEK_FLAG_BYTE)
-#endif
+#if (LIBAVFORMAT_BUILD >= 4629) && (defined(HAVE_FFMPEG_AVFORMAT_H) || defined(HAVE_LIBAVFORMAT_TREE))
/*****************************************************************************
* demux_sys_t: demux descriptor
static int Control( demux_t *p_demux, int i_query, va_list args );
static int IORead( void *opaque, uint8_t *buf, int buf_size );
-static int IOSeek( void *opaque, offset_t offset, int whence );
+static offset_t IOSeek( void *opaque, offset_t offset, int whence );
/*****************************************************************************
* Open
return VLC_EGENERIC;
}
- /* Should we call it only once ? */
- av_register_all();
+ av_register_all(); /* Can be called several times */
/* Guess format */
if( !( fmt = av_probe_input_format( &pd, 1 ) ) )
return VLC_EGENERIC;
}
+ /* Don't trigger false alarms on bin files */
+ if( !p_demux->b_force && !strcmp( fmt->name, "psxstr" ) )
+ {
+ int i_len;
+
+ if( !p_demux->psz_path ) return VLC_EGENERIC;
+
+ i_len = strlen( p_demux->psz_path );
+ if( i_len < 4 ) return VLC_EGENERIC;
+
+ if( strcasecmp( &p_demux->psz_path[i_len - 4], ".str" ) &&
+ strcasecmp( &p_demux->psz_path[i_len - 4], ".xai" ) &&
+ strcasecmp( &p_demux->psz_path[i_len - 3], ".xa" ) )
+ {
+ return VLC_EGENERIC;
+ }
+ }
+
msg_Dbg( p_demux, "detected format: %s", fmt->name );
/* Fill p_demux fields */
p_demux->pf_demux = Demux;
p_demux->pf_control = Control;
p_demux->p_sys = p_sys = malloc( sizeof( demux_sys_t ) );
+ p_sys->ic = 0;
p_sys->fmt = fmt;
p_sys->i_tk = 0;
p_sys->tk = NULL;
p_sys->i_pcr_tk = -1;
+ p_sys->i_pcr = -1;
/* Create I/O wrapper */
p_sys->io_buffer_size = 32768; /* FIXME */
p_sys->fmt, NULL ) )
{
msg_Err( p_demux, "av_open_input_stream failed" );
+ E_(CloseDemux)( p_this );
return VLC_EGENERIC;
}
- if( av_find_stream_info( p_sys->ic ) )
+ if( av_find_stream_info( p_sys->ic ) < 0 )
{
msg_Err( p_demux, "av_find_stream_info failed" );
+ E_(CloseDemux)( p_this );
return VLC_EGENERIC;
}
for( i = 0; i < p_sys->ic->nb_streams; i++ )
{
- AVCodecContext *cc = &p_sys->ic->streams[i]->codec;
+ AVCodecContext *cc = p_sys->ic->streams[i]->codec;
es_out_id_t *es;
es_format_t fmt;
vlc_fourcc_t fcc;
if( !E_(GetVlcFourcc)( cc->codec_id, NULL, &fcc, NULL ) )
+ {
fcc = VLC_FOURCC( 'u', 'n', 'd', 'f' );
+ /* Special case for raw video data */
+ if( cc->codec_id == CODEC_ID_RAWVIDEO )
+ {
+ msg_Dbg( p_demux, "raw video, pixel format: %i", cc->pix_fmt );
+ fcc = E_(GetVlcChroma)( cc->pix_fmt );
+ }
+ }
+
switch( cc->codec_type )
{
case CODEC_TYPE_AUDIO:
{
demux_t *p_demux = (demux_t*)p_this;
demux_sys_t *p_sys = p_demux->p_sys;
+ unsigned int i;
- av_close_input_file( p_sys->ic );
-
- free( p_sys->io_buffer );
+ FREENULL( p_sys->tk );
+ if( p_sys->ic ) av_close_input_file( p_sys->ic );
+ if( p_sys->io_buffer ) free( p_sys->io_buffer );
free( p_sys );
}
p_sys->ic->start_time : 0;
p_frame->i_dts = ( pkt.dts == AV_NOPTS_VALUE ) ?
- 0 : (pkt.dts - i_start_time) * 1000000 / AV_TIME_BASE;
+ 0 : (pkt.dts - i_start_time) * 1000000 *
+ p_sys->ic->streams[pkt.stream_index]->time_base.num /
+ p_sys->ic->streams[pkt.stream_index]->time_base.den;
p_frame->i_pts = ( pkt.pts == AV_NOPTS_VALUE ) ?
- 0 : (pkt.pts - i_start_time) * 1000000 / AV_TIME_BASE;
+ 0 : (pkt.pts - i_start_time) * 1000000 *
+ p_sys->ic->streams[pkt.stream_index]->time_base.num /
+ p_sys->ic->streams[pkt.stream_index]->time_base.den;
#ifdef AVFORMAT_DEBUG
msg_Dbg( p_demux, "tk[%d] dts="I64Fd" pts="I64Fd,
( pkt.stream_index == p_sys->i_pcr_tk || p_sys->i_pcr_tk < 0 ) )
{
p_sys->i_pcr_tk = pkt.stream_index;
- p_sys->i_pcr = pkt.dts - i_start_time;
+ p_sys->i_pcr = p_frame->i_dts;
es_out_Control( p_demux->out, ES_OUT_SET_PCR, (int64_t)p_sys->i_pcr );
}
switch( i_query )
{
case DEMUX_GET_POSITION:
- pf = (double*) va_arg( args, double* );
+ pf = (double*) va_arg( args, double* ); *pf = 0.0;
i64 = stream_Size( p_demux->s );
if( i64 > 0 )
{
*pf = (double)stream_Tell( p_demux->s ) / (double)i64;
}
- else
+
+ if( (p_sys->ic->duration != AV_NOPTS_VALUE) && (p_sys->i_pcr > 0) )
{
- *pf = 0.0;
+ *pf = (double)p_sys->i_pcr / (double)p_sys->ic->duration;
}
+
return VLC_SUCCESS;
case DEMUX_SET_POSITION:
f = (double) va_arg( args, double );
i64 = stream_Tell( p_demux->s );
- if( i64 && p_sys->i_pcr )
+ if( i64 && p_sys->i_pcr > 0 )
{
int64_t i_size = stream_Size( p_demux->s );
if( p_sys->ic->start_time != AV_NOPTS_VALUE )
i64 += p_sys->ic->start_time;
+ if( p_sys->ic->duration != AV_NOPTS_VALUE )
+ i64 = p_sys->ic->duration * f;
+
msg_Warn( p_demux, "DEMUX_SET_POSITION: "I64Fd, i64 );
- if( av_seek_frame( p_sys->ic, -1, i64 ) )
+ if( av_seek_frame( p_sys->ic, -1, i64, 0 ) < 0 )
{
return VLC_EGENERIC;
}
}
return VLC_SUCCESS;
+ case DEMUX_GET_LENGTH:
+ pi64 = (int64_t*)va_arg( args, int64_t * );
+ if( p_sys->ic->duration != AV_NOPTS_VALUE )
+ {
+ *pi64 = p_sys->ic->duration;
+ }
+ else *pi64 = 0;
+ return VLC_SUCCESS;
+
case DEMUX_GET_TIME:
pi64 = (int64_t*)va_arg( args, int64_t * );
*pi64 = p_sys->i_pcr;
msg_Warn( p_demux, "DEMUX_SET_TIME: "I64Fd, i64 );
- if( av_seek_frame( p_sys->ic, -1, i64 ) < 0 )
+ if( av_seek_frame( p_sys->ic, -1, i64, 0 ) < 0 )
{
return VLC_EGENERIC;
}
case DEMUX_GET_META:
{
- vlc_meta_t **pp_meta = (vlc_meta_t**)va_arg( args, vlc_meta_t** );
- vlc_meta_t *meta;
+ vlc_meta_t *p_meta = (vlc_meta_t*)va_arg( args, vlc_meta_t* );
if( !p_sys->ic->title[0] || !p_sys->ic->author[0] ||
!p_sys->ic->copyright[0] || !p_sys->ic->comment[0] ||
return VLC_EGENERIC;
}
- *pp_meta = meta = vlc_meta_New();
-
if( p_sys->ic->title[0] )
- vlc_meta_Add( meta, VLC_META_TITLE, p_sys->ic->title );
+ vlc_meta_SetTitle( p_meta, p_sys->ic->title );
if( p_sys->ic->author[0] )
- vlc_meta_Add( meta, VLC_META_AUTHOR, p_sys->ic->author );
+ vlc_meta_SetArtist( p_meta, p_sys->ic->author );
if( p_sys->ic->copyright[0] )
- vlc_meta_Add( meta, VLC_META_COPYRIGHT, p_sys->ic->copyright );
+ vlc_meta_SetCopyright( p_meta, p_sys->ic->copyright );
if( p_sys->ic->comment[0] )
- vlc_meta_Add( meta, VLC_META_DESCRIPTION, p_sys->ic->comment );
+ vlc_meta_SetDescription( p_meta, p_sys->ic->comment );
if( p_sys->ic->genre[0] )
- vlc_meta_Add( meta, VLC_META_GENRE, p_sys->ic->genre );
+ vlc_meta_SetGenre( p_meta, p_sys->ic->genre );
return VLC_SUCCESS;
}
return i_ret ? i_ret : -1;
}
-static int IOSeek( void *opaque, offset_t offset, int whence )
+static offset_t IOSeek( void *opaque, offset_t offset, int whence )
{
URLContext *p_url = opaque;
demux_t *p_demux = p_url->priv_data;
{
}
-#endif /* LIBAVFORMAT_BUILD >= 4611 */
+#endif /* LIBAVFORMAT_BUILD >= 4629 */
projects / vlc / blobdiff