From 56d9a23ee9a4623e498f644eddd721a423264ce5 Mon Sep 17 00:00:00 2001 From: diego Date: Sun, 1 Feb 2009 02:10:31 +0000 Subject: Add support for libavcodec GMC flag, patch by Dave Baker, dbkr mxtelecom com. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28415 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpcodecs/ve_lavc.c | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'libmpcodecs') diff --git a/libmpcodecs/ve_lavc.c b/libmpcodecs/ve_lavc.c index 9c94c1d1f9..bbb5d69ed1 100644 --- a/libmpcodecs/ve_lavc.c +++ b/libmpcodecs/ve_lavc.c @@ -113,6 +113,7 @@ static int lavc_param_bit_exact = 0; static int lavc_param_aic= 0; static int lavc_param_aiv= 0; static int lavc_param_umv= 0; +static int lavc_param_gmc= 0; static int lavc_param_obmc= 0; static int lavc_param_loop= 0; static int lavc_param_last_pred= 0; @@ -282,6 +283,9 @@ m_option_t lavcopts_conf[]={ #endif #ifdef CODEC_FLAG_CLOSED_GOP {"cgop", &lavc_param_closed_gop, CONF_TYPE_FLAG, 0, 0, CODEC_FLAG_CLOSED_GOP, NULL}, +#endif +#ifdef CODEC_FLAG_GMC + {"gmc", &lavc_param_gmc, CONF_TYPE_FLAG, 0, 0, CODEC_FLAG_GMC, NULL}, #endif {"dc", &lavc_param_dc_precision, CONF_TYPE_INT, CONF_RANGE, 8, 11, NULL}, {"border_mask", &lavc_param_border_masking, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 1.0, NULL}, @@ -555,6 +559,7 @@ static int config(struct vf_instance_s* vf, lavc_venc_context->flags|= lavc_param_ss; lavc_venc_context->flags|= lavc_param_alt; lavc_venc_context->flags|= lavc_param_ilme; + lavc_venc_context->flags|= lavc_param_gmc; #ifdef CODEC_FLAG_CLOSED_GOP lavc_venc_context->flags|= lavc_param_closed_gop; #endif -- cgit v1.2.3 From edc3c57aeef30663e4d25ca1d0e291d8be73b31c Mon Sep 17 00:00:00 2001 From: zuxy Date: Mon, 2 Feb 2009 07:26:05 +0000 Subject: Convert CONFIG_XVMC into a 0/1 definition. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28447 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpcodecs/vd_ffmpeg.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'libmpcodecs') diff --git a/libmpcodecs/vd_ffmpeg.c b/libmpcodecs/vd_ffmpeg.c index c59e9f1b8b..dc9ce071d1 100644 --- a/libmpcodecs/vd_ffmpeg.c +++ b/libmpcodecs/vd_ffmpeg.c @@ -26,7 +26,7 @@ LIBVD_EXTERN(ffmpeg) #include "libavcodec/avcodec.h" -#ifdef CONFIG_XVMC +#if CONFIG_XVMC #include "xvmc_render.h" #endif @@ -59,7 +59,7 @@ typedef struct { static int get_buffer(AVCodecContext *avctx, AVFrame *pic); static void release_buffer(AVCodecContext *avctx, AVFrame *pic); -#ifdef CONFIG_XVMC +#if CONFIG_XVMC static enum PixelFormat get_format(struct AVCodecContext * avctx, const enum PixelFormat * pix_fmt); static int mc_get_buffer(AVCodecContext *avctx, AVFrame *pic); @@ -143,7 +143,7 @@ static int control(sh_video_t *sh,int cmd,void* arg,...){ if(avctx->pix_fmt==PIX_FMT_YUV420P) return CONTROL_TRUE;// u/v swap if(avctx->pix_fmt==PIX_FMT_YUV422P && !ctx->do_dr1) return CONTROL_TRUE;// half stride break; -#ifdef CONFIG_XVMC +#if CONFIG_XVMC case IMGFMT_XVMC_IDCT_MPEG2: case IMGFMT_XVMC_MOCO_MPEG2: if(avctx->pix_fmt==PIX_FMT_XVMC_MPEG2_IDCT) return CONTROL_TRUE; @@ -250,7 +250,7 @@ static int init(sh_video_t *sh){ ctx->avctx = avcodec_alloc_context(); avctx = ctx->avctx; -#ifdef CONFIG_XVMC +#if CONFIG_XVMC #ifdef CODEC_CAP_HWACCEL if(lavc_codec->capabilities & CODEC_CAP_HWACCEL){ @@ -533,7 +533,7 @@ static int init_vo(sh_video_t *sh, enum PixelFormat pix_fmt){ case PIX_FMT_RGB565: ctx->best_csp=IMGFMT_BGR16;break; //4xm case PIX_FMT_GRAY8: ctx->best_csp=IMGFMT_Y800;break; // gray jpeg case PIX_FMT_PAL8: ctx->best_csp=IMGFMT_BGR8;break; //8bps,mrle,cram -#ifdef CONFIG_XVMC +#if CONFIG_XVMC case PIX_FMT_XVMC_MPEG2_MC:ctx->best_csp=IMGFMT_XVMC_MOCO_MPEG2;break; case PIX_FMT_XVMC_MPEG2_IDCT:ctx->best_csp=IMGFMT_XVMC_IDCT_MPEG2;break; #endif @@ -910,7 +910,7 @@ static mp_image_t* decode(sh_video_t *sh,void* data,int len,int flags){ return mpi; } -#ifdef CONFIG_XVMC +#if CONFIG_XVMC static enum PixelFormat get_format(struct AVCodecContext * avctx, const enum PixelFormat * fmt){ sh_video_t * sh = avctx->opaque; -- cgit v1.2.3 From 75243478ce90d862f64c8fa6a03d0a651099317b Mon Sep 17 00:00:00 2001 From: reimar Date: Mon, 2 Feb 2009 20:22:36 +0000 Subject: Adapt to lzo changes in libavutil git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28448 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpcodecs/vd_lzo.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libmpcodecs') diff --git a/libmpcodecs/vd_lzo.c b/libmpcodecs/vd_lzo.c index a2e92a5301..5371e4115f 100644 --- a/libmpcodecs/vd_lzo.c +++ b/libmpcodecs/vd_lzo.c @@ -55,7 +55,7 @@ static int init(sh_video_t *sh) return 0; } priv->bufsz = sh->bih->biSizeImage; - priv->buffer = malloc(priv->bufsz + LZO_OUTPUT_PADDING); + priv->buffer = malloc(priv->bufsz + AV_LZO_OUTPUT_PADDING); priv->codec = -1; sh->context = priv; @@ -88,7 +88,7 @@ static mp_image_t* decode(sh_video_t *sh,void* data,int len,int flags) return NULL; // skipped frame } - r = lzo1x_decode(priv->buffer, &w, data, &len); + r = av_lzo1x_decode(priv->buffer, &w, data, &len); if (r) { /* this should NEVER happen */ mp_msg (MSGT_DECVIDEO, MSGL_ERR, -- cgit v1.2.3 From 046cf63aff27747e4b62e4a260895023d60be68f Mon Sep 17 00:00:00 2001 From: diego Date: Mon, 2 Feb 2009 23:48:16 +0000 Subject: FFmpeg sync: LZO_OUTPUT_PADDING --> AV_LZO_OUTPUT_PADDING git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28449 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpcodecs/native/nuppelvideo.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libmpcodecs') diff --git a/libmpcodecs/native/nuppelvideo.c b/libmpcodecs/native/nuppelvideo.c index ff3e1f83fa..c0b3b8ac11 100644 --- a/libmpcodecs/native/nuppelvideo.c +++ b/libmpcodecs/native/nuppelvideo.c @@ -56,7 +56,7 @@ void decode_nuv( unsigned char *encoded, int encoded_size, int in_len = encodedh->packetlength; #ifdef KEEP_BUFFER if (!previous_buffer) - previous_buffer = ( unsigned char * ) malloc ( out_len + LZO_OUTPUT_PADDING ); + previous_buffer = ( unsigned char * ) malloc ( out_len + AV_LZO_OUTPUT_PADDING ); #endif switch(encodedh->comptype) @@ -69,7 +69,7 @@ void decode_nuv( unsigned char *encoded, int encoded_size, break; case '2': /* RTJpeg with LZO */ if (!buffer) - buffer = ( unsigned char * ) malloc ( out_len + LZO_OUTPUT_PADDING ); + buffer = ( unsigned char * ) malloc ( out_len + AV_LZO_OUTPUT_PADDING ); if (!buffer) { mp_msg(MSGT_DECVIDEO, MSGL_ERR, "Nuppelvideo: error decompressing\n"); -- cgit v1.2.3 From a019ba3643001e90a53d31d05129ad43e4fd6f15 Mon Sep 17 00:00:00 2001 From: reimar Date: Tue, 3 Feb 2009 00:12:19 +0000 Subject: Rename lzo1x_decode -> av_lzo1x_decode, this was missed in the previous patch. It currently works (though badly with missing prototype) but will break on libavutil version bump. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28450 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpcodecs/native/nuppelvideo.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libmpcodecs') diff --git a/libmpcodecs/native/nuppelvideo.c b/libmpcodecs/native/nuppelvideo.c index c0b3b8ac11..8128f85c47 100644 --- a/libmpcodecs/native/nuppelvideo.c +++ b/libmpcodecs/native/nuppelvideo.c @@ -75,7 +75,7 @@ void decode_nuv( unsigned char *encoded, int encoded_size, mp_msg(MSGT_DECVIDEO, MSGL_ERR, "Nuppelvideo: error decompressing\n"); break; } - r = lzo1x_decode ( buffer, &out_len, encoded + 12, &in_len ); + r = av_lzo1x_decode ( buffer, &out_len, encoded + 12, &in_len ); if ( r ) { mp_msg(MSGT_DECVIDEO, MSGL_ERR, "Nuppelvideo: error decompressing\n"); @@ -84,7 +84,7 @@ void decode_nuv( unsigned char *encoded, int encoded_size, RTjpeg_decompressYUV420 ( ( __s8 * ) buffer, decoded ); break; case '3': /* raw YUV420 with LZO */ - r = lzo1x_decode ( decoded, &out_len, encoded + 12, &in_len ); + r = av_lzo1x_decode ( decoded, &out_len, encoded + 12, &in_len ); if ( r ) { mp_msg(MSGT_DECVIDEO, MSGL_ERR, "Nuppelvideo: error decompressing\n"); -- cgit v1.2.3 From 3819692fdad07d6b9bc16615bc9401fd76a367ee Mon Sep 17 00:00:00 2001 From: reimar Date: Tue, 3 Feb 2009 10:39:56 +0000 Subject: swab() needs _XOPEN_SOURCE to be defined. Fixes two implicit declaration warnings. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28455 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libmpcodecs/ad_hwac3.c | 1 + libmpcodecs/ad_liba52.c | 1 + 2 files changed, 2 insertions(+) (limited to 'libmpcodecs') diff --git a/libmpcodecs/ad_hwac3.c b/libmpcodecs/ad_hwac3.c index 1757018796..d58de77610 100644 --- a/libmpcodecs/ad_hwac3.c +++ b/libmpcodecs/ad_hwac3.c @@ -5,6 +5,7 @@ (see http://www.dtek.chalmers.se/~dvd/) */ +#define _XOPEN_SOURCE #include #include #include diff --git a/libmpcodecs/ad_liba52.c b/libmpcodecs/ad_liba52.c index d886ad6a6a..73b43dcaab 100644 --- a/libmpcodecs/ad_liba52.c +++ b/libmpcodecs/ad_liba52.c @@ -1,3 +1,4 @@ +#define _XOPEN_SOURCE #include #include #include -- cgit v1.2.3