modules/control/http/Makefile
modules/demux/Makefile
modules/demux/asf/Makefile
+ modules/demux/avformat/Makefile
modules/demux/avi/Makefile
modules/demux/mp4/Makefile
modules/demux/mpeg/Makefile
encoder.c \
$(NULL)
-SOURCES_avformat = \
- avformat.c \
- avformat.h \
- demux.c \
- avutil.h \
- fourcc.h \
- chroma.h \
- $(NULL)
-
-if ENABLE_SOUT
-SOURCES_avformat += mux.c
-endif
-
-EXTRA_libavformat_plugin_la_SOURCES = \
- mux.c \
- $(NULL)
-
SOURCES_imgresample = \
imgresample.c \
imgresample.h \
libvlc_LTLIBRARIES += \
$(LTLIBavcodec) \
- $(LTLIBavformat) \
$(LTLIBimgresample)
EXTRA_LTLIBRARIES += \
libavcodec_plugin.la \
- libavformat_plugin.la \
libimgresample_plugin.la
# FIXME SOURCES_ffmpegaltivec = \
+++ /dev/null
-/*****************************************************************************
- * avformat.c: demuxer and muxer using libavformat library
- *****************************************************************************
- * Copyright (C) 1999-2008 the VideoLAN team
- * $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
- * (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.
- *
- * 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.
- *****************************************************************************/
-
-/*****************************************************************************
- * Preamble
- *****************************************************************************/
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <vlc_common.h>
-#include <vlc_plugin.h>
-#include <vlc_codec.h>
-
-/* ffmpeg header */
-#ifdef HAVE_LIBAVFORMAT_AVFORMAT_H
-# include <libavformat/avformat.h>
-#elif defined(HAVE_FFMPEG_AVFORMAT_H)
-# include <ffmpeg/avformat.h>
-#endif
-
-#include "avformat.h"
-
-/*****************************************************************************
- * Module descriptor
- *****************************************************************************/
-vlc_module_begin();
- add_shortcut( "ffmpeg" );
- set_category( CAT_INPUT );
- set_subcategory( SUBCAT_INPUT_SCODEC );
- set_description( N_("FFmpeg demuxer" ) );
- set_capability( "demux", 2 );
- set_callbacks( OpenDemux, CloseDemux );
-
-#ifdef ENABLE_SOUT
- /* mux submodule */
- add_submodule();
- set_description( N_("FFmpeg muxer" ) );
- set_capability( "sout mux", 2 );
- add_string( "ffmpeg-mux", NULL, NULL, MUX_TEXT,
- MUX_LONGTEXT, true );
- set_callbacks( OpenMux, CloseMux );
-#endif
-vlc_module_end();
+++ /dev/null
-/*****************************************************************************
- * avformat.h: muxer and demuxer using libavformat
- *****************************************************************************
- * Copyright (C) 2001-2008 the VideoLAN team
- * $Id$
- *
- * Authors: Laurent Aimar <fenrir@via.ecp.fr>
- *
- * 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
- * (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.
- *
- * 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.
- *****************************************************************************/
-
-void LibavcodecCallback( void *p_opaque, int i_level,
- const char *psz_format, va_list va );
-
-/* Demux module */
-int OpenDemux ( vlc_object_t * );
-void CloseDemux( vlc_object_t * );
-
-/* Mux module */
-int OpenMux ( vlc_object_t * );
-void CloseMux( vlc_object_t * );
-
-#define MUX_TEXT N_("Ffmpeg mux")
-#define MUX_LONGTEXT N_("Force use of ffmpeg muxer.")
+++ /dev/null
-/*****************************************************************************
- * demux.c: demuxer using ffmpeg (libavformat).
- *****************************************************************************
- * Copyright (C) 2004-2007 the VideoLAN team
- * $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
- * (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.
- *
- * 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.
- *****************************************************************************/
-
-/*****************************************************************************
- * Preamble
- *****************************************************************************/
-
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <vlc_common.h>
-#include <vlc_demux.h>
-#include <vlc_stream.h>
-#include <vlc_meta.h>
-
-/* ffmpeg header */
-#if defined(HAVE_LIBAVFORMAT_AVFORMAT_H)
-# include <libavformat/avformat.h>
-#elif defined(HAVE_FFMPEG_AVFORMAT_H)
-# include <ffmpeg/avformat.h>
-#endif
-
-#include "fourcc.h"
-#include "chroma.h"
-
-//#define AVFORMAT_DEBUG 1
-
-/* Version checking */
-#if defined(HAVE_FFMPEG_AVFORMAT_H) || defined(HAVE_LIBAVFORMAT_AVFORMAT_H)
-
-/*****************************************************************************
- * demux_sys_t: demux descriptor
- *****************************************************************************/
-struct demux_sys_t
-{
- ByteIOContext io;
- int io_buffer_size;
- uint8_t *io_buffer;
-
- AVInputFormat *fmt;
- AVFormatContext *ic;
- URLContext url;
- URLProtocol prot;
-
- int i_tk;
- es_out_id_t **tk;
-
- int64_t i_pcr;
- int64_t i_pcr_inc;
- int i_pcr_tk;
-};
-
-/*****************************************************************************
- * Local prototypes
- *****************************************************************************/
-static int Demux ( demux_t *p_demux );
-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 offset_t IOSeek( void *opaque, offset_t offset, int whence );
-
-/*****************************************************************************
- * Open
- *****************************************************************************/
-int OpenDemux( vlc_object_t *p_this )
-{
- demux_t *p_demux = (demux_t*)p_this;
- demux_sys_t *p_sys;
- AVProbeData pd;
- AVInputFormat *fmt;
- unsigned int i;
- bool b_avfmt_nofile;
-
- /* Init Probe data */
- pd.filename = p_demux->psz_path;
- if( ( pd.buf_size = stream_Peek( p_demux->s, &pd.buf, 2048 ) ) <= 0 )
- {
- msg_Warn( p_demux, "cannot peek" );
- return VLC_EGENERIC;
- }
-
- av_register_all(); /* Can be called several times */
-
- /* Guess format */
- if( !( fmt = av_probe_input_format( &pd, 1 ) ) )
- {
- msg_Dbg( p_demux, "couldn't guess format" );
- return VLC_EGENERIC;
- }
-
- /* Don't try to handle MPEG unless forced */
- if( !p_demux->b_force &&
- ( !strcmp( fmt->name, "mpeg" ) ||
- !strcmp( fmt->name, "vcd" ) ||
- !strcmp( fmt->name, "vob" ) ||
- !strcmp( fmt->name, "mpegts" ) ||
- /* libavformat's redirector won't work */
- !strcmp( fmt->name, "redir" ) ||
- !strcmp( fmt->name, "sdp" ) ) )
- {
- 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->io_buffer = malloc( p_sys->io_buffer_size );
- p_sys->url.priv_data = p_demux;
- p_sys->url.prot = &p_sys->prot;
- p_sys->url.prot->name = "VLC I/O wrapper";
- p_sys->url.prot->url_open = 0;
- p_sys->url.prot->url_read =
- (int (*) (URLContext *, unsigned char *, int))IORead;
- p_sys->url.prot->url_write = 0;
- p_sys->url.prot->url_seek =
- (offset_t (*) (URLContext *, offset_t, int))IOSeek;
- p_sys->url.prot->url_close = 0;
- p_sys->url.prot->next = 0;
- init_put_byte( &p_sys->io, p_sys->io_buffer, p_sys->io_buffer_size,
- 0, &p_sys->url, IORead, NULL, IOSeek );
-
- b_avfmt_nofile = p_sys->fmt->flags & AVFMT_NOFILE;
- p_sys->fmt->flags |= AVFMT_NOFILE; /* libavformat must not fopen/fclose */
-
- /* Open it */
- if( av_open_input_stream( &p_sys->ic, &p_sys->io, p_demux->psz_path,
- p_sys->fmt, NULL ) )
- {
- msg_Err( p_demux, "av_open_input_stream failed" );
- if( !b_avfmt_nofile ) p_sys->fmt->flags ^= AVFMT_NOFILE;
- CloseDemux( p_this );
- return VLC_EGENERIC;
- }
-
- if( av_find_stream_info( p_sys->ic ) < 0 )
- {
- msg_Err( p_demux, "av_find_stream_info failed" );
- if( !b_avfmt_nofile ) p_sys->fmt->flags ^= AVFMT_NOFILE;
- CloseDemux( p_this );
- return VLC_EGENERIC;
- }
- if( !b_avfmt_nofile ) p_sys->fmt->flags ^= AVFMT_NOFILE;
-
- for( i = 0; i < p_sys->ic->nb_streams; i++ )
- {
- AVCodecContext *cc = p_sys->ic->streams[i]->codec;
- es_out_id_t *es;
- es_format_t fmt;
- vlc_fourcc_t fcc;
-
- if( !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 = GetVlcChroma( cc->pix_fmt );
- }
- }
-
- switch( cc->codec_type )
- {
- case CODEC_TYPE_AUDIO:
- es_format_Init( &fmt, AUDIO_ES, fcc );
- fmt.audio.i_channels = cc->channels;
- fmt.audio.i_rate = cc->sample_rate;
- fmt.audio.i_bitspersample = cc->bits_per_sample;
- fmt.audio.i_blockalign = cc->block_align;
- break;
- case CODEC_TYPE_VIDEO:
- es_format_Init( &fmt, VIDEO_ES, fcc );
- fmt.video.i_width = cc->width;
- fmt.video.i_height = cc->height;
- if( cc->palctrl )
- {
- fmt.video.p_palette = malloc( sizeof(video_palette_t) );
- *fmt.video.p_palette = *(video_palette_t *)cc->palctrl;
- }
- break;
- case CODEC_TYPE_SUBTITLE:
- es_format_Init( &fmt, SPU_ES, fcc );
- break;
- default:
- msg_Warn( p_demux, "unsupported track type in ffmpeg demux" );
- break;
- }
-
- fmt.psz_language = strdup( p_sys->ic->streams[i]->language );
- fmt.i_extra = cc->extradata_size;
- fmt.p_extra = cc->extradata;
- es = es_out_Add( p_demux->out, &fmt );
-
- msg_Dbg( p_demux, "adding es: %s codec = %4.4s",
- cc->codec_type == CODEC_TYPE_AUDIO ? "audio" : "video",
- (char*)&fcc );
- TAB_APPEND( p_sys->i_tk, p_sys->tk, es );
- }
-
- msg_Dbg( p_demux, "AVFormat supported stream" );
- msg_Dbg( p_demux, " - format = %s (%s)",
- p_sys->fmt->name, p_sys->fmt->long_name );
- msg_Dbg( p_demux, " - start time = %"PRId64,
- ( p_sys->ic->start_time != (int64_t)AV_NOPTS_VALUE ) ?
- p_sys->ic->start_time * 1000000 / AV_TIME_BASE : -1 );
- msg_Dbg( p_demux, " - duration = %"PRId64,
- ( p_sys->ic->duration != (int64_t)AV_NOPTS_VALUE ) ?
- p_sys->ic->duration * 1000000 / AV_TIME_BASE : -1 );
-
- return VLC_SUCCESS;
-}
-
-/*****************************************************************************
- * Close
- *****************************************************************************/
-void CloseDemux( vlc_object_t *p_this )
-{
- demux_t *p_demux = (demux_t*)p_this;
- demux_sys_t *p_sys = p_demux->p_sys;
- bool b_avfmt_nofile;
-
- FREENULL( p_sys->tk );
-
- b_avfmt_nofile = p_sys->fmt->flags & AVFMT_NOFILE;
- p_sys->fmt->flags |= AVFMT_NOFILE; /* libavformat must not fopen/fclose */
- if( p_sys->ic ) av_close_input_file( p_sys->ic );
- if( !b_avfmt_nofile ) p_sys->fmt->flags ^= AVFMT_NOFILE;
-
- free( p_sys->io_buffer );
- free( p_sys );
-}
-
-/*****************************************************************************
- * Demux:
- *****************************************************************************/
-static int Demux( demux_t *p_demux )
-{
- demux_sys_t *p_sys = p_demux->p_sys;
- AVPacket pkt;
- block_t *p_frame;
- int64_t i_start_time;
-
- /* Read a frame */
- if( av_read_frame( p_sys->ic, &pkt ) )
- {
- return 0;
- }
- if( pkt.stream_index < 0 || pkt.stream_index >= p_sys->i_tk )
- {
- av_free_packet( &pkt );
- return 1;
- }
- if( ( p_frame = block_New( p_demux, pkt.size ) ) == NULL )
- {
- return 0;
- }
-
- memcpy( p_frame->p_buffer, pkt.data, pkt.size );
-
- if( pkt.flags & PKT_FLAG_KEY )
- p_frame->i_flags |= BLOCK_FLAG_TYPE_I;
-
- i_start_time = ( p_sys->ic->start_time != (int64_t)AV_NOPTS_VALUE ) ?
- ( p_sys->ic->start_time / AV_TIME_BASE ) : 0;
-
- p_frame->i_dts = ( pkt.dts == (int64_t)AV_NOPTS_VALUE ) ?
- 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 == (int64_t)AV_NOPTS_VALUE ) ?
- 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=%"PRId64" pts=%"PRId64,
- pkt.stream_index, p_frame->i_dts, p_frame->i_pts );
-#endif
-
- if( pkt.dts > 0 &&
- ( 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 = p_frame->i_dts;
-
- es_out_Control( p_demux->out, ES_OUT_SET_PCR, (int64_t)p_sys->i_pcr );
- }
-
- es_out_Send( p_demux->out, p_sys->tk[pkt.stream_index], p_frame );
- av_free_packet( &pkt );
- return 1;
-}
-
-/*****************************************************************************
- * Control:
- *****************************************************************************/
-static int Control( demux_t *p_demux, int i_query, va_list args )
-{
- demux_sys_t *p_sys = p_demux->p_sys;
- double f, *pf;
- int64_t i64, *pi64;
-
- switch( i_query )
- {
- case DEMUX_GET_POSITION:
- 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;
- }
-
- if( (p_sys->ic->duration != (int64_t)AV_NOPTS_VALUE) && (p_sys->i_pcr > 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( p_sys->i_pcr > 0 )
- {
- i64 = p_sys->ic->duration * f;
- if( p_sys->ic->start_time != (int64_t)AV_NOPTS_VALUE )
- i64 += p_sys->ic->start_time;
-
- msg_Warn( p_demux, "DEMUX_SET_POSITION: %"PRId64, i64 );
-
- /* If we have a duration, we prefer to seek by time
- but if we don't, or if the seek fails, try BYTE seeking */
- if( p_sys->ic->duration == (int64_t)AV_NOPTS_VALUE ||
- (av_seek_frame( p_sys->ic, -1, i64, 0 ) < 0) )
- {
- int64_t i_size = stream_Size( p_demux->s );
- i64 = (int64_t)i_size * f;
-
- msg_Warn( p_demux, "DEMUX_SET_BYTE_POSITION: %"PRId64, i64 );
- if( av_seek_frame( p_sys->ic, -1, i64, AVSEEK_FLAG_BYTE ) < 0 )
- return VLC_EGENERIC;
- }
- es_out_Control( p_demux->out, ES_OUT_RESET_PCR );
- p_sys->i_pcr = -1; /* Invalidate time display */
- }
- return VLC_SUCCESS;
-
- case DEMUX_GET_LENGTH:
- pi64 = (int64_t*)va_arg( args, int64_t * );
- if( p_sys->ic->duration != (int64_t)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;
- return VLC_SUCCESS;
-
- case DEMUX_SET_TIME:
- i64 = (int64_t)va_arg( args, int64_t );
- if( p_sys->ic->start_time != (int64_t)AV_NOPTS_VALUE )
- i64 += p_sys->ic->start_time;
-
- msg_Warn( p_demux, "DEMUX_SET_TIME: %"PRId64, i64 );
-
- if( av_seek_frame( p_sys->ic, -1, i64, 0 ) < 0 )
- {
- return VLC_EGENERIC;
- }
- es_out_Control( p_demux->out, ES_OUT_RESET_PCR );
- p_sys->i_pcr = -1; /* Invalidate time display */
- return VLC_SUCCESS;
-
- case DEMUX_GET_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] ||
- /*!p_sys->ic->album[0] ||*/ !p_sys->ic->genre[0] )
- {
- return VLC_EGENERIC;
- }
-
- if( p_sys->ic->title[0] )
- vlc_meta_SetTitle( p_meta, p_sys->ic->title );
- if( p_sys->ic->author[0] )
- vlc_meta_SetArtist( p_meta, p_sys->ic->author );
- if( p_sys->ic->copyright[0] )
- vlc_meta_SetCopyright( p_meta, p_sys->ic->copyright );
- if( p_sys->ic->comment[0] )
- vlc_meta_SetDescription( p_meta, p_sys->ic->comment );
- if( p_sys->ic->genre[0] )
- vlc_meta_SetGenre( p_meta, p_sys->ic->genre );
- return VLC_SUCCESS;
- }
-
- default:
- return VLC_EGENERIC;
- }
-}
-
-/*****************************************************************************
- * I/O wrappers for libavformat
- *****************************************************************************/
-static int IORead( void *opaque, uint8_t *buf, int buf_size )
-{
- URLContext *p_url = opaque;
- demux_t *p_demux = p_url->priv_data;
- int i_ret = stream_Read( p_demux->s, buf, buf_size );
- return i_ret ? i_ret : -1;
-}
-
-static offset_t IOSeek( void *opaque, offset_t offset, int whence )
-{
- URLContext *p_url = opaque;
- demux_t *p_demux = p_url->priv_data;
- int64_t i_absolute = (int64_t)offset;
- int64_t i_size = stream_Size( p_demux->s );
-
-#ifdef AVFORMAT_DEBUG
- msg_Warn( p_demux, "IOSeek offset: %"PRId64", whence: %i", offset, whence );
-#endif
-
- switch( whence )
- {
- case SEEK_SET:
- break;
- case SEEK_CUR:
- i_absolute = stream_Tell( p_demux->s ) + offset;
- break;
- case SEEK_END:
- i_absolute = i_size + offset;
- break;
- default:
- return -1;
-
- }
- if( i_absolute < 0 )
- i_absolute = 0;
- if( i_size )
- {
- if( i_absolute > i_size )
- i_absolute = i_size;
- if( stream_Tell( p_demux->s ) >= i_size )
- {
- msg_Err( p_demux, "Seeking too far : EOF?" );
- return -1;
- }
- }
-
- if( stream_Seek( p_demux->s, i_absolute ) )
- {
- return -1;
- }
-
- return stream_Tell( p_demux->s );
-}
-
-#endif /* HAVE_LIBAVFORMAT_AVFORMAT_H */
+++ /dev/null
-/*****************************************************************************
- * mux.c: muxer using ffmpeg (libavformat).
- *****************************************************************************
- * Copyright (C) 2006 the VideoLAN team
- * $Id$
- *
- * Authors: 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
- * (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.
- *
- * 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.
- *****************************************************************************/
-
-/*****************************************************************************
- * Preamble
- *****************************************************************************/
-
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
-
-#include <vlc_common.h>
-#include <vlc_block.h>
-#include <vlc_sout.h>
-
-/* ffmpeg header */
-#ifdef HAVE_LIBAVFORMAT_AVFORMAT_H
-# include <libavformat/avformat.h>
-#elif defined(HAVE_FFMPEG_AVFORMAT_H)
-# include <ffmpeg/avformat.h>
-#endif
-
-#include "avformat.h"
-#include "fourcc.h"
-#include "avutil.h"
-
-//#define AVFORMAT_DEBUG 1
-
-static const char *const ppsz_mux_options[] = {
- "mux", NULL
-};
-
-/*****************************************************************************
- * mux_sys_t: mux descriptor
- *****************************************************************************/
-struct sout_mux_sys_t
-{
- ByteIOContext io;
- int io_buffer_size;
- uint8_t *io_buffer;
-
- AVFormatContext *oc;
- URLContext url;
- URLProtocol prot;
-
- bool b_write_header;
- bool b_error;
-
- int64_t i_initial_dts;
-};
-
-/*****************************************************************************
- * Local prototypes
- *****************************************************************************/
-static int Control ( sout_mux_t *, int, va_list );
-static int AddStream( sout_mux_t *, sout_input_t * );
-static int DelStream( sout_mux_t *, sout_input_t * );
-static int Mux ( sout_mux_t * );
-
-static int IOWrite( void *opaque, uint8_t *buf, int buf_size );
-static offset_t IOSeek( void *opaque, offset_t offset, int whence );
-
-/*****************************************************************************
- * Open
- *****************************************************************************/
-int OpenMux( vlc_object_t *p_this )
-{
- AVOutputFormat *file_oformat;
- sout_mux_t *p_mux = (sout_mux_t*)p_this;
- sout_mux_sys_t *p_sys;
- AVFormatParameters params, *ap = ¶ms;
- char *psz_mux;
-
- /* Should we call it only once ? */
- av_register_all();
- av_log_set_callback( LibavutilCallback );
-
- config_ChainParse( p_mux, "ffmpeg-", ppsz_mux_options, p_mux->p_cfg );
-
- /* Find the requested muxer */
- psz_mux = var_GetNonEmptyString( p_mux, "ffmpeg-mux" );
- if( psz_mux )
- {
- file_oformat = guess_format( psz_mux, NULL, NULL );
- }
- else
- {
- file_oformat =
- guess_format(NULL, p_mux->p_access->psz_path, NULL);
- }
- if (!file_oformat)
- {
- msg_Err( p_mux, "unable for find a suitable output format" );
- return VLC_EGENERIC;
- }
-
- /* Fill p_mux fields */
- p_mux->pf_control = Control;
- p_mux->pf_addstream = AddStream;
- p_mux->pf_delstream = DelStream;
- p_mux->pf_mux = Mux;
- p_mux->p_sys = p_sys = malloc( sizeof( sout_mux_sys_t ) );
-
- p_sys->oc = av_alloc_format_context();
- p_sys->oc->oformat = file_oformat;
-
- /* Create I/O wrapper */
- p_sys->io_buffer_size = 32768; /* FIXME */
- p_sys->io_buffer = malloc( p_sys->io_buffer_size );
- p_sys->url.priv_data = p_mux;
- p_sys->url.prot = &p_sys->prot;
- p_sys->url.prot->name = "VLC I/O wrapper";
- p_sys->url.prot->url_open = 0;
- p_sys->url.prot->url_read = 0;
- p_sys->url.prot->url_write =
- (int (*) (URLContext *, unsigned char *, int))IOWrite;
- p_sys->url.prot->url_seek =
- (offset_t (*) (URLContext *, offset_t, int))IOSeek;
- p_sys->url.prot->url_close = 0;
- p_sys->url.prot->next = 0;
- init_put_byte( &p_sys->io, p_sys->io_buffer, p_sys->io_buffer_size,
- 1, &p_sys->url, NULL, IOWrite, IOSeek );
-
- memset( ap, 0, sizeof(*ap) );
- if( av_set_parameters( p_sys->oc, ap ) < 0 )
- {
- msg_Err( p_mux, "invalid encoding parameters" );
- av_free( p_sys->oc );
- free( p_sys->io_buffer );
- free( p_sys );
- return VLC_EGENERIC;
- }
-
-#if LIBAVFORMAT_VERSION_INT >= ((52<<16)+(0<<8)+0)
- p_sys->oc->pb = &p_sys->io;
-#else
- p_sys->oc->pb = p_sys->io;
-#endif
- p_sys->oc->nb_streams = 0;
-
- p_sys->b_write_header = true;
- p_sys->b_error = false;
- p_sys->i_initial_dts = 0;
-
- return VLC_SUCCESS;
-}
-
-/*****************************************************************************
- * Close
- *****************************************************************************/
-void CloseMux( vlc_object_t *p_this )
-{
- sout_mux_t *p_mux = (sout_mux_t*)p_this;
- sout_mux_sys_t *p_sys = p_mux->p_sys;
- unsigned int i;
-
- if( av_write_trailer( p_sys->oc ) < 0 )
- {
- msg_Err( p_mux, "could not write trailer" );
- }
-
- for( i = 0 ; i < p_sys->oc->nb_streams; i++ )
- {
- if( p_sys->oc->streams[i]->codec->extradata )
- av_free( p_sys->oc->streams[i]->codec->extradata );
- av_free( p_sys->oc->streams[i]->codec );
- av_free( p_sys->oc->streams[i] );
- }
- av_free( p_sys->oc );
-
- free( p_sys->io_buffer );
- free( p_sys );
-}
-
-/*****************************************************************************
- * AddStream
- *****************************************************************************/
-static int AddStream( sout_mux_t *p_mux, sout_input_t *p_input )
-{
- sout_mux_sys_t *p_sys = p_mux->p_sys;
- AVCodecContext *codec;
- AVStream *stream;
- int i_codec_id, i_aspect_num, i_aspect_den;
-
- msg_Dbg( p_mux, "adding input" );
-
- if( !GetFfmpegCodec( p_input->p_fmt->i_codec, 0, &i_codec_id, 0 ) )
- {
- msg_Dbg( p_mux, "couldn't find codec for fourcc '%4.4s'",
- (char *)&p_input->p_fmt->i_codec );
- return VLC_EGENERIC;
- }
-
- p_input->p_sys = malloc( sizeof( int ) );
- *((int *)p_input->p_sys) = p_sys->oc->nb_streams;
-
- stream = av_new_stream( p_sys->oc, p_sys->oc->nb_streams);
- if( !stream )
- {
- free( p_input->p_sys );
- return VLC_EGENERIC;
- }
- codec = stream->codec;
-
- /* This is used by LibavutilCallback (avutil.h) to print messages */
- codec->opaque = (void*)p_mux;
-
- switch( p_input->p_fmt->i_cat )
- {
- case AUDIO_ES:
- codec->codec_type = CODEC_TYPE_AUDIO;
- codec->channels = p_input->p_fmt->audio.i_channels;
- codec->sample_rate = p_input->p_fmt->audio.i_rate;
- codec->time_base = (AVRational){1, codec->sample_rate};
- break;
-
- case VIDEO_ES:
- if( !p_input->p_fmt->video.i_frame_rate ||
- !p_input->p_fmt->video.i_frame_rate_base )
- {
- msg_Warn( p_mux, "Missing frame rate, assuming 25fps" );
- p_input->p_fmt->video.i_frame_rate = 25;
- p_input->p_fmt->video.i_frame_rate_base = 1;
- }
- codec->codec_type = CODEC_TYPE_VIDEO;
- codec->width = p_input->p_fmt->video.i_width;
- codec->height = p_input->p_fmt->video.i_height;
- av_reduce( &i_aspect_num, &i_aspect_den,
- p_input->p_fmt->video.i_aspect,
- VOUT_ASPECT_FACTOR, 1 << 30 /* something big */ );
- av_reduce( &codec->sample_aspect_ratio.num,
- &codec->sample_aspect_ratio.den,
- i_aspect_num * (int64_t)codec->height,
- i_aspect_den * (int64_t)codec->width, 1 << 30 );
- codec->time_base.den = p_input->p_fmt->video.i_frame_rate;
- codec->time_base.num = p_input->p_fmt->video.i_frame_rate_base;
- break;
-
- default:
- msg_Warn( p_mux, "Unhandled ES category" );
- }
-
- codec->bit_rate = p_input->p_fmt->i_bitrate;
-#if LIBAVFORMAT_VERSION_INT >= ((51<<16)+(8<<8)+0)
- codec->codec_tag = av_codec_get_tag( p_sys->oc->oformat->codec_tag, i_codec_id );
- if( !codec->codec_tag && i_codec_id == CODEC_ID_MP2 )
- {
- i_codec_id = CODEC_ID_MP3;
- codec->codec_tag = av_codec_get_tag( p_sys->oc->oformat->codec_tag, i_codec_id );
- }
-#else
-# warning "WARNING!!!!!!!"
-# warning "Using libavformat muxing with versions older than 51.8.0 (r7593) might produce broken files."
- /* This is a hack */
- if( i_codec_id == CODEC_ID_MP2 )
- i_codec_id = CODEC_ID_MP3;
- codec->codec_tag = p_input->p_fmt->i_codec;
-#endif
- codec->codec_id = i_codec_id;
-
- if( p_input->p_fmt->i_extra )
- {
- codec->extradata_size = p_input->p_fmt->i_extra;
- codec->extradata = av_malloc( p_input->p_fmt->i_extra );
- memcpy( codec->extradata, p_input->p_fmt->p_extra,
- p_input->p_fmt->i_extra );
- }
-
- return VLC_SUCCESS;
-}
-
-/*****************************************************************************
- * DelStream
- *****************************************************************************/
-static int DelStream( sout_mux_t *p_mux, sout_input_t *p_input )
-{
- msg_Dbg( p_mux, "removing input" );
- free( p_input->p_sys );
- return VLC_SUCCESS;
-}
-
-/*
- * TODO move this function to src/stream_output.c (used by nearly all muxers)
- */
-static int MuxGetStream( sout_mux_t *p_mux, int *pi_stream, mtime_t *pi_dts )
-{
- mtime_t i_dts;
- int i_stream, i;
-
- for( i = 0, i_dts = 0, i_stream = -1; i < p_mux->i_nb_inputs; i++ )
- {
- block_fifo_t *p_fifo;
-
- p_fifo = p_mux->pp_inputs[i]->p_fifo;
-
- /* We don't really need to have anything in the SPU fifo */
- if( p_mux->pp_inputs[i]->p_fmt->i_cat == SPU_ES &&
- block_FifoCount( p_fifo ) == 0 ) continue;
-
- if( block_FifoCount( p_fifo ) )
- {
- block_t *p_buf;
-
- p_buf = block_FifoShow( p_fifo );
- if( i_stream < 0 || p_buf->i_dts < i_dts )
- {
- i_dts = p_buf->i_dts;
- i_stream = i;
- }
- }
- else return -1;
-
- }
- if( pi_stream ) *pi_stream = i_stream;
- if( pi_dts ) *pi_dts = i_dts;
- if( !p_mux->p_sys->i_initial_dts ) p_mux->p_sys->i_initial_dts = i_dts;
- return i_stream;
-}
-
-static int MuxBlock( sout_mux_t *p_mux, sout_input_t *p_input )
-{
- sout_mux_sys_t *p_sys = p_mux->p_sys;
- block_t *p_data = block_FifoGet( p_input->p_fifo );
- int i_stream = *((int *)p_input->p_sys);
- AVStream *p_stream = p_sys->oc->streams[i_stream];
- AVPacket pkt;
-
- memset( &pkt, 0, sizeof(AVPacket) );
-
- av_init_packet(&pkt);
- pkt.data = p_data->p_buffer;
- pkt.size = p_data->i_buffer;
- pkt.stream_index = i_stream;
-
- if( p_data->i_flags & BLOCK_FLAG_TYPE_I ) pkt.flags |= PKT_FLAG_KEY;
-
- /* avformat expects pts/dts which start from 0 */
- p_data->i_dts -= p_mux->p_sys->i_initial_dts;
- p_data->i_pts -= p_mux->p_sys->i_initial_dts;
-
- if( p_data->i_pts > 0 )
- pkt.pts = p_data->i_pts * p_stream->time_base.den /
- INT64_C(1000000) / p_stream->time_base.num;
- if( p_data->i_dts > 0 )
- pkt.dts = p_data->i_dts * p_stream->time_base.den /
- INT64_C(1000000) / p_stream->time_base.num;
-
- /* this is another hack to prevent libavformat from triggering the "non monotone timestamps" check in avformat/utils.c */
- p_stream->cur_dts = ( p_data->i_dts * p_stream->time_base.den /
- INT64_C(1000000) / p_stream->time_base.num ) - 1;
-
- if( av_write_frame( p_sys->oc, &pkt ) < 0 )
- {
- msg_Err( p_mux, "could not write frame (pts: %"PRId64", dts: %"PRId64") "
- "(pkt pts: %"PRId64", dts: %"PRId64")",
- p_data->i_pts, p_data->i_dts, pkt.pts, pkt.dts );
- block_Release( p_data );
- return VLC_EGENERIC;
- }
-
- block_Release( p_data );
- return VLC_SUCCESS;
-}
-
-/*****************************************************************************
- * Mux: multiplex available data in input fifos
- *****************************************************************************/
-static int Mux( sout_mux_t *p_mux )
-{
- sout_mux_sys_t *p_sys = p_mux->p_sys;
- int i_stream;
-
- if( p_sys->b_error ) return VLC_EGENERIC;
-
- if( p_sys->b_write_header )
- {
- msg_Dbg( p_mux, "writing header" );
-
- if( av_write_header( p_sys->oc ) < 0 )
- {
- msg_Err( p_mux, "could not write header" );
- p_sys->b_write_header = false;
- p_sys->b_error = true;
- return VLC_EGENERIC;
- }
-
-#if LIBAVFORMAT_VERSION_INT >= ((52<<16)+(0<<8)+0)
- put_flush_packet( p_sys->oc->pb );
-#else
- put_flush_packet( &p_sys->oc->pb );
-#endif
- p_sys->b_write_header = false;
- }
-
- for( ;; )
- {
- if( MuxGetStream( p_mux, &i_stream, 0 ) < 0 ) return VLC_SUCCESS;
- MuxBlock( p_mux, p_mux->pp_inputs[i_stream] );
- }
-
- return VLC_SUCCESS;
-}
-
-/*****************************************************************************
- * Control:
- *****************************************************************************/
-static int Control( sout_mux_t *p_mux, int i_query, va_list args )
-{
- bool *pb_bool;
-
- switch( i_query )
- {
- case MUX_CAN_ADD_STREAM_WHILE_MUXING:
- pb_bool = (bool*)va_arg( args, bool * );
- *pb_bool = false;
- return VLC_SUCCESS;
-
- case MUX_GET_ADD_STREAM_WAIT:
- pb_bool = (bool*)va_arg( args, bool * );
- *pb_bool = true;
- return VLC_SUCCESS;
-
- case MUX_GET_MIME:
- {
- char **ppsz = (char**)va_arg( args, char ** );
- *ppsz = strdup( p_mux->p_sys->oc->oformat->mime_type );
- return VLC_SUCCESS;
- }
-
- default:
- return VLC_EGENERIC;
- }
-}
-
-/*****************************************************************************
- * I/O wrappers for libavformat
- *****************************************************************************/
-static int IOWrite( void *opaque, uint8_t *buf, int buf_size )
-{
- URLContext *p_url = opaque;
- sout_mux_t *p_mux = p_url->priv_data;
- int i_ret;
-
-#ifdef AVFORMAT_DEBUG
- msg_Dbg( p_mux, "IOWrite %i bytes", buf_size );
-#endif
-
- block_t *p_buf = block_New( p_mux->p_sout, buf_size );
- if( buf_size > 0 ) memcpy( p_buf->p_buffer, buf, buf_size );
-
- if( p_mux->p_sys->b_write_header )
- p_buf->i_flags |= BLOCK_FLAG_HEADER;
-
- i_ret = sout_AccessOutWrite( p_mux->p_access, p_buf );
- return i_ret ? i_ret : -1;
-}
-
-static offset_t IOSeek( void *opaque, offset_t offset, int whence )
-{
- URLContext *p_url = opaque;
- sout_mux_t *p_mux = p_url->priv_data;
- int64_t i_absolute;
-
-#ifdef AVFORMAT_DEBUG
- msg_Dbg( p_mux, "IOSeek offset: %"PRId64", whence: %i", offset, whence );
-#endif
-
- switch( whence )
- {
- case SEEK_SET:
- i_absolute = offset;
- break;
- case SEEK_CUR:
- case SEEK_END:
- default:
- return -1;
- }
-
- if( sout_AccessOutSeek( p_mux->p_access, i_absolute ) )
- {
- return -1;
- }
-
- return 0;
-}
-SUBDIRS = asf avi mp4 mpeg playlist
+SUBDIRS = asf avformat avi mp4 mpeg playlist
SOURCES_a52sys = a52.c
SOURCES_dtssys = dts.c
SOURCES_flacsys = flac.c
--- /dev/null
+/*****************************************************************************
+ * avformat.c: demuxer and muxer using libavformat library
+ *****************************************************************************
+ * Copyright (C) 1999-2008 the VideoLAN team
+ * $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
+ * (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.
+ *
+ * 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.
+ *****************************************************************************/
+
+/*****************************************************************************
+ * Preamble
+ *****************************************************************************/
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
+#include <vlc_plugin.h>
+#include <vlc_codec.h>
+
+/* ffmpeg header */
+#ifdef HAVE_LIBAVFORMAT_AVFORMAT_H
+# include <libavformat/avformat.h>
+#elif defined(HAVE_FFMPEG_AVFORMAT_H)
+# include <ffmpeg/avformat.h>
+#endif
+
+#include "avformat.h"
+
+/*****************************************************************************
+ * Module descriptor
+ *****************************************************************************/
+vlc_module_begin();
+ add_shortcut( "ffmpeg" );
+ set_category( CAT_INPUT );
+ set_subcategory( SUBCAT_INPUT_SCODEC );
+ set_description( N_("FFmpeg demuxer" ) );
+ set_capability( "demux", 2 );
+ set_callbacks( OpenDemux, CloseDemux );
+
+#ifdef ENABLE_SOUT
+ /* mux submodule */
+ add_submodule();
+ set_description( N_("FFmpeg muxer" ) );
+ set_capability( "sout mux", 2 );
+ add_string( "ffmpeg-mux", NULL, NULL, MUX_TEXT,
+ MUX_LONGTEXT, true );
+ set_callbacks( OpenMux, CloseMux );
+#endif
+vlc_module_end();
--- /dev/null
+/*****************************************************************************
+ * avformat.h: muxer and demuxer using libavformat
+ *****************************************************************************
+ * Copyright (C) 2001-2008 the VideoLAN team
+ * $Id$
+ *
+ * Authors: Laurent Aimar <fenrir@via.ecp.fr>
+ *
+ * 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
+ * (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.
+ *
+ * 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.
+ *****************************************************************************/
+
+void LibavcodecCallback( void *p_opaque, int i_level,
+ const char *psz_format, va_list va );
+
+/* Demux module */
+int OpenDemux ( vlc_object_t * );
+void CloseDemux( vlc_object_t * );
+
+/* Mux module */
+int OpenMux ( vlc_object_t * );
+void CloseMux( vlc_object_t * );
+
+#define MUX_TEXT N_("Ffmpeg mux")
+#define MUX_LONGTEXT N_("Force use of ffmpeg muxer.")
--- /dev/null
+/*****************************************************************************
+ * demux.c: demuxer using ffmpeg (libavformat).
+ *****************************************************************************
+ * Copyright (C) 2004-2007 the VideoLAN team
+ * $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
+ * (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.
+ *
+ * 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.
+ *****************************************************************************/
+
+/*****************************************************************************
+ * Preamble
+ *****************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
+#include <vlc_demux.h>
+#include <vlc_stream.h>
+#include <vlc_meta.h>
+
+/* ffmpeg header */
+#if defined(HAVE_LIBAVFORMAT_AVFORMAT_H)
+# include <libavformat/avformat.h>
+#elif defined(HAVE_FFMPEG_AVFORMAT_H)
+# include <ffmpeg/avformat.h>
+#endif
+
+#include "../../codec/ffmpeg/fourcc.h"
+#include "../../codec/ffmpeg/chroma.h"
+
+//#define AVFORMAT_DEBUG 1
+
+/* Version checking */
+#if defined(HAVE_FFMPEG_AVFORMAT_H) || defined(HAVE_LIBAVFORMAT_AVFORMAT_H)
+
+/*****************************************************************************
+ * demux_sys_t: demux descriptor
+ *****************************************************************************/
+struct demux_sys_t
+{
+ ByteIOContext io;
+ int io_buffer_size;
+ uint8_t *io_buffer;
+
+ AVInputFormat *fmt;
+ AVFormatContext *ic;
+ URLContext url;
+ URLProtocol prot;
+
+ int i_tk;
+ es_out_id_t **tk;
+
+ int64_t i_pcr;
+ int64_t i_pcr_inc;
+ int i_pcr_tk;
+};
+
+/*****************************************************************************
+ * Local prototypes
+ *****************************************************************************/
+static int Demux ( demux_t *p_demux );
+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 offset_t IOSeek( void *opaque, offset_t offset, int whence );
+
+/*****************************************************************************
+ * Open
+ *****************************************************************************/
+int OpenDemux( vlc_object_t *p_this )
+{
+ demux_t *p_demux = (demux_t*)p_this;
+ demux_sys_t *p_sys;
+ AVProbeData pd;
+ AVInputFormat *fmt;
+ unsigned int i;
+ bool b_avfmt_nofile;
+
+ /* Init Probe data */
+ pd.filename = p_demux->psz_path;
+ if( ( pd.buf_size = stream_Peek( p_demux->s, &pd.buf, 2048 ) ) <= 0 )
+ {
+ msg_Warn( p_demux, "cannot peek" );
+ return VLC_EGENERIC;
+ }
+
+ av_register_all(); /* Can be called several times */
+
+ /* Guess format */
+ if( !( fmt = av_probe_input_format( &pd, 1 ) ) )
+ {
+ msg_Dbg( p_demux, "couldn't guess format" );
+ return VLC_EGENERIC;
+ }
+
+ /* Don't try to handle MPEG unless forced */
+ if( !p_demux->b_force &&
+ ( !strcmp( fmt->name, "mpeg" ) ||
+ !strcmp( fmt->name, "vcd" ) ||
+ !strcmp( fmt->name, "vob" ) ||
+ !strcmp( fmt->name, "mpegts" ) ||
+ /* libavformat's redirector won't work */
+ !strcmp( fmt->name, "redir" ) ||
+ !strcmp( fmt->name, "sdp" ) ) )
+ {
+ 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->io_buffer = malloc( p_sys->io_buffer_size );
+ p_sys->url.priv_data = p_demux;
+ p_sys->url.prot = &p_sys->prot;
+ p_sys->url.prot->name = "VLC I/O wrapper";
+ p_sys->url.prot->url_open = 0;
+ p_sys->url.prot->url_read =
+ (int (*) (URLContext *, unsigned char *, int))IORead;
+ p_sys->url.prot->url_write = 0;
+ p_sys->url.prot->url_seek =
+ (offset_t (*) (URLContext *, offset_t, int))IOSeek;
+ p_sys->url.prot->url_close = 0;
+ p_sys->url.prot->next = 0;
+ init_put_byte( &p_sys->io, p_sys->io_buffer, p_sys->io_buffer_size,
+ 0, &p_sys->url, IORead, NULL, IOSeek );
+
+ b_avfmt_nofile = p_sys->fmt->flags & AVFMT_NOFILE;
+ p_sys->fmt->flags |= AVFMT_NOFILE; /* libavformat must not fopen/fclose */
+
+ /* Open it */
+ if( av_open_input_stream( &p_sys->ic, &p_sys->io, p_demux->psz_path,
+ p_sys->fmt, NULL ) )
+ {
+ msg_Err( p_demux, "av_open_input_stream failed" );
+ if( !b_avfmt_nofile ) p_sys->fmt->flags ^= AVFMT_NOFILE;
+ CloseDemux( p_this );
+ return VLC_EGENERIC;
+ }
+
+ if( av_find_stream_info( p_sys->ic ) < 0 )
+ {
+ msg_Err( p_demux, "av_find_stream_info failed" );
+ if( !b_avfmt_nofile ) p_sys->fmt->flags ^= AVFMT_NOFILE;
+ CloseDemux( p_this );
+ return VLC_EGENERIC;
+ }
+ if( !b_avfmt_nofile ) p_sys->fmt->flags ^= AVFMT_NOFILE;
+
+ for( i = 0; i < p_sys->ic->nb_streams; i++ )
+ {
+ AVCodecContext *cc = p_sys->ic->streams[i]->codec;
+ es_out_id_t *es;
+ es_format_t fmt;
+ vlc_fourcc_t fcc;
+
+ if( !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 = GetVlcChroma( cc->pix_fmt );
+ }
+ }
+
+ switch( cc->codec_type )
+ {
+ case CODEC_TYPE_AUDIO:
+ es_format_Init( &fmt, AUDIO_ES, fcc );
+ fmt.audio.i_channels = cc->channels;
+ fmt.audio.i_rate = cc->sample_rate;
+ fmt.audio.i_bitspersample = cc->bits_per_sample;
+ fmt.audio.i_blockalign = cc->block_align;
+ break;
+ case CODEC_TYPE_VIDEO:
+ es_format_Init( &fmt, VIDEO_ES, fcc );
+ fmt.video.i_width = cc->width;
+ fmt.video.i_height = cc->height;
+ if( cc->palctrl )
+ {
+ fmt.video.p_palette = malloc( sizeof(video_palette_t) );
+ *fmt.video.p_palette = *(video_palette_t *)cc->palctrl;
+ }
+ break;
+ case CODEC_TYPE_SUBTITLE:
+ es_format_Init( &fmt, SPU_ES, fcc );
+ break;
+ default:
+ msg_Warn( p_demux, "unsupported track type in ffmpeg demux" );
+ break;
+ }
+
+ fmt.psz_language = strdup( p_sys->ic->streams[i]->language );
+ fmt.i_extra = cc->extradata_size;
+ fmt.p_extra = cc->extradata;
+ es = es_out_Add( p_demux->out, &fmt );
+
+ msg_Dbg( p_demux, "adding es: %s codec = %4.4s",
+ cc->codec_type == CODEC_TYPE_AUDIO ? "audio" : "video",
+ (char*)&fcc );
+ TAB_APPEND( p_sys->i_tk, p_sys->tk, es );
+ }
+
+ msg_Dbg( p_demux, "AVFormat supported stream" );
+ msg_Dbg( p_demux, " - format = %s (%s)",
+ p_sys->fmt->name, p_sys->fmt->long_name );
+ msg_Dbg( p_demux, " - start time = %"PRId64,
+ ( p_sys->ic->start_time != (int64_t)AV_NOPTS_VALUE ) ?
+ p_sys->ic->start_time * 1000000 / AV_TIME_BASE : -1 );
+ msg_Dbg( p_demux, " - duration = %"PRId64,
+ ( p_sys->ic->duration != (int64_t)AV_NOPTS_VALUE ) ?
+ p_sys->ic->duration * 1000000 / AV_TIME_BASE : -1 );
+
+ return VLC_SUCCESS;
+}
+
+/*****************************************************************************
+ * Close
+ *****************************************************************************/
+void CloseDemux( vlc_object_t *p_this )
+{
+ demux_t *p_demux = (demux_t*)p_this;
+ demux_sys_t *p_sys = p_demux->p_sys;
+ bool b_avfmt_nofile;
+
+ FREENULL( p_sys->tk );
+
+ b_avfmt_nofile = p_sys->fmt->flags & AVFMT_NOFILE;
+ p_sys->fmt->flags |= AVFMT_NOFILE; /* libavformat must not fopen/fclose */
+ if( p_sys->ic ) av_close_input_file( p_sys->ic );
+ if( !b_avfmt_nofile ) p_sys->fmt->flags ^= AVFMT_NOFILE;
+
+ free( p_sys->io_buffer );
+ free( p_sys );
+}
+
+/*****************************************************************************
+ * Demux:
+ *****************************************************************************/
+static int Demux( demux_t *p_demux )
+{
+ demux_sys_t *p_sys = p_demux->p_sys;
+ AVPacket pkt;
+ block_t *p_frame;
+ int64_t i_start_time;
+
+ /* Read a frame */
+ if( av_read_frame( p_sys->ic, &pkt ) )
+ {
+ return 0;
+ }
+ if( pkt.stream_index < 0 || pkt.stream_index >= p_sys->i_tk )
+ {
+ av_free_packet( &pkt );
+ return 1;
+ }
+ if( ( p_frame = block_New( p_demux, pkt.size ) ) == NULL )
+ {
+ return 0;
+ }
+
+ memcpy( p_frame->p_buffer, pkt.data, pkt.size );
+
+ if( pkt.flags & PKT_FLAG_KEY )
+ p_frame->i_flags |= BLOCK_FLAG_TYPE_I;
+
+ i_start_time = ( p_sys->ic->start_time != (int64_t)AV_NOPTS_VALUE ) ?
+ ( p_sys->ic->start_time / AV_TIME_BASE ) : 0;
+
+ p_frame->i_dts = ( pkt.dts == (int64_t)AV_NOPTS_VALUE ) ?
+ 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 == (int64_t)AV_NOPTS_VALUE ) ?
+ 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=%"PRId64" pts=%"PRId64,
+ pkt.stream_index, p_frame->i_dts, p_frame->i_pts );
+#endif
+
+ if( pkt.dts > 0 &&
+ ( 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 = p_frame->i_dts;
+
+ es_out_Control( p_demux->out, ES_OUT_SET_PCR, (int64_t)p_sys->i_pcr );
+ }
+
+ es_out_Send( p_demux->out, p_sys->tk[pkt.stream_index], p_frame );
+ av_free_packet( &pkt );
+ return 1;
+}
+
+/*****************************************************************************
+ * Control:
+ *****************************************************************************/
+static int Control( demux_t *p_demux, int i_query, va_list args )
+{
+ demux_sys_t *p_sys = p_demux->p_sys;
+ double f, *pf;
+ int64_t i64, *pi64;
+
+ switch( i_query )
+ {
+ case DEMUX_GET_POSITION:
+ 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;
+ }
+
+ if( (p_sys->ic->duration != (int64_t)AV_NOPTS_VALUE) && (p_sys->i_pcr > 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( p_sys->i_pcr > 0 )
+ {
+ i64 = p_sys->ic->duration * f;
+ if( p_sys->ic->start_time != (int64_t)AV_NOPTS_VALUE )
+ i64 += p_sys->ic->start_time;
+
+ msg_Warn( p_demux, "DEMUX_SET_POSITION: %"PRId64, i64 );
+
+ /* If we have a duration, we prefer to seek by time
+ but if we don't, or if the seek fails, try BYTE seeking */
+ if( p_sys->ic->duration == (int64_t)AV_NOPTS_VALUE ||
+ (av_seek_frame( p_sys->ic, -1, i64, 0 ) < 0) )
+ {
+ int64_t i_size = stream_Size( p_demux->s );
+ i64 = (int64_t)i_size * f;
+
+ msg_Warn( p_demux, "DEMUX_SET_BYTE_POSITION: %"PRId64, i64 );
+ if( av_seek_frame( p_sys->ic, -1, i64, AVSEEK_FLAG_BYTE ) < 0 )
+ return VLC_EGENERIC;
+ }
+ es_out_Control( p_demux->out, ES_OUT_RESET_PCR );
+ p_sys->i_pcr = -1; /* Invalidate time display */
+ }
+ return VLC_SUCCESS;
+
+ case DEMUX_GET_LENGTH:
+ pi64 = (int64_t*)va_arg( args, int64_t * );
+ if( p_sys->ic->duration != (int64_t)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;
+ return VLC_SUCCESS;
+
+ case DEMUX_SET_TIME:
+ i64 = (int64_t)va_arg( args, int64_t );
+ if( p_sys->ic->start_time != (int64_t)AV_NOPTS_VALUE )
+ i64 += p_sys->ic->start_time;
+
+ msg_Warn( p_demux, "DEMUX_SET_TIME: %"PRId64, i64 );
+
+ if( av_seek_frame( p_sys->ic, -1, i64, 0 ) < 0 )
+ {
+ return VLC_EGENERIC;
+ }
+ es_out_Control( p_demux->out, ES_OUT_RESET_PCR );
+ p_sys->i_pcr = -1; /* Invalidate time display */
+ return VLC_SUCCESS;
+
+ case DEMUX_GET_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] ||
+ /*!p_sys->ic->album[0] ||*/ !p_sys->ic->genre[0] )
+ {
+ return VLC_EGENERIC;
+ }
+
+ if( p_sys->ic->title[0] )
+ vlc_meta_SetTitle( p_meta, p_sys->ic->title );
+ if( p_sys->ic->author[0] )
+ vlc_meta_SetArtist( p_meta, p_sys->ic->author );
+ if( p_sys->ic->copyright[0] )
+ vlc_meta_SetCopyright( p_meta, p_sys->ic->copyright );
+ if( p_sys->ic->comment[0] )
+ vlc_meta_SetDescription( p_meta, p_sys->ic->comment );
+ if( p_sys->ic->genre[0] )
+ vlc_meta_SetGenre( p_meta, p_sys->ic->genre );
+ return VLC_SUCCESS;
+ }
+
+ default:
+ return VLC_EGENERIC;
+ }
+}
+
+/*****************************************************************************
+ * I/O wrappers for libavformat
+ *****************************************************************************/
+static int IORead( void *opaque, uint8_t *buf, int buf_size )
+{
+ URLContext *p_url = opaque;
+ demux_t *p_demux = p_url->priv_data;
+ int i_ret = stream_Read( p_demux->s, buf, buf_size );
+ return i_ret ? i_ret : -1;
+}
+
+static offset_t IOSeek( void *opaque, offset_t offset, int whence )
+{
+ URLContext *p_url = opaque;
+ demux_t *p_demux = p_url->priv_data;
+ int64_t i_absolute = (int64_t)offset;
+ int64_t i_size = stream_Size( p_demux->s );
+
+#ifdef AVFORMAT_DEBUG
+ msg_Warn( p_demux, "IOSeek offset: %"PRId64", whence: %i", offset, whence );
+#endif
+
+ switch( whence )
+ {
+ case SEEK_SET:
+ break;
+ case SEEK_CUR:
+ i_absolute = stream_Tell( p_demux->s ) + offset;
+ break;
+ case SEEK_END:
+ i_absolute = i_size + offset;
+ break;
+ default:
+ return -1;
+
+ }
+ if( i_absolute < 0 )
+ i_absolute = 0;
+ if( i_size )
+ {
+ if( i_absolute > i_size )
+ i_absolute = i_size;
+ if( stream_Tell( p_demux->s ) >= i_size )
+ {
+ msg_Err( p_demux, "Seeking too far : EOF?" );
+ return -1;
+ }
+ }
+
+ if( stream_Seek( p_demux->s, i_absolute ) )
+ {
+ return -1;
+ }
+
+ return stream_Tell( p_demux->s );
+}
+
+#endif /* HAVE_LIBAVFORMAT_AVFORMAT_H */
--- /dev/null
+/*****************************************************************************
+ * mux.c: muxer using ffmpeg (libavformat).
+ *****************************************************************************
+ * Copyright (C) 2006 the VideoLAN team
+ * $Id$
+ *
+ * Authors: 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
+ * (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.
+ *
+ * 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.
+ *****************************************************************************/
+
+/*****************************************************************************
+ * Preamble
+ *****************************************************************************/
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
+#include <vlc_common.h>
+#include <vlc_block.h>
+#include <vlc_sout.h>
+
+/* ffmpeg header */
+#ifdef HAVE_LIBAVFORMAT_AVFORMAT_H
+# include <libavformat/avformat.h>
+#elif defined(HAVE_FFMPEG_AVFORMAT_H)
+# include <ffmpeg/avformat.h>
+#endif
+
+#include "avformat.h"
+#include "../../codec/ffmpeg/fourcc.h"
+#include "../../codec/ffmpeg/avutil.h"
+
+//#define AVFORMAT_DEBUG 1
+
+static const char *const ppsz_mux_options[] = {
+ "mux", NULL
+};
+
+/*****************************************************************************
+ * mux_sys_t: mux descriptor
+ *****************************************************************************/
+struct sout_mux_sys_t
+{
+ ByteIOContext io;
+ int io_buffer_size;
+ uint8_t *io_buffer;
+
+ AVFormatContext *oc;
+ URLContext url;
+ URLProtocol prot;
+
+ bool b_write_header;
+ bool b_error;
+
+ int64_t i_initial_dts;
+};
+
+/*****************************************************************************
+ * Local prototypes
+ *****************************************************************************/
+static int Control ( sout_mux_t *, int, va_list );
+static int AddStream( sout_mux_t *, sout_input_t * );
+static int DelStream( sout_mux_t *, sout_input_t * );
+static int Mux ( sout_mux_t * );
+
+static int IOWrite( void *opaque, uint8_t *buf, int buf_size );
+static offset_t IOSeek( void *opaque, offset_t offset, int whence );
+
+/*****************************************************************************
+ * Open
+ *****************************************************************************/
+int OpenMux( vlc_object_t *p_this )
+{
+ AVOutputFormat *file_oformat;
+ sout_mux_t *p_mux = (sout_mux_t*)p_this;
+ sout_mux_sys_t *p_sys;
+ AVFormatParameters params, *ap = ¶ms;
+ char *psz_mux;
+
+ /* Should we call it only once ? */
+ av_register_all();
+ av_log_set_callback( LibavutilCallback );
+
+ config_ChainParse( p_mux, "ffmpeg-", ppsz_mux_options, p_mux->p_cfg );
+
+ /* Find the requested muxer */
+ psz_mux = var_GetNonEmptyString( p_mux, "ffmpeg-mux" );
+ if( psz_mux )
+ {
+ file_oformat = guess_format( psz_mux, NULL, NULL );
+ }
+ else
+ {
+ file_oformat =
+ guess_format(NULL, p_mux->p_access->psz_path, NULL);
+ }
+ if (!file_oformat)
+ {
+ msg_Err( p_mux, "unable for find a suitable output format" );
+ return VLC_EGENERIC;
+ }
+
+ /* Fill p_mux fields */
+ p_mux->pf_control = Control;
+ p_mux->pf_addstream = AddStream;
+ p_mux->pf_delstream = DelStream;
+ p_mux->pf_mux = Mux;
+ p_mux->p_sys = p_sys = malloc( sizeof( sout_mux_sys_t ) );
+
+ p_sys->oc = av_alloc_format_context();
+ p_sys->oc->oformat = file_oformat;
+
+ /* Create I/O wrapper */
+ p_sys->io_buffer_size = 32768; /* FIXME */
+ p_sys->io_buffer = malloc( p_sys->io_buffer_size );
+ p_sys->url.priv_data = p_mux;
+ p_sys->url.prot = &p_sys->prot;
+ p_sys->url.prot->name = "VLC I/O wrapper";
+ p_sys->url.prot->url_open = 0;
+ p_sys->url.prot->url_read = 0;
+ p_sys->url.prot->url_write =
+ (int (*) (URLContext *, unsigned char *, int))IOWrite;
+ p_sys->url.prot->url_seek =
+ (offset_t (*) (URLContext *, offset_t, int))IOSeek;
+ p_sys->url.prot->url_close = 0;
+ p_sys->url.prot->next = 0;
+ init_put_byte( &p_sys->io, p_sys->io_buffer, p_sys->io_buffer_size,
+ 1, &p_sys->url, NULL, IOWrite, IOSeek );
+
+ memset( ap, 0, sizeof(*ap) );
+ if( av_set_parameters( p_sys->oc, ap ) < 0 )
+ {
+ msg_Err( p_mux, "invalid encoding parameters" );
+ av_free( p_sys->oc );
+ free( p_sys->io_buffer );
+ free( p_sys );
+ return VLC_EGENERIC;
+ }
+
+#if LIBAVFORMAT_VERSION_INT >= ((52<<16)+(0<<8)+0)
+ p_sys->oc->pb = &p_sys->io;
+#else
+ p_sys->oc->pb = p_sys->io;
+#endif
+ p_sys->oc->nb_streams = 0;
+
+ p_sys->b_write_header = true;
+ p_sys->b_error = false;
+ p_sys->i_initial_dts = 0;
+
+ return VLC_SUCCESS;
+}
+
+/*****************************************************************************
+ * Close
+ *****************************************************************************/
+void CloseMux( vlc_object_t *p_this )
+{
+ sout_mux_t *p_mux = (sout_mux_t*)p_this;
+ sout_mux_sys_t *p_sys = p_mux->p_sys;
+ unsigned int i;
+
+ if( av_write_trailer( p_sys->oc ) < 0 )
+ {
+ msg_Err( p_mux, "could not write trailer" );
+ }
+
+ for( i = 0 ; i < p_sys->oc->nb_streams; i++ )
+ {
+ if( p_sys->oc->streams[i]->codec->extradata )
+ av_free( p_sys->oc->streams[i]->codec->extradata );
+ av_free( p_sys->oc->streams[i]->codec );
+ av_free( p_sys->oc->streams[i] );
+ }
+ av_free( p_sys->oc );
+
+ free( p_sys->io_buffer );
+ free( p_sys );
+}
+
+/*****************************************************************************
+ * AddStream
+ *****************************************************************************/
+static int AddStream( sout_mux_t *p_mux, sout_input_t *p_input )
+{
+ sout_mux_sys_t *p_sys = p_mux->p_sys;
+ AVCodecContext *codec;
+ AVStream *stream;
+ int i_codec_id, i_aspect_num, i_aspect_den;
+
+ msg_Dbg( p_mux, "adding input" );
+
+ if( !GetFfmpegCodec( p_input->p_fmt->i_codec, 0, &i_codec_id, 0 ) )
+ {
+ msg_Dbg( p_mux, "couldn't find codec for fourcc '%4.4s'",
+ (char *)&p_input->p_fmt->i_codec );
+ return VLC_EGENERIC;
+ }
+
+ p_input->p_sys = malloc( sizeof( int ) );
+ *((int *)p_input->p_sys) = p_sys->oc->nb_streams;
+
+ stream = av_new_stream( p_sys->oc, p_sys->oc->nb_streams);
+ if( !stream )
+ {
+ free( p_input->p_sys );
+ return VLC_EGENERIC;
+ }
+ codec = stream->codec;
+
+ /* This is used by LibavutilCallback (avutil.h) to print messages */
+ codec->opaque = (void*)p_mux;
+
+ switch( p_input->p_fmt->i_cat )
+ {
+ case AUDIO_ES:
+ codec->codec_type = CODEC_TYPE_AUDIO;
+ codec->channels = p_input->p_fmt->audio.i_channels;
+ codec->sample_rate = p_input->p_fmt->audio.i_rate;
+ codec->time_base = (AVRational){1, codec->sample_rate};
+ break;
+
+ case VIDEO_ES:
+ if( !p_input->p_fmt->video.i_frame_rate ||
+ !p_input->p_fmt->video.i_frame_rate_base )
+ {
+ msg_Warn( p_mux, "Missing frame rate, assuming 25fps" );
+ p_input->p_fmt->video.i_frame_rate = 25;
+ p_input->p_fmt->video.i_frame_rate_base = 1;
+ }
+ codec->codec_type = CODEC_TYPE_VIDEO;
+ codec->width = p_input->p_fmt->video.i_width;
+ codec->height = p_input->p_fmt->video.i_height;
+ av_reduce( &i_aspect_num, &i_aspect_den,
+ p_input->p_fmt->video.i_aspect,
+ VOUT_ASPECT_FACTOR, 1 << 30 /* something big */ );
+ av_reduce( &codec->sample_aspect_ratio.num,
+ &codec->sample_aspect_ratio.den,
+ i_aspect_num * (int64_t)codec->height,
+ i_aspect_den * (int64_t)codec->width, 1 << 30 );
+ codec->time_base.den = p_input->p_fmt->video.i_frame_rate;
+ codec->time_base.num = p_input->p_fmt->video.i_frame_rate_base;
+ break;
+
+ default:
+ msg_Warn( p_mux, "Unhandled ES category" );
+ }
+
+ codec->bit_rate = p_input->p_fmt->i_bitrate;
+#if LIBAVFORMAT_VERSION_INT >= ((51<<16)+(8<<8)+0)
+ codec->codec_tag = av_codec_get_tag( p_sys->oc->oformat->codec_tag, i_codec_id );
+ if( !codec->codec_tag && i_codec_id == CODEC_ID_MP2 )
+ {
+ i_codec_id = CODEC_ID_MP3;
+ codec->codec_tag = av_codec_get_tag( p_sys->oc->oformat->codec_tag, i_codec_id );
+ }
+#else
+# warning "WARNING!!!!!!!"
+# warning "Using libavformat muxing with versions older than 51.8.0 (r7593) might produce broken files."
+ /* This is a hack */
+ if( i_codec_id == CODEC_ID_MP2 )
+ i_codec_id = CODEC_ID_MP3;
+ codec->codec_tag = p_input->p_fmt->i_codec;
+#endif
+ codec->codec_id = i_codec_id;
+
+ if( p_input->p_fmt->i_extra )
+ {
+ codec->extradata_size = p_input->p_fmt->i_extra;
+ codec->extradata = av_malloc( p_input->p_fmt->i_extra );
+ memcpy( codec->extradata, p_input->p_fmt->p_extra,
+ p_input->p_fmt->i_extra );
+ }
+
+ return VLC_SUCCESS;
+}
+
+/*****************************************************************************
+ * DelStream
+ *****************************************************************************/
+static int DelStream( sout_mux_t *p_mux, sout_input_t *p_input )
+{
+ msg_Dbg( p_mux, "removing input" );
+ free( p_input->p_sys );
+ return VLC_SUCCESS;
+}
+
+/*
+ * TODO move this function to src/stream_output.c (used by nearly all muxers)
+ */
+static int MuxGetStream( sout_mux_t *p_mux, int *pi_stream, mtime_t *pi_dts )
+{
+ mtime_t i_dts;
+ int i_stream, i;
+
+ for( i = 0, i_dts = 0, i_stream = -1; i < p_mux->i_nb_inputs; i++ )
+ {
+ block_fifo_t *p_fifo;
+
+ p_fifo = p_mux->pp_inputs[i]->p_fifo;
+
+ /* We don't really need to have anything in the SPU fifo */
+ if( p_mux->pp_inputs[i]->p_fmt->i_cat == SPU_ES &&
+ block_FifoCount( p_fifo ) == 0 ) continue;
+
+ if( block_FifoCount( p_fifo ) )
+ {
+ block_t *p_buf;
+
+ p_buf = block_FifoShow( p_fifo );
+ if( i_stream < 0 || p_buf->i_dts < i_dts )
+ {
+ i_dts = p_buf->i_dts;
+ i_stream = i;
+ }
+ }
+ else return -1;
+
+ }
+ if( pi_stream ) *pi_stream = i_stream;
+ if( pi_dts ) *pi_dts = i_dts;
+ if( !p_mux->p_sys->i_initial_dts ) p_mux->p_sys->i_initial_dts = i_dts;
+ return i_stream;
+}
+
+static int MuxBlock( sout_mux_t *p_mux, sout_input_t *p_input )
+{
+ sout_mux_sys_t *p_sys = p_mux->p_sys;
+ block_t *p_data = block_FifoGet( p_input->p_fifo );
+ int i_stream = *((int *)p_input->p_sys);
+ AVStream *p_stream = p_sys->oc->streams[i_stream];
+ AVPacket pkt;
+
+ memset( &pkt, 0, sizeof(AVPacket) );
+
+ av_init_packet(&pkt);
+ pkt.data = p_data->p_buffer;
+ pkt.size = p_data->i_buffer;
+ pkt.stream_index = i_stream;
+
+ if( p_data->i_flags & BLOCK_FLAG_TYPE_I ) pkt.flags |= PKT_FLAG_KEY;
+
+ /* avformat expects pts/dts which start from 0 */
+ p_data->i_dts -= p_mux->p_sys->i_initial_dts;
+ p_data->i_pts -= p_mux->p_sys->i_initial_dts;
+
+ if( p_data->i_pts > 0 )
+ pkt.pts = p_data->i_pts * p_stream->time_base.den /
+ INT64_C(1000000) / p_stream->time_base.num;
+ if( p_data->i_dts > 0 )
+ pkt.dts = p_data->i_dts * p_stream->time_base.den /
+ INT64_C(1000000) / p_stream->time_base.num;
+
+ /* this is another hack to prevent libavformat from triggering the "non monotone timestamps" check in avformat/utils.c */
+ p_stream->cur_dts = ( p_data->i_dts * p_stream->time_base.den /
+ INT64_C(1000000) / p_stream->time_base.num ) - 1;
+
+ if( av_write_frame( p_sys->oc, &pkt ) < 0 )
+ {
+ msg_Err( p_mux, "could not write frame (pts: %"PRId64", dts: %"PRId64") "
+ "(pkt pts: %"PRId64", dts: %"PRId64")",
+ p_data->i_pts, p_data->i_dts, pkt.pts, pkt.dts );
+ block_Release( p_data );
+ return VLC_EGENERIC;
+ }
+
+ block_Release( p_data );
+ return VLC_SUCCESS;
+}
+
+/*****************************************************************************
+ * Mux: multiplex available data in input fifos
+ *****************************************************************************/
+static int Mux( sout_mux_t *p_mux )
+{
+ sout_mux_sys_t *p_sys = p_mux->p_sys;
+ int i_stream;
+
+ if( p_sys->b_error ) return VLC_EGENERIC;
+
+ if( p_sys->b_write_header )
+ {
+ msg_Dbg( p_mux, "writing header" );
+
+ if( av_write_header( p_sys->oc ) < 0 )
+ {
+ msg_Err( p_mux, "could not write header" );
+ p_sys->b_write_header = false;
+ p_sys->b_error = true;
+ return VLC_EGENERIC;
+ }
+
+#if LIBAVFORMAT_VERSION_INT >= ((52<<16)+(0<<8)+0)
+ put_flush_packet( p_sys->oc->pb );
+#else
+ put_flush_packet( &p_sys->oc->pb );
+#endif
+ p_sys->b_write_header = false;
+ }
+
+ for( ;; )
+ {
+ if( MuxGetStream( p_mux, &i_stream, 0 ) < 0 ) return VLC_SUCCESS;
+ MuxBlock( p_mux, p_mux->pp_inputs[i_stream] );
+ }
+
+ return VLC_SUCCESS;
+}
+
+/*****************************************************************************
+ * Control:
+ *****************************************************************************/
+static int Control( sout_mux_t *p_mux, int i_query, va_list args )
+{
+ bool *pb_bool;
+
+ switch( i_query )
+ {
+ case MUX_CAN_ADD_STREAM_WHILE_MUXING:
+ pb_bool = (bool*)va_arg( args, bool * );
+ *pb_bool = false;
+ return VLC_SUCCESS;
+
+ case MUX_GET_ADD_STREAM_WAIT:
+ pb_bool = (bool*)va_arg( args, bool * );
+ *pb_bool = true;
+ return VLC_SUCCESS;
+
+ case MUX_GET_MIME:
+ {
+ char **ppsz = (char**)va_arg( args, char ** );
+ *ppsz = strdup( p_mux->p_sys->oc->oformat->mime_type );
+ return VLC_SUCCESS;
+ }
+
+ default:
+ return VLC_EGENERIC;
+ }
+}
+
+/*****************************************************************************
+ * I/O wrappers for libavformat
+ *****************************************************************************/
+static int IOWrite( void *opaque, uint8_t *buf, int buf_size )
+{
+ URLContext *p_url = opaque;
+ sout_mux_t *p_mux = p_url->priv_data;
+ int i_ret;
+
+#ifdef AVFORMAT_DEBUG
+ msg_Dbg( p_mux, "IOWrite %i bytes", buf_size );
+#endif
+
+ block_t *p_buf = block_New( p_mux->p_sout, buf_size );
+ if( buf_size > 0 ) memcpy( p_buf->p_buffer, buf, buf_size );
+
+ if( p_mux->p_sys->b_write_header )
+ p_buf->i_flags |= BLOCK_FLAG_HEADER;
+
+ i_ret = sout_AccessOutWrite( p_mux->p_access, p_buf );
+ return i_ret ? i_ret : -1;
+}
+
+static offset_t IOSeek( void *opaque, offset_t offset, int whence )
+{
+ URLContext *p_url = opaque;
+ sout_mux_t *p_mux = p_url->priv_data;
+ int64_t i_absolute;
+
+#ifdef AVFORMAT_DEBUG
+ msg_Dbg( p_mux, "IOSeek offset: %"PRId64", whence: %i", offset, whence );
+#endif
+
+ switch( whence )
+ {
+ case SEEK_SET:
+ i_absolute = offset;
+ break;
+ case SEEK_CUR:
+ case SEEK_END:
+ default:
+ return -1;
+ }
+
+ if( sout_AccessOutSeek( p_mux->p_access, i_absolute ) )
+ {
+ return -1;
+ }
+
+ return 0;
+}