[Mplayer-cvslog] CVS: main/libmpcodecs ve_raw.c, NONE, 1.1 Makefile, 1.123, 1.124 ve.c, 1.9, 1.10 ve_rawrgb.c, 1.9, NONE ve_rawyuv.c, 1.1, NONE
Attila Kinali CVS
syncmail at mplayerhq.hu
Tue Feb 17 13:43:09 CET 2004
CVS change done by Attila Kinali CVS
Update of /cvsroot/mplayer/main/libmpcodecs
In directory mail:/var2/tmp/cvs-serv14505/libmpcodecs
Modified Files:
Makefile ve.c
Added Files:
ve_raw.c
Removed Files:
ve_rawrgb.c ve_rawyuv.c
Log Message:
remove raw nonsense and replace it by one ovc
patch by John Earl <jwe21 at cam.ac.uk>
--- NEW FILE ---
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include "../config.h"
#include "../mp_msg.h"
#include "codec-cfg.h"
#include "stream.h"
#include "demuxer.h"
#include "stheader.h"
#include "muxer.h"
#include "img_format.h"
#include "mp_image.h"
#include "vf.h"
//===========================================================================//
struct vf_priv_s {
muxer_stream_t* mux;
};
#define mux_v (vf->priv->mux)
static int set_format(struct vf_instance_s *vf, unsigned int fmt) {
mux_v->bih->biCompression = fmt;
mux_v->bih->biPlanes = 1;
if (IMGFMT_IS_RGB(fmt)) {
if (IMGFMT_RGB_DEPTH(fmt) < 8 && !(fmt&128))
mux_v->bih->biBitCount = IMGFMT_RGB_DEPTH(fmt);
else
mux_v->bih->biBitCount = (IMGFMT_RGB_DEPTH(fmt)+7)&(~7);
return 1;
}
if (IMGFMT_IS_BGR(fmt)) {
if (IMGFMT_BGR_DEPTH(fmt) < 8 && !(fmt&128))
mux_v->bih->biBitCount = IMGFMT_BGR_DEPTH(fmt);
else
mux_v->bih->biBitCount = (IMGFMT_BGR_DEPTH(fmt)+7)&(~7);
return 1;
}
switch (fmt) {
case IMGFMT_I420:
case IMGFMT_IYUV:
case IMGFMT_YV12:
case IMGFMT_411P:
mux_v->bih->biPlanes = 3;
mux_v->bih->biBitCount = 12;
break;
case IMGFMT_444P:
mux_v->bih->biPlanes = 3;
mux_v->bih->biBitCount = 24;
break;
case IMGFMT_422P:
mux_v->bih->biPlanes = 3;
mux_v->bih->biBitCount = 16;
break;
case IMGFMT_IF09:
mux_v->bih->biPlanes = 4;
case IMGFMT_YVU9:
mux_v->bih->biBitCount = 9;
break;
case IMGFMT_UYVY:
case IMGFMT_YUY2:
mux_v->bih->biBitCount = 16;
break;
default:
printf("ve_raw: raw output with fourcc [%x] not supported!\n", fmt);
mux_v->bih->biCompression = 0;
return 0;
}
return 1;
}
static int config(struct vf_instance_s *vf,
int width, int height, int d_width, int d_height,
unsigned int flags, unsigned int outfmt)
{
int ret;
mux_v->bih->biWidth = width;
mux_v->bih->biHeight = height;
ret = set_format(vf, outfmt);
if (!ret) return 0;
mux_v->bih->biSizeImage = mux_v->bih->biWidth*mux_v->bih->biHeight*mux_v->bih->biBitCount/8;
return 1;
}
static int control(struct vf_instance_s *vf, int request, void *data) {
return CONTROL_UNKNOWN;
}
static int query_format(struct vf_instance_s *vf, unsigned int fmt) {
if (IMGFMT_IS_RGB(fmt) || IMGFMT_IS_BGR(fmt))
return VFCAP_CSP_SUPPORTED | VFCAP_CSP_SUPPORTED_BY_HW;
switch (fmt) {
case IMGFMT_I420:
case IMGFMT_IYUV:
case IMGFMT_YV12:
case IMGFMT_411P:
case IMGFMT_444P:
case IMGFMT_422P:
case IMGFMT_UYVY:
case IMGFMT_YUY2:
case IMGFMT_YVU9:
case IMGFMT_IF09:
return VFCAP_CSP_SUPPORTED | VFCAP_CSP_SUPPORTED_BY_HW;
}
return 0;
}
static int put_image(struct vf_instance_s *vf, mp_image_t *mpi) {
mux_v->buffer = mpi->planes[0];
muxer_write_chunk(mux_v, mpi->width*mpi->height*mux_v->bih->biBitCount/8, 0x10);
return 1;
}
//===========================================================================//
static int vf_open(vf_instance_t *vf, char* args){
vf->config = config;
vf->control = control;
vf->query_format = query_format;
vf->put_image = put_image;
vf->priv = malloc(sizeof(struct vf_priv_s));
memset(vf->priv, 0, sizeof(struct vf_priv_s));
vf->priv->mux = (muxer_stream_t*)args;
mux_v->bih = malloc(sizeof(BITMAPINFOHEADER));
mux_v->bih->biSize = sizeof(BITMAPINFOHEADER);
mux_v->bih->biWidth = 0;
mux_v->bih->biHeight = 0;
return 1;
}
vf_info_t ve_info_raw = {
"raw encoder",
"raw",
"jwe21 at cam.ac.uk",
"Based on rawrgb",
vf_open
};
//===========================================================================//
Index: Makefile
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/Makefile,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -r1.123 -r1.124
--- Makefile 6 Feb 2004 20:31:57 -0000 1.123
+++ Makefile 17 Feb 2004 12:43:07 -0000 1.124
@@ -19,7 +19,7 @@
VFILTER_SRCS += vf_pp.c
endif
-ENCODER_SRCS=ve.c ve_divx4.c ve_lavc.c ve_vfw.c ve_rawrgb.c ve_rawyuv.c ve_libdv.c ve_xvid.c ve_xvid4.c ve_qtvideo.c ve_nuv.c
+ENCODER_SRCS=ve.c ve_divx4.c ve_lavc.c ve_vfw.c ve_raw.c ve_libdv.c ve_xvid.c ve_xvid4.c ve_qtvideo.c ve_nuv.c
NATIVE_SRCS=native/RTjpegN.c native/cinepak.c native/fli.c native/minilzo.c native/nuppelvideo.c native/qtrle.c native/roqav.c native/xa_gsm.c native/decode144.c native/decode288.c
Index: ve.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpcodecs/ve.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ve.c 8 Dec 2003 12:44:10 -0000 1.9
+++ ve.c 17 Feb 2004 12:43:07 -0000 1.10
@@ -12,8 +12,7 @@
extern vf_info_t ve_info_divx4;
extern vf_info_t ve_info_lavc;
extern vf_info_t ve_info_vfw;
-extern vf_info_t ve_info_rawrgb;
-extern vf_info_t ve_info_rawyuv;
+extern vf_info_t ve_info_raw;
extern vf_info_t ve_info_libdv;
extern vf_info_t ve_info_xvid;
extern vf_info_t ve_info_qtvideo;
@@ -33,8 +32,7 @@
#ifdef HAVE_LIBDV095
&ve_info_libdv,
#endif
- &ve_info_rawrgb,
- &ve_info_rawyuv,
+ &ve_info_raw,
#if defined(HAVE_XVID3) || defined(HAVE_XVID4)
&ve_info_xvid,
#endif
--- ve_rawrgb.c DELETED ---
--- ve_rawyuv.c DELETED ---
More information about the MPlayer-cvslog
mailing list