/*****************************************************************************
- * mux.c: muxer using ffmpeg (libavformat).
+ * mux.c: muxer using libavformat
*****************************************************************************
- * Copyright (C) 2006 the VideoLAN team
+ * Copyright (C) 2006 VLC authors and VideoLAN
* $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
+ * 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., 59 Temple Place - Suite 330, Boston, MA 02111, 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_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 <libavformat/avformat.h>
#include "avformat.h"
#include "../../codec/avcodec/avcodec.h"
-#include "../../codec/avcodec/avutil.h"
+#include "../../codec/avcodec/avcommon.h"
+
//#define AVFORMAT_DEBUG 1
static const char *const ppsz_mux_options[] = {
- "mux", NULL
+ "mux", "options", NULL
};
/*****************************************************************************
*****************************************************************************/
struct sout_mux_sys_t
{
- ByteIOContext io;
+ AVIOContext *io;
int io_buffer_size;
uint8_t *io_buffer;
AVFormatContext *oc;
- URLContext url;
- URLProtocol prot;
bool b_write_header;
+ bool b_write_keyframe;
bool b_error;
-
- int64_t i_initial_dts;
};
/*****************************************************************************
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 );
+ vlc_init_avformat(p_this);
- config_ChainParse( p_mux, "ffmpeg-", ppsz_mux_options, p_mux->p_cfg );
+ config_ChainParse( p_mux, "sout-avformat-", ppsz_mux_options, p_mux->p_cfg );
/* Find the requested muxer */
- psz_mux = var_GetNonEmptyString( p_mux, "ffmpeg-mux" );
+ psz_mux = var_GetNonEmptyString( p_mux, "sout-avformat-mux" );
if( psz_mux )
{
- file_oformat = guess_format( psz_mux, NULL, NULL );
+ file_oformat = av_guess_format( psz_mux, NULL, NULL );
+ free( psz_mux );
}
else
{
file_oformat =
- guess_format(NULL, p_mux->p_access->psz_path, NULL);
+ av_guess_format( NULL, p_mux->p_access->psz_path, NULL);
}
if (!file_oformat)
{
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 ) );
+ if( !p_sys )
+ return VLC_ENOMEM;
- p_sys->oc = av_alloc_format_context();
+ p_sys->oc = avformat_alloc_context();
p_sys->oc->oformat = file_oformat;
+ /* If we use dummy access, let avformat write output */
+ if( !strcmp( p_mux->p_access->psz_access, "dummy") )
+ strcpy( p_sys->oc->filename, p_mux->p_access->psz_path );
/* Create I/O wrapper */
- p_sys->io_buffer_size = 32768; /* FIXME */
+ p_sys->io_buffer_size = 10 * 1024 * 1024; /* 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 =
- (int64_t (*) (URLContext *, int64_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
+ bool b_can_seek;
+ if( sout_AccessOutControl( p_mux->p_access, ACCESS_OUT_CAN_SEEK, &b_can_seek ) )
+ b_can_seek = false;
+ p_sys->io = avio_alloc_context(
+ p_sys->io_buffer, p_sys->io_buffer_size,
+ 1, p_mux, NULL, IOWrite, b_can_seek ? IOSeek : NULL );
+
p_sys->oc->pb = p_sys->io;
-#endif
p_sys->oc->nb_streams = 0;
p_sys->b_write_header = true;
+ p_sys->b_write_keyframe = false;
p_sys->b_error = false;
- p_sys->i_initial_dts = 0;
+
+ /* Fill p_mux fields */
+ p_mux->pf_control = Control;
+ p_mux->pf_addstream = AddStream;
+ p_mux->pf_delstream = DelStream;
+ p_mux->pf_mux = Mux;
return VLC_SUCCESS;
}
{
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 )
+ if( !p_sys->b_write_header && !p_sys->b_error && 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 );
+ avformat_free_context(p_sys->oc);
free( p_sys->io_buffer );
free( p_sys );
sout_mux_sys_t *p_sys = p_mux->p_sys;
AVCodecContext *codec;
AVStream *stream;
- int i_codec_id, i_aspect_num, i_aspect_den;
+ unsigned i_codec_id;
msg_Dbg( p_mux, "adding input" );
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( p_input->p_fmt->i_cat != VIDEO_ES && p_input->p_fmt->i_cat != AUDIO_ES)
+ {
+ msg_Warn( p_mux, "Unhandled ES category" );
+ return VLC_EGENERIC;
+ }
+
+ stream = avformat_new_stream( p_sys->oc, NULL);
if( !stream )
{
free( p_input->p_sys );
}
codec = stream->codec;
- /* This is used by LibavutilCallback (avutil.h) to print messages */
- codec->opaque = (void*)p_mux;
+ codec->opaque = p_mux;
switch( p_input->p_fmt->i_cat )
{
case AUDIO_ES:
- codec->codec_type = CODEC_TYPE_AUDIO;
+ codec->codec_type = AVMEDIA_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};
+ codec->frame_size = p_input->p_fmt->audio.i_frame_length;
break;
case VIDEO_ES:
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->codec_type = AVMEDIA_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 );
+ p_input->p_fmt->video.i_sar_num,
+ p_input->p_fmt->video.i_sar_den, 1 << 30 /* something big */ );
+ stream->sample_aspect_ratio.den = codec->sample_aspect_ratio.den;
+ stream->sample_aspect_ratio.num = codec->sample_aspect_ratio.num;
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 )
+ if( !codec->codec_tag && i_codec_id == AV_CODEC_ID_MP2 )
{
- i_codec_id = CODEC_ID_MP3;
+ i_codec_id = AV_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 )
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;
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;
+ if( p_data->i_flags & BLOCK_FLAG_TYPE_I )
+ {
+#ifdef AVFMT_ALLOW_FLUSH
+ /* Make sure we don't inadvertedly mark buffered data as keyframes. */
+ if( p_sys->oc->oformat->flags & AVFMT_ALLOW_FLUSH )
+ av_write_frame( p_sys->oc, NULL );
+#endif
- /* 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;
+ p_sys->b_write_keyframe = true;
+ pkt.flags |= AV_PKT_FLAG_KEY;
+ }
if( p_data->i_pts > 0 )
pkt.pts = p_data->i_pts * p_stream->time_base.den /
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 )
{
+ int error;
msg_Dbg( p_mux, "writing header" );
- if( av_write_header( p_sys->oc ) < 0 )
+ char *psz_opts = var_GetNonEmptyString( p_mux, "sout-avformat-options" );
+ AVDictionary *options = NULL;
+ if (psz_opts && *psz_opts)
+ options = vlc_av_get_options(psz_opts);
+ free(psz_opts);
+ error = avformat_write_header( p_sys->oc, options ? &options : NULL);
+ AVDictionaryEntry *t = NULL;
+ while ((t = av_dict_get(options, "", t, AV_DICT_IGNORE_SUFFIX))) {
+ msg_Err( p_mux, "Unknown option \"%s\"", t->key );
+ }
+ av_dict_free(&options);
+ if( error < 0 )
{
- msg_Err( p_mux, "could not write header" );
+ errno = AVUNERROR(error);
+ msg_Err( p_mux, "could not write header: %m" );
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
+ avio_flush( p_sys->oc->pb );
p_sys->b_write_header = false;
}
for( ;; )
{
- if( MuxGetStream( p_mux, &i_stream, 0 ) < 0 ) return VLC_SUCCESS;
+ mtime_t i_dts;
+
+ int i_stream = sout_MuxGetStream( p_mux, 1, &i_dts );
+ if( i_stream < 0 )
+ return VLC_SUCCESS;
+
MuxBlock( p_mux, p_mux->pp_inputs[i_stream] );
}
*****************************************************************************/
static int IOWrite( void *opaque, uint8_t *buf, int buf_size )
{
- URLContext *p_url = opaque;
- sout_mux_t *p_mux = p_url->priv_data;
+ sout_mux_t *p_mux = opaque;
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 );
+ block_t *p_buf = block_Alloc( 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;
+ if( p_mux->p_sys->b_write_keyframe )
+ {
+ p_buf->i_flags |= BLOCK_FLAG_TYPE_I;
+ p_mux->p_sys->b_write_keyframe = false;
+ }
+
i_ret = sout_AccessOutWrite( p_mux->p_access, p_buf );
return i_ret ? i_ret : -1;
}
static int64_t IOSeek( void *opaque, int64_t offset, int whence )
{
- URLContext *p_url = opaque;
- sout_mux_t *p_mux = p_url->priv_data;
- int64_t i_absolute;
+ sout_mux_t *p_mux = opaque;
#ifdef AVFORMAT_DEBUG
msg_Dbg( p_mux, "IOSeek offset: %"PRId64", whence: %i", offset, whence );
switch( whence )
{
case SEEK_SET:
- i_absolute = offset;
- break;
+ return sout_AccessOutSeek( p_mux->p_access, offset );
case SEEK_CUR:
case SEEK_END:
default:
return -1;
}
-
- if( sout_AccessOutSeek( p_mux->p_access, i_absolute ) )
- {
- return -1;
- }
-
- return 0;
}
projects / vlc / blobdiff