/*****************************************************************************
* avcodec.c: video and audio decoder and encoder using libavcodec
*****************************************************************************
- * Copyright (C) 1999-2008 the VideoLAN team
+ * Copyright (C) 1999-2008 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 <vlc_plugin.h>
#include <vlc_codec.h>
#include <vlc_avcodec.h>
+#include <vlc_cpu.h>
-/* ffmpeg header */
#define HAVE_MMX 1
-#ifdef HAVE_LIBAVCODEC_AVCODEC_H
-# include <libavcodec/avcodec.h>
-#elif defined(HAVE_FFMPEG_AVCODEC_H)
-# include <ffmpeg/avcodec.h>
-#else
-# include <avcodec.h>
-#endif
-
-#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT( 51, 48, 0 )
-# error You must update libavcodec to a version >= 51.48.0
-#elif LIBAVCODEC_VERSION_INT < AV_VERSION_INT( 52, 25, 0 )
-# warning You should update libavcodec to get subtitle support
-#endif
-
+#include <libavcodec/avcodec.h>
#include "avcodec.h"
-#include "avutil.h"
+#include "chroma.h"
+#include "avcommon.h"
+
+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT( 53, 34, 0 )
+# error You must update libavcodec to a version >= 53.34.0
+#elif LIBAVCODEC_VERSION_INT < AV_VERSION_INT( 54, 25, 0 )
+# warning You should update libavcodec to a version >= 54.25.0
+#endif
/*****************************************************************************
* decoder_sys_t: decoder descriptor
struct decoder_sys_t
{
/* Common part between video and audio decoder */
- FFMPEG_COMMON_MEMBERS
+ AVCODEC_COMMON_MEMBERS
};
/****************************************************************************
N_("rd"), N_("bits"), N_("simple") };
#endif
+#ifdef MERGE_FFMPEG
+# include "../../demux/avformat/avformat.h"
+# include "../../access/avio.h"
+#endif
+
/*****************************************************************************
* Module descriptor
*****************************************************************************/
-#define MODULE_DESCRIPTION N_( "Various audio and video decoders/encoders" \
+#define MODULE_DESCRIPTION N_( "Various audio and video decoders/encoders " \
"delivered by the FFmpeg library. This includes (MS)MPEG4, DivX, SV1,"\
"H261, H263, H264, WMV, WMA, AAC, AMR, DV, MJPEG and other codecs")
set_shortname( "FFmpeg")
add_shortcut( "ffmpeg" )
set_category( CAT_INPUT )
- set_subcategory( SUBCAT_INPUT_SCODEC )
+ set_subcategory( SUBCAT_INPUT_VCODEC )
/* decoder main module */
-#if defined(MODULE_NAME_is_ffmpegaltivec) \
- || (defined(CAN_COMPILE_ALTIVEC) && !defined(NO_ALTIVEC_IN_FFMPEG))
- set_description( N_("AltiVec FFmpeg audio/video decoder ((MS)MPEG4,SVQ1,H263,WMV,WMA)") )
- /*add_requirement( ALTIVEC )*/
- set_capability( "decoder", 71 )
-#else
set_description( N_("FFmpeg audio/video decoder") )
set_help( MODULE_DESCRIPTION )
set_capability( "decoder", 70 )
-#endif
set_section( N_("Decoding") , NULL )
set_callbacks( OpenDecoder, CloseDecoder )
- add_bool( "ffmpeg-dr", 1, NULL, DR_TEXT, DR_TEXT, true )
- add_integer ( "ffmpeg-error-resilience", 1, NULL, ERROR_TEXT,
+ add_obsolete_bool( "ffmpeg-dr" ) /* removed since 2.1.0 */
+ add_bool( "avcodec-dr", true, DR_TEXT, DR_TEXT, true )
+ add_obsolete_integer ( "ffmpeg-error-resilience" ) /* removed since 2.1.0 */
+ add_integer ( "avcodec-error-resilience", 1, ERROR_TEXT,
ERROR_LONGTEXT, true )
- add_integer ( "ffmpeg-workaround-bugs", 1, NULL, BUGS_TEXT, BUGS_LONGTEXT,
+ add_obsolete_integer ( "ffmpeg-workaround-bugs" ) /* removed since 2.1.0 */
+ add_integer ( "avcodec-workaround-bugs", 1, BUGS_TEXT, BUGS_LONGTEXT,
false )
- add_bool( "ffmpeg-hurry-up", 1, NULL, HURRYUP_TEXT, HURRYUP_LONGTEXT,
+ add_obsolete_bool( "ffmpeg-hurry-up" ) /* removed since 2.1.0 */
+ add_bool( "avcodec-hurry-up", true, HURRYUP_TEXT, HURRYUP_LONGTEXT,
false )
- add_integer( "ffmpeg-skip-frame", 0, NULL, SKIP_FRAME_TEXT,
+ add_obsolete_integer( "ffmpeg-skip-frame") /* removed since 2.1.0 */
+ add_integer( "avcodec-skip-frame", 0, SKIP_FRAME_TEXT,
SKIP_FRAME_LONGTEXT, true )
change_integer_range( -1, 4 )
- add_integer( "ffmpeg-skip-idct", 0, NULL, SKIP_IDCT_TEXT,
+ add_obsolete_integer( "ffmpeg-skip-idct" ) /* removed since 2.1.0 */
+ add_integer( "avcodec-skip-idct", 0, SKIP_IDCT_TEXT,
SKIP_IDCT_LONGTEXT, true )
change_integer_range( -1, 4 )
- add_integer ( "ffmpeg-vismv", 0, NULL, VISMV_TEXT, VISMV_LONGTEXT,
+ add_obsolete_integer ( "ffmpeg-vismv" ) /* removed since 2.1.0 */
+ add_integer ( "avcodec-vismv", 0, VISMV_TEXT, VISMV_LONGTEXT,
true )
- add_integer ( "ffmpeg-lowres", 0, NULL, LOWRES_TEXT, LOWRES_LONGTEXT,
- true )
- change_integer_range( 0, 2 )
- add_bool( "ffmpeg-fast", 0, NULL, FAST_TEXT, FAST_LONGTEXT, true )
- add_integer ( "ffmpeg-skiploopfilter", 0, NULL, SKIPLOOPF_TEXT,
- SKIPLOOPF_LONGTEXT, true )
+ add_obsolete_integer ( "ffmpeg-lowres" ) /* removed since 2.1.0 */
+ add_obsolete_bool( "ffmpeg-fast" ) /* removed since 2.1.0 */
+ add_bool( "avcodec-fast", false, FAST_TEXT, FAST_LONGTEXT, false )
+ add_obsolete_integer ( "ffmpeg-skiploopfilter" ) /* removed since 2.1.0 */
+ add_integer ( "avcodec-skiploopfilter", 0, SKIPLOOPF_TEXT,
+ SKIPLOOPF_LONGTEXT, false)
change_safe ()
- change_integer_list( nloopf_list, nloopf_list_text, NULL )
+ change_integer_list( nloopf_list, nloopf_list_text )
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 54, 41, 0 )
+ add_bool( "avcodec-ignorecrop", false, IGNORECROP_TEXT, IGNORECROP_LONGTEXT,
+ true )
+#endif
- add_integer( "ffmpeg-debug", 0, NULL, DEBUG_TEXT, DEBUG_LONGTEXT,
+ add_obsolete_integer( "ffmpeg-debug" ) /* removed since 2.1.0 */
+ add_integer( "avcodec-debug", 0, DEBUG_TEXT, DEBUG_LONGTEXT,
true )
-#ifdef HAVE_AVCODEC_VAAPI
- add_bool( "ffmpeg-hw", true, NULL, HW_TEXT, HW_LONGTEXT, true )
+ add_obsolete_string( "ffmpeg-codec" ) /* removed since 2.1.0 */
+ add_string( "avcodec-codec", NULL, CODEC_TEXT, CODEC_LONGTEXT, true )
+ add_obsolete_bool( "ffmpeg-hw" ) /* removed since 2.1.0 */
+ add_module( "avcodec-hw", "hw decoder", "none", HW_TEXT, HW_LONGTEXT, false )
+#if defined(FF_THREAD_FRAME)
+ add_obsolete_integer( "ffmpeg-threads" ) /* removed since 2.1.0 */
+ add_integer( "avcodec-threads", 0, THREADS_TEXT, THREADS_LONGTEXT, true );
#endif
+ add_string( "avcodec-options", NULL, AV_OPTIONS_TEXT, AV_OPTIONS_LONGTEXT, true )
+
#ifdef ENABLE_SOUT
/* encoder submodule */
set_capability( "encoder", 100 )
set_callbacks( OpenEncoder, CloseEncoder )
- add_string( ENC_CFG_PREFIX "hq", "simple", NULL, ENC_HQ_TEXT,
+ /* removed in 2.1.0 */
+ add_obsolete_string( "sout-ffmpeg-codec" )
+ add_obsolete_string( "sout-ffmpeg-hq" )
+ add_obsolete_integer( "sout-ffmpeg-keyint" )
+ add_obsolete_integer( "sout-ffmpeg-bframes" )
+ add_obsolete_bool( "sout-ffmpeg-hurry-up" )
+ add_obsolete_bool( "sout-ffmpeg-interlace" )
+ add_obsolete_bool( "sout-ffmpeg-interlace-me" )
+ add_obsolete_integer( "sout-ffmpeg-vt" )
+ add_obsolete_bool( "sout-ffmpeg-pre-me" )
+ add_obsolete_integer( "sout-ffmpeg-rc-buffer-size" )
+ add_obsolete_float( "sout-ffmpeg-rc-buffer-aggressivity" )
+ add_obsolete_float( "sout-ffmpeg-i-quant-factor" )
+ add_obsolete_integer( "sout-ffmpeg-noise-reduction" )
+ add_obsolete_bool( "sout-ffmpeg-mpeg4-matrix" )
+ add_obsolete_integer( "sout-ffmpeg-qmin" )
+ add_obsolete_integer( "sout-ffmpeg-qmax" )
+ add_obsolete_bool( "sout-ffmpeg-trellis" )
+ add_obsolete_float( "sout-ffmpeg-qscale" )
+ add_obsolete_integer( "sout-ffmpeg-strict" )
+ add_obsolete_float( "sout-ffmpeg-lumi-masking" )
+ add_obsolete_float( "sout-ffmpeg-dark-masking" )
+ add_obsolete_float( "sout-ffmpeg-p-masking" )
+ add_obsolete_float( "sout-ffmpeg-border-masking" )
+ add_obsolete_integer( "sout-ffmpeg-luma-elim-threshold" )
+ add_obsolete_integer( "sout-ffmpeg-chroma-elim-threshold" )
+ add_obsolete_string( "sout-ffmpeg-aac-profile" )
+
+
+ add_string( ENC_CFG_PREFIX "codec", NULL, CODEC_TEXT, CODEC_LONGTEXT, true )
+ add_string( ENC_CFG_PREFIX "hq", "rd", ENC_HQ_TEXT,
ENC_HQ_LONGTEXT, false )
- change_string_list( enc_hq_list, enc_hq_list_text, 0 )
- add_integer( ENC_CFG_PREFIX "keyint", 0, NULL, ENC_KEYINT_TEXT,
+ change_string_list( enc_hq_list, enc_hq_list_text )
+ add_integer( ENC_CFG_PREFIX "keyint", 0, ENC_KEYINT_TEXT,
ENC_KEYINT_LONGTEXT, false )
- add_integer( ENC_CFG_PREFIX "bframes", 0, NULL, ENC_BFRAMES_TEXT,
+ add_integer( ENC_CFG_PREFIX "bframes", 0, ENC_BFRAMES_TEXT,
ENC_BFRAMES_LONGTEXT, false )
- add_bool( ENC_CFG_PREFIX "hurry-up", 0, NULL, ENC_HURRYUP_TEXT,
+ add_bool( ENC_CFG_PREFIX "hurry-up", false, ENC_HURRYUP_TEXT,
ENC_HURRYUP_LONGTEXT, false )
- add_bool( ENC_CFG_PREFIX "interlace", 0, NULL, ENC_INTERLACE_TEXT,
+ add_bool( ENC_CFG_PREFIX "interlace", false, ENC_INTERLACE_TEXT,
ENC_INTERLACE_LONGTEXT, true )
- add_bool( ENC_CFG_PREFIX "interlace-me", 1, NULL, ENC_INTERLACE_ME_TEXT,
+ add_bool( ENC_CFG_PREFIX "interlace-me", true, ENC_INTERLACE_ME_TEXT,
ENC_INTERLACE_ME_LONGTEXT, true )
- add_integer( ENC_CFG_PREFIX "vt", 0, NULL, ENC_VT_TEXT,
+ add_integer( ENC_CFG_PREFIX "vt", 0, ENC_VT_TEXT,
ENC_VT_LONGTEXT, true )
- add_bool( ENC_CFG_PREFIX "pre-me", 0, NULL, ENC_PRE_ME_TEXT,
+ add_bool( ENC_CFG_PREFIX "pre-me", false, ENC_PRE_ME_TEXT,
ENC_PRE_ME_LONGTEXT, true )
- add_integer( ENC_CFG_PREFIX "rc-buffer-size", 224*1024*8, NULL,
+ add_integer( ENC_CFG_PREFIX "rc-buffer-size", 0,
ENC_RC_BUF_TEXT, ENC_RC_BUF_LONGTEXT, true )
- add_float( ENC_CFG_PREFIX "rc-buffer-aggressivity", 1.0, NULL,
+ add_float( ENC_CFG_PREFIX "rc-buffer-aggressivity", 1.0,
ENC_RC_BUF_AGGR_TEXT, ENC_RC_BUF_AGGR_LONGTEXT, true )
- add_float( ENC_CFG_PREFIX "i-quant-factor", 0, NULL,
+ add_float( ENC_CFG_PREFIX "i-quant-factor", 0,
ENC_IQUANT_FACTOR_TEXT, ENC_IQUANT_FACTOR_LONGTEXT, true )
- add_integer( ENC_CFG_PREFIX "noise-reduction", 0, NULL,
+ add_integer( ENC_CFG_PREFIX "noise-reduction", 0,
ENC_NOISE_RED_TEXT, ENC_NOISE_RED_LONGTEXT, true )
- add_bool( ENC_CFG_PREFIX "mpeg4-matrix", 0, NULL,
+ add_bool( ENC_CFG_PREFIX "mpeg4-matrix", false,
ENC_MPEG4_MATRIX_TEXT, ENC_MPEG4_MATRIX_LONGTEXT, true )
- add_integer( ENC_CFG_PREFIX "qmin", 0, NULL,
+ add_integer( ENC_CFG_PREFIX "qmin", 0,
ENC_QMIN_TEXT, ENC_QMIN_LONGTEXT, true )
- add_integer( ENC_CFG_PREFIX "qmax", 0, NULL,
+ add_integer( ENC_CFG_PREFIX "qmax", 0,
ENC_QMAX_TEXT, ENC_QMAX_LONGTEXT, true )
- add_bool( ENC_CFG_PREFIX "trellis", 0, NULL,
+ add_bool( ENC_CFG_PREFIX "trellis", false,
ENC_TRELLIS_TEXT, ENC_TRELLIS_LONGTEXT, true )
- add_float( ENC_CFG_PREFIX "qscale", 0, NULL,
+ add_float( ENC_CFG_PREFIX "qscale", 0,
ENC_QSCALE_TEXT, ENC_QSCALE_LONGTEXT, true )
- add_integer( ENC_CFG_PREFIX "strict", 0, NULL,
+ add_integer( ENC_CFG_PREFIX "strict", 0,
ENC_STRICT_TEXT, ENC_STRICT_LONGTEXT, true )
- add_float( ENC_CFG_PREFIX "lumi-masking", 0.0, NULL,
+ change_integer_range( -2, 2 )
+ add_float( ENC_CFG_PREFIX "lumi-masking", 0.0,
ENC_LUMI_MASKING_TEXT, ENC_LUMI_MASKING_LONGTEXT, true )
- add_float( ENC_CFG_PREFIX "dark-masking", 0.0, NULL,
+ add_float( ENC_CFG_PREFIX "dark-masking", 0.0,
ENC_DARK_MASKING_TEXT, ENC_DARK_MASKING_LONGTEXT, true )
- add_float( ENC_CFG_PREFIX "p-masking", 0.0, NULL,
+ add_float( ENC_CFG_PREFIX "p-masking", 0.0,
ENC_P_MASKING_TEXT, ENC_P_MASKING_LONGTEXT, true )
- add_float( ENC_CFG_PREFIX "border-masking", 0.0, NULL,
+ add_float( ENC_CFG_PREFIX "border-masking", 0.0,
ENC_BORDER_MASKING_TEXT, ENC_BORDER_MASKING_LONGTEXT, true )
- add_integer( ENC_CFG_PREFIX "luma-elim-threshold", 0, NULL,
+ add_integer( ENC_CFG_PREFIX "luma-elim-threshold", 0,
ENC_LUMA_ELIM_TEXT, ENC_LUMA_ELIM_LONGTEXT, true )
- add_integer( ENC_CFG_PREFIX "chroma-elim-threshold", 0, NULL,
+ add_integer( ENC_CFG_PREFIX "chroma-elim-threshold", 0,
ENC_CHROMA_ELIM_TEXT, ENC_CHROMA_ELIM_LONGTEXT, true )
/* Audio AAC encoder profile */
- add_string( ENC_CFG_PREFIX "aac-profile", "low", NULL,
+ add_string( ENC_CFG_PREFIX "aac-profile", "low",
ENC_PROFILE_TEXT, ENC_PROFILE_LONGTEXT, true )
+
+ add_string( ENC_CFG_PREFIX "options", NULL, AV_OPTIONS_TEXT, AV_OPTIONS_LONGTEXT, true )
#endif /* ENABLE_SOUT */
- /* video filter submodule */
+#ifdef MERGE_FFMPEG
add_submodule ()
- set_capability( "video filter2", 0 )
- set_callbacks( OpenDeinterlace, CloseDeinterlace )
- set_description( N_("FFmpeg deinterlace video filter") )
- add_shortcut( "ffmpeg-deinterlace" )
-
+# include "../../demux/avformat/avformat.c"
+ add_submodule ()
+ AVIO_MODULE
+#endif
vlc_module_end ()
/*****************************************************************************
}
/* Initialization must be done before avcodec_find_decoder() */
- InitLibavcodec(p_this);
+ vlc_init_avcodec();
/* *** ask ffmpeg for a decoder *** */
- p_codec = avcodec_find_decoder( i_codec_id );
+ char *psz_decoder = var_CreateGetString( p_this, "avcodec-codec" );
+ if( psz_decoder && *psz_decoder )
+ {
+ p_codec = avcodec_find_decoder_by_name( psz_decoder );
+ if( !p_codec )
+ msg_Err( p_this, "Decoder `%s' not found", psz_decoder );
+ else if( p_codec->id != i_codec_id )
+ {
+ msg_Err( p_this, "Decoder `%s' can't handle %4.4s",
+ psz_decoder, (char*)&p_dec->fmt_in.i_codec );
+ p_codec = NULL;
+ }
+ }
+ free( psz_decoder );
+ if( !p_codec )
+ p_codec = avcodec_find_decoder( i_codec_id );
if( !p_codec )
{
msg_Dbg( p_dec, "codec not found (%s)", psz_namecodec );
}
/* *** get a p_context *** */
- p_context = avcodec_alloc_context();
+ p_context = avcodec_alloc_context3(p_codec);
if( !p_context )
return VLC_ENOMEM;
- p_context->debug = config_GetInt( p_dec, "ffmpeg-debug" );
+ p_context->debug = var_InheritInteger( p_dec, "avcodec-debug" );
p_context->opaque = (void *)p_this;
- /* Set CPU capabilities */
- unsigned i_cpu = vlc_CPU();
- p_context->dsp_mask = 0;
- if( !(i_cpu & CPU_CAPABILITY_MMX) )
- {
- p_context->dsp_mask |= FF_MM_MMX;
- }
- if( !(i_cpu & CPU_CAPABILITY_MMXEXT) )
- {
- p_context->dsp_mask |= FF_MM_MMXEXT;
- }
- if( !(i_cpu & CPU_CAPABILITY_3DNOW) )
- {
- p_context->dsp_mask |= FF_MM_3DNOW;
- }
- if( !(i_cpu & CPU_CAPABILITY_SSE) )
- {
- p_context->dsp_mask |= FF_MM_SSE;
- }
- if( !(i_cpu & CPU_CAPABILITY_SSE2) )
- {
- p_context->dsp_mask |= FF_MM_SSE2;
- }
+ /* set CPU capabilities */
+#if LIBAVUTIL_VERSION_CHECK(51, 25, 0, 42, 100)
+ av_set_cpu_flags_mask( INT_MAX & ~GetVlcDspMask() );
+#else
+ p_context->dsp_mask = GetVlcDspMask();
+#endif
p_dec->b_need_packetized = true;
switch( i_cat )
i_result = InitAudioDec ( p_dec, p_context, p_codec,
i_codec_id, psz_namecodec );
break;
-#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 52, 25, 0 )
case SPU_ES:
p_dec->pf_decode_sub = DecodeSubtitle;
i_result = InitSubtitleDec( p_dec, p_context, p_codec,
i_codec_id, psz_namecodec );
break;
-#endif
default:
i_result = VLC_EGENERIC;
}
- if( i_result == VLC_SUCCESS ) p_dec->p_sys->i_cat = i_cat;
+ if( i_result == VLC_SUCCESS )
+ {
+ p_dec->p_sys->i_cat = i_cat;
+ if( p_context->profile != FF_PROFILE_UNKNOWN)
+ p_dec->fmt_in.i_profile = p_context->profile;
+ if( p_context->level != FF_LEVEL_UNKNOWN)
+ p_dec->fmt_in.i_level = p_context->level;
+ }
return i_result;
}
switch( p_sys->i_cat )
{
- case AUDIO_ES:
- EndAudioDec ( p_dec );
- break;
case VIDEO_ES:
EndVideoDec ( p_dec );
break;
- case SPU_ES:
- EndSubtitleDec( p_dec );
- break;
}
if( p_sys->p_context )
free( p_sys );
}
-void InitLibavcodec( vlc_object_t *p_object )
+/*****************************************************************************
+ * ffmpeg_OpenCodec:
+ *****************************************************************************/
+int ffmpeg_OpenCodec( decoder_t *p_dec )
{
- static bool b_ffmpeginit = false;
-
- vlc_avcodec_lock();
+ decoder_sys_t *p_sys = p_dec->p_sys;
- /* *** init ffmpeg library (libavcodec) *** */
- if( !b_ffmpeginit )
+ if( p_sys->p_context->extradata_size <= 0 )
{
- avcodec_init();
- avcodec_register_all();
- av_log_set_callback( LibavutilCallback );
- b_ffmpeginit = true;
-
- msg_Dbg( p_object, "libavcodec initialized (interface 0x%x)",
- LIBAVCODEC_VERSION_INT );
+ if( p_sys->i_codec_id == AV_CODEC_ID_VC1 ||
+ p_sys->i_codec_id == AV_CODEC_ID_VORBIS ||
+ p_sys->i_codec_id == AV_CODEC_ID_THEORA ||
+ ( p_sys->i_codec_id == AV_CODEC_ID_AAC &&
+ !p_dec->fmt_in.b_packetized ) )
+ {
+ msg_Warn( p_dec, "waiting for extra data for codec %s",
+ p_sys->psz_namecodec );
+ return 1;
+ }
+ }
+ if( p_dec->fmt_in.i_cat == VIDEO_ES )
+ {
+ p_sys->p_context->width = p_dec->fmt_in.video.i_width;
+ p_sys->p_context->height = p_dec->fmt_in.video.i_height;
+ p_sys->p_context->bits_per_coded_sample = p_dec->fmt_in.video.i_bits_per_pixel;
}
- else
+ else if( p_dec->fmt_in.i_cat == AUDIO_ES )
{
- msg_Dbg( p_object, "libavcodec already initialized" );
+ p_sys->p_context->sample_rate = p_dec->fmt_in.audio.i_rate;
+ p_sys->p_context->channels = p_dec->fmt_in.audio.i_channels;
+
+ p_sys->p_context->block_align = p_dec->fmt_in.audio.i_blockalign;
+ p_sys->p_context->bit_rate = p_dec->fmt_in.i_bitrate;
+ p_sys->p_context->bits_per_coded_sample = p_dec->fmt_in.audio.i_bitspersample;
+ if( p_sys->i_codec_id == AV_CODEC_ID_ADPCM_G726 &&
+ p_sys->p_context->bit_rate > 0 &&
+ p_sys->p_context->sample_rate > 0)
+ p_sys->p_context->bits_per_coded_sample = p_sys->p_context->bit_rate /
+ p_sys->p_context->sample_rate;
}
+ int ret;
+ char *psz_opts = var_InheritString( p_dec, "avcodec-options" );
+ AVDictionary *options = NULL;
+ if (psz_opts && *psz_opts)
+ options = vlc_av_get_options(psz_opts);
+ free(psz_opts);
+ vlc_avcodec_lock();
+ ret = avcodec_open2( p_sys->p_context, p_sys->p_codec, options ? &options : NULL );
vlc_avcodec_unlock();
+
+ AVDictionaryEntry *t = NULL;
+ while ((t = av_dict_get(options, "", t, AV_DICT_IGNORE_SUFFIX))) {
+ msg_Err( p_dec, "Unknown option \"%s\"", t->key );
+ }
+ av_dict_free(&options);
+
+ if( ret < 0 )
+ return VLC_EGENERIC;
+ msg_Dbg( p_dec, "avcodec codec (%s) started", p_sys->psz_namecodec );
+
+#ifdef HAVE_AVCODEC_MT
+ if( p_dec->fmt_in.i_cat == VIDEO_ES )
+ {
+ switch( p_sys->p_context->active_thread_type )
+ {
+ case FF_THREAD_FRAME:
+ msg_Dbg( p_dec, "using frame thread mode with %d threads",
+ p_sys->p_context->thread_count );
+ break;
+ case FF_THREAD_SLICE:
+ msg_Dbg( p_dec, "using slice thread mode with %d threads",
+ p_sys->p_context->thread_count );
+ break;
+ case 0:
+ if( p_sys->p_context->thread_count > 1 )
+ msg_Warn( p_dec, "failed to enable threaded decoding" );
+ break;
+ default:
+ msg_Warn( p_dec, "using unknown thread mode with %d threads",
+ p_sys->p_context->thread_count );
+ break;
+ }
+ }
+#endif
+
+ p_sys->b_delayed_open = false;
+
+ return VLC_SUCCESS;
}
projects / vlc / blobdiff