/*****************************************************************************
- * video.c: video decoder using ffmpeg library
+ * video.c: video decoder using the ffmpeg library
*****************************************************************************
* Copyright (C) 1999-2001 VideoLAN
- * $Id: video.c,v 1.2 2002/11/05 10:07:56 gbazin Exp $
+ * $Id$
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
- * Gildas Bazin <gbazin@netcourrier.com>
+ * 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
/*****************************************************************************
* Preamble
*****************************************************************************/
-#include <stdlib.h> /* malloc(), free() */
-
#include <vlc/vlc.h>
-#include <vlc/vout.h>
-#include <vlc/aout.h>
#include <vlc/decoder.h>
-#include <vlc/input.h>
-
-#include <string.h>
-#ifdef HAVE_SYS_TIMES_H
-# include <sys/times.h>
+/* ffmpeg header */
+#ifdef HAVE_FFMPEG_AVCODEC_H
+# include <ffmpeg/avcodec.h>
+#else
+# include <avcodec.h>
#endif
-#include "avcodec.h" /* ffmpeg */
-
-#include "postprocessing/postprocessing.h"
-
#include "ffmpeg.h"
-#include "video.h"
/*****************************************************************************
- * Local prototypes
+ * decoder_sys_t : decoder descriptor
*****************************************************************************/
-static void ffmpeg_CopyPicture( picture_t *, AVPicture *, vdec_thread_t * );
-static void ffmpeg_PostProcPicture( vdec_thread_t *, picture_t * );
-static int ffmpeg_GetFrameBuf( struct AVCodecContext *, int, int, int );
-
-/* FIXME FIXME some of them are wrong */
-static int i_ffmpeg_PixFmtToChroma[] =
+struct decoder_sys_t
{
- /* 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
- */
- 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
+ /* Common part between video and audio decoder */
+ int i_cat;
+ int i_codec_id;
+ char *psz_namecodec;
+
+ AVCodecContext *p_context;
+ AVCodec *p_codec;
+
+ /* Video decoder specific part */
+ mtime_t input_pts;
+ mtime_t input_dts;
+ mtime_t i_pts;
+
+ AVFrame *p_ff_pic;
+ BITMAPINFOHEADER *p_format;
+
+ /* for frame skipping algo */
+ int b_hurry_up;
+ int i_frame_skip;
+
+ /* how many decoded frames are late */
+ int i_late_frames;
+ mtime_t i_late_frames_start;
+
+ /* for direct rendering */
+ int b_direct_rendering;
+
+ vlc_bool_t b_has_b_frames;
+
+ /* Hack to force display of still pictures */
+ vlc_bool_t b_first_frame;
+
+ int i_buffer_orig, i_buffer;
+ char *p_buffer_orig, *p_buffer;
+
+ /* Postprocessing handle */
+ void *p_pp;
+ vlc_bool_t b_pp;
+ vlc_bool_t b_pp_async;
+ vlc_bool_t b_pp_init;
};
+/* FIXME (dummy palette for now) */
+static AVPaletteControl palette_control;
+
/*****************************************************************************
- * Local Functions
+ * Local prototypes
*****************************************************************************/
+static void ffmpeg_CopyPicture ( decoder_t *, picture_t *, AVFrame * );
+static int ffmpeg_GetFrameBuf ( struct AVCodecContext *, AVFrame * );
+static void ffmpeg_ReleaseFrameBuf( struct AVCodecContext *, AVFrame * );
-static inline u32 ffmpeg_PixFmtToChroma( int i_ffmpegchroma )
+static uint32_t ffmpeg_CodecTag( vlc_fourcc_t fcc )
{
- if( ++i_ffmpegchroma > 7 )
- {
- return( 0 );
- }
- else
- {
- return( i_ffmpeg_PixFmtToChroma[i_ffmpegchroma] );
- }
+ uint8_t *p = (uint8_t*)&fcc;
+ return p[0] | (p[1] << 8) | (p[2] << 16) | (p[3] << 24);
}
-static inline int ffmpeg_FfAspect( int i_width, int i_height, int i_ffaspect )
+/*****************************************************************************
+ * Local Functions
+ *****************************************************************************/
+static uint32_t ffmpeg_PixFmtToChroma( int i_ff_chroma )
{
- switch( i_ffaspect )
- {
- 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 );
+ switch( i_ff_chroma )
+ {
+ case PIX_FMT_YUV420P:
+ return VLC_FOURCC('I','4','2','0');
+ case PIX_FMT_YUV422P:
+ return VLC_FOURCC('I','4','2','2');
+ case PIX_FMT_YUV444P:
+ return VLC_FOURCC('I','4','4','4');
+
+ case PIX_FMT_YUV422:
+ return VLC_FOURCC('Y','U','Y','2');
+
+ case PIX_FMT_RGB555:
+ return VLC_FOURCC('R','V','1','5');
+ case PIX_FMT_RGB565:
+ return VLC_FOURCC('R','V','1','6');
+ case PIX_FMT_RGB24:
+ return VLC_FOURCC('R','V','2','4');
+ case PIX_FMT_RGBA32:
+ return VLC_FOURCC('R','V','3','2');
+ case PIX_FMT_GRAY8:
+ return VLC_FOURCC('G','R','E','Y');
+
+ case PIX_FMT_YUV410P:
+ case PIX_FMT_YUV411P:
+ case PIX_FMT_BGR24:
+ default:
+ return 0;
}
}
-/* Check if we have a Vout with good parameters */
-static int ffmpeg_CheckVout( vout_thread_t *p_vout,
- int i_width,
- int i_height,
- int i_aspect,
- int i_chroma )
+/* Returns a new picture buffer */
+static inline picture_t *ffmpeg_NewPictBuf( decoder_t *p_dec,
+ AVCodecContext *p_context )
{
- 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
- {
- return( 1 );
- }
-}
+ decoder_sys_t *p_sys = p_dec->p_sys;
+ picture_t *p_pic;
-/* Return a Vout */
-static vout_thread_t *ffmpeg_CreateVout( vdec_thread_t *p_vdec,
- int i_width,
- int i_height,
- int i_aspect,
- int i_chroma )
-{
- vout_thread_t *p_vout;
+ p_dec->fmt_out.video.i_width = p_context->width;
+ p_dec->fmt_out.video.i_height = p_context->height;
+ p_dec->fmt_out.i_codec = ffmpeg_PixFmtToChroma( p_context->pix_fmt );
- if( (!i_width)||(!i_height) )
+ if( !p_context->width || !p_context->height )
{
- return( NULL ); /* Can't create a new vout without display size */
+ return NULL; /* invalid display size */
}
- if( !i_chroma )
+ if( !p_dec->fmt_out.i_codec )
{
/* 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 );
+ p_dec->fmt_out.i_codec = VLC_FOURCC('I','4','2','0');
+ }
- /* 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 )
+ /* If an aspect-ratio was specified in the input format then force it */
+ if( p_dec->fmt_in.video.i_aspect )
{
- p_vout = vlc_object_find( p_vdec->p_fifo, VLC_OBJECT_VOUT,
- FIND_ANYWHERE );
+ p_dec->fmt_out.video.i_aspect = p_dec->fmt_in.video.i_aspect;
}
-
- if( p_vout )
+ else
{
- 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( p_vout );
- vlc_object_release( p_vout );
- vout_DestroyThread( p_vout );
- p_vout = NULL;
- }
- else
+#if LIBAVCODEC_BUILD >= 4687
+ p_dec->fmt_out.video.i_aspect =
+ VOUT_ASPECT_FACTOR * ( av_q2d(p_context->sample_aspect_ratio) *
+ p_context->width / p_context->height );
+ p_dec->fmt_out.video.i_sar_num = p_context->sample_aspect_ratio.num;
+ p_dec->fmt_out.video.i_sar_den = p_context->sample_aspect_ratio.den;
+#else
+ p_dec->fmt_out.video.i_aspect =
+ VOUT_ASPECT_FACTOR * p_context->aspect_ratio;
+#endif
+ if( p_dec->fmt_out.video.i_aspect == 0 )
{
- /* This video output is cool! Hijack it. */
- vlc_object_detach( p_vout );
- vlc_object_attach( p_vout, p_vdec->p_fifo );
- vlc_object_release( p_vout );
+ p_dec->fmt_out.video.i_aspect =
+ VOUT_ASPECT_FACTOR * p_context->width / p_context->height;
}
}
- if( p_vout == NULL )
+ if( p_context->frame_rate > 0 && p_context->frame_rate_base > 0 )
{
- msg_Dbg( p_vdec->p_fifo, "no vout present, spawning one" );
+ p_dec->fmt_out.video.i_frame_rate = p_context->frame_rate;
+ p_dec->fmt_out.video.i_frame_rate_base = p_context->frame_rate_base;
+ }
+
+ p_pic = p_dec->pf_vout_buffer_new( p_dec );
- p_vout = vout_CreateThread( p_vdec->p_fifo,
- i_width, i_height,
- i_chroma, i_aspect );
+#ifdef LIBAVCODEC_PP
+ if( p_sys->p_pp && p_sys->b_pp && !p_sys->b_pp_init )
+ {
+ E_(InitPostproc)( p_dec, p_sys->p_pp, p_context->width,
+ p_context->height, p_context->pix_fmt );
+ p_sys->b_pp_init = VLC_TRUE;
}
+#endif
- return( p_vout );
+ return p_pic;
}
-/* 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
-*/
-static void ffmpeg_ConvertPictureI410toI420( picture_t *p_pic,
- AVPicture *p_avpicture,
- vdec_thread_t *p_vdec )
+/*****************************************************************************
+ * InitVideo: initialize the video decoder
+ *****************************************************************************
+ * the ffmpeg codec will be opened, some memory allocated. The vout is not yet
+ * opened (done after the first decoded frame).
+ *****************************************************************************/
+int E_(InitVideoDec)( decoder_t *p_dec, AVCodecContext *p_context,
+ AVCodec *p_codec, int i_codec_id, char *psz_namecodec )
{
- 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;
+ decoder_sys_t *p_sys;
+ vlc_value_t lockval;
+ vlc_value_t val;
- p_dst = p_pic->p[0].p_pixels;
- p_src = p_avpicture->data[0];
+ var_Get( p_dec->p_libvlc, "avcodec", &lockval );
- /* copy first plane */
- for( i_y = 0; i_y < i_height; i_y++ )
+ /* Allocate the memory needed to store the decoder's structure */
+ if( ( p_dec->p_sys = p_sys =
+ (decoder_sys_t *)malloc(sizeof(decoder_sys_t)) ) == NULL )
{
- 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];
+ msg_Err( p_dec, "out of memory" );
+ return VLC_EGENERIC;
}
- /* 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;
+ p_dec->p_sys->p_context = p_context;
+ p_dec->p_sys->p_codec = p_codec;
+ p_dec->p_sys->i_codec_id = i_codec_id;
+ p_dec->p_sys->psz_namecodec = psz_namecodec;
+ p_sys->p_ff_pic = avcodec_alloc_frame();
- p_dst = p_plane[i_plane] = malloc( i_lines * i_stride * 2 * 2 );
- p_src = p_avpicture->data[i_plane];
+ /* ***** Fill p_context with init values ***** */
+ /* FIXME: remove when ffmpeg deals properly with avc1 */
+ if( p_dec->fmt_in.i_codec != VLC_FOURCC('a','v','c','1') )
+ /* End FIXME */
+ p_sys->p_context->codec_tag = ffmpeg_CodecTag( p_dec->fmt_in.i_codec );
+ 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_sample = p_dec->fmt_in.video.i_bits_per_pixel;
- /* 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;
+ /* ***** Get configuration of ffmpeg plugin ***** */
+ p_sys->p_context->workaround_bugs =
+ config_GetInt( p_dec, "ffmpeg-workaround-bugs" );
+ p_sys->p_context->error_resilience =
+ config_GetInt( p_dec, "ffmpeg-error-resilience" );
+
+ var_Create( p_dec, "grayscale", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
+ var_Get( p_dec, "grayscale", &val );
+ if( val.b_bool ) p_sys->p_context->flags |= CODEC_FLAG_GRAY;
+
+ var_Create( p_dec, "ffmpeg-vismv", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
+ var_Get( p_dec, "ffmpeg-vismv", &val );
+#if LIBAVCODEC_BUILD >= 4698
+ if( val.i_int ) p_sys->p_context->debug_mv = val.i_int;
+#endif
- }
- p_dst[2 * i_stride - 2] = p_src[i_x];
- p_dst[2 * i_stride - 1] = p_src[i_x];
+ var_Create( p_dec, "ffmpeg-lowres", VLC_VAR_INTEGER | VLC_VAR_DOINHERIT );
+ var_Get( p_dec, "ffmpeg-lowres", &val );
+#if LIBAVCODEC_BUILD >= 4723
+ if( val.i_int > 0 && val.i_int <= 2 ) p_sys->p_context->lowres = val.i_int;
+#endif
- p_dst += 4 * i_stride; /* process the next even lines */
- p_src += i_stride;
- }
+ /* ***** ffmpeg frame skipping ***** */
+ var_Create( p_dec, "ffmpeg-hurry-up", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
+ var_Get( p_dec, "ffmpeg-hurry-up", &val );
+ p_sys->b_hurry_up = val.b_bool;
+
+ /* ***** ffmpeg direct rendering ***** */
+ p_sys->b_direct_rendering = 0;
+ var_Create( p_dec, "ffmpeg-dr", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
+ var_Get( p_dec, "ffmpeg-dr", &val );
+ if( val.b_bool && (p_sys->p_codec->capabilities & CODEC_CAP_DR1) &&
+ ffmpeg_PixFmtToChroma( p_sys->p_context->pix_fmt ) &&
+ /* Apparently direct rendering doesn't work with YUV422P */
+ p_sys->p_context->pix_fmt != PIX_FMT_YUV422P &&
+ /* H264 uses too many reference frames */
+ p_sys->i_codec_id != CODEC_ID_H264 &&
+ !(p_sys->p_context->width % 16) && !(p_sys->p_context->height % 16) &&
+#if LIBAVCODEC_BUILD >= 4698
+ !p_sys->p_context->debug_mv )
+#else
+ 1 )
+#endif
+ {
+ /* Some codecs set pix_fmt only after the 1st frame has been decoded,
+ * so we need to do another check in ffmpeg_GetFrameBuf() */
+ p_sys->b_direct_rendering = 1;
}
- for( i_plane = 1; i_plane < 3; i_plane++ )
+#ifdef LIBAVCODEC_PP
+ p_sys->p_pp = NULL;
+ p_sys->b_pp = p_sys->b_pp_async = p_sys->b_pp_init = VLC_FALSE;
+ p_sys->p_pp = E_(OpenPostproc)( p_dec, &p_sys->b_pp_async );
+#endif
+
+ /* ffmpeg doesn't properly release old pictures when frames are skipped */
+ //if( p_sys->b_hurry_up ) p_sys->b_direct_rendering = 0;
+ if( p_sys->b_direct_rendering )
{
- i_stride = p_avpicture->linesize[i_plane];
- i_lines = i_height / 4;
+ msg_Dbg( p_dec, "using direct rendering" );
+ p_sys->p_context->flags |= CODEC_FLAG_EMU_EDGE;
+ }
- p_dst = p_plane[i_plane] + 2*i_stride;
- p_src = p_plane[i_plane];
+ /* Always use our get_buffer wrapper so we can calculate the
+ * PTS correctly */
+ p_sys->p_context->get_buffer = ffmpeg_GetFrameBuf;
+ p_sys->p_context->release_buffer = ffmpeg_ReleaseFrameBuf;
+ p_sys->p_context->opaque = p_dec;
- for( i_y = 0; i_y < i_lines - 1; i_y++ )
+ /* ***** init this codec with special data ***** */
+ if( p_dec->fmt_in.i_extra )
+ {
+ int i_size = p_dec->fmt_in.i_extra;
+
+ if( p_sys->i_codec_id == CODEC_ID_SVQ3 )
{
- for( i_x = 0; i_x < 2 * i_stride ; i_x++ )
+ uint8_t *p;
+
+ p_sys->p_context->extradata_size = i_size + 12;
+ p = p_sys->p_context->extradata =
+ malloc( p_sys->p_context->extradata_size );
+
+ memcpy( &p[0], "SVQ3", 4 );
+ memset( &p[4], 0, 8 );
+ memcpy( &p[12], p_dec->fmt_in.p_extra, i_size );
+
+ /* Now remove all atoms before the SMI one */
+ if( p_sys->p_context->extradata_size > 0x5a &&
+ strncmp( &p[0x56], "SMI ", 4 ) )
{
- p_dst[i_x] = ( p_src[i_x] + p_src[i_x + 4*i_stride])/2;
- }
+ uint8_t *psz = &p[0x52];
- p_dst += 4 * i_stride; /* process the next odd lines */
- p_src += 4 * i_stride;
+ while( psz < &p[p_sys->p_context->extradata_size - 8] )
+ {
+ int i_size = GetDWBE( psz );
+ if( i_size <= 1 )
+ {
+ /* FIXME handle 1 as long size */
+ break;
+ }
+ if( !strncmp( &psz[4], "SMI ", 4 ) )
+ {
+ memmove( &p[0x52], psz,
+ &p[p_sys->p_context->extradata_size] - psz );
+ break;
+ }
+
+ psz += i_size;
+ }
+ }
}
- /* 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++ )
- {
- int i_size;
- p_src = p_plane[i_plane];
- p_dst = p_pic->p[i_plane].p_pixels;
+ else if( p_dec->fmt_in.i_codec == VLC_FOURCC( 'R', 'V', '1', '0' ) ||
+ p_dec->fmt_in.i_codec == VLC_FOURCC( 'R', 'V', '1', '3' ) ||
+ p_dec->fmt_in.i_codec == VLC_FOURCC( 'R', 'V', '2', '0' ) )
+ {
+ if( p_dec->fmt_in.i_extra == 8 )
+ {
+ p_sys->p_context->extradata_size = 8;
+ p_sys->p_context->extradata = malloc( 8 );
+
+ memcpy( p_sys->p_context->extradata,
+ p_dec->fmt_in.p_extra,
+ p_dec->fmt_in.i_extra );
+ p_sys->p_context->sub_id= ((uint32_t*)p_dec->fmt_in.p_extra)[1];
- 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++ )
+ msg_Warn( p_dec, "using extra data for RV codec sub_id=%08x",
+ p_sys->p_context->sub_id );
+ }
+ }
+ /* FIXME: remove when ffmpeg deals properly with avc1 */
+ else if( p_dec->fmt_in.i_codec == VLC_FOURCC('a','v','c','1') )
{
- 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;
+ ;
+ }
+ /* End FIXME */
+ else
+ {
+ p_sys->p_context->extradata_size = i_size;
+ p_sys->p_context->extradata =
+ malloc( i_size + FF_INPUT_BUFFER_PADDING_SIZE );
+ memcpy( p_sys->p_context->extradata,
+ p_dec->fmt_in.p_extra, i_size );
+ memset( &((uint8_t*)p_sys->p_context->extradata)[i_size],
+ 0, FF_INPUT_BUFFER_PADDING_SIZE );
}
- free( p_plane[i_plane] );
}
-}
-/*****************************************************************************
- *
- * Functions that initialize, decode and end the decoding process
- *
- * Functions exported for ffmpeg.c
- * * E_( InitThread_Video )
- * * E_( DecodeThread )
- * * E_( EndThread_Video )
- *****************************************************************************/
+ /* ***** misc init ***** */
+ p_sys->input_pts = p_sys->input_dts = 0;
+ p_sys->i_pts = 0;
+ p_sys->b_has_b_frames = VLC_FALSE;
+ p_sys->b_first_frame = VLC_TRUE;
+ p_sys->i_late_frames = 0;
+ p_sys->i_buffer = 0;
+ p_sys->i_buffer_orig = 1;
+ p_sys->p_buffer_orig = p_sys->p_buffer = malloc( p_sys->i_buffer_orig );
+
+ /* Set output properties */
+ p_dec->fmt_out.i_cat = VIDEO_ES;
+ p_dec->fmt_out.i_codec = ffmpeg_PixFmtToChroma( p_context->pix_fmt );
+
+ /* Setup palette */
+#if LIBAVCODEC_BUILD >= 4688
+ if( p_dec->fmt_in.video.p_palette )
+ p_sys->p_context->palctrl =
+ (AVPaletteControl *)p_dec->fmt_in.video.p_palette;
+ else
+ p_sys->p_context->palctrl = &palette_control;
+#endif
+
+ /* ***** Open the codec ***** */
+ vlc_mutex_lock( lockval.p_address );
+ if( avcodec_open( p_sys->p_context, p_sys->p_codec ) < 0 )
+ {
+ vlc_mutex_unlock( lockval.p_address );
+ msg_Err( p_dec, "cannot open codec (%s)", p_sys->psz_namecodec );
+ free( p_sys );
+ return VLC_EGENERIC;
+ }
+ vlc_mutex_unlock( lockval.p_address );
+ msg_Dbg( p_dec, "ffmpeg codec (%s) started", p_sys->psz_namecodec );
+
+
+ return VLC_SUCCESS;
+}
/*****************************************************************************
- * InitThread: initialize vdec output thread
- *****************************************************************************
- * This function is called from decoder_Run 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.
- *
- * ffmpeg codec will be open, some memory allocated. But Vout is not yet
- * open (done after the first decoded frame)
+ * DecodeVideo: Called to decode one or more frames
*****************************************************************************/
-int E_( InitThread_Video )( vdec_thread_t *p_vdec )
+picture_t *E_(DecodeVideo)( decoder_t *p_dec, block_t **pp_block )
{
- int i_tmp;
+ decoder_sys_t *p_sys = p_dec->p_sys;
+ int b_drawpicture;
+ int b_null_size = VLC_FALSE;
+ block_t *p_block;
- if( p_vdec->p_fifo->p_demux_data )
- {
- p_vdec->p_format = (BITMAPINFOHEADER *)p_vdec->p_fifo->p_demux_data;
- }
- else
- {
- msg_Warn( p_vdec->p_fifo, "display informations missing" );
- }
+ if( !pp_block || !*pp_block ) return NULL;
- /* ***** Fill p_context with init values ***** */
- p_vdec->p_context->width = p_vdec->p_format->biWidth;
- p_vdec->p_context->height = p_vdec->p_format->biHeight;
-
- /* ***** Get configuration of ffmpeg plugin ***** */
-#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 );
+ p_block = *pp_block;
- 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" ) )
+ if( p_block->i_flags & (BLOCK_FLAG_DISCONTINUITY|BLOCK_FLAG_CORRUPTED) )
{
- p_vdec->p_context->flags|= CODEC_FLAG_GRAY;
- }
-#endif
+ p_sys->i_buffer = 0;
+ p_sys->i_pts = 0; /* To make sure we recover properly */
- p_vdec->b_hurry_up = config_GetInt(p_vdec->p_fifo, "ffmpeg-hurry-up");
+ p_sys->input_pts = p_sys->input_dts = 0;
+ p_sys->i_late_frames = 0;
- p_vdec->b_direct_rendering = 0;
-#if LIBAVCODEC_BUILD > 4615
- if( (p_vdec->p_codec->capabilities & CODEC_CAP_DR1)
- && (p_vdec->p_context->pix_fmt != PIX_FMT_YUV410P) )
- {
- msg_Dbg( p_vdec->p_fifo, "using direct rendering" );
- p_vdec->b_direct_rendering = 1;
- p_vdec->p_context->flags|= CODEC_FLAG_EMU_EDGE | CODEC_FLAG_DR1;
- p_vdec->p_context->get_buffer_callback = ffmpeg_GetFrameBuf;
- p_vdec->p_context->opaque = p_vdec;
+ block_Release( p_block );
+ return NULL;
}
-#endif
- /* ***** Open the codec ***** */
- if( avcodec_open(p_vdec->p_context, p_vdec->p_codec) < 0 )
+ if( p_block->i_flags & BLOCK_FLAG_PREROLL )
{
- 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 );
+ /* Do not care about late frames when prerolling
+ * TODO avoid decoding of non reference frame
+ * (ie all B except for H264 where it depends only on nal_ref_idc) */
+ p_sys->i_late_frames = 0;
}
- /* ***** init this codec with special data ***** */
- if( p_vdec->p_format->biSize > sizeof(BITMAPINFOHEADER) )
+ if( !p_dec->b_pace_control && p_sys->i_late_frames > 0 &&
+ mdate() - p_sys->i_late_frames_start > I64C(5000000) )
{
- AVPicture avpicture;
- int b_gotpicture;
-
- switch( p_vdec->i_codec_id )
+ if( p_sys->i_pts )
{
- case( CODEC_ID_MPEG4 ):
- avcodec_decode_video( p_vdec->p_context, &avpicture,
- &b_gotpicture,
- (void *)&p_vdec->p_format[1],
- p_vdec->p_format->biSize
- - sizeof(BITMAPINFOHEADER) );
- break;
- default:
- if( p_vdec->p_fifo->i_fourcc == FOURCC_MP4S ||
- p_vdec->p_fifo->i_fourcc == FOURCC_mp4s ||
- p_vdec->p_fifo->i_fourcc == FOURCC_M4S2 ||
- p_vdec->p_fifo->i_fourcc == FOURCC_m4s2 )
- {
- p_vdec->p_context->extradata_size =
- p_vdec->p_format->biSize - sizeof(BITMAPINFOHEADER);
- p_vdec->p_context->extradata =
- malloc( p_vdec->p_context->extradata_size );
- memcpy( p_vdec->p_context->extradata,
- &p_vdec->p_format[1],
- p_vdec->p_context->extradata_size );
- }
-
- break;
- }
- }
-
- /* ***** Load post processing ***** */
-
- /* get overridding settings */
- p_vdec->i_pp_mode = 0;
- if( config_GetInt( p_vdec->p_fifo, "ffmpeg-db-yv" ) )
- p_vdec->i_pp_mode |= PP_DEBLOCK_Y_V;
- if( config_GetInt( p_vdec->p_fifo, "ffmpeg-db-yh" ) )
- p_vdec->i_pp_mode |= PP_DEBLOCK_Y_H;
- if( config_GetInt( p_vdec->p_fifo, "ffmpeg-db-cv" ) )
- p_vdec->i_pp_mode |= PP_DEBLOCK_C_V;
- if( config_GetInt( p_vdec->p_fifo, "ffmpeg-db-ch" ) )
- p_vdec->i_pp_mode |= PP_DEBLOCK_C_H;
- if( config_GetInt( p_vdec->p_fifo, "ffmpeg-dr-y" ) )
- p_vdec->i_pp_mode |= PP_DERING_Y;
- if( config_GetInt( p_vdec->p_fifo, "ffmpeg-dr-c" ) )
- p_vdec->i_pp_mode |= PP_DERING_C;
-
- if( ( config_GetInt( p_vdec->p_fifo, "ffmpeg-pp-q" ) > 0 )||
- ( config_GetInt( p_vdec->p_fifo, "ffmpeg-pp-auto" ) )||
- ( p_vdec->i_pp_mode != 0 ) )
- {
- /* check if the codec support postproc. */
- switch( p_vdec->i_codec_id )
- {
-#if LIBAVCODEC_BUILD > 4608
- case( CODEC_ID_MSMPEG4V1 ):
- case( CODEC_ID_MSMPEG4V2 ):
- case( CODEC_ID_MSMPEG4V3 ):
-#else
- case( CODEC_ID_MSMPEG4 ):
-#endif
- case( CODEC_ID_MPEG4 ):
- case( CODEC_ID_H263 ):
-// case( CODEC_ID_H263P ): I don't use it up to now
- case( CODEC_ID_H263I ):
- /* Ok we can make postprocessing :)) */
- /* first try to get a postprocess module */
-#if LIBAVCODEC_BUILD > 4613
- p_vdec->p_pp = vlc_object_create( p_vdec->p_fifo,
- sizeof( postprocessing_t ) );
- p_vdec->p_pp->psz_object_name = "postprocessing";
- p_vdec->p_pp->p_module =
- module_Need( p_vdec->p_pp, "postprocessing", "$ffmpeg-pp" );
-
- if( !p_vdec->p_pp->p_module )
- {
- msg_Warn( p_vdec->p_fifo,
- "no suitable postprocessing module" );
- vlc_object_destroy( p_vdec->p_pp );
- p_vdec->p_pp = NULL;
- p_vdec->i_pp_mode = 0;
- }
- else
- {
- /* get mode upon quality */
- p_vdec->i_pp_mode |=
- p_vdec->p_pp->pf_getmode(
- config_GetInt( p_vdec->p_fifo, "ffmpeg-pp-q" ),
- config_GetInt( p_vdec->p_fifo, "ffmpeg-pp-auto" )
- );
-
- /* allocate table for postprocess */
- p_vdec->p_context->quant_store =
- malloc( sizeof( int ) * ( MBR + 1 ) * ( MBC + 1 ) );
- p_vdec->p_context->qstride = MBC + 1;
- }
-#else
- p_vdec->i_pp_mode = 0;
- msg_Warn( p_vdec->p_fifo,
- "post-processing not supported, upgrade ffmpeg" );
-#endif
- break;
- default:
- p_vdec->i_pp_mode = 0;
- msg_Warn( p_vdec->p_fifo,
- "Post processing unsupported for this codec" );
- break;
+ msg_Err( p_dec, "more than 5 seconds of late video -> "
+ "dropping frame (computer too slow ?)" );
+ p_sys->i_pts = 0; /* To make sure we recover properly */
}
-
+ block_Release( p_block );
+ p_sys->i_late_frames--;
+ return NULL;
}
-// memset( &p_vdec->statistic, 0, sizeof( statistic_t ) );
- return( 0 );
-}
+ if( p_block->i_pts > 0 || p_block->i_dts > 0 )
+ {
+ p_sys->input_pts = p_block->i_pts;
+ p_sys->input_dts = p_block->i_dts;
-/*****************************************************************************
- * DecodeThread: Called for decode one frame
- *****************************************************************************
- * We have to get a frame stored in a pes, give it to ffmpeg decoder and send
- * the image to the output.
- *****************************************************************************/
-void E_( DecodeThread_Video )( vdec_thread_t *p_vdec )
-{
- pes_packet_t *p_pes;
- int i_frame_size;
- int i_status;
- int b_drawpicture;
- int b_gotpicture;
- AVPicture avpicture; /* ffmpeg picture */
- picture_t *p_pic; /* videolan picture */
+ /* Make sure we don't reuse the same timestamps twice */
+ p_block->i_pts = p_block->i_dts = 0;
+ }
/* TODO implement it in a better way */
/* A good idea could be to decode all I pictures and see for the other */
- if( ( p_vdec->b_hurry_up )&& ( p_vdec->i_frame_late > 4 ) )
+ if( !p_dec->b_pace_control &&
+ p_sys->b_hurry_up && p_sys->i_late_frames > 4 )
{
-#if LIBAVCODEC_BUILD > 4603
b_drawpicture = 0;
- if( p_vdec->i_frame_late < 8 )
+ if( p_sys->i_late_frames < 8 )
{
- p_vdec->p_context->hurry_up = 2;
+ p_sys->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 */
- input_ExtractPES( p_vdec->p_fifo, NULL );
- return;
+ /* picture too late, won't decode
+ * but break picture until a new I, and for mpeg4 ...*/
+
+ p_sys->i_late_frames--; /* needed else it will never be decrease */
+ block_Release( p_block );
+ p_sys->i_buffer = 0;
+ return NULL;
}
-#else
- if( p_vdec->i_frame_late < 8 )
+ }
+ else
+ {
+ if (!(p_block->i_flags & BLOCK_FLAG_PREROLL))
{
- b_drawpicture = 0; /* not really good but .. UPGRADE FFMPEG !! */
+ b_drawpicture = 1;
+ p_sys->p_context->hurry_up = 0;
}
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 */
- input_ExtractPES( p_vdec->p_fifo, NULL );
- return;
+ b_drawpicture = 0;
+ p_sys->p_context->hurry_up = 1;
}
-#endif
}
- else
+
+
+ if( p_sys->p_context->width <= 0 || p_sys->p_context->height <= 0 )
{
- b_drawpicture = 1;
-#if LIBAVCODEC_BUILD > 4603
- p_vdec->p_context->hurry_up = 0;
-#endif
+ p_sys->p_context->hurry_up = 5;
+ b_null_size = VLC_TRUE;
}
- do
+ /*
+ * Do the actual decoding now
+ */
+
+ /* Check if post-processing was enabled */
+ p_sys->b_pp = p_sys->b_pp_async;
+
+ /* Don't forget that ffmpeg requires a little more bytes
+ * that the real frame size */
+ if( p_block->i_buffer > 0 )
{
- input_ExtractPES( p_vdec->p_fifo, &p_pes );
- if( !p_pes )
+ p_sys->i_buffer = p_block->i_buffer;
+ if( p_sys->i_buffer + FF_INPUT_BUFFER_PADDING_SIZE >
+ p_sys->i_buffer_orig )
{
- p_vdec->p_fifo->b_error = 1;
- return;
+ free( p_sys->p_buffer_orig );
+ p_sys->i_buffer_orig =
+ p_block->i_buffer + FF_INPUT_BUFFER_PADDING_SIZE;
+ p_sys->p_buffer_orig = malloc( p_sys->i_buffer_orig );
}
- p_vdec->pts = p_pes->i_pts;
- i_frame_size = p_pes->i_pes_size;
+ p_sys->p_buffer = p_sys->p_buffer_orig;
+ p_sys->i_buffer = p_block->i_buffer;
+ p_dec->p_vlc->pf_memcpy( p_sys->p_buffer, p_block->p_buffer,
+ p_block->i_buffer );
+ memset( p_sys->p_buffer + p_block->i_buffer, 0,
+ FF_INPUT_BUFFER_PADDING_SIZE );
- if( i_frame_size > 0 )
+ p_block->i_buffer = 0;
+ }
+
+ while( p_sys->i_buffer > 0 )
+ {
+ int i_used, b_gotpicture;
+ picture_t *p_pic;
+
+ i_used = avcodec_decode_video( p_sys->p_context, p_sys->p_ff_pic,
+ &b_gotpicture,
+ p_sys->p_buffer, p_sys->i_buffer );
+ if( b_null_size && p_sys->p_context->width > 0 &&
+ p_sys->p_context->height > 0 )
{
- if( p_vdec->i_buffer < i_frame_size + 16 )
- {
- FREE( p_vdec->p_buffer );
- p_vdec->p_buffer = malloc( i_frame_size + 16 );
- p_vdec->i_buffer = i_frame_size + 16;
- }
-
- E_( GetPESData )( p_vdec->p_buffer, p_vdec->i_buffer, p_pes );
+ /* Reparse it to not drop the I frame */
+ b_null_size = VLC_FALSE;
+ p_sys->p_context->hurry_up = 0;
+ i_used = avcodec_decode_video( p_sys->p_context, p_sys->p_ff_pic,
+ &b_gotpicture,
+ p_sys->p_buffer, p_sys->i_buffer );
}
- input_DeletePES( p_vdec->p_fifo->p_packets_mgt, p_pes );
- } while( i_frame_size <= 0 );
+ if( i_used < 0 )
+ {
+ msg_Warn( p_dec, "cannot decode one frame (%d bytes)",
+ p_sys->i_buffer );
+ block_Release( p_block );
+ return NULL;
+ }
+ else if( i_used > p_sys->i_buffer )
+ {
+ i_used = p_sys->i_buffer;
+ }
- i_status = avcodec_decode_video( p_vdec->p_context,
- &avpicture,
- &b_gotpicture,
- p_vdec->p_buffer,
- i_frame_size );
+ /* Consumed bytes */
+ p_sys->i_buffer -= i_used;
+ p_sys->p_buffer += i_used;
- if( i_status < 0 )
- {
- msg_Warn( p_vdec->p_fifo, "cannot decode one frame (%d bytes)",
- i_frame_size );
- p_vdec->i_frame_error++;
- return;
- }
- /* Update frame late count*/
- /* I don't make statistic on decoding time */
- if( p_vdec->pts <= mdate())
- {
- p_vdec->i_frame_late++;
- }
- else
- {
- p_vdec->i_frame_late = 0;
- }
+ /* Nothing to display */
+ if( !b_gotpicture )
+ {
+ if( i_used == 0 ) break;
+ continue;
+ }
- if( !b_gotpicture || avpicture.linesize[0] == 0 || !b_drawpicture )
- {
- return;
- }
+ /* Update frame late count (except when doing preroll) */
+ if( p_sys->i_pts && p_sys->i_pts <= mdate() &&
+ !(p_block->i_flags & BLOCK_FLAG_PREROLL) )
+ {
+ p_sys->i_late_frames++;
+ if( p_sys->i_late_frames == 1 )
+ p_sys->i_late_frames_start = mdate();
+ }
+ else
+ {
+ p_sys->i_late_frames = 0;
+ }
- if( !p_vdec->b_direct_rendering )
- {
- /* 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)) )
+ if( !b_drawpicture || !p_sys->p_ff_pic->linesize[0] )
{
- 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 )
+ /* Do not display the picture */
+ continue;
+ }
+
+ if( !p_sys->p_ff_pic->opaque )
+ {
+ /* Get a new picture */
+ p_pic = ffmpeg_NewPictBuf( p_dec, p_sys->p_context );
+ if( !p_pic )
{
- msg_Err( p_vdec->p_fifo, "cannot create vout" );
- p_vdec->p_fifo->b_error = 1; /* abort */
- return;
+ block_Release( p_block );
+ return NULL;
}
+
+ /* Fill p_picture_t from AVVideoFrame and do chroma conversion
+ * if needed */
+ ffmpeg_CopyPicture( p_dec, p_pic, p_sys->p_ff_pic );
+ }
+ else
+ {
+ p_pic = (picture_t *)p_sys->p_ff_pic->opaque;
+ }
+
+ /* Set the PTS */
+ if( p_sys->p_ff_pic->pts ) p_sys->i_pts = p_sys->p_ff_pic->pts;
+
+ /* Sanity check (seems to be needed for some streams ) */
+ if( p_sys->p_ff_pic->pict_type == FF_B_TYPE )
+ {
+ p_sys->b_has_b_frames = VLC_TRUE;
}
- /* Get a new picture */
- while( !(p_pic = vout_CreatePicture( p_vdec->p_vout, 0, 0, 0 ) ) )
+ /* Send decoded frame to vout */
+ if( p_sys->i_pts )
{
- if( p_vdec->p_fifo->b_die || p_vdec->p_fifo->b_error )
+ p_pic->date = p_sys->i_pts;
+
+ /* interpolate the next PTS */
+ if( p_sys->p_context->frame_rate > 0 )
{
- return;
+ p_sys->i_pts += I64C(1000000) *
+ (2 + p_sys->p_ff_pic->repeat_pict) *
+ p_sys->p_context->frame_rate_base /
+ (2 * p_sys->p_context->frame_rate);
}
- msleep( VOUT_OUTMEM_SLEEP );
- }
- /* fill p_picture_t from avpicture, do I410->I420 if needed */
- ffmpeg_CopyPicture( p_pic, &avpicture, p_vdec );
- }
- else
- {
-#if LIBAVCODEC_BUILD > 4615
- p_pic = (picture_t *)p_vdec->p_context->dr_opaque_frame;
-#endif
- }
+ if( p_sys->b_first_frame )
+ {
+ /* Hack to force display of still pictures */
+ p_sys->b_first_frame = VLC_FALSE;
+ p_pic->b_force = VLC_TRUE;
+ }
- /* Do post-processing if requested */
- ffmpeg_PostProcPicture( p_vdec, p_pic );
+ p_pic->i_nb_fields = 2 + p_sys->p_ff_pic->repeat_pict;
+#if LIBAVCODEC_BUILD >= 4685
+ p_pic->b_progressive = !p_sys->p_ff_pic->interlaced_frame;
+ p_pic->b_top_field_first = p_sys->p_ff_pic->top_field_first;
+#endif
- /* FIXME correct avi and use i_dts */
+ return p_pic;
+ }
+ else
+ {
+ p_dec->pf_vout_buffer_del( p_dec, p_pic );
+ }
+ }
- /* Send decoded frame to vout */
- vout_DatePicture( p_vdec->p_vout, p_pic, p_vdec->pts);
- vout_DisplayPicture( p_vdec->p_vout, p_pic );
-
- return;
+ block_Release( p_block );
+ return NULL;
}
/*****************************************************************************
- * EndThread: thread destruction
+ * EndVideo: decoder destruction
*****************************************************************************
* This function is called when the thread ends after a sucessful
* initialization.
*****************************************************************************/
-void E_( EndThread_Video )( vdec_thread_t *p_vdec )
+void E_(EndVideoDec)( decoder_t *p_dec )
{
- if( p_vdec->p_pp )
- {
- /* release postprocessing module */
- module_Unneed( p_vdec->p_pp, p_vdec->p_pp->p_module );
- vlc_object_destroy( p_vdec->p_pp );
- p_vdec->p_pp = NULL;
- }
+ decoder_sys_t *p_sys = p_dec->p_sys;
- if( p_vdec->p_vout != NULL )
- {
- /* We are about to die. Reattach video output to p_vlc. */
- vlc_object_detach( p_vdec->p_vout );
- vlc_object_attach( p_vdec->p_vout, p_vdec->p_fifo->p_vlc );
- }
+ if( p_sys->p_ff_pic ) av_free( p_sys->p_ff_pic );
+
+#ifdef LIBAVCODEC_PP
+ E_(ClosePostproc)( p_dec, p_sys->p_pp );
+#endif
+
+ free( p_sys->p_buffer_orig );
}
/*****************************************************************************
* ffmpeg_CopyPicture: copy a picture from ffmpeg internal buffers to a
* picture_t structure (when not in direct rendering mode).
*****************************************************************************/
-static void ffmpeg_CopyPicture( picture_t *p_pic, AVPicture *p_avpicture,
- vdec_thread_t *p_vdec )
+static void ffmpeg_CopyPicture( decoder_t *p_dec,
+ picture_t *p_pic, AVFrame *p_ff_pic )
{
- int i_plane;
- int i_size;
- int i_line;
+ decoder_sys_t *p_sys = p_dec->p_sys;
- u8 *p_dst;
- u8 *p_src;
- int i_src_stride;
- int i_dst_stride;
-
- if( ffmpeg_PixFmtToChroma( p_vdec->p_context->pix_fmt ) )
+ if( ffmpeg_PixFmtToChroma( p_sys->p_context->pix_fmt ) )
{
+ int i_plane, i_size, i_line;
+ uint8_t *p_dst, *p_src;
+ int i_src_stride, i_dst_stride;
+
+#ifdef LIBAVCODEC_PP
+ if( p_sys->p_pp && p_sys->b_pp )
+ E_(PostprocPict)( p_dec, p_sys->p_pp, p_pic, p_ff_pic );
+ else
+#endif
for( i_plane = 0; i_plane < p_pic->i_planes; i_plane++ )
{
- p_src = p_avpicture->data[i_plane];
+ p_src = p_ff_pic->data[i_plane];
p_dst = p_pic->p[i_plane].p_pixels;
- i_src_stride = p_avpicture->linesize[i_plane];
+ i_src_stride = p_ff_pic->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++ )
+ for( i_line = 0; i_line < p_pic->p[i_plane].i_visible_lines;
+ i_line++ )
{
- p_vdec->p_fifo->p_vlc->pf_memcpy( p_dst, p_src, i_size );
+ p_dec->p_vlc->pf_memcpy( p_dst, p_src, i_size );
p_src += i_src_stride;
p_dst += i_dst_stride;
}
}
else
{
+ AVPicture dest_pic;
+ int i;
+
/* we need to convert to I420 */
- switch( p_vdec->p_context->pix_fmt )
+ switch( p_sys->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;
+ case PIX_FMT_YUV410P:
+ case PIX_FMT_YUV411P:
+ case PIX_FMT_PAL8:
+ for( i = 0; i < p_pic->i_planes; i++ )
+ {
+ dest_pic.data[i] = p_pic->p[i].p_pixels;
+ dest_pic.linesize[i] = p_pic->p[i].i_pitch;
+ }
+ img_convert( &dest_pic, PIX_FMT_YUV420P,
+ (AVPicture *)p_ff_pic,
+ p_sys->p_context->pix_fmt,
+ p_sys->p_context->width,
+ p_sys->p_context->height );
+ break;
+ default:
+ msg_Err( p_dec, "don't know how to convert chroma %i",
+ p_sys->p_context->pix_fmt );
+ p_dec->b_error = 1;
+ break;
}
}
}
-/*****************************************************************************
- * ffmpeg_PostProcPicture: Postprocessing is done here.
- *****************************************************************************/
-static void ffmpeg_PostProcPicture( vdec_thread_t *p_vdec, picture_t *p_pic )
-{
-#if LIBAVCODEC_BUILD > 4313
- if( ( p_vdec->i_pp_mode )&&
- ( ( p_vdec->p_vout->render.i_chroma ==
- VLC_FOURCC( 'I','4','2','0' ) )||
- ( p_vdec->p_vout->render.i_chroma ==
- VLC_FOURCC( 'Y','V','1','2' ) ) ) )
- {
- /* Make postproc */
- p_vdec->p_pp->pf_postprocess( p_pic,
- p_vdec->p_context->quant_store,
- p_vdec->p_context->qstride,
- p_vdec->i_pp_mode );
- }
-#endif
-}
-
/*****************************************************************************
* ffmpeg_GetFrameBuf: callback used by ffmpeg to get a frame buffer.
- * (used for direct rendering)
+ *****************************************************************************
+ * It is used for direct rendering as well as to get the right PTS for each
+ * decoded picture (even in indirect rendering mode).
*****************************************************************************/
-static int ffmpeg_GetFrameBuf( struct AVCodecContext *avctx, int width,
- int height, int pict_type )
+static int ffmpeg_GetFrameBuf( struct AVCodecContext *p_context,
+ AVFrame *p_ff_pic )
{
-#if LIBAVCODEC_BUILD > 4615
- vdec_thread_t *p_vdec = (vdec_thread_t *)avctx->opaque;
+ decoder_t *p_dec = (decoder_t *)p_context->opaque;
+ decoder_sys_t *p_sys = p_dec->p_sys;
picture_t *p_pic;
- /* 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 )
+ /* Set picture PTS */
+ if( p_sys->input_pts )
+ {
+ p_ff_pic->pts = p_sys->input_pts;
+ }
+ else if( p_sys->input_dts )
+ {
+ /* Some demuxers only set the dts so let's try to find a useful
+ * timestamp from this */
+ if( !p_context->has_b_frames || !p_sys->b_has_b_frames ||
+ !p_ff_pic->reference || !p_sys->i_pts )
{
- msg_Err( p_vdec->p_fifo, "cannot create vout" );
- p_vdec->p_fifo->b_error = 1; /* abort */
- return -1;
+ p_ff_pic->pts = p_sys->input_dts;
}
+ else p_ff_pic->pts = 0;
}
+ else p_ff_pic->pts = 0;
- /* Get a new picture */
- while( !(p_pic = vout_CreatePicture( p_vdec->p_vout, 0, 0, 0 ) ) )
+ if( p_sys->i_pts ) /* make sure 1st frame has a pts > 0 */
{
- if( p_vdec->p_fifo->b_die || p_vdec->p_fifo->b_error )
- {
- return -1;
- }
- msleep( VOUT_OUTMEM_SLEEP );
+ p_sys->input_pts = p_sys->input_dts = 0;
}
- /* FIXME: we may have to use link/unlinkPicture to fully support streams
- * with B FRAMES */
+ p_ff_pic->opaque = 0;
+
+ /* Not much to do in indirect rendering mode */
+ if( !p_sys->b_direct_rendering || p_sys->b_pp )
+ {
+ return avcodec_default_get_buffer( p_context, p_ff_pic );
+ }
+
+ /* Some codecs set pix_fmt only after the 1st frame has been decoded,
+ * so this check is necessary. */
+ if( !ffmpeg_PixFmtToChroma( p_context->pix_fmt ) ||
+ p_sys->p_context->width % 16 || p_sys->p_context->height % 16 )
+ {
+ msg_Dbg( p_dec, "disabling direct rendering" );
+ p_sys->b_direct_rendering = 0;
+ return avcodec_default_get_buffer( p_context, p_ff_pic );
+ }
+
+ /* Get a new picture */
+ //p_sys->p_vout->render.b_allow_modify_pics = 0;
+ p_pic = ffmpeg_NewPictBuf( p_dec, p_sys->p_context );
+ if( !p_pic )
+ {
+ p_sys->b_direct_rendering = 0;
+ return avcodec_default_get_buffer( p_context, p_ff_pic );
+ }
+ p_sys->p_context->draw_horiz_band = NULL;
- avctx->draw_horiz_band= NULL;
- avctx->dr_buffer[0]= p_pic->p[0].p_pixels;
- avctx->dr_buffer[1]= p_pic->p[1].p_pixels;
- avctx->dr_buffer[2]= p_pic->p[2].p_pixels;
+ p_ff_pic->opaque = (void*)p_pic;
+ p_ff_pic->type = FF_BUFFER_TYPE_USER;
+ p_ff_pic->data[0] = p_pic->p[0].p_pixels;
+ p_ff_pic->data[1] = p_pic->p[1].p_pixels;
+ p_ff_pic->data[2] = p_pic->p[2].p_pixels;
+ p_ff_pic->data[3] = NULL; /* alpha channel but I'm not sure */
- avctx->dr_stride = p_pic->p[0].i_pitch;
- avctx->dr_uvstride = p_pic->p[1].i_pitch;
+ p_ff_pic->linesize[0] = p_pic->p[0].i_pitch;
+ p_ff_pic->linesize[1] = p_pic->p[1].i_pitch;
+ p_ff_pic->linesize[2] = p_pic->p[2].i_pitch;
+ p_ff_pic->linesize[3] = 0;
- avctx->dr_opaque_frame = p_pic;
+ if( p_ff_pic->reference != 0 )
+ {
+ p_dec->pf_picture_link( p_dec, p_pic );
+ }
- /* FIXME: this variable is used to determine if a macro-block to be written
- * can be skipped. The idea behind this is that if a macro-block hasn't
- * changed and all the frame-buffers already have the value of this
- * macro-block, then we can skip the writting.
- * But currently we cannot ensure this is the case, so we decide to write
- * everything. */
- avctx->dr_ip_buffer_count = 999;
+ /* FIXME what is that, should give good value */
+ p_ff_pic->age = 256*256*256*64; // FIXME FIXME from ffmpeg
return 0;
-#endif
+}
+
+static void ffmpeg_ReleaseFrameBuf( struct AVCodecContext *p_context,
+ AVFrame *p_ff_pic )
+{
+ decoder_t *p_dec = (decoder_t *)p_context->opaque;
+ picture_t *p_pic;
+
+ if( !p_ff_pic->opaque )
+ {
+ avcodec_default_release_buffer( p_context, p_ff_pic );
+ return;
+ }
+
+ p_pic = (picture_t*)p_ff_pic->opaque;
+
+ p_ff_pic->data[0] = NULL;
+ p_ff_pic->data[1] = NULL;
+ p_ff_pic->data[2] = NULL;
+ p_ff_pic->data[3] = NULL;
+
+ if( p_ff_pic->reference != 0 )
+ {
+ p_dec->pf_picture_unlink( p_dec, p_pic );
+ }
}
projects / vlc / blobdiff