github/mpv
1
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-07-27 17:48:22 +02:00
Code Releases Activity

Use ffmpeg lzo instead of (also quite outdated) minlzo in nuppelvideo.

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22098 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
reimar 2007-01-31 23:20:03 +00:00
parent 77efea9cf2
commit 17cb5504b1
1 changed files with 12 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
libmpcodecs/native/nuppelvideo.c
View File

@ -20,7 +20,11 @@
#include "libmpdemux/nuppelvideo.h" #include "libmpdemux/nuppelvideo.h"
#include "RTjpegN.h" #include "RTjpegN.h"
#include "minilzo.h" #ifdef USE_LIBAVUTIL_SO
#include <ffmpeg/lzo.h>
#else
#include "libavutil/lzo.h"
#endif
#define KEEP_BUFFER #define KEEP_BUFFER
@ -34,7 +38,6 @@ void decode_nuv( unsigned char *encoded, int encoded_size,
#ifdef KEEP_BUFFER #ifdef KEEP_BUFFER
static unsigned char *previous_buffer = 0; /* to support Last-frame-copy */ static unsigned char *previous_buffer = 0; /* to support Last-frame-copy */
#endif #endif
static int is_lzo_inited = 0;
// printf("frametype: %c, comtype: %c, encoded_size: %d, width: %d, height: %d\n", // printf("frametype: %c, comtype: %c, encoded_size: %d, width: %d, height: %d\n",
// encodedh->frametype, encodedh->comptype, encoded_size, width, height); // encodedh->frametype, encodedh->comptype, encoded_size, width, height);
@ -55,23 +58,12 @@ void decode_nuv( unsigned char *encoded, int encoded_size,
} }
case 'V': case 'V':
{ {
int in_len = encodedh->packetlength;
#ifdef KEEP_BUFFER #ifdef KEEP_BUFFER
if (!previous_buffer) if (!previous_buffer)
previous_buffer = ( unsigned char * ) malloc ( out_len ); previous_buffer = ( unsigned char * ) malloc ( out_len + LZO_OUTPUT_PADDING );
#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 )
{
mp_msg(MSGT_DECVIDEO, MSGL_ERR, "LZO init failed\n");
return;
}
is_lzo_inited = 1;
}
switch(encodedh->comptype) switch(encodedh->comptype)
{ {
case '0': /* raw YUV420 */ case '0': /* raw YUV420 */
@ -82,14 +74,14 @@ void decode_nuv( unsigned char *encoded, int encoded_size,
break; break;
case '2': /* RTJpeg with LZO */ case '2': /* RTJpeg with LZO */
if (!buffer) if (!buffer)
buffer = ( unsigned char * ) malloc ( out_len ); buffer = ( unsigned char * ) malloc ( out_len + LZO_OUTPUT_PADDING );
if (!buffer) if (!buffer)
{ {
mp_msg(MSGT_DECVIDEO, MSGL_ERR, "Nuppelvideo: error decompressing\n"); mp_msg(MSGT_DECVIDEO, MSGL_ERR, "Nuppelvideo: error decompressing\n");
break; break;
} }
r = lzo1x_decompress_safe ( encoded + 12, encodedh->packetlength, buffer, &out_len, NULL ); r = lzo1x_decode ( buffer, &out_len, encoded + 12, &in_len );
if ( r != LZO_E_OK ) if ( r )
{ {
mp_msg(MSGT_DECVIDEO, MSGL_ERR, "Nuppelvideo: error decompressing\n"); mp_msg(MSGT_DECVIDEO, MSGL_ERR, "Nuppelvideo: error decompressing\n");
break; break;
@ -97,8 +89,8 @@ void decode_nuv( unsigned char *encoded, int encoded_size,
RTjpeg_decompressYUV420 ( ( __s8 * ) buffer, decoded ); RTjpeg_decompressYUV420 ( ( __s8 * ) buffer, decoded );
break; break;
case '3': /* raw YUV420 with LZO */ case '3': /* raw YUV420 with LZO */
r = lzo1x_decompress_safe ( encoded + 12, encodedh->packetlength, decoded, &out_len, NULL ); r = lzo1x_decode ( decoded, &out_len, encoded + 12, &in_len );
if ( r != LZO_E_OK ) if ( r )
{ {
mp_msg(MSGT_DECVIDEO, MSGL_ERR, "Nuppelvideo: error decompressing\n"); mp_msg(MSGT_DECVIDEO, MSGL_ERR, "Nuppelvideo: error decompressing\n");
break; break;