diff options
| author | alex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-12-27 23:05:01 +0000 |
|---|---|---|
| committer | alex <alex@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-12-27 23:05:01 +0000 |
| commit | b2b11bb2df5109220a887f90aa73511b8600c1c3 (patch) | |
| tree | 957e6c2ef2ec98cb9dc8ece753db334c6b3692f3 | |
| parent | 287a2e4e5edbea8843231fb14e4ee6d400c9babf (diff) | |
| download | mpv-b2b11bb2df5109220a887f90aa73511b8600c1c3.tar.bz2 mpv-b2b11bb2df5109220a887f90aa73511b8600c1c3.tar.xz | |
fixed RTjpeg and removed one memcpy
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@3811 b3059339-0415-0410-9bf9-f77b7e298cf2
| -rw-r--r-- | nuppelvideo.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/nuppelvideo.c b/nuppelvideo.c index 4e33d1c77f..8ac1729477 100644 --- a/nuppelvideo.c +++ b/nuppelvideo.c @@ -13,6 +13,8 @@ #include "config.h" #include "mp_msg.h" +#include "fastmemcpy.h" + #include "libmpdemux/nuppelvideo.h" #include "RTjpegN.h" #include "minilzo.h" @@ -29,8 +31,8 @@ void decode_nuv( unsigned char *encoded, int encoded_size, static unsigned char *previous_buffer = 0; static is_lzo_inited = 0; -// printf("NUV packet: frametype: %c comptype: %c\n", -// encodedh->frametype, encodedh->comptype); +// printf("frametype: %c, comtype: %c, encoded_size: %d, width: %d, height: %d\n", +// encodedh->frametype, encodedh->comptype, encoded_size, width, height); switch(encodedh->frametype) { @@ -39,8 +41,9 @@ void decode_nuv( unsigned char *encoded, int encoded_size, /* tables are in encoded */ if (encodedh->comptype == 'R') { - RTjpeg_init_decompress ( encoded, width, height ); - printf("Found RTjpeg tables\n"); + RTjpeg_init_decompress ( encoded+12, width, height ); + printf("Found RTjpeg tables (size: %d, width: %d, height: %d)\n", + encoded_size-12, width, height); } break; } @@ -96,12 +99,12 @@ void decode_nuv( unsigned char *encoded, int encoded_size, RTjpeg_decompressYUV420 ( ( __s8 * ) buffer, decoded ); break; case '3': /* raw YUV420 with LZO */ - r = lzo1x_decompress ( encoded + 12, encodedh->packetlength, buffer, &out_len, NULL ); + r = lzo1x_decompress ( encoded + 12, encodedh->packetlength, decoded, &out_len, NULL ); if ( r != LZO_E_OK ) { printf ( "Error decompressing\n" ); } - memcpy(decoded, buffer, width*height*3/2); +// memcpy(decoded, buffer, width*height*3/2); break; case 'N': /* black frame */ memset ( decoded, 0, width * height ); |