diff --git a/Makefile b/Makefile index 57dc4a34c1..bc18fb7f53 100644 --- a/Makefile +++ b/Makefile @@ -22,7 +22,7 @@ MANDIR = ${prefix}/man # a BSD compatible 'install' program INSTALL = install -SRCS_COMMON = adpcm.c xacodec.c cpudetect.c mp_msg.c ac3-iec958.c dec_audio.c dec_video.c msvidc.c cinepak.c fli.c qtrle.c codec-cfg.c cfgparser.c my_profile.c RTjpegN.c minilzo.c nuppelvideo.c +SRCS_COMMON = cyuv.c adpcm.c xacodec.c cpudetect.c mp_msg.c ac3-iec958.c dec_audio.c dec_video.c msvidc.c cinepak.c fli.c qtrle.c codec-cfg.c cfgparser.c my_profile.c RTjpegN.c minilzo.c nuppelvideo.c SRCS_MENCODER = mencoder.c $(SRCS_COMMON) libao2/afmt.c divx4_vbr.c libvo/aclib.c libvo/img_format.c SRCS_MPLAYER = mplayer.c $(SRCS_COMMON) find_sub.c subreader.c lirc_mp.c mixer.c spudec.c diff --git a/codec-cfg.c b/codec-cfg.c index 909607ff3f..1307bd9366 100644 --- a/codec-cfg.c +++ b/codec-cfg.c @@ -240,6 +240,7 @@ static short get_driver(char *s,int audioflag) "cinepak", "qtrle", "nuv", + "cyuv", NULL }; char **drv=audioflag?audiodrv:videodrv; diff --git a/codec-cfg.h b/codec-cfg.h index b28f748c38..15705a3ed2 100644 --- a/codec-cfg.h +++ b/codec-cfg.h @@ -52,6 +52,7 @@ #define VFM_CINEPAK 13 #define VFM_QTRLE 14 #define VFM_NUV 15 +#define VFM_CYUV 16 #ifndef GUID_TYPE #define GUID_TYPE diff --git a/cyuv.c b/cyuv.c new file mode 100644 index 0000000000..86d597af7d --- /dev/null +++ b/cyuv.c @@ -0,0 +1,85 @@ +/* ------------------------------------------------------------------------ + * Creative YUV Video Decoder + * + * Dr. Tim Ferguson, 2001. + * For more details on the algorithm: + * http://www.csse.monash.edu.au/~timf/videocodec.html + * + * This is a very simple predictive coder. A video frame is coded in YUV411 + * format. The first pixel of each scanline is coded using the upper four + * bits of its absolute value. Subsequent pixels for the scanline are coded + * using the difference between the last pixel and the current pixel (DPCM). + * The DPCM values are coded using a 16 entry table found at the start of the + * frame. Thus four bits per component are used and are as follows: + * UY VY YY UY VY YY UY VY... + * This code assumes the frame width will be a multiple of four pixels. This + * should probably be fixed. + * ------------------------------------------------------------------------ */ +#include +#include +#include +#include +#include + +/* ------------------------------------------------------------------------ + * This function decodes a buffer containing a CYUV encoded frame. + * + * buf - the input buffer to be decoded + * size - the size of the input buffer + * frame - the output frame buffer (UYVY format) + * width - the width of the output frame + * height - the height of the output frame + * bit_per_pixel - ignored for now: may be used later for conversions. + */ +void decode_cyuv(unsigned char *buf, int size, unsigned char *frame, int width, int height, int bit_per_pixel) +{ +int i, xpos, ypos, cur_Y = 0, cur_U = 0, cur_V = 0; +char *delta_y_tbl, *delta_c_tbl, *ptr; + + delta_y_tbl = buf + 16; + delta_c_tbl = buf + 32; + ptr = buf + (16 * 3); + + for(ypos = 0; ypos < height; ypos++) + for(xpos = 0; xpos < width; xpos += 4) + { + if(xpos == 0) /* first pixels in scanline */ + { + cur_U = *(ptr++); + cur_Y = (cur_U & 0x0f) << 4; + cur_U = cur_U & 0xf0; + *frame++ = cur_U; + *frame++ = cur_Y; + + cur_V = *(ptr++); + cur_Y = (cur_Y + delta_y_tbl[cur_V & 0x0f]) & 0xff; + cur_V = cur_V & 0xf0; + *frame++ = cur_V; + *frame++ = cur_Y; + } + else /* subsequent pixels in scanline */ + { + i = *(ptr++); + cur_U = (cur_U + delta_c_tbl[i >> 4]) & 0xff; + cur_Y = (cur_Y + delta_y_tbl[i & 0x0f]) & 0xff; + *frame++ = cur_U; + *frame++ = cur_Y; + + i = *(ptr++); + cur_V = (cur_V + delta_c_tbl[i >> 4]) & 0xff; + cur_Y = (cur_Y + delta_y_tbl[i & 0x0f]) & 0xff; + *frame++ = cur_V; + *frame++ = cur_Y; + } + + i = *(ptr++); + cur_Y = (cur_Y + delta_y_tbl[i & 0x0f]) & 0xff; + *frame++ = cur_U; + *frame++ = cur_Y; + + cur_Y = (cur_Y + delta_y_tbl[i >> 4]) & 0xff; + *frame++ = cur_V; + *frame++ = cur_Y; + } +} + diff --git a/dec_video.c b/dec_video.c index c5c910d6fc..0f500a313c 100644 --- a/dec_video.c +++ b/dec_video.c @@ -135,6 +135,25 @@ void decode_nuv( int width, int height); +void *decode_cinepak_init(void); + +void decode_cinepak( + void *context, + unsigned char *buf, + int size, + unsigned char *frame, + int width, + int height, + int bit_per_pixel); + +void decode_cyuv( + unsigned char *buf, + int size, + unsigned char *frame, + int width, + int height, + int bit_per_pixel); + //**************************************************************************// // The OpenDivX stuff: //**************************************************************************// @@ -558,6 +577,12 @@ if ((sh_video->codec->driver == VFM_QTRLE) && (sh_video->bih->biBitCount != 24)) case VFM_NUV: sh_video->our_out_buffer = (char *)memalign(64, sh_video->disp_w*sh_video->disp_h*3/2); break; + case VFM_CYUV: { + int bpp=((out_fmt&255)+7)/8; + sh_video->our_out_buffer = + (char*)memalign(64, sh_video->disp_w*sh_video->disp_h*3); + break; + } } } sh_video->inited=1; @@ -831,6 +856,11 @@ if(verbose>1){ ((out_fmt&255)+7)/8); blit_frame = 3; break; + case VFM_CYUV: + decode_cyuv(start, in_size, sh_video->our_out_buffer, + sh_video->disp_w, sh_video->disp_h, (out_fmt==IMGFMT_YUY2)?16:(out_fmt&255)); + blit_frame = 3; + break; } // switch //------------------------ frame decoded. -------------------- diff --git a/etc/codecs.conf b/etc/codecs.conf index 49b9fb59c7..94328b6a01 100644 --- a/etc/codecs.conf +++ b/etc/codecs.conf @@ -318,6 +318,13 @@ videocodec nuv driver nuv out I420 +videocodec cyuv + info "Creative YUV (native codec)" + status working + fourcc cyuv,CYUV + driver cyuv + out UYVY + audiocodec imaadpcm info "IMA ADPCM" status working