/*****************************************************************************
* demux.c: demuxer using libavformat
*****************************************************************************
- * Copyright (C) 2004-2009 the VideoLAN team
+ * Copyright (C) 2004-2009 VLC authors and VideoLAN
* $Id$
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
* Gildas Bazin <gbazin@videolan.org>
*
- * 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 "../../codec/avcodec/avcodec.h"
#include "../../codec/avcodec/chroma.h"
+#include "../../codec/avcodec/avcommon.h"
#include "avformat.h"
#include "../xiph.h"
#include "../vobsub.h"
//#define AVFORMAT_DEBUG 1
-/* Version checking */
-#if defined(HAVE_FFMPEG_AVFORMAT_H) || defined(HAVE_LIBAVFORMAT_AVFORMAT_H)
-
-#if (LIBAVCODEC_VERSION_INT >= ((51<<16)+(50<<8)+0) )
-# define HAVE_AVUTIL_CODEC_ATTACHMENT 1
-#endif
+# define HAVE_AVUTIL_CODEC_ATTACHMENT 1
/*****************************************************************************
* demux_sys_t: demux descriptor
*****************************************************************************/
struct demux_sys_t
{
-#if LIBAVFORMAT_VERSION_INT < ((53<<16)+(2<<8)+0)
- ByteIOContext io;
-#endif
-
int io_buffer_size;
uint8_t *io_buffer;
}
stream_Control( p_demux->s, STREAM_CAN_SEEK, &b_can_seek );
- vlc_avcodec_lock();
- av_register_all(); /* Can be called several times */
- vlc_avcodec_unlock();
+ vlc_init_avformat(p_this);
- char *psz_format = var_InheritString( p_this, "ffmpeg-format" );
+ char *psz_format = var_InheritString( p_this, "avformat-format" );
if( psz_format )
{
- if( fmt = av_find_input_format(psz_format) )
+ if( (fmt = av_find_input_format(psz_format)) )
msg_Dbg( p_demux, "forcing format: %s", fmt->name );
free( psz_format );
}
p_sys->io_buffer_size = 32768; /* FIXME */
p_sys->io_buffer = malloc( p_sys->io_buffer_size );
-#if LIBAVFORMAT_VERSION_INT >= ((53<<16)+(2<<8)+0)
p_sys->ic = avformat_alloc_context();
p_sys->ic->pb = avio_alloc_context( p_sys->io_buffer,
p_sys->io_buffer_size, 0, p_demux, IORead, NULL, IOSeek );
p_sys->ic->pb->seekable = b_can_seek ? AVIO_SEEKABLE_NORMAL : 0;
error = avformat_open_input(&p_sys->ic, psz_url, p_sys->fmt, NULL);
-#else
- init_put_byte( &p_sys->io, p_sys->io_buffer, p_sys->io_buffer_size, 0,
- p_demux, IORead, NULL, IOSeek );
- p_sys->io.is_streamed = !b_can_seek;
-# if defined(AVIO_SEEKABLE_NORMAL)
- p_sys->io.seekable = !!b_can_seek;
-# endif
- error = av_open_input_stream(&p_sys->ic, &p_sys->io, psz_url, p_sys->fmt, NULL);
-#endif
- free( psz_url );
if( error < 0 )
{
errno = AVUNERROR(error);
msg_Err( p_demux, "Could not open %s: %m", psz_url );
p_sys->ic = NULL;
+ free( psz_url );
CloseDemux( p_this );
return VLC_EGENERIC;
}
+ free( psz_url );
- vlc_avcodec_lock(); /* avformat calls avcodec behind our back!!! */
#if LIBAVFORMAT_VERSION_INT >= ((53<<16)+(26<<8)+0)
- error = avformat_find_stream_info( p_sys->ic, NULL /* options */ );
+ char *psz_opts = var_InheritString( p_demux, "avformat-options" );
+ AVDictionary *options[p_sys->ic->nb_streams ? p_sys->ic->nb_streams : 1];
+ options[0] = NULL;
+ unsigned int nb_streams = p_sys->ic->nb_streams;
+ for (unsigned i = 1; i < nb_streams; i++)
+ options[i] = NULL;
+ if (psz_opts && *psz_opts) {
+ options[0] = vlc_av_get_options(psz_opts);
+ for (unsigned i = 1; i < nb_streams; i++) {
+ av_dict_copy(&options[i], options[0], 0);
+ }
+ }
+ free(psz_opts);
+ vlc_avcodec_lock(); /* avformat calls avcodec behind our back!!! */
+ error = avformat_find_stream_info( p_sys->ic, options );
+ /* FIXME: what if nb_streams change after that call? */
+ vlc_avcodec_unlock();
+ AVDictionaryEntry *t = NULL;
+ while ((t = av_dict_get(options[0], "", t, AV_DICT_IGNORE_SUFFIX))) {
+ msg_Err( p_demux, "Unknown option \"%s\"", t->key );
+ }
+ av_dict_free(&options[0]);
+ for (unsigned i = 1; i < nb_streams; i++) {
+ av_dict_free(&options[i]);
+ }
#else
+ vlc_avcodec_lock(); /* avformat calls avcodec behind our back!!! */
error = av_find_stream_info( p_sys->ic );
+ vlc_avcodec_unlock();
#endif
+
if( error < 0 )
{
errno = AVUNERROR(error);
msg_Warn( p_demux, "Could not find stream info: %m" );
}
- vlc_avcodec_unlock();
for( i = 0; i < p_sys->ic->nb_streams; i++ )
{
if( !GetVlcFourcc( cc->codec_id, NULL, &fcc, NULL ) )
fcc = VLC_FOURCC( 'u', 'n', 'd', 'f' );
+#if LIBAVFORMAT_VERSION_INT >= ((54<<16)+(2<<8)+0)
+ /* Do not use the cover art as a stream */
+ if( s->disposition == AV_DISPOSITION_ATTACHED_PIC )
+ continue;
+#endif
+
switch( cc->codec_type )
{
case AVMEDIA_TYPE_AUDIO:
case AVMEDIA_TYPE_VIDEO:
es_format_Init( &fmt, VIDEO_ES, fcc );
+ fmt.video.i_bits_per_pixel = cc->bits_per_coded_sample;
/* Special case for raw video data */
- if( cc->codec_id == CODEC_ID_RAWVIDEO )
+ if( cc->codec_id == AV_CODEC_ID_RAWVIDEO )
{
msg_Dbg( p_demux, "raw video, pixel format: %i", cc->pix_fmt );
if( GetVlcChroma( &fmt.video, cc->pix_fmt ) != VLC_SUCCESS)
fmt.i_codec = fmt.video.i_chroma;
}
/* We need this for the h264 packetizer */
- else if( cc->codec_id == CODEC_ID_H264 && ( p_sys->fmt == av_find_input_format("flv") ||
+ else if( cc->codec_id == AV_CODEC_ID_H264 && ( p_sys->fmt == av_find_input_format("flv") ||
p_sys->fmt == av_find_input_format("matroska") || p_sys->fmt == av_find_input_format("mp4") ) )
fmt.i_original_fourcc = VLC_FOURCC( 'a', 'v', 'c', '1' );
psz_type = "video";
fmt.video.i_frame_rate = cc->time_base.den;
fmt.video.i_frame_rate_base = cc->time_base.num * __MAX( cc->ticks_per_frame, 1 );
+ fmt.video.i_sar_num = s->sample_aspect_ratio.num;
+ if (s->sample_aspect_ratio.num > 0)
+ fmt.video.i_sar_den = s->sample_aspect_ratio.den;
+ else
+ fmt.video.i_sar_den = 0;
break;
case AVMEDIA_TYPE_SUBTITLE:
es_format_Init( &fmt, SPU_ES, fcc );
if( strncmp( p_sys->ic->iformat->name, "matroska", 8 ) == 0 &&
- cc->codec_id == CODEC_ID_DVD_SUBTITLE &&
+ cc->codec_id == AV_CODEC_ID_DVD_SUBTITLE &&
cc->extradata != NULL &&
cc->extradata_size > 0 )
{
input_attachment_t *p_attachment;
psz_type = "attachment";
- if( cc->codec_id == CODEC_ID_TTF )
+ if( cc->codec_id == AV_CODEC_ID_TTF )
{
AVDictionaryEntry *filename = av_dict_get( s->metadata, "filename", NULL, 0 );
if( filename && filename->value )
fmt.psz_language = strdup( language->value );
if( s->disposition & AV_DISPOSITION_DEFAULT )
- fmt.i_priority = 1000;
+ fmt.i_priority = ES_PRIORITY_SELECTABLE_MIN + 1000;
#ifdef HAVE_AVUTIL_CODEC_ATTACHMENT
if( cc->codec_type != AVMEDIA_TYPE_ATTACHMENT )
const uint8_t *p_extra = cc->extradata;
unsigned i_extra = cc->extradata_size;
- if( cc->codec_id == CODEC_ID_THEORA && b_ogg )
+ if( cc->codec_id == AV_CODEC_ID_THEORA && b_ogg )
{
unsigned pi_size[3];
const void *pp_data[3];
fmt.p_extra = NULL;
}
}
- else if( cc->codec_id == CODEC_ID_SPEEX && b_ogg )
+ else if( cc->codec_id == AV_CODEC_ID_SPEEX && b_ogg )
{
const uint8_t p_dummy_comment[] = {
0, 0, 0, 0,
es_out_Control( p_demux->out, ES_OUT_SET_ES_DEFAULT, es );
es_format_Clean( &fmt );
- msg_Dbg( p_demux, "adding es: %s codec = %4.4s",
- psz_type, (char*)&fcc );
+ msg_Dbg( p_demux, "adding es: %s codec = %4.4s (%d)",
+ psz_type, (char*)&fcc, cc->codec_id );
TAB_APPEND( p_sys->i_tk, p_sys->tk, es );
}
}
if( p_sys->ic )
{
-#if LIBAVFORMAT_VERSION_INT >= ((53<<16)+(2<<8)+0)
av_free( p_sys->ic->pb );
-#endif
#if LIBAVFORMAT_VERSION_INT >= ((53<<16)+(26<<8)+0)
avformat_close_input( &p_sys->ic );
#else
int64_t i_start_time;
/* Read a frame */
- if( av_read_frame( p_sys->ic, &pkt ) )
+ int i_av_ret = av_read_frame( p_sys->ic, &pkt );
+ if( i_av_ret )
{
+ /* Avoid EOF if av_read_frame returns AVERROR(EAGAIN) */
+ if( i_av_ret == AVERROR(EAGAIN) )
+ return 1;
+
return 0;
}
if( pkt.stream_index < 0 || pkt.stream_index >= p_sys->i_tk )
av_free_packet( &pkt );
return 1;
}
- if( p_stream->codec->codec_id == CODEC_ID_SSA )
+ if( p_stream->codec->codec_id == AV_CODEC_ID_SSA )
{
p_frame = BuildSsaFrame( &pkt, p_sys->i_ssa_order++ );
if( !p_frame )
}
else
{
- if( ( p_frame = block_New( p_demux, pkt.size ) ) == NULL )
+ if( ( p_frame = block_Alloc( pkt.size ) ) == NULL )
{
av_free_packet( &pkt );
return 0;
p_stream->time_base.num /
p_stream->time_base.den;
- if( pkt.dts != AV_NOPTS_VALUE && pkt.dts == pkt.pts &&
+ if( pkt.dts != (int64_t)AV_NOPTS_VALUE && pkt.dts == pkt.pts &&
p_stream->codec->codec_type == AVMEDIA_TYPE_VIDEO )
{
/* Add here notoriously bugged file formats/samples regarding PTS */
case DEMUX_GET_META:
{
- vlc_meta_t *p_meta = (vlc_meta_t*)va_arg( args, vlc_meta_t* );
-
- AVDictionaryEntry *title = av_dict_get( p_sys->ic->metadata, "language", NULL, 0 );
- AVDictionaryEntry *artist = av_dict_get( p_sys->ic->metadata, "artist", NULL, 0 );
- AVDictionaryEntry *copyright = av_dict_get( p_sys->ic->metadata, "copyright", NULL, 0 );
- AVDictionaryEntry *comment = av_dict_get( p_sys->ic->metadata, "comment", NULL, 0 );
- AVDictionaryEntry *genre = av_dict_get( p_sys->ic->metadata, "genre", NULL, 0 );
-
- if( title && title->value )
- vlc_meta_SetTitle( p_meta, title->value );
- if( artist && artist->value )
- vlc_meta_SetArtist( p_meta, artist->value );
- if( copyright && copyright->value )
- vlc_meta_SetCopyright( p_meta, copyright->value );
- if( comment && comment->value )
- vlc_meta_SetDescription( p_meta, comment->value );
- if( genre && genre->value )
- vlc_meta_SetGenre( p_meta, genre->value );
+ static const char names[][10] = {
+ [vlc_meta_Title] = "title",
+ [vlc_meta_Artist] = "artist",
+ [vlc_meta_Genre] = "genre",
+ [vlc_meta_Copyright] = "copyright",
+ [vlc_meta_Album] = "album",
+ //[vlc_meta_TrackNumber] -- TODO: parse number/total value
+ [vlc_meta_Description] = "comment",
+ //[vlc_meta_Rating]
+ [vlc_meta_Date] = "date",
+ [vlc_meta_Setting] = "encoder",
+ //[vlc_meta_URL]
+ [vlc_meta_Language] = "language",
+ //[vlc_meta_NowPlaying]
+ [vlc_meta_Publisher] = "publisher",
+ [vlc_meta_EncodedBy] = "encoded_by",
+ //[vlc_meta_ArtworkURL]
+ //[vlc_meta_TrackID]
+ //[vlc_meta_TrackTotal]
+ };
+ vlc_meta_t *p_meta = va_arg( args, vlc_meta_t * );
+ AVDictionary *dict = p_sys->ic->metadata;
+
+ for( unsigned i = 0; i < sizeof(names) / sizeof(*names); i++)
+ {
+ if( !names[i][0] )
+ continue;
+
+ AVDictionaryEntry *e = av_dict_get( dict, names[i], NULL, 0 );
+ if( e != NULL && e->value != NULL && IsUTF8(e->value) )
+ vlc_meta_Set( p_meta, i, e->value );
+ }
return VLC_SUCCESS;
}
return VLC_EGENERIC;
*pi_int = p_sys->i_attachments;;
- *ppp_attach = malloc( sizeof(input_attachment_t**) * p_sys->i_attachments );
+ *ppp_attach = malloc( sizeof(input_attachment_t*) * p_sys->i_attachments );
for( i = 0; i < p_sys->i_attachments; i++ )
(*ppp_attach)[i] = vlc_input_attachment_Duplicate( p_sys->attachments[i] );
return VLC_SUCCESS;
return VLC_EGENERIC;
*pi_int = 1;
- *ppp_title = malloc( sizeof( input_title_t**) );
+ *ppp_title = malloc( sizeof( input_title_t*) );
(*ppp_title)[0] = vlc_input_title_Duplicate( p_sys->p_title );
*pi_title_offset = 0;
*pi_seekpoint_offset = 0;
return stream_Tell( p_demux->s );
}
-
-#endif /* HAVE_LIBAVFORMAT_AVFORMAT_H */
projects / vlc / blobdiff