diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | codec-cfg.c | 1 | ||||
| -rw-r--r-- | codec-cfg.h | 1 | ||||
| -rw-r--r-- | dec_video.c | 16 | ||||
| -rw-r--r-- | nuppelvideo.c | 125 |
5 files changed, 144 insertions, 1 deletions
@@ -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 +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_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 3ed8f480ec..bf207ce378 100644 --- a/codec-cfg.c +++ b/codec-cfg.c @@ -237,6 +237,7 @@ static short get_driver(char *s,int audioflag) "fli", "cinepak", "qtrle", + "nuv", NULL }; char **drv=audioflag?audiodrv:videodrv; diff --git a/codec-cfg.h b/codec-cfg.h index 592779b9cf..0e522a0d6c 100644 --- a/codec-cfg.h +++ b/codec-cfg.h @@ -49,6 +49,7 @@ #define VFM_FLI 12 #define VFM_CINEPAK 13 #define VFM_QTRLE 14 +#define VFM_NUV 15 #ifndef GUID_TYPE #define GUID_TYPE diff --git a/dec_video.c b/dec_video.c index fd9ba206ba..2963613563 100644 --- a/dec_video.c +++ b/dec_video.c @@ -128,6 +128,13 @@ void qt_decode_rle( int encoded_bpp, int bytes_per_pixel); +void decode_nuv( + unsigned char *encoded, + int encoded_size, + unsigned char *decoded, + int width, + int height); + //**************************************************************************// // The OpenDivX stuff: //**************************************************************************// @@ -544,7 +551,10 @@ if ((sh_video->codec->driver == VFM_QTRLE) && (sh_video->bih->biBitCount != 24)) " this Quicktime file to the MPlayer FTP, the team could look at it.\n", sh_video->bih->biBitCount); + break; } + case VFM_NUV: + sh_video->our_out_buffer = (char *)memalign(64, sh_video->disp_w*sh_video->disp_h*3/2); break; } } @@ -805,6 +815,12 @@ if(verbose>1){ ((out_fmt&255)+7)/8); blit_frame = 3; break; + case VFM_NUV: + decode_nuv( + start, in_size, sh_video->our_out_buffer, + sh_video->disp_w, sh_video->disp_h); + blit_frame = 3; + break; case VFM_QTRLE: qt_decode_rle( start, in_size, sh_video->our_out_buffer, diff --git a/nuppelvideo.c b/nuppelvideo.c new file mode 100644 index 0000000000..4e33d1c77f --- /dev/null +++ b/nuppelvideo.c @@ -0,0 +1,125 @@ +/* + * NuppelVideo 0.05 file parser + * for MPlayer + * by Panagiotis Issaris <takis@lumumba.luc.ac.be> + * + * Reworked by alex + */ + +#include <stdio.h> +#include <stdlib.h> +#include <unistd.h> + +#include "config.h" +#include "mp_msg.h" + +#include "libmpdemux/nuppelvideo.h" +#include "RTjpegN.h" +#include "minilzo.h" + +#define KEEP_BUFFER + +void decode_nuv( unsigned char *encoded, int encoded_size, + unsigned char *decoded, int width, int height) +{ + int r; + unsigned int out_len; + struct rtframeheader *encodedh = ( struct rtframeheader* ) encoded; + static unsigned char *buffer = 0; + static unsigned char *previous_buffer = 0; + static is_lzo_inited = 0; + +// printf("NUV packet: frametype: %c comptype: %c\n", +// encodedh->frametype, encodedh->comptype); + + switch(encodedh->frametype) + { + case 'D': /* additional data for compressors */ + { + /* tables are in encoded */ + if (encodedh->comptype == 'R') + { + RTjpeg_init_decompress ( encoded, width, height ); + printf("Found RTjpeg tables\n"); + } + break; + } + case 'V': + { + /* do the buffer stuffs */ + if ( buffer == NULL ) + { + buffer = ( unsigned char * ) malloc ( width * height + ( width * height ) / 2 ); +#if 0 + printf ( "Allocated for %dx%d image %d bytes\n", width, height, + width * height + ( width * height ) / 2 ); +#endif + } + +#ifdef KEEP_BUFFER + if ( previous_buffer == NULL ) + { + previous_buffer = ( unsigned char * ) malloc ( width * height + ( width * height ) / 2 ); +#if 0 + printf ( "Allocated for %dx%d image %d bytes\n", width, height, + width * height + ( width * height ) / 2 ); +#endif + } +#endif + + if (((encodedh->comptype == '2') || + (encodedh->comptype == '3')) && !is_lzo_inited) + { + /* frame using lzo, init lzo first if not inited */ + if ( lzo_init() != LZO_E_OK ) + { + fprintf ( stderr, "%s\n", "lzo_init() failed !!!" ); + return NULL; + } + is_lzo_inited = 1; + } + + switch(encodedh->comptype) + { + case '0': /* raw YUV420 */ + memcpy(decoded, encoded + 12, width*height*3/2); + break; + case '1': /* RTJpeg */ + RTjpeg_decompressYUV420 ( ( __s8 * ) encoded + 12, decoded ); + break; + case '2': /* RTJpeg with LZO */ + r = lzo1x_decompress ( encoded + 12, encodedh->packetlength, buffer, &out_len, NULL ); + if ( r != LZO_E_OK ) + { + printf ( "Error decompressing\n" ); + } + RTjpeg_decompressYUV420 ( ( __s8 * ) buffer, decoded ); + break; + case '3': /* raw YUV420 with LZO */ + r = lzo1x_decompress ( encoded + 12, encodedh->packetlength, buffer, &out_len, NULL ); + if ( r != LZO_E_OK ) + { + printf ( "Error decompressing\n" ); + } + memcpy(decoded, buffer, width*height*3/2); + break; + case 'N': /* black frame */ + memset ( decoded, 0, width * height ); + memset ( decoded + width * height, 127, width * height / 2); + break; + case 'L': /* copy last frame */ +#ifdef KEEP_BUFFER + memcpy ( decoded, previous_buffer, width*height*3/2); +#endif + break; + } + +#ifdef KEEP_BUFFER + memcpy(previous_buffer, decoded, width*height*3/2); +#endif + break; + } + default: + printf("Unknown chunk: %c\n", encodedh->frametype); + } +} |