[Mplayer-cvslog] CVS: main/libmpcodecs vd_ffmpeg.c,NONE,1.1 Makefile,1.4,1.5

[Arpi of Ize]

Update of /cvsroot/mplayer/main/libmpcodecs
In directory mplayer:/var/tmp.root/cvs-serv28844

Modified Files:
	Makefile 
Added Files:
	vd_ffmpeg.c 
Log Message:
vd_ffmpeg added

--- NEW FILE ---
#include <stdio.h>
#include <stdlib.h>
#include <assert.h>

#include "config.h"
#include "mp_msg.h"
#include "help_mp.h"

#ifdef USE_LIBAVCODEC

#include "bswap.h"

#include "codec-cfg.h"
#include "../libvo/img_format.h"

#include "stream.h"
#include "demuxer.h"
#include "stheader.h"

#include "vd.h"
#include "vd_internal.h"

static vd_info_t info = {
	"FFmpeg's libavcodec codec family",
	"ffmpeg",
	VFM_FFMPEG,
	"A'rpi",
	"http://ffmpeg.sf.net",
	"native codecs"
};

LIBVD_EXTERN(ffmpeg)

#ifdef USE_LIBAVCODEC_SO
#include <libffmpeg/avcodec.h>
#else
#include "libavcodec/avcodec.h"
#endif

int avcodec_inited=0;

//#ifdef FF_POSTPROCESS
//unsigned int lavc_pp=0;
//#endif

// to set/get/query special features/parameters
static int control(sh_video_t *sh,int cmd,void* arg,...){
    return CONTROL_UNKNOWN;
}

// init driver
static int init(sh_video_t *sh){
    AVCodec *lavc_codec;
    AVCodecContext *ctx;

    if(!avcodec_inited){
      avcodec_init();
      avcodec_register_all();
      avcodec_inited=1;
    }
    
    lavc_codec = (AVCodec *)avcodec_find_decoder_by_name(sh->codec->dll);
    if(!lavc_codec){
	mp_msg(MSGT_DECVIDEO,MSGL_ERR,MSGTR_MissingLAVCcodec,sh->codec->dll);
	return 0;
    }
    
    ctx = sh->context = malloc(sizeof(AVCodecContext));
    memset(ctx, 0, sizeof(AVCodecContext));
    
    ctx->width = sh->disp_w;
    ctx->height= sh->disp_h;
    mp_dbg(MSGT_DECVIDEO,MSGL_DBG2,"libavcodec.size: %d x %d\n",ctx->width,ctx->height);
    if (sh->format == mmioFOURCC('R', 'V', '1', '3'))
	ctx->sub_id = 3;
    /* open it */
    if (avcodec_open(ctx, lavc_codec) < 0) {
        mp_msg(MSGT_DECVIDEO,MSGL_ERR, MSGTR_CantOpenCodec);
        return 0;
    }
    mp_msg(MSGT_DECVIDEO,MSGL_V,"INFO: libavcodec init OK!\n");
    mpcodecs_config_vo(sh,sh->disp_w,sh->disp_h,IMGFMT_YV12);
    return 1;
}

// uninit driver
static void uninit(sh_video_t *sh){
    if (avcodec_close(sh->context) < 0)
    	    mp_msg(MSGT_DECVIDEO,MSGL_ERR, MSGTR_CantCloseCodec);
}

//mp_image_t* mpcodecs_get_image(sh_video_t *sh, int mp_imgtype, int mp_imgflag, int w, int h);

// decode a frame
static mp_image_t* decode(sh_video_t *sh,void* data,int len,int flags){
    int got_picture=0;
    int ret;
    AVPicture lavc_picture;
    AVCodecContext *ctx = sh->context;
    mp_image_t* mpi;

    if(len<=0) return NULL; // skipped frame
    
    ret = avcodec_decode_video(sh->context, &lavc_picture,
	     &got_picture, data, len);
    
    if(ret<0) mp_msg(MSGT_DECVIDEO,MSGL_WARN, "Error while decoding frame!\n");
    if(!got_picture) return NULL;	// skipped image
    
    mpi=mpcodecs_get_image(sh, MP_IMGTYPE_EXPORT, MP_IMGFLAG_PRESERVE,
	ctx->width, ctx->height);
    if(!mpi){	// temporary!
	printf("couldn't allocate image for cinepak codec\n");
	return NULL;
    }
    
    mpi->planes[0]=lavc_picture.data[0];
    mpi->planes[1]=lavc_picture.data[1];
    mpi->planes[2]=lavc_picture.data[2];
    mpi->stride[0]=lavc_picture.linesize[0];
    mpi->stride[1]=lavc_picture.linesize[1];
    mpi->stride[2]=lavc_picture.linesize[2];

    if(ctx->pix_fmt==PIX_FMT_YUV422P){
	mpi->stride[1]*=2;
	mpi->stride[2]*=2;
    }
    
    return mpi;
}

#endif


Index: Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- Makefile	2 Mar 2002 22:08:19 -0000	1.4
+++ Makefile	6 Mar 2002 20:54:43 -0000	1.5
@@ -3,7 +3,7 @@
 
 LIBNAME = libmpcodecs.a
 
-SRCS=dec_video.c vd.c vd_null.c vd_cinepak.c vd_qtrpza.c
+SRCS=dec_video.c vd.c vd_null.c vd_cinepak.c vd_qtrpza.c vd_ffmpeg.c
 
 OBJS=$(SRCS:.c=.o)