/*****************************************************************************
* ffmpeg.c: video decoder using ffmpeg library
*****************************************************************************
- * Copyright (C) 1999-2001 VideoLAN
- * $Id: ffmpeg.c,v 1.1 2002/08/04 17:23:42 sam Exp $
+ * Copyright (C) 1999-2001 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
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <stdlib.h> /* malloc(), free() */
-
#include <vlc/vlc.h>
-#include <vlc/vout.h>
#include <vlc/decoder.h>
-#include <vlc/input.h>
-#ifdef HAVE_UNISTD_H
-#include <unistd.h> /* getpid() */
+/* ffmpeg header */
+#define HAVE_MMX 1
+#ifdef HAVE_FFMPEG_AVCODEC_H
+# include <ffmpeg/avcodec.h>
+#else
+# include <avcodec.h>
#endif
-#include <errno.h>
-#include <string.h>
-
-#ifdef HAVE_SYS_TIMES_H
-# include <sys/times.h>
+#if LIBAVCODEC_BUILD < 4680
+# error You must have a libavcodec >= 4680 (get CVS)
#endif
-#include "vdec_ext-plugins.h"
-#include "avcodec.h" /* ffmpeg */
#include "ffmpeg.h"
-/*
- * Local prototypes
- */
-static int OpenDecoder ( vlc_object_t * );
-static int RunDecoder ( decoder_fifo_t * );
-static int InitThread ( videodec_thread_t * );
-static void EndThread ( videodec_thread_t * );
-static void DecodeThread ( videodec_thread_t * );
+#ifdef LIBAVCODEC_PP
+# ifdef HAVE_POSTPROC_POSTPROCESS_H
+# include <postproc/postprocess.h>
+# else
+# include <libpostproc/postprocess.h>
+# endif
+#endif
+/*****************************************************************************
+ * decoder_sys_t: decoder descriptor
+ *****************************************************************************/
+struct decoder_sys_t
+{
+ /* Common part between video and audio decoder */
+ int i_cat;
+ int i_codec_id;
+ char *psz_namecodec;
-static int b_ffmpeginit = 0;
+ AVCodecContext *p_context;
+ AVCodec *p_codec;
+};
+
+/****************************************************************************
+ * Local prototypes
+ ****************************************************************************/
+static int OpenDecoder( vlc_object_t * );
+static void CloseDecoder( vlc_object_t * );
+
+static int nloopf_list[] = { 0, 1, 2, 3, 4 };
+static char *nloopf_list_text[] =
+ { N_("None"), N_("Non-ref"), N_("Bidir"), N_("Non-key"), N_("All") };
+static char *enc_hq_list[] = { "rd", "bits", "simple" };
+static char *enc_hq_list_text[] = { N_("rd"), N_("bits"), N_("simple") };
/*****************************************************************************
* Module descriptor
*****************************************************************************/
-
-#define ERROR_RESILIENCE_LONGTEXT \
- "ffmpeg can make errors resiliences. \n"\
- "Nevertheless, with buggy encoder (like ISO MPEG-4 encoder from M$) " \
- "this will produce a lot of errors.\n" \
- "Valid range is -1 to 99 (-1 disable all errors resiliences)."
-
-#define HURRY_UP_LONGTEXT \
- "Allow the decoder to partially decode or skip frame(s) " \
- "when there not enough time.\n It's usefull with low CPU power " \
- "but it could produce broken pictures."
-
vlc_module_begin();
- add_category_hint( N_("Miscellaneous"), NULL );
-#if LIBAVCODEC_BUILD >= 4611
- add_integer ( "ffmpeg-error-resilience", 0, NULL,
- "error resilience", ERROR_RESILIENCE_LONGTEXT );
- add_integer ( "ffmpeg-workaround-bugs", 0, NULL,
- "workaround bugs", "0-99, seems to be for msmpeg v3\n" );
-#endif
- add_bool( "ffmpeg-hurry-up", 0, NULL, "hurry up", HURRY_UP_LONGTEXT );
- set_description( _("ffmpeg video decoder((MS)MPEG4,SVQ1,H263)") );
+ set_shortname( "FFmpeg");
+ set_category( CAT_INPUT );
+ set_subcategory( SUBCAT_INPUT_SCODEC );
+ /* decoder main module */
+#if defined(MODULE_NAME_is_ffmpegaltivec) \
+ || (defined(CAN_COMPILE_ALTIVEC) && !defined(NO_ALTIVEC_IN_FFMPEG))
+ set_description( _("AltiVec FFmpeg audio/video decoder/encoder ((MS)MPEG4,SVQ1,H263,WMV,WMA)") );
+ /*add_requirement( ALTIVEC );*/
+ set_capability( "decoder", 71 );
+#else
+ set_description( _("FFmpeg audio/video decoder/encoder ((MS)MPEG4,SVQ1,H263,WMV,WMA)") );
set_capability( "decoder", 70 );
- set_callbacks( OpenDecoder, NULL );
+#endif
+ set_section( N_("Decoding") , NULL );
+ set_callbacks( OpenDecoder, CloseDecoder );
+
+ add_bool( "ffmpeg-dr", 1, NULL, DR_TEXT, DR_TEXT, VLC_TRUE );
+ add_integer ( "ffmpeg-error-resilience", 1, NULL, ERROR_TEXT,
+ ERROR_LONGTEXT, VLC_TRUE );
+ add_integer ( "ffmpeg-workaround-bugs", 1, NULL, BUGS_TEXT, BUGS_LONGTEXT,
+ VLC_FALSE );
+ add_bool( "ffmpeg-hurry-up", 0, NULL, HURRYUP_TEXT, HURRYUP_LONGTEXT,
+ VLC_FALSE );
+ add_integer ( "ffmpeg-vismv", 0, NULL, VISMV_TEXT, VISMV_LONGTEXT,
+ VLC_TRUE );
+ add_integer ( "ffmpeg-lowres", 0, NULL, LOWRES_TEXT, LOWRES_LONGTEXT,
+ VLC_TRUE );
+ change_integer_range( 0, 2 );
+ add_integer ( "ffmpeg-skiploopfilter", 0, NULL, SKIPLOOPF_TEXT,
+ SKIPLOOPF_LONGTEXT, VLC_TRUE );
+ change_integer_list( nloopf_list, nloopf_list_text, 0 );
+
+#ifdef LIBAVCODEC_PP
+ add_integer( "ffmpeg-pp-q", 0, NULL, PP_Q_TEXT, PP_Q_LONGTEXT, VLC_FALSE );
+ add_string( "ffmpeg-pp-name", "default", NULL, LIBAVCODEC_PP_TEXT,
+ LIBAVCODEC_PP_LONGTEXT, VLC_TRUE );
+#endif
+ add_integer( "ffmpeg-debug", 0, NULL, DEBUG_TEXT, DEBUG_LONGTEXT,
+ VLC_TRUE );
+
+ /* chroma conversion submodule */
+ add_submodule();
+ set_capability( "chroma", 50 );
+ set_callbacks( E_(OpenChroma), E_(CloseChroma) );
+ set_description( _("FFmpeg chroma conversion") );
+
+ /* encoder submodule */
+ add_submodule();
+ set_section( N_("Encoding") , NULL );
+ set_description( _("FFmpeg audio/video encoder") );
+ set_capability( "encoder", 100 );
+ set_callbacks( E_(OpenEncoder), E_(CloseEncoder) );
+
+ add_string( ENC_CFG_PREFIX "hq", "simple", NULL, ENC_HQ_TEXT,
+ ENC_HQ_LONGTEXT, VLC_FALSE );
+ change_string_list( enc_hq_list, enc_hq_list_text, 0 );
+ add_integer( ENC_CFG_PREFIX "keyint", 0, NULL, ENC_KEYINT_TEXT,
+ ENC_KEYINT_LONGTEXT, VLC_FALSE );
+ add_integer( ENC_CFG_PREFIX "bframes", 0, NULL, ENC_BFRAMES_TEXT,
+ ENC_BFRAMES_LONGTEXT, VLC_FALSE );
+ add_bool( ENC_CFG_PREFIX "hurry-up", 0, NULL, ENC_HURRYUP_TEXT,
+ ENC_HURRYUP_LONGTEXT, VLC_FALSE );
+ add_bool( ENC_CFG_PREFIX "interlace", 0, NULL, ENC_INTERLACE_TEXT,
+ ENC_INTERLACE_LONGTEXT, VLC_TRUE );
+ add_bool( ENC_CFG_PREFIX "interlace-me", 1, NULL, ENC_INTERLACE_ME_TEXT,
+ ENC_INTERLACE_ME_LONGTEXT, VLC_TRUE );
+ add_integer( ENC_CFG_PREFIX "vt", 0, NULL, ENC_VT_TEXT,
+ ENC_VT_LONGTEXT, VLC_TRUE );
+ add_bool( ENC_CFG_PREFIX "pre-me", 0, NULL, ENC_PRE_ME_TEXT,
+ ENC_PRE_ME_LONGTEXT, VLC_TRUE );
+ add_bool( ENC_CFG_PREFIX "strict-rc", 0, NULL, ENC_RC_STRICT_TEXT,
+ ENC_RC_STRICT_LONGTEXT, VLC_TRUE );
+ add_integer( ENC_CFG_PREFIX "rc-buffer-size", 224*1024*8, NULL,
+ ENC_RC_BUF_TEXT, ENC_RC_BUF_LONGTEXT, VLC_TRUE );
+ add_float( ENC_CFG_PREFIX "rc-buffer-aggressivity", 1.0, NULL,
+ ENC_RC_BUF_AGGR_TEXT, ENC_RC_BUF_AGGR_LONGTEXT, VLC_TRUE );
+ add_float( ENC_CFG_PREFIX "i-quant-factor", 0, NULL,
+ ENC_IQUANT_FACTOR_TEXT, ENC_IQUANT_FACTOR_LONGTEXT, VLC_TRUE );
+ add_integer( ENC_CFG_PREFIX "noise-reduction", 0, NULL,
+ ENC_NOISE_RED_TEXT, ENC_NOISE_RED_LONGTEXT, VLC_TRUE );
+ add_bool( ENC_CFG_PREFIX "mpeg4-matrix", 0, NULL,
+ ENC_MPEG4_MATRIX_TEXT, ENC_MPEG4_MATRIX_LONGTEXT, VLC_TRUE );
+ add_integer( ENC_CFG_PREFIX "qmin", 0, NULL,
+ ENC_QMIN_TEXT, ENC_QMIN_LONGTEXT, VLC_TRUE );
+ add_integer( ENC_CFG_PREFIX "qmax", 0, NULL,
+ ENC_QMAX_TEXT, ENC_QMAX_LONGTEXT, VLC_TRUE );
+ add_bool( ENC_CFG_PREFIX "trellis", 0, NULL,
+ ENC_TRELLIS_TEXT, ENC_TRELLIS_LONGTEXT, VLC_TRUE );
+ add_float( ENC_CFG_PREFIX "qscale", 0, NULL,
+ ENC_QSCALE_TEXT, ENC_QSCALE_LONGTEXT, VLC_TRUE );
+ add_integer( ENC_CFG_PREFIX "strict", 0, NULL,
+ ENC_STRICT_TEXT, ENC_STRICT_LONGTEXT, VLC_TRUE );
+ add_float( ENC_CFG_PREFIX "lumi-masking", 0.0, NULL,
+ ENC_LUMI_MASKING_TEXT, ENC_LUMI_MASKING_LONGTEXT, VLC_TRUE );
+ add_float( ENC_CFG_PREFIX "dark-masking", 0.0, NULL,
+ ENC_DARK_MASKING_TEXT, ENC_DARK_MASKING_LONGTEXT, VLC_TRUE );
+ add_float( ENC_CFG_PREFIX "p-masking", 0.0, NULL,
+ ENC_P_MASKING_TEXT, ENC_P_MASKING_LONGTEXT, VLC_TRUE );
+ add_float( ENC_CFG_PREFIX "border-masking", 0.0, NULL,
+ ENC_BORDER_MASKING_TEXT, ENC_BORDER_MASKING_LONGTEXT, VLC_TRUE );
+ add_integer( ENC_CFG_PREFIX "luma-elim-threshold", 0, NULL,
+ ENC_LUMA_ELIM_TEXT, ENC_LUMA_ELIM_LONGTEXT, VLC_TRUE );
+ add_integer( ENC_CFG_PREFIX "chroma-elim-threshold", 0, NULL,
+ ENC_CHROMA_ELIM_TEXT, ENC_CHROMA_ELIM_LONGTEXT, VLC_TRUE );
+
+ /* demux submodule */
+ add_submodule();
+ set_description( _("FFmpeg demuxer" ) );
+ set_capability( "demux2", 2 );
+ set_callbacks( E_(OpenDemux), E_(CloseDemux) );
+
+ /* video filter submodule */
+ add_submodule();
+ set_capability( "video filter2", 50 );
+ set_callbacks( E_(OpenFilter), E_(CloseFilter) );
+ set_description( _("FFmpeg video filter") );
+
+ /* crop/padd submodule */
+ add_submodule();
+ set_capability( "crop padd", 10 );
+ set_callbacks( E_(OpenCropPadd), E_(CloseFilter) );
+ set_description( _("FFmpeg crop padd filter") );
+
+ /* video filter submodule */
+ add_submodule();
+ set_capability( "video filter2", 0 );
+ set_callbacks( E_(OpenDeinterlace), E_(CloseDeinterlace) );
+ set_description( _("FFmpeg deinterlace video filter") );
+ add_shortcut( "ffmpeg-deinterlace" );
+
+ var_Create( p_module->p_libvlc, "avcodec", VLC_VAR_MUTEX );
vlc_module_end();
/*****************************************************************************
* OpenDecoder: probe the decoder and return score
- *****************************************************************************
- * Tries to launch a decoder and return score so that the interface is able
- * to chose.
*****************************************************************************/
static int OpenDecoder( vlc_object_t *p_this )
{
- decoder_fifo_t *p_fifo = (decoder_fifo_t*) p_this;
+ decoder_t *p_dec = (decoder_t*) p_this;
+ int i_cat, i_codec_id, i_result;
+ char *psz_namecodec;
+
+ AVCodecContext *p_context = NULL;
+ AVCodec *p_codec = NULL;
- if( ffmpeg_GetFfmpegCodec( p_fifo->i_fourcc, NULL, NULL ) )
+ /* *** determine codec type *** */
+ if( !E_(GetFfmpegCodec)( p_dec->fmt_in.i_codec, &i_cat, &i_codec_id,
+ &psz_namecodec ) )
{
- p_fifo->pf_run = RunDecoder;
- return VLC_SUCCESS;
+ return VLC_EGENERIC;
}
- return VLC_EGENERIC;
-}
+ /* Bail out if buggy decoder */
+ if( i_codec_id == CODEC_ID_AAC )
+ {
+ msg_Dbg( p_dec, "refusing to use ffmpeg's (%s) decoder which is buggy",
+ psz_namecodec );
+ return VLC_EGENERIC;
+ }
-/*****************************************************************************
- * RunDecoder: this function is called just after the thread is created
- *****************************************************************************/
-static int RunDecoder( decoder_fifo_t *p_fifo )
-{
- videodec_thread_t *p_vdec;
- int b_error;
+ /* Initialization must be done before avcodec_find_decoder() */
+ E_(InitLibavcodec)(p_this);
- if ( !(p_vdec = (videodec_thread_t*)malloc( sizeof(videodec_thread_t))) )
+ /* *** ask ffmpeg for a decoder *** */
+ p_codec = avcodec_find_decoder( i_codec_id );
+ if( !p_codec )
{
- msg_Err( p_fifo, "out of memory" );
- DecoderError( p_fifo );
- return( -1 );
+ msg_Dbg( p_dec, "codec not found (%s)", psz_namecodec );
+ return VLC_EGENERIC;
}
- memset( p_vdec, 0, sizeof( videodec_thread_t ) );
- p_vdec->p_fifo = p_fifo;
+ /* *** get a p_context *** */
+ p_context = avcodec_alloc_context();
+ if( !p_context )
+ return VLC_ENOMEM;
+ p_context->debug = config_GetInt( p_dec, "ffmpeg-debug" );
+ p_context->opaque = (void *)p_this;
- if( InitThread( p_vdec ) != 0 )
+ /* Set CPU capabilities */
+ p_context->dsp_mask = 0;
+ if( !(p_dec->p_libvlc->i_cpu & CPU_CAPABILITY_MMX) )
{
- DecoderError( p_fifo );
- return( -1 );
+ p_context->dsp_mask |= FF_MM_MMX;
}
-
- while( (!p_vdec->p_fifo->b_die) && (!p_vdec->p_fifo->b_error) )
+ if( !(p_dec->p_libvlc->i_cpu & CPU_CAPABILITY_MMXEXT) )
{
- DecodeThread( p_vdec );
+ p_context->dsp_mask |= FF_MM_MMXEXT;
}
-
- if( ( b_error = p_vdec->p_fifo->b_error ) )
+ if( !(p_dec->p_libvlc->i_cpu & CPU_CAPABILITY_3DNOW) )
{
- DecoderError( p_vdec->p_fifo );
+ p_context->dsp_mask |= FF_MM_3DNOW;
+ }
+ if( !(p_dec->p_libvlc->i_cpu & CPU_CAPABILITY_SSE) )
+ {
+ p_context->dsp_mask |= FF_MM_SSE;
+ }
+ if( !(p_dec->p_libvlc->i_cpu & CPU_CAPABILITY_SSE2) )
+ {
+ p_context->dsp_mask |= FF_MM_SSE2;
}
- EndThread( p_vdec );
-
- if( b_error )
+ switch( i_cat )
{
- return( -1 );
+ case VIDEO_ES:
+ p_dec->b_need_packetized = VLC_TRUE;
+ p_dec->pf_decode_video = E_(DecodeVideo);
+ i_result = E_( InitVideoDec )( p_dec, p_context, p_codec,
+ i_codec_id, psz_namecodec );
+ break;
+ case AUDIO_ES:
+ p_dec->pf_decode_audio = E_(DecodeAudio);
+ i_result = E_( InitAudioDec )( p_dec, p_context, p_codec,
+ i_codec_id, psz_namecodec );
+ break;
+ default:
+ i_result = VLC_EGENERIC;
}
-
- return( 0 );
-}
+ if( i_result == VLC_SUCCESS ) p_dec->p_sys->i_cat = i_cat;
+
+ return i_result;
+}
/*****************************************************************************
- * locales Functions
+ * CloseDecoder: decoder destruction
*****************************************************************************/
+static void CloseDecoder( vlc_object_t *p_this )
+{
+ decoder_t *p_dec = (decoder_t *)p_this;
+ decoder_sys_t *p_sys = p_dec->p_sys;
+ vlc_value_t lockval;
-#define GetWLE( p ) \
- ( *(u8*)(p) + ( *((u8*)(p)+1) << 8 ) )
-
-#define GetDWLE( p ) \
- ( *(u8*)(p) + ( *((u8*)(p)+1) << 8 ) + \
- ( *((u8*)(p)+2) << 16 ) + ( *((u8*)(p)+3) << 24 ) )
+ var_Get( p_dec->p_libvlc, "avcodec", &lockval );
-static void ffmpeg_ParseBitMapInfoHeader( bitmapinfoheader_t *p_bh,
- u8 *p_data )
-{
- p_bh->i_size = GetDWLE( p_data );
- p_bh->i_width = GetDWLE( p_data + 4 );
- p_bh->i_height = GetDWLE( p_data + 8 );
- p_bh->i_planes = GetWLE( p_data + 12 );
- p_bh->i_bitcount = GetWLE( p_data + 14 );
- p_bh->i_compression = GetDWLE( p_data + 16 );
- p_bh->i_sizeimage = GetDWLE( p_data + 20 );
- p_bh->i_xpelspermeter = GetDWLE( p_data + 24 );
- p_bh->i_ypelspermeter = GetDWLE( p_data + 28 );
- p_bh->i_clrused = GetDWLE( p_data + 32 );
- p_bh->i_clrimportant = GetDWLE( p_data + 36 );
-
- if( p_bh->i_size > 40 )
+ switch( p_sys->i_cat )
{
- p_bh->i_data = p_bh->i_size - 40;
- p_bh->p_data = malloc( p_bh->i_data );
- memcpy( p_bh->p_data, p_data + 40, p_bh->i_data );
+ case AUDIO_ES:
+ E_( EndAudioDec )( p_dec );
+ break;
+ case VIDEO_ES:
+ E_( EndVideoDec )( p_dec );
+ break;
}
- else
- {
- p_bh->i_data = 0;
- p_bh->p_data = NULL;
- }
-
-}
-/* get the first pes from fifo */
-static pes_packet_t *__PES_GET( decoder_fifo_t *p_fifo )
-{
- pes_packet_t *p_pes;
- vlc_mutex_lock( &p_fifo->data_lock );
-
- /* if fifo is emty wait */
- while( !p_fifo->p_first )
+ if( p_sys->p_context )
{
- if( p_fifo->b_die )
- {
- vlc_mutex_unlock( &p_fifo->data_lock );
- return( NULL );
- }
- vlc_cond_wait( &p_fifo->data_wait, &p_fifo->data_lock );
+ if( p_sys->p_context->extradata )
+ free( p_sys->p_context->extradata );
+ p_sys->p_context->extradata = NULL;
+ vlc_mutex_lock( lockval.p_address );
+ avcodec_close( p_sys->p_context );
+ vlc_mutex_unlock( lockval.p_address );
+ msg_Dbg( p_dec, "ffmpeg codec (%s) stopped", p_sys->psz_namecodec );
+ av_free( p_sys->p_context );
}
- p_pes = p_fifo->p_first;
-
- vlc_mutex_unlock( &p_fifo->data_lock );
- return( p_pes );
+ free( p_sys );
}
-/* free the first pes and go to next */
-static void __PES_NEXT( decoder_fifo_t *p_fifo )
+/*****************************************************************************
+ * local Functions
+ *****************************************************************************/
+static void LibavcodecCallback( void *p_opaque, int i_level,
+ const char *psz_format, va_list va )
{
- pes_packet_t *p_next;
+ int i_vlc_level;
+ AVCodecContext *p_avctx = (AVCodecContext *)p_opaque;
+ AVClass *p_avc;
+ vlc_object_t *p_this;
+ char *psz_new_format;
+ const char *psz_item_name;
+
+ p_avc = p_avctx ? p_avctx->av_class : 0;
+
+#define cln p_avc->class_name
+ /* Make sure we can get p_this back */
+ if( !p_avctx || !p_avc || !cln ||
+ cln[0]!='A' || cln[1]!='V' || cln[2]!='C' || cln[3]!='o' ||
+ cln[4]!='d' || cln[5]!='e' || cln[6]!='c' )
+ {
+ if( i_level == AV_LOG_ERROR ) vfprintf( stderr, psz_format, va );
+ return;
+ }
+#undef cln
- vlc_mutex_lock( &p_fifo->data_lock );
-
- p_next = p_fifo->p_first->p_next;
- p_fifo->p_first->p_next = NULL;
- input_DeletePES( p_fifo->p_packets_mgt, p_fifo->p_first );
- p_fifo->p_first = p_next;
- p_fifo->i_depth--;
+ p_this = (vlc_object_t *)p_avctx->opaque;
- if( !p_fifo->p_first )
+ switch( i_level )
{
- /* No PES in the fifo */
- /* pp_last no longer valid */
- p_fifo->pp_last = &p_fifo->p_first;
- while( !p_fifo->p_first )
- {
- vlc_cond_signal( &p_fifo->data_wait );
- vlc_cond_wait( &p_fifo->data_wait, &p_fifo->data_lock );
- }
+ case AV_LOG_QUIET:
+ i_vlc_level = VLC_MSG_ERR;
+ break;
+ case AV_LOG_ERROR:
+ i_vlc_level = VLC_MSG_WARN;
+ break;
+ case AV_LOG_INFO:
+ i_vlc_level = VLC_MSG_DBG;
+ break;
+ case AV_LOG_DEBUG:
+ /* Print debug messages if they were requested */
+ if( p_avctx->debug ) vfprintf( stderr, psz_format, va );
+ return;
+ default:
+ return;
}
- vlc_mutex_unlock( &p_fifo->data_lock );
+
+ psz_item_name = p_avc->item_name(p_opaque);
+ psz_new_format = malloc( strlen(psz_format) + strlen(psz_item_name)
+ + 18 + 5 );
+ snprintf( psz_new_format, strlen(psz_format) + strlen(psz_item_name)
+ + 18 + 5, "%s (%s@%p)", psz_format, p_avc->item_name(p_opaque), p_opaque );
+ msg_GenericVa( p_this, MSG_QUEUE_NORMAL,i_vlc_level,
+ MODULE_STRING, psz_new_format, va );
+ free( psz_new_format );
}
-static inline void __GetFrame( videodec_thread_t *p_vdec )
+void E_(InitLibavcodec)( vlc_object_t *p_object )
{
- pes_packet_t *p_pes;
- data_packet_t *p_data;
- byte_t *p_buffer;
+ static int b_ffmpeginit = 0;
+ vlc_value_t lockval;
- p_pes = __PES_GET( p_vdec->p_fifo );
- p_vdec->i_pts = p_pes->i_pts;
+ var_Get( p_object->p_libvlc, "avcodec", &lockval );
+ vlc_mutex_lock( lockval.p_address );
- while( ( !p_pes->i_nb_data )||( !p_pes->i_pes_size ) )
+ /* *** init ffmpeg library (libavcodec) *** */
+ if( !b_ffmpeginit )
{
- __PES_NEXT( p_vdec->p_fifo );
- p_pes = __PES_GET( p_vdec->p_fifo );
+ avcodec_init();
+ avcodec_register_all();
+ av_log_set_callback( LibavcodecCallback );
+ b_ffmpeginit = 1;
+
+ msg_Dbg( p_object, "libavcodec initialized (interface %d )",
+ LIBAVCODEC_BUILD );
}
- p_vdec->i_framesize = p_pes->i_pes_size;
- if( p_pes->i_nb_data == 1 )
+ else
{
- p_vdec->p_framedata = p_pes->p_first->p_payload_start;
- return;
+ msg_Dbg( p_object, "libavcodec already initialized" );
}
- /* get a buffer and gather all data packet */
- p_vdec->p_framedata = p_buffer = malloc( p_pes->i_pes_size );
- p_data = p_pes->p_first;
- do
- {
- p_vdec->p_fifo->p_vlc->pf_memcpy( p_buffer, p_data->p_payload_start,
- p_data->p_payload_end - p_data->p_payload_start );
- p_buffer += p_data->p_payload_end - p_data->p_payload_start;
- p_data = p_data->p_next;
- } while( p_data );
+
+ vlc_mutex_unlock( lockval.p_address );
}
-static inline void __NextFrame( videodec_thread_t *p_vdec )
+/*****************************************************************************
+ * Chroma fourcc -> ffmpeg_id mapping
+ *****************************************************************************/
+static struct
{
- pes_packet_t *p_pes;
+ vlc_fourcc_t i_chroma;
+ int i_chroma_id;
- p_pes = __PES_GET( p_vdec->p_fifo );
- if( p_pes->i_nb_data != 1 )
- {
- free( p_vdec->p_framedata ); /* FIXME keep this buffer */
- }
- __PES_NEXT( p_vdec->p_fifo );
-}
-
-/* FIXME FIXME some of them are wrong */
-static int i_ffmpeg_PixFmtToChroma[] =
+} chroma_table[] =
{
-/* PIX_FMT_ANY = -1,PIX_FMT_YUV420P, PIX_FMT_YUV422,
- PIX_FMT_RGB24, PIX_FMT_BGR24, PIX_FMT_YUV422P,
- PIX_FMT_YUV444P, PIX_FMT_YUV410P */
+ /* Planar YUV formats */
+ { VLC_FOURCC('Y','U','V','A'), PIX_FMT_YUV444P }, /* Hack */
+ { VLC_FOURCC('I','4','4','4'), PIX_FMT_YUV444P },
+ { VLC_FOURCC('J','4','4','4'), PIX_FMT_YUVJ444P },
+ { VLC_FOURCC('I','4','2','2'), PIX_FMT_YUV422P },
+ { VLC_FOURCC('J','4','2','2'), PIX_FMT_YUVJ422P },
+ { VLC_FOURCC('I','4','2','0'), PIX_FMT_YUV420P },
+ { VLC_FOURCC('Y','V','1','2'), PIX_FMT_YUV420P },
+ { VLC_FOURCC('I','Y','U','V'), PIX_FMT_YUV420P },
+ { VLC_FOURCC('J','4','2','0'), PIX_FMT_YUVJ420P },
+ { VLC_FOURCC('I','4','1','1'), PIX_FMT_YUV411P },
+ { VLC_FOURCC('I','4','1','0'), PIX_FMT_YUV410P },
+ { VLC_FOURCC('Y','V','U','9'), PIX_FMT_YUV410P },
+
+ /* Packed YUV formats */
+ { VLC_FOURCC('Y','U','Y','2'), PIX_FMT_YUV422 },
+#if LIBAVCODEC_BUILD >= 4720
+ { VLC_FOURCC('U','Y','V','Y'), PIX_FMT_UYVY422 },
+#endif
+
+ /* Packed RGB formats */
+ { VLC_FOURCC('R','V','1','5'), PIX_FMT_RGB555 },
+ { VLC_FOURCC('R','V','1','6'), PIX_FMT_RGB565 },
+ { VLC_FOURCC('R','V','2','4'), PIX_FMT_RGB24 },
+ { VLC_FOURCC('R','V','3','2'), PIX_FMT_RGBA32 },
+ { VLC_FOURCC('G','R','E','Y'), PIX_FMT_GRAY8 },
- 0, VLC_FOURCC('I','4','2','0'), VLC_FOURCC('I','4','2','0'),
- VLC_FOURCC('R','V','2','4'), 0, VLC_FOURCC('Y','4','2','2'),
- VLC_FOURCC('I','4','4','4'), 0
+ {0}
};
-static inline u32 ffmpeg_PixFmtToChroma( int i_ffmpegchroma )
+int E_(GetFfmpegChroma)( vlc_fourcc_t i_chroma )
{
- if( ++i_ffmpegchroma > 7 )
- {
- return( 0 );
- }
- else
- {
- return( i_ffmpeg_PixFmtToChroma[i_ffmpegchroma] );
- }
-}
+ int i;
-static inline int ffmpeg_FfAspect( int i_width, int i_height, int i_ffaspect )
-{
- switch( i_ffaspect )
+ for( i = 0; chroma_table[i].i_chroma != 0; i++ )
{
- case( FF_ASPECT_4_3_625 ):
- case( FF_ASPECT_4_3_525 ):
- return( VOUT_ASPECT_FACTOR * 4 / 3);
- case( FF_ASPECT_16_9_625 ):
- case( FF_ASPECT_16_9_525 ):
- return( VOUT_ASPECT_FACTOR * 16 / 9 );
- case( FF_ASPECT_SQUARE ):
- default:
- return( VOUT_ASPECT_FACTOR * i_width / i_height );
+ if( chroma_table[i].i_chroma == i_chroma )
+ return chroma_table[i].i_chroma_id;
}
+ return -1;
}
-static int ffmpeg_CheckVout( vout_thread_t *p_vout,
- int i_width,
- int i_height,
- int i_aspect,
- int i_chroma )
+vlc_fourcc_t E_(GetVlcChroma)( int i_ffmpeg_chroma )
{
- if( !p_vout )
- {
- return( 0 );
- }
- if( !i_chroma )
- {
- /* we will try to make conversion */
- i_chroma = VLC_FOURCC('I','4','2','0');
- }
-
- if( ( p_vout->render.i_width != i_width )||
- ( p_vout->render.i_height != i_height )||
- ( p_vout->render.i_chroma != i_chroma )||
- ( p_vout->render.i_aspect !=
- ffmpeg_FfAspect( i_width, i_height, i_aspect ) ) )
- {
- return( 0 );
- }
- else
+ int i;
+
+ for( i = 0; chroma_table[i].i_chroma != 0; i++ )
{
- return( 1 );
+ if( chroma_table[i].i_chroma_id == i_ffmpeg_chroma )
+ return chroma_table[i].i_chroma;
}
+ return 0;
}
-/* Return a Vout */
+/*****************************************************************************
+ * Codec fourcc -> ffmpeg_id mapping
+ *****************************************************************************/
+static struct
+{
+ vlc_fourcc_t i_fourcc;
+ int i_codec;
+ int i_cat;
+ char *psz_name;
-static vout_thread_t *ffmpeg_CreateVout( videodec_thread_t *p_vdec,
- int i_width,
- int i_height,
- int i_aspect,
- int i_chroma )
+} codecs_table[] =
{
- vout_thread_t *p_vout;
+ /* MPEG-1 Video */
+ { VLC_FOURCC('m','p','1','v'), CODEC_ID_MPEG1VIDEO,
+ VIDEO_ES, "MPEG-1 Video" },
+
+ /* MPEG-2 Video */
+ { VLC_FOURCC('m','p','2','v'), CODEC_ID_MPEG2VIDEO,
+ VIDEO_ES, "MPEG-2 Video" },
+ { VLC_FOURCC('m','p','g','v'), CODEC_ID_MPEG2VIDEO,
+ VIDEO_ES, "MPEG-2 Video" },
+
+ /* MPEG-4 Video */
+ { VLC_FOURCC('D','I','V','X'), CODEC_ID_MPEG4,
+ VIDEO_ES, "MPEG-4 Video" },
+ { VLC_FOURCC('d','i','v','x'), CODEC_ID_MPEG4,
+ VIDEO_ES, "MPEG-4 Video" },
+ { VLC_FOURCC('M','P','4','S'), CODEC_ID_MPEG4,
+ VIDEO_ES, "MPEG-4 Video" },
+ { VLC_FOURCC('m','p','4','s'), CODEC_ID_MPEG4,
+ VIDEO_ES, "MPEG-4 Video" },
+ { VLC_FOURCC('M','4','S','2'), CODEC_ID_MPEG4,
+ VIDEO_ES, "MPEG-4 Video" },
+ { VLC_FOURCC('m','4','s','2'), CODEC_ID_MPEG4,
+ VIDEO_ES, "MPEG-4 Video" },
+ { VLC_FOURCC('x','v','i','d'), CODEC_ID_MPEG4,
+ VIDEO_ES, "MPEG-4 Video" },
+ { VLC_FOURCC('X','V','I','D'), CODEC_ID_MPEG4,
+ VIDEO_ES, "MPEG-4 Video" },
+ { VLC_FOURCC('X','v','i','D'), CODEC_ID_MPEG4,
+ VIDEO_ES, "MPEG-4 Video" },
+ { VLC_FOURCC('X','V','I','X'), CODEC_ID_MPEG4,
+ VIDEO_ES, "MPEG-4 Video" },
+ { VLC_FOURCC('x','v','i','x'), CODEC_ID_MPEG4,
+ VIDEO_ES, "MPEG-4 Video" },
+ { VLC_FOURCC('D','X','5','0'), CODEC_ID_MPEG4,
+ VIDEO_ES, "MPEG-4 Video" },
+ { VLC_FOURCC('d','x','5','0'), CODEC_ID_MPEG4,
+ VIDEO_ES, "MPEG-4 Video" },
+ { VLC_FOURCC('m','p','4','v'), CODEC_ID_MPEG4,
+ VIDEO_ES, "MPEG-4 Video" },
+ { VLC_FOURCC('M','P','4','V'), CODEC_ID_MPEG4,
+ VIDEO_ES, "MPEG-4 Video" },
+ { VLC_FOURCC( 4, 0, 0, 0 ), CODEC_ID_MPEG4,
+ VIDEO_ES, "MPEG-4 Video" },
+ { VLC_FOURCC('m','4','c','c'), CODEC_ID_MPEG4,
+ VIDEO_ES, "MPEG-4 Video" },
+ { VLC_FOURCC('M','4','C','C'), CODEC_ID_MPEG4,
+ VIDEO_ES, "MPEG-4 Video" },
+ { VLC_FOURCC('F','M','P','4'), CODEC_ID_MPEG4,
+ VIDEO_ES, "MPEG-4 Video" },
+ /* 3ivx delta 3.5 Unsupported
+ * putting it here gives extreme distorted images
+ { VLC_FOURCC('3','I','V','1'), CODEC_ID_MPEG4,
+ VIDEO_ES, "MPEG-4 Video" },
+ { VLC_FOURCC('3','i','v','1'), CODEC_ID_MPEG4,
+ VIDEO_ES, "MPEG-4 Video" }, */
+ /* 3ivx delta 4 */
+ { VLC_FOURCC('3','I','V','2'), CODEC_ID_MPEG4,
+ VIDEO_ES, "MPEG-4 Video" },
+ { VLC_FOURCC('3','i','v','2'), CODEC_ID_MPEG4,
+ VIDEO_ES, "MPEG-4 Video" },
+
+ /* MSMPEG4 v1 */
+ { VLC_FOURCC('D','I','V','1'), CODEC_ID_MSMPEG4V1,
+ VIDEO_ES, "MS MPEG-4 Video v1" },
+ { VLC_FOURCC('d','i','v','1'), CODEC_ID_MSMPEG4V1,
+ VIDEO_ES, "MS MPEG-4 Video v1" },
+ { VLC_FOURCC('M','P','G','4'), CODEC_ID_MSMPEG4V1,
+ VIDEO_ES, "MS MPEG-4 Video v1" },
+ { VLC_FOURCC('m','p','g','4'), CODEC_ID_MSMPEG4V1,
+ VIDEO_ES, "MS MPEG-4 Video v1" },
+
+ /* MSMPEG4 v2 */
+ { VLC_FOURCC('D','I','V','2'), CODEC_ID_MSMPEG4V2,
+ VIDEO_ES, "MS MPEG-4 Video v2" },
+ { VLC_FOURCC('d','i','v','2'), CODEC_ID_MSMPEG4V2,
+ VIDEO_ES, "MS MPEG-4 Video v2" },
+ { VLC_FOURCC('M','P','4','2'), CODEC_ID_MSMPEG4V2,
+ VIDEO_ES, "MS MPEG-4 Video v2" },
+ { VLC_FOURCC('m','p','4','2'), CODEC_ID_MSMPEG4V2,
+ VIDEO_ES, "MS MPEG-4 Video v2" },
+
+ /* MSMPEG4 v3 / M$ mpeg4 v3 */
+ { VLC_FOURCC('M','P','G','3'), CODEC_ID_MSMPEG4V3,
+ VIDEO_ES, "MS MPEG-4 Video v3" },
+ { VLC_FOURCC('m','p','g','3'), CODEC_ID_MSMPEG4V3,
+ VIDEO_ES, "MS MPEG-4 Video v3" },
+ { VLC_FOURCC('d','i','v','3'), CODEC_ID_MSMPEG4V3,
+ VIDEO_ES, "MS MPEG-4 Video v3" },
+ { VLC_FOURCC('M','P','4','3'), CODEC_ID_MSMPEG4V3,
+ VIDEO_ES, "MS MPEG-4 Video v3" },
+ { VLC_FOURCC('m','p','4','3'), CODEC_ID_MSMPEG4V3,
+ VIDEO_ES, "MS MPEG-4 Video v3" },
+ /* DivX 3.20 */
+ { VLC_FOURCC('D','I','V','3'), CODEC_ID_MSMPEG4V3,
+ VIDEO_ES, "MS MPEG-4 Video v3" },
+ { VLC_FOURCC('D','I','V','4'), CODEC_ID_MSMPEG4V3,
+ VIDEO_ES, "MS MPEG-4 Video v3" },
+ { VLC_FOURCC('d','i','v','4'), CODEC_ID_MSMPEG4V3,
+ VIDEO_ES, "MS MPEG-4 Video v3" },
+ { VLC_FOURCC('D','I','V','5'), CODEC_ID_MSMPEG4V3,
+ VIDEO_ES, "MS MPEG-4 Video v3" },
+ { VLC_FOURCC('d','i','v','5'), CODEC_ID_MSMPEG4V3,
+ VIDEO_ES, "MS MPEG-4 Video v3" },
+ { VLC_FOURCC('D','I','V','6'), CODEC_ID_MSMPEG4V3,
+ VIDEO_ES, "MS MPEG-4 Video v3" },
+ { VLC_FOURCC('d','i','v','6'), CODEC_ID_MSMPEG4V3,
+ VIDEO_ES, "MS MPEG-4 Video v3" },
+ /* AngelPotion stuff */
+ { VLC_FOURCC('A','P','4','1'), CODEC_ID_MSMPEG4V3,
+ VIDEO_ES, "MS MPEG-4 Video v3" },
+ /* 3ivx doctered divx files */
+ { VLC_FOURCC('3','I','V','D'), CODEC_ID_MSMPEG4V3,
+ VIDEO_ES, "MS MPEG-4 Video v3" },
+ { VLC_FOURCC('3','i','v','d'), CODEC_ID_MSMPEG4V3,
+ VIDEO_ES, "MS MPEG-4 Video v3" },
+ /* who knows? */
+ { VLC_FOURCC('3','V','I','D'), CODEC_ID_MSMPEG4V3,
+ VIDEO_ES, "MS MPEG-4 Video v3" },
+ { VLC_FOURCC('3','v','i','d'), CODEC_ID_MSMPEG4V3,
+ VIDEO_ES, "MS MPEG-4 Video v3" },
+
+ /* Sorenson v1 */
+ { VLC_FOURCC('S','V','Q','1'), CODEC_ID_SVQ1,
+ VIDEO_ES, "SVQ-1 (Sorenson Video v1)" },
+
+ /* Sorenson v3 */
+ { VLC_FOURCC('S','V','Q','3'), CODEC_ID_SVQ3,
+ VIDEO_ES, "SVQ-3 (Sorenson Video v3)" },
+
+ /* h264 */
+ { VLC_FOURCC('h','2','6','4'), CODEC_ID_H264,
+ VIDEO_ES, "h264" },
+ { VLC_FOURCC('H','2','6','4'), CODEC_ID_H264,
+ VIDEO_ES, "h264" },
+ { VLC_FOURCC('x','2','6','4'), CODEC_ID_H264,
+ VIDEO_ES, "h264" },
+ /* avc1: special case h264 */
+ { VLC_FOURCC('a','v','c','1'), CODEC_ID_H264,
+ VIDEO_ES, "h264" },
+ { VLC_FOURCC('V','S','S','H'), CODEC_ID_H264,
+ VIDEO_ES, "h264" },
+ { VLC_FOURCC('v','s','s','h'), CODEC_ID_H264,
+ VIDEO_ES, "h264" },
+
+/* H263 and H263i */
+/* H263(+) is also known as Real Video 1.0 */
+
+/* FIXME FOURCC_H263P exist but what fourcc ? */
+
+ /* H263 */
+ { VLC_FOURCC('H','2','6','3'), CODEC_ID_H263,
+ VIDEO_ES, "H263" },
+ { VLC_FOURCC('h','2','6','3'), CODEC_ID_H263,
+ VIDEO_ES, "H263" },
+ { VLC_FOURCC('U','2','6','3'), CODEC_ID_H263,
+ VIDEO_ES, "H263" },
+ { VLC_FOURCC('M','2','6','3'), CODEC_ID_H263,
+ VIDEO_ES, "H263" },
+
+ /* H263i */
+ { VLC_FOURCC('I','2','6','3'), CODEC_ID_H263I,
+ VIDEO_ES, "I263.I" },
+ { VLC_FOURCC('i','2','6','3'), CODEC_ID_H263I,
+ VIDEO_ES, "I263.I" },
+
+ /* Flash (H263) variant */
+ { VLC_FOURCC('F','L','V','1'), CODEC_ID_FLV1,
+ VIDEO_ES, "Flash Video" },
+
+#if LIBAVCODEC_BUILD > 4716
+ { VLC_FOURCC('H','2','6','1'), CODEC_ID_H261,
+ VIDEO_ES, "H.261" },
+#endif
- if( (!i_width)||(!i_height) )
- {
- return( NULL ); /* Can't create a new vout without display size */
- }
+#if LIBAVCODEC_BUILD > 4680
+ { VLC_FOURCC('F','L','I','C'), CODEC_ID_FLIC,
+ VIDEO_ES, "Flic Video" },
+#endif
- if( !i_chroma )
- {
- /* we make conversion if possible*/
- i_chroma = VLC_FOURCC('I','4','2','0');
- msg_Warn( p_vdec->p_fifo, "Internal chroma conversion (FIXME)");
- /* It's mainly for I410 -> I420 conversion that I've made,
- it's buggy and very slow */
- }
-
- i_aspect = ffmpeg_FfAspect( i_width, i_height, i_aspect );
-
- /* Spawn a video output if there is none. First we look for our children,
- * then we look for any other vout that might be available. */
- p_vout = vlc_object_find( p_vdec->p_fifo, VLC_OBJECT_VOUT,
- FIND_CHILD );
- if( !p_vout )
- {
- p_vout = vlc_object_find( p_vdec->p_fifo, VLC_OBJECT_VOUT,
- FIND_ANYWHERE );
- }
+ /* MJPEG */
+ { VLC_FOURCC( 'M', 'J', 'P', 'G' ), CODEC_ID_MJPEG,
+ VIDEO_ES, "Motion JPEG Video" },
+ { VLC_FOURCC( 'm', 'j', 'p', 'g' ), CODEC_ID_MJPEG,
+ VIDEO_ES, "Motion JPEG Video" },
+ { VLC_FOURCC( 'm', 'j', 'p', 'a' ), CODEC_ID_MJPEG, /* for mov file */
+ VIDEO_ES, "Motion JPEG Video" },
+ { VLC_FOURCC( 'j', 'p', 'e', 'g' ), CODEC_ID_MJPEG,
+ VIDEO_ES, "Motion JPEG Video" },
+ { VLC_FOURCC( 'J', 'P', 'E', 'G' ), CODEC_ID_MJPEG,
+ VIDEO_ES, "Motion JPEG Video" },
+ { VLC_FOURCC( 'J', 'F', 'I', 'F' ), CODEC_ID_MJPEG,
+ VIDEO_ES, "Motion JPEG Video" },
+ { VLC_FOURCC( 'J', 'P', 'G', 'L' ), CODEC_ID_MJPEG,
+ VIDEO_ES, "Motion JPEG Video" },
+
+ { VLC_FOURCC( 'm', 'j', 'p', 'b' ), CODEC_ID_MJPEGB, /* for mov file */
+ VIDEO_ES, "Motion JPEG B Video" },
+
+#if LIBAVCODEC_BUILD > 4680
+ { VLC_FOURCC( 'S', 'P', '5', 'X' ), CODEC_ID_SP5X,
+ VIDEO_ES, "Sunplus Motion JPEG Video" },
+#endif
- if( p_vout )
- {
- if( !ffmpeg_CheckVout( p_vout,
- i_width, i_height, i_aspect,i_chroma ) )
- {
- /* We are not interested in this format, close this vout */
- vlc_object_detach_all( p_vout );
- vlc_object_release( p_vout );
- vout_DestroyThread( p_vout );
- p_vout = NULL;
- }
- else
- {
- /* This video output is cool! Hijack it. */
- vlc_object_detach_all( p_vout );
- vlc_object_attach( p_vout, p_vdec->p_fifo );
- vlc_object_release( p_vout );
- }
- }
+ /* DV */
+ { VLC_FOURCC('d','v','s','l'), CODEC_ID_DVVIDEO,
+ VIDEO_ES, "DV Video" },
+ { VLC_FOURCC('d','v','s','d'), CODEC_ID_DVVIDEO,
+ VIDEO_ES, "DV Video" },
+ { VLC_FOURCC('D','V','S','D'), CODEC_ID_DVVIDEO,
+ VIDEO_ES, "DV Video" },
+ { VLC_FOURCC('d','v','h','d'), CODEC_ID_DVVIDEO,
+ VIDEO_ES, "DV Video" },
+ { VLC_FOURCC('d','v','c',' '), CODEC_ID_DVVIDEO,
+ VIDEO_ES, "DV Video" },
+ { VLC_FOURCC('d','v','c','p'), CODEC_ID_DVVIDEO,
+ VIDEO_ES, "DV Video PAL" },
+ { VLC_FOURCC('d','v','p',' '), CODEC_ID_DVVIDEO,
+ VIDEO_ES, "DV Video Pro" },
+ { VLC_FOURCC('d','v','p','p'), CODEC_ID_DVVIDEO,
+ VIDEO_ES, "DV Video Pro PAL" },
+ { VLC_FOURCC('C','D','V','C'), CODEC_ID_DVVIDEO,
+ VIDEO_ES, "DV Video" },
+
+ /* Windows Media Video */
+ { VLC_FOURCC('W','M','V','1'), CODEC_ID_WMV1,
+ VIDEO_ES, "Windows Media Video 1" },
+ { VLC_FOURCC('W','M','V','2'), CODEC_ID_WMV2,
+ VIDEO_ES, "Windows Media Video 2" },
+#if LIBAVCODEC_BUILD >= ((51<<16)+(10<<8)+1)
+ { VLC_FOURCC('W','M','V','3'), CODEC_ID_WMV3,
+ VIDEO_ES, "Windows Media Video 3" },
+ { VLC_FOURCC('W','V','C','1'), CODEC_ID_VC1,
+ VIDEO_ES, "Windows Media Video VC1" },
+#endif
+#if 0
+ /* WMVA is the VC-1 codec before the standardization proces,
+ it is not bitstream compatible and deprecated */
+ { VLC_FOURCC('W','M','V','A'), CODEC_ID_VC1,
+ VIDEO_ES, "Windows Media Video Advanced Profile" },
+#endif
- if( p_vout == NULL )
- {
- msg_Dbg( p_vdec->p_fifo, "no vout present, spawning one" );
-
- p_vout = vout_CreateThread( p_vdec->p_fifo,
- i_width,
- i_height,
- i_chroma,
- i_aspect );
- }
+#if LIBAVCODEC_BUILD >= 4683
+ /* Microsoft Video 1 */
+ { VLC_FOURCC('M','S','V','C'), CODEC_ID_MSVIDEO1,
+ VIDEO_ES, "Microsoft Video 1" },
+ { VLC_FOURCC('m','s','v','c'), CODEC_ID_MSVIDEO1,
+ VIDEO_ES, "Microsoft Video 1" },
+ { VLC_FOURCC('C','R','A','M'), CODEC_ID_MSVIDEO1,
+ VIDEO_ES, "Microsoft Video 1" },
+ { VLC_FOURCC('c','r','a','m'), CODEC_ID_MSVIDEO1,
+ VIDEO_ES, "Microsoft Video 1" },
+ { VLC_FOURCC('W','H','A','M'), CODEC_ID_MSVIDEO1,
+ VIDEO_ES, "Microsoft Video 1" },
+ { VLC_FOURCC('w','h','a','m'), CODEC_ID_MSVIDEO1,
+ VIDEO_ES, "Microsoft Video 1" },
+
+ /* Microsoft RLE */
+ { VLC_FOURCC('m','r','l','e'), CODEC_ID_MSRLE,
+ VIDEO_ES, "Microsoft RLE Video" },
+ { VLC_FOURCC(0x1,0x0,0x0,0x0), CODEC_ID_MSRLE,
+ VIDEO_ES, "Microsoft RLE Video" },
+#endif
- return( p_vout );
-}
+ /* Indeo Video Codecs (Quality of this decoder on ppc is not good) */
+ { VLC_FOURCC('I','V','3','1'), CODEC_ID_INDEO3,
+ VIDEO_ES, "Indeo Video v3" },
+ { VLC_FOURCC('i','v','3','1'), CODEC_ID_INDEO3,
+ VIDEO_ES, "Indeo Video v3" },
+ { VLC_FOURCC('I','V','3','2'), CODEC_ID_INDEO3,
+ VIDEO_ES, "Indeo Video v3" },
+ { VLC_FOURCC('i','v','3','2'), CODEC_ID_INDEO3,
+ VIDEO_ES, "Indeo Video v3" },
+
+#if LIBAVCODEC_BUILD >= 4721
+ { VLC_FOURCC('t','s','c','c'), CODEC_ID_TSCC,
+ VIDEO_ES, "TechSmith Camtasia Screen Capture Video" },
+#endif
-/* FIXME FIXME FIXME this is a big shit
- does someone want to rewrite this function ?
- or said to me how write a better thing
- FIXME FIXME FIXME
-*/
+ /* Huff YUV */
+ { VLC_FOURCC('H','F','Y','U'), CODEC_ID_HUFFYUV,
+ VIDEO_ES, "Huff YUV Video" },
-static void ffmpeg_ConvertPictureI410toI420( picture_t *p_pic,
- AVPicture *p_avpicture,
- videodec_thread_t *p_vdec )
-{
- u8 *p_src, *p_dst;
- u8 *p_plane[3];
- int i_plane;
-
- int i_stride, i_lines;
- int i_height, i_width;
- int i_y, i_x;
-
- i_height = p_vdec->p_context->height;
- i_width = p_vdec->p_context->width;
-
- p_dst = p_pic->p[0].p_pixels;
- p_src = p_avpicture->data[0];
-
- /* copy first plane */
- for( i_y = 0; i_y < i_height; i_y++ )
- {
- p_vdec->p_fifo->p_vlc->pf_memcpy( p_dst, p_src, i_width);
- p_dst += p_pic->p[0].i_pitch;
- p_src += p_avpicture->linesize[0];
- }
-
- /* process each plane in a temporary buffer */
- for( i_plane = 1; i_plane < 3; i_plane++ )
- {
- i_stride = p_avpicture->linesize[i_plane];
- i_lines = i_height / 4;
+ /* Creative YUV */
+ { VLC_FOURCC('C','Y','U','V'), CODEC_ID_CYUV,
+ VIDEO_ES, "Creative YUV Video" },
- p_dst = p_plane[i_plane] = malloc( i_lines * i_stride * 2 * 2 );
- p_src = p_avpicture->data[i_plane];
+ /* On2 VP3 Video Codecs */
+ { VLC_FOURCC('V','P','3','1'), CODEC_ID_VP3,
+ VIDEO_ES, "On2's VP3 Video" },
+ { VLC_FOURCC('v','p','3','1'), CODEC_ID_VP3,
+ VIDEO_ES, "On2's VP3 Video" },
- /* for each source line */
- for( i_y = 0; i_y < i_lines; i_y++ )
- {
- for( i_x = 0; i_x < i_stride - 1; i_x++ )
- {
- p_dst[2 * i_x ] = p_src[i_x];
- p_dst[2 * i_x + 1] = ( p_src[i_x] + p_src[i_x + 1]) / 2;
-
- }
- p_dst[2 * i_stride - 2] = p_src[i_x];
- p_dst[2 * i_stride - 1] = p_src[i_x];
-
- p_dst += 4 * i_stride; /* process the next even lines */
- p_src += i_stride;
- }
+#if LIBAVCODEC_BUILD >= 4685
+ /* Xiph.org theora */
+ { VLC_FOURCC('t','h','e','o'), CODEC_ID_THEORA,
+ VIDEO_ES, "Xiph.org's Theora Video" },
+#endif
+#if ( !defined( WORDS_BIGENDIAN ) )
+ /* Asus Video (Another thing that doesn't work on PPC) */
+ { VLC_FOURCC('A','S','V','1'), CODEC_ID_ASV1,
+ VIDEO_ES, "Asus V1 Video" },
+ { VLC_FOURCC('A','S','V','2'), CODEC_ID_ASV2,
+ VIDEO_ES, "Asus V2 Video" },
+#endif
- }
+ /* FFMPEG Video 1 (lossless codec) */
+ { VLC_FOURCC('F','F','V','1'), CODEC_ID_FFV1,
+ VIDEO_ES, "FFMpeg Video 1" },
- for( i_plane = 1; i_plane < 3; i_plane++ )
- {
- i_stride = p_avpicture->linesize[i_plane];
- i_lines = i_height / 4;
+ /* ATI VCR1 */
+ { VLC_FOURCC('V','C','R','1'), CODEC_ID_VCR1,
+ VIDEO_ES, "ATI VCR1 Video" },
- p_dst = p_plane[i_plane] + 2*i_stride;
- p_src = p_plane[i_plane];
+ /* Cirrus Logic AccuPak */
+ { VLC_FOURCC('C','L','J','R'), CODEC_ID_CLJR,
+ VIDEO_ES, "Creative Logic AccuPak" },
- for( i_y = 0; i_y < i_lines - 1; i_y++ )
- {
- for( i_x = 0; i_x < 2 * i_stride ; i_x++ )
- {
- p_dst[i_x] = ( p_src[i_x] + p_src[i_x + 4*i_stride])/2;
- }
-
- p_dst += 4 * i_stride; /* process the next odd lines */
- p_src += 4 * i_stride;
- }
- /* last line */
- p_vdec->p_fifo->p_vlc->pf_memcpy( p_dst, p_src, 2*i_stride );
- }
- /* copy to p_pic, by block
- if I do pixel per pixel it segfault. It's why I use
- temporaries buffers */
- for( i_plane = 1; i_plane < 3; i_plane++ )
- {
+ /* Real Video */
+ { VLC_FOURCC('R','V','1','0'), CODEC_ID_RV10,
+ VIDEO_ES, "Real Video 10" },
+ { VLC_FOURCC('R','V','1','3'), CODEC_ID_RV10,
+ VIDEO_ES, "Real Video 13" },
- int i_size;
- p_src = p_plane[i_plane];
- p_dst = p_pic->p[i_plane].p_pixels;
+#if LIBAVCODEC_BUILD >= 4684
+ /* Apple Video */
+ { VLC_FOURCC('r','p','z','a'), CODEC_ID_RPZA,
+ VIDEO_ES, "Apple Video" },
- i_size = __MIN( 2*i_stride, p_pic->p[i_plane].i_pitch);
- for( i_y = 0; i_y < __MIN(p_pic->p[i_plane].i_lines, 2 * i_lines); i_y++ )
- {
- p_vdec->p_fifo->p_vlc->pf_memcpy( p_dst, p_src, i_size );
- p_src += 2 * i_stride;
- p_dst += p_pic->p[i_plane].i_pitch;
- }
- free( p_plane[i_plane] );
- }
+ { VLC_FOURCC('s','m','c',' '), CODEC_ID_SMC,
+ VIDEO_ES, "Apple graphics" },
-}
+ /* Cinepak */
+ { VLC_FOURCC('c','v','i','d'), CODEC_ID_CINEPAK,
+ VIDEO_ES, "Cinepak Video" },
-static void ffmpeg_ConvertPicture( picture_t *p_pic,
- AVPicture *p_avpicture,
- videodec_thread_t *p_vdec )
-{
- int i_plane;
- int i_size;
- int i_line;
-
- u8 *p_dst;
- u8 *p_src;
- int i_src_stride;
- int i_dst_stride;
-
- if( ffmpeg_PixFmtToChroma( p_vdec->p_context->pix_fmt ) )
- {
- /* convert ffmpeg picture to our format */
- for( i_plane = 0; i_plane < p_pic->i_planes; i_plane++ )
- {
- p_src = p_avpicture->data[i_plane];
- p_dst = p_pic->p[i_plane].p_pixels;
- i_src_stride = p_avpicture->linesize[i_plane];
- i_dst_stride = p_pic->p[i_plane].i_pitch;
-
- i_size = __MIN( i_src_stride, i_dst_stride );
- for( i_line = 0; i_line < p_pic->p[i_plane].i_lines; i_line++ )
- {
- p_vdec->p_fifo->p_vlc->pf_memcpy( p_dst, p_src, i_size );
- p_src += i_src_stride;
- p_dst += i_dst_stride;
- }
- }
- return;
- }
+ /* Id Quake II CIN */
+ { VLC_FOURCC('I','D','C','I'), CODEC_ID_IDCIN,
+ VIDEO_ES, "Id Quake II CIN Video" },
+#endif
- /* we need to convert to I420 */
- switch( p_vdec->p_context->pix_fmt )
- {
-#if LIBAVCODEC_BUILD >= 4615
- case( PIX_FMT_YUV410P ):
- ffmpeg_ConvertPictureI410toI420( p_pic, p_avpicture, p_vdec );
- break;
-#endif
- default:
- p_vdec->p_fifo->b_error =1;
- break;
- }
-}
+ /* 4X Technologies */
+ { VLC_FOURCC('4','x','m','v'), CODEC_ID_4XM,
+ VIDEO_ES, "4X Technologies Video" },
+#if LIBAVCODEC_BUILD >= 4694
+ /* Duck TrueMotion */
+ { VLC_FOURCC('D','U','C','K'), CODEC_ID_TRUEMOTION1,
+ VIDEO_ES, "Duck TrueMotion v1 Video" },
+#endif
-/*****************************************************************************
- *
- * Functions that initialize, decode and end the decoding process
- *
- *****************************************************************************/
+ /* Interplay MVE */
+ { VLC_FOURCC('i','m','v','e'), CODEC_ID_INTERPLAY_VIDEO,
+ VIDEO_ES, "Interplay MVE Video" },
-/*****************************************************************************
- * InitThread: initialize vdec output thread
- *****************************************************************************
- * This function is called from RunDecoderoder and performs the second step
- * of the initialization. It returns 0 on success. Note that the thread's
- * flag are not modified inside this function.
- *****************************************************************************/
+ /* Id RoQ */
+ { VLC_FOURCC('R','o','Q','v'), CODEC_ID_ROQ,
+ VIDEO_ES, "Id RoQ Video" },
-static int InitThread( videodec_thread_t *p_vdec )
-{
- int i_ffmpeg_codec;
- int i_tmp;
-
- if( p_vdec->p_fifo->p_demux_data )
- {
- ffmpeg_ParseBitMapInfoHeader( &p_vdec->format,
- (u8*)p_vdec->p_fifo->p_demux_data );
- }
- else
- {
- msg_Warn( p_vdec->p_fifo, "display informations missing" );
- }
+ /* Sony Playstation MDEC */
+ { VLC_FOURCC('M','D','E','C'), CODEC_ID_MDEC,
+ VIDEO_ES, "PSX MDEC Video" },
- /*init ffmpeg */
- if( !b_ffmpeginit )
- {
- avcodec_init();
- avcodec_register_all();
- b_ffmpeginit = 1;
- msg_Dbg( p_vdec->p_fifo, "library ffmpeg initialized" );
- }
- else
- {
- msg_Dbg( p_vdec->p_fifo, "library ffmpeg already initialized" );
- }
- ffmpeg_GetFfmpegCodec( p_vdec->p_fifo->i_fourcc,
- &i_ffmpeg_codec,
- &p_vdec->psz_namecodec );
- p_vdec->p_codec =
- avcodec_find_decoder( i_ffmpeg_codec );
-
- if( !p_vdec->p_codec )
- {
- msg_Err( p_vdec->p_fifo, "codec not found (%s)",
- p_vdec->psz_namecodec );
- return( -1 );
- }
+#if LIBAVCODEC_BUILD >= 4699
+ /* Sierra VMD */
+ { VLC_FOURCC('v','m','d','v'), CODEC_ID_VMDVIDEO,
+ VIDEO_ES, "Sierra VMD Video" },
+#endif
- p_vdec->p_context = &p_vdec->context;
- memset( p_vdec->p_context, 0, sizeof( AVCodecContext ) );
-
- p_vdec->p_context->width = p_vdec->format.i_width;
- p_vdec->p_context->height = p_vdec->format.i_height;
-
-/* XXX
- p_vdec->p_context->workaround_bugs
- --> seems to be for msmpeg 3 but can't know what is supposed to do
-
- p_vdec->p_context->strict_std_compliance
- --> strictly follow mpeg4 standard for decoder or encoder ??
-
- p_vdec->p_context->error_resilience
- --> don't make error resilience, because of some ms encoder witch
- use some wrong VLC code.
-*/
-
-#if LIBAVCODEC_BUILD >= 4611
- i_tmp = config_GetInt( p_vdec->p_fifo, "ffmpeg-workaround-bugs" );
- p_vdec->p_context->workaround_bugs = __MAX( __MIN( i_tmp, 99 ), 0 );
-
- i_tmp = config_GetInt( p_vdec->p_fifo, "ffmpeg-error-resilience" );
- p_vdec->p_context->error_resilience = __MAX( __MIN( i_tmp, 99 ), -1 );
-#endif
-#if LIBAVCODEC_BUILD >= 4614
- if( config_GetInt( p_vdec->p_fifo, "grayscale" ) )
- {
- p_vdec->p_context->flags|= CODEC_FLAG_GRAY;
- }
+#if LIBAVCODEC_BUILD >= 4719
+ /* FFMPEG's SNOW wavelet codec */
+ { VLC_FOURCC('S','N','O','W'), CODEC_ID_SNOW,
+ VIDEO_ES, "FFMpeg SNOW wavelet Video" },
#endif
-
- if (avcodec_open(p_vdec->p_context, p_vdec->p_codec) < 0)
- {
- msg_Err( p_vdec->p_fifo, "cannot open codec (%s)",
- p_vdec->psz_namecodec );
- return( -1 );
- }
- else
- {
- msg_Dbg( p_vdec->p_fifo, "ffmpeg codec (%s) started",
- p_vdec->psz_namecodec );
- }
-
- /* first give init data */
- if( p_vdec->format.i_data )
- {
- AVPicture avpicture;
- int b_gotpicture;
-
- switch( i_ffmpeg_codec )
- {
- case( CODEC_ID_MPEG4 ):
- avcodec_decode_video( p_vdec->p_context, &avpicture,
- &b_gotpicture,
- p_vdec->format.p_data,
- p_vdec->format.i_data );
- break;
- default:
- break;
- }
- }
-
- /* This will be created after the first decoded frame */
- p_vdec->p_vout = NULL;
-
- return( 0 );
-}
-/*****************************************************************************
- * DecodeThread: Called for decode one frame
- *****************************************************************************/
-static void DecodeThread( videodec_thread_t *p_vdec )
-{
- int i_status;
- int b_drawpicture;
- int b_gotpicture;
- AVPicture avpicture; /* ffmpeg picture */
- picture_t *p_pic; /* videolan picture */
- /* we have to get a frame stored in a pes
- give it to ffmpeg decoder
- and send the image to the output */
-
- /* TODO implement it in a better way */
-
- if( ( config_GetInt(p_vdec->p_fifo, "ffmpeg-hurry-up") )&&
- ( p_vdec->i_frame_late > 4 ) )
- {
-#if LIBAVCODEC_BUILD > 4603
- b_drawpicture = 0;
- if( p_vdec->i_frame_late < 8 )
- {
- p_vdec->p_context->hurry_up = 2;
- }
- else
- {
- /* too much late picture, won't decode
- but break picture until a new I, and for mpeg4 ...*/
- p_vdec->i_frame_late--; /* needed else it will never be decrease */
- __PES_NEXT( p_vdec->p_fifo );
- return;
- }
-#else
- if( p_vdec->i_frame_late < 8 )
- {
- b_drawpicture = 0; /* not really good but .. */
- }
- else
- {
- /* too much late picture, won't decode
- but break picture until a new I, and for mpeg4 ...*/
- p_vdec->i_frame_late--; /* needed else it will never be decrease */
- __PES_NEXT( p_vdec->p_fifo );
- return;
- }
+#if LIBAVCODEC_BUILD >= 4752
+ { VLC_FOURCC('r','l','e',' '), CODEC_ID_QTRLE,
+ VIDEO_ES, "Apple QuickTime RLE Video" },
+
+ { VLC_FOURCC('q','d','r','w'), CODEC_ID_QDRAW,
+ VIDEO_ES, "Apple QuickDraw Video" },
+
+ { VLC_FOURCC('Q','P','E','G'), CODEC_ID_QPEG,
+ VIDEO_ES, "QPEG Video" },
+ { VLC_FOURCC('Q','1','.','0'), CODEC_ID_QPEG,
+ VIDEO_ES, "QPEG Video" },
+ { VLC_FOURCC('Q','1','.','1'), CODEC_ID_QPEG,
+ VIDEO_ES, "QPEG Video" },
+
+ { VLC_FOURCC('U','L','T','I'), CODEC_ID_ULTI,
+ VIDEO_ES, "IBM Ultimotion Video" },
+
+ { VLC_FOURCC('V','I','X','L'), CODEC_ID_VIXL,
+ VIDEO_ES, "Miro/Pinnacle VideoXL Video" },
+
+ { VLC_FOURCC('L','O','C','O'), CODEC_ID_LOCO,
+ VIDEO_ES, "LOCO Video" },
+
+ { VLC_FOURCC('W','N','V','1'), CODEC_ID_WNV1,
+ VIDEO_ES, "Winnov WNV1 Video" },
+
+ { VLC_FOURCC('A','A','S','C'), CODEC_ID_AASC,
+ VIDEO_ES, "Autodesc RLE Video" },
#endif
- }
- else
- {
- b_drawpicture = 1;
-#if LIBAVCODEC_BUILD > 4603
- p_vdec->p_context->hurry_up = 0;
+#if LIBAVCODEC_BUILD >= 4753
+ { VLC_FOURCC('I','V','2','0'), CODEC_ID_INDEO2,
+ VIDEO_ES, "Indeo Video v2" },
+ { VLC_FOURCC('R','T','2','1'), CODEC_ID_INDEO2,
+ VIDEO_ES, "Indeo Video v2" },
#endif
- }
- __GetFrame( p_vdec );
+ /*
+ * Image codecs
+ */
+
+#if LIBAVCODEC_BUILD >= 4731
+ { VLC_FOURCC('p','n','g',' '), CODEC_ID_PNG,
+ VIDEO_ES, "PNG Image" },
+ { VLC_FOURCC('p','p','m',' '), CODEC_ID_PPM,
+ VIDEO_ES, "PPM Image" },
+ { VLC_FOURCC('p','g','m',' '), CODEC_ID_PGM,
+ VIDEO_ES, "PGM Image" },
+ { VLC_FOURCC('p','g','m','y'), CODEC_ID_PGMYUV,
+ VIDEO_ES, "PGM YUV Image" },
+ { VLC_FOURCC('p','a','m',' '), CODEC_ID_PAM,
+ VIDEO_ES, "PAM Image" },
+#endif
- i_status = avcodec_decode_video( p_vdec->p_context,
- &avpicture,
- &b_gotpicture,
- p_vdec->p_framedata,
- p_vdec->i_framesize);
+#if LIBAVCODEC_BUILD >= ((51<<16)+(0<<8)+0)
+ { VLC_FOURCC('b','m','p',' '), CODEC_ID_BMP,
+ VIDEO_ES, "BMP Image" },
+#endif
- __NextFrame( p_vdec );
+ /*
+ * Audio Codecs
+ */
+
+ /* Windows Media Audio 1 */
+ { VLC_FOURCC('W','M','A','1'), CODEC_ID_WMAV1,
+ AUDIO_ES, "Windows Media Audio 1" },
+ { VLC_FOURCC('w','m','a','1'), CODEC_ID_WMAV1,
+ AUDIO_ES, "Windows Media Audio 1" },
+
+ /* Windows Media Audio 2 */
+ { VLC_FOURCC('W','M','A','2'), CODEC_ID_WMAV2,
+ AUDIO_ES, "Windows Media Audio 2" },
+ { VLC_FOURCC('w','m','a','2'), CODEC_ID_WMAV2,
+ AUDIO_ES, "Windows Media Audio 2" },
+
+ /* DV Audio */
+ { VLC_FOURCC('d','v','a','u'), CODEC_ID_DVAUDIO,
+ AUDIO_ES, "DV Audio" },
+
+ /* MACE-3 Audio */
+ { VLC_FOURCC('M','A','C','3'), CODEC_ID_MACE3,
+ AUDIO_ES, "MACE-3 Audio" },
+
+ /* MACE-6 Audio */
+ { VLC_FOURCC('M','A','C','6'), CODEC_ID_MACE6,
+ AUDIO_ES, "MACE-6 Audio" },
+
+ /* RealAudio 1.0 */
+ { VLC_FOURCC('1','4','_','4'), CODEC_ID_RA_144,
+ AUDIO_ES, "RealAudio 1.0" },
+
+ /* RealAudio 2.0 */
+ { VLC_FOURCC('2','8','_','8'), CODEC_ID_RA_288,
+ AUDIO_ES, "RealAudio 2.0" },
+
+ /* MPEG Audio layer 1/2/3 */
+ { VLC_FOURCC('m','p','g','a'), CODEC_ID_MP2,
+ AUDIO_ES, "MPEG Audio layer 1/2" },
+ { VLC_FOURCC('m','p','3',' '), CODEC_ID_MP3,
+ AUDIO_ES, "MPEG Audio layer 1/2/3" },
+
+ /* A52 Audio (aka AC3) */
+ { VLC_FOURCC('a','5','2',' '), CODEC_ID_AC3,
+ AUDIO_ES, "A52 Audio (aka AC3)" },
+ { VLC_FOURCC('a','5','2','b'), CODEC_ID_AC3, /* VLC specific hack */
+ AUDIO_ES, "A52 Audio (aka AC3)" },
+
+#if LIBAVCODEC_BUILD >= 4719
+ /* DTS Audio */
+ { VLC_FOURCC('d','t','s',' '), CODEC_ID_DTS,
+ AUDIO_ES, "DTS Audio" },
+#endif
- if( i_status < 0 )
- {
- msg_Warn( p_vdec->p_fifo, "cannot decode one frame (%d bytes)",
- p_vdec->i_framesize );
- p_vdec->i_frame_error++;
- return;
- }
- /* Update frame late count*/
- /* I don't make statistic on decoding time */
- if( p_vdec->i_pts <= mdate())
- {
- p_vdec->i_frame_late++;
- }
- else
- {
- p_vdec->i_frame_late = 0;
- }
+ /* AAC audio */
+ { VLC_FOURCC('m','p','4','a'), CODEC_ID_AAC,
+ AUDIO_ES, "MPEG AAC Audio" },
- if( !b_gotpicture || avpicture.linesize[0] == 0 || !b_drawpicture)
- {
- return;
- }
-
- /* Check our vout */
- if( !ffmpeg_CheckVout( p_vdec->p_vout,
- p_vdec->p_context->width,
- p_vdec->p_context->height,
- p_vdec->p_context->aspect_ratio_info,
- ffmpeg_PixFmtToChroma(p_vdec->p_context->pix_fmt)) )
- {
- p_vdec->p_vout =
- ffmpeg_CreateVout( p_vdec,
- p_vdec->p_context->width,
- p_vdec->p_context->height,
- p_vdec->p_context->aspect_ratio_info,
- ffmpeg_PixFmtToChroma(p_vdec->p_context->pix_fmt));
- if( !p_vdec->p_vout )
- {
- msg_Err( p_vdec->p_fifo, "cannot create vout" );
- p_vdec->p_fifo->b_error = 1; /* abort */
- return;
- }
- }
+ /* 4X Technologies */
+ { VLC_FOURCC('4','x','m','a'), CODEC_ID_ADPCM_4XM,
+ AUDIO_ES, "4X Technologies Audio" },
+
+ /* Interplay DPCM */
+ { VLC_FOURCC('i','d','p','c'), CODEC_ID_INTERPLAY_DPCM,
+ AUDIO_ES, "Interplay DPCM Audio" },
+
+ /* Id RoQ */
+ { VLC_FOURCC('R','o','Q','a'), CODEC_ID_ROQ_DPCM,
+ AUDIO_ES, "Id RoQ DPCM Audio" },
+
+#if LIBAVCODEC_BUILD >= 4685
+ /* Sony Playstation XA ADPCM */
+ { VLC_FOURCC('x','a',' ',' '), CODEC_ID_ADPCM_XA,
+ AUDIO_ES, "PSX XA ADPCM Audio" },
+
+ /* ADX ADPCM */
+ { VLC_FOURCC('a','d','x',' '), CODEC_ID_ADPCM_ADX,
+ AUDIO_ES, "ADX ADPCM Audio" },
+#endif
+
+#if LIBAVCODEC_BUILD >= 4699
+ /* Sierra VMD */
+ { VLC_FOURCC('v','m','d','a'), CODEC_ID_VMDAUDIO,
+ AUDIO_ES, "Sierra VMD Audio" },
+#endif
+
+#if LIBAVCODEC_BUILD >= 4706
+ /* G.726 ADPCM */
+ { VLC_FOURCC('g','7','2','6'), CODEC_ID_ADPCM_G726,
+ AUDIO_ES, "G.726 ADPCM Audio" },
+#endif
+
+#if LIBAVCODEC_BUILD >= 4683
+ /* AMR */
+ { VLC_FOURCC('s','a','m','r'), CODEC_ID_AMR_NB,
+ AUDIO_ES, "AMR narrow band" },
+ { VLC_FOURCC('s','a','w','b'), CODEC_ID_AMR_WB,
+ AUDIO_ES, "AMR wide band" },
+#endif
+
+#if LIBAVCODEC_BUILD >= 4703
+ /* FLAC */
+ { VLC_FOURCC('f','l','a','c'), CODEC_ID_FLAC,
+ AUDIO_ES, "FLAC (Free Lossless Audio Codec)" },
+#endif
+
+#if LIBAVCODEC_BUILD >= 4745
+ /* ALAC */
+ { VLC_FOURCC('a','l','a','c'), CODEC_ID_ALAC,
+ AUDIO_ES, "Apple Lossless Audio Codec" },
+#endif
+
+#if LIBAVCODEC_BUILD >= ((50<<16)+(0<<8)+1)
+ /* QDM2 */
+ { VLC_FOURCC('Q','D','M','2'), CODEC_ID_QDM2,
+ AUDIO_ES, "QDM2 Audio" },
+#endif
+
+#if LIBAVCODEC_BUILD >= ((51<<16)+(0<<8)+0)
+ /* COOK */
+ { VLC_FOURCC('c','o','o','k'), CODEC_ID_COOK,
+ AUDIO_ES, "Cook Audio" },
+#endif
+
+#if LIBAVCODEC_BUILD >= ((51<<16)+(8<<8)+0)
+ /* Shorten */
+ { VLC_FOURCC('s','h','n',' '), CODEC_ID_SHORTEN,
+ AUDIO_ES, "Shorten Lossless Audio" },
+#endif
+
+ /* PCM */
+ { VLC_FOURCC('s','8',' ',' '), CODEC_ID_PCM_S8,
+ AUDIO_ES, "PCM S8" },
+ { VLC_FOURCC('u','8',' ',' '), CODEC_ID_PCM_U8,
+ AUDIO_ES, "PCM U8" },
+ { VLC_FOURCC('s','1','6','l'), CODEC_ID_PCM_S16LE,
+ AUDIO_ES, "PCM S16 LE" },
+ { VLC_FOURCC('s','1','6','b'), CODEC_ID_PCM_S16BE,
+ AUDIO_ES, "PCM S16 BE" },
+ { VLC_FOURCC('u','1','6','l'), CODEC_ID_PCM_U16LE,
+ AUDIO_ES, "PCM U16 LE" },
+ { VLC_FOURCC('u','1','6','b'), CODEC_ID_PCM_U16BE,
+ AUDIO_ES, "PCM U16 BE" },
+ { VLC_FOURCC('a','l','a','w'), CODEC_ID_PCM_ALAW,
+ AUDIO_ES, "PCM ALAW" },
+ { VLC_FOURCC('u','l','a','w'), CODEC_ID_PCM_MULAW,
+ AUDIO_ES, "PCM ULAW" },
+
+ {0}
+};
+
+int E_(GetFfmpegCodec)( vlc_fourcc_t i_fourcc, int *pi_cat,
+ int *pi_ffmpeg_codec, char **ppsz_name )
+{
+ int i;
- /* Send decoded frame to vout */
- while( !(p_pic = vout_CreatePicture( p_vdec->p_vout, 0, 0, 0 ) ) )
+ for( i = 0; codecs_table[i].i_fourcc != 0; i++ )
{
- if( p_vdec->p_fifo->b_die || p_vdec->p_fifo->b_error )
+ if( codecs_table[i].i_fourcc == i_fourcc )
{
- return;
+ if( pi_cat ) *pi_cat = codecs_table[i].i_cat;
+ if( pi_ffmpeg_codec ) *pi_ffmpeg_codec = codecs_table[i].i_codec;
+ if( ppsz_name ) *ppsz_name = codecs_table[i].psz_name;
+
+ return VLC_TRUE;
}
- msleep( VOUT_OUTMEM_SLEEP );
}
-
- ffmpeg_ConvertPicture( p_pic,
- &avpicture,
- p_vdec );
-
-
- /* FIXME correct avi and use i_dts */
- vout_DatePicture( p_vdec->p_vout, p_pic, p_vdec->i_pts);
- vout_DisplayPicture( p_vdec->p_vout, p_pic );
-
- return;
+ return VLC_FALSE;
}
-
-/*****************************************************************************
- * EndThread: thread destruction
- *****************************************************************************
- * This function is called when the thread ends after a sucessful
- * initialization.
- *****************************************************************************/
-static void EndThread( videodec_thread_t *p_vdec )
+int E_(GetVlcFourcc)( int i_ffmpeg_codec, int *pi_cat,
+ vlc_fourcc_t *pi_fourcc, char **ppsz_name )
{
- if( !p_vdec )
- {
- return;
- }
-
- if( p_vdec->p_context != NULL)
- {
- avcodec_close( p_vdec->p_context );
- msg_Dbg( p_vdec->p_fifo, "ffmpeg codec (%s) stopped",
- p_vdec->psz_namecodec );
- }
+ int i;
- if( p_vdec->p_vout != NULL )
+ for( i = 0; codecs_table[i].i_codec != 0; i++ )
{
- /* We are about to die. Reattach video output to p_vlc. */
- vlc_object_detach( p_vdec->p_vout, p_vdec->p_fifo );
- vlc_object_attach( p_vdec->p_vout, p_vdec->p_fifo->p_vlc );
- }
+ if( codecs_table[i].i_codec == i_ffmpeg_codec )
+ {
+ if( pi_cat ) *pi_cat = codecs_table[i].i_cat;
+ if( pi_fourcc ) *pi_fourcc = codecs_table[i].i_fourcc;
+ if( ppsz_name ) *ppsz_name = codecs_table[i].psz_name;
- if( p_vdec->format.p_data != NULL)
- {
- free( p_vdec->format.p_data );
+ return VLC_TRUE;
+ }
}
-
- free( p_vdec );
+ return VLC_FALSE;
}
projects / vlc / blobdiff