added LCL decoder by Roberto Togni <r_togni@libero.it>, removed my old vd_zlib

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7223 b3059339-0415-0410-9bf9-f77b7e298cf2

1 files changed, 0 insertions, 182 deletions

diff --git a/libmpcodecs/vd_zlib.c b/libmpcodecs/vd_zlib.c
deleted file mode 100644
index c22be627cc..0000000000
--- a/libmpcodecs/vd_zlib.c
+++ /dev/null
@@ -1,182 +0,0 @@
-/*
-    AVIzlib decoder
-    
-    http://www.pcisys.net/~melanson/codecs/lcl.txt
-*/
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#include "config.h"
-
-#ifdef HAVE_ZLIB
-#include "mp_msg.h"
-
-#include <zlib.h>
-
-#include "vd_internal.h"
-
-static vd_info_t info = {
-	"AVIzlib decoder",
-	"zlib",
-	"Alex",
-	"Alex",
-	"based on vd_ijpg.c, uses zlib, supports only BGR24 (as AVIzlib)"
-};
-
-LIBVD_EXTERN(zlib)
-
-typedef struct {
-    int width;
-    int height;
-    int imgformat;
-    int decompsize;
-    z_stream zstrm;
-} vd_zlib_ctx;
-
-/* BITMAPINFOHEADER LCL Extension */
-typedef struct {
-    unsigned char filler[sizeof(BITMAPINFOHEADER)];
-    unsigned char unknown[4];
-    unsigned char imgtype;
-    unsigned char compression;
-    unsigned char flags;
-    unsigned char codec;
-} bih_lcl_ext;
-
-// to set/get/query special features/parameters
-static int control(sh_video_t *sh, int cmd, void *arg, ...)
-{
-    vd_zlib_ctx *ctx = sh->context;
-    switch(cmd)
-    {
-	case VDCTRL_QUERY_FORMAT:
-	{
-	    if (*((int*)arg) == (ctx->imgformat))
-		return(CONTROL_TRUE);
-	    else
-		return(CONTROL_FALSE);
-	}
-    }
-    return(CONTROL_UNKNOWN);
-}
-
-// init driver
-static int init(sh_video_t *sh)
-{
-    int zret;
-    vd_zlib_ctx *ctx;
-    bih_lcl_ext *ext;
-    
-    ctx = sh->context = malloc(sizeof(vd_zlib_ctx));
-    if (!ctx)
-	return(0);
-    memset(ctx, 0, sizeof(vd_zlib_ctx));
-
-    ctx->width = sh->bih->biWidth;
-    ctx->height = sh->bih->biHeight;
-    ctx->imgformat = IMGFMT_BGR24;
-    ctx->decompsize = ctx->width*ctx->height*((24+7)/8);
-    
-    if (sh->bih->biSize > sizeof(BITMAPINFOHEADER))
-    {
-	ext = sh->bih;
-	if (ext->codec != 3) /* 1 == MSZH, 3 == ZLIB */
-	    return(0);
-	switch(ext->imgtype)
-	{
-	    case 2: /* RGB24 */
-		ctx->imgformat = IMGFMT_BGR24;
-		ctx->decompsize = ctx->width*ctx->height*((24+7)/8);
-		break;
-	    case 0: /* YUV411 */
-//		ctx->imgformat = IMGFMT_YVU9;
-//		ctx->decompsize = ctx->width*(ctx->height+2)/8*9;
-//		break;
-	    case 1: /* YUV422 */
-//		ctx->imgformat = IMGFMT_YUY2;
-//		ctx->decompsize = ctx->width*(ctx->height+2)/8*16;
-//		break;
-	    case 5: /* YUV420 */
-//		ctx->imgformat = IMGFMT_YV12;
-//		ctx->decompsize = ctx->width*(ctx->height+2)/8*12;
-//		break;
-	    case 3: /* YUV411 */
-	    case 4: /* YUV211 */
-	    default:
-		printf("Unknown imgtype\n");
-		return(0);
-	}
-    }
-
-    ctx->zstrm.zalloc = (alloc_func)NULL;
-    ctx->zstrm.zfree = (free_func)NULL;
-    ctx->zstrm.opaque = (voidpf)NULL;
-
-    zret = inflateInit(&ctx->zstrm);
-    if (zret != Z_OK)
-    {
-	mp_msg(MSGT_DECVIDEO, MSGL_ERR, "[vd_zlib] inflate init error: %d\n",
-	    zret);
-	return(NULL);
-    }
-
-    if (!mpcodecs_config_vo(sh, ctx->width, ctx->height, ctx->imgformat))
-	return(NULL);
-
-
-    return(1);
-}
-
-// uninit driver
-static void uninit(sh_video_t *sh)
-{
-    vd_zlib_ctx *ctx = sh->context;
-
-    inflateEnd(&ctx->zstrm);
-    if (ctx)
-	free(ctx);
-}
-
-//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)
-{
-    mp_image_t *mpi;
-    vd_zlib_ctx *ctx = sh->context;
-    int zret;
-    z_stream *zstrm = &ctx->zstrm;
-
-    if (len <= 0)
-	return(NULL); // skipped frame
-
-    mpi = mpcodecs_get_image(sh, MP_IMGTYPE_TEMP, 0, ctx->width, ctx->height);
-    if (!mpi) return(NULL);
-
-    zstrm->next_in = data;
-    zstrm->avail_in = len;
-    zstrm->next_out = mpi->planes[0];
-    zstrm->avail_out = ctx->decompsize;
-
-    mp_dbg(MSGT_DECVIDEO, MSGL_DBG2, "[vd_zlib] input: %p (%d bytes), output: %p (%d bytes)\n",
-	zstrm->next_in, zstrm->avail_in, zstrm->next_out, zstrm->avail_out);
-    
-    zret = inflate(zstrm, Z_NO_FLUSH);
-    if ((zret != Z_OK) && (zret != Z_STREAM_END))
-    {
-	mp_msg(MSGT_DECVIDEO, MSGL_ERR, "[vd_zlib] inflate error: %d\n",
-	    zret);
-	return(NULL);
-    }
-    
-    if (ctx->decompsize != (int)zstrm->total_out)
-    {
-	mp_msg(MSGT_DECVIDEO, MSGL_WARN, "[vd_zlib] decoded size differs (%d != %d)\n",
-	    ctx->decompsize, zstrm->total_out);
-	return(NULL);
-    }
-
-    return mpi;
-}
-#endif