Skip to content

V
vlc
Commit 16d2d11b authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf
Browse files
Options

Removing realvideo plugin

parent cff6fc15
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 568 deletions
configure.ac
View file @ 16d2d11b
...@@ -618,7 +618,7 @@ AC_CHECK_FUNC(getopt_long,, [ ...@@ -618,7 +618,7 @@ AC_CHECK_FUNC(getopt_long,, [
AC_SUBST(GNUGETOPT_LIBS) AC_SUBST(GNUGETOPT_LIBS)
AC_CHECK_LIB(m,cos,[ AC_CHECK_LIB(m,cos,[
VLC_ADD_LIBS([adjust wave ripple psychedelic gradient a52tofloat32 dtstofloat32 x264 goom visual panoramix rotate noise grain scene kate flac lua chorus_flanger freetype avcodec avformat access_avio swscale postproc i420_rgb faad twolame equalizer spatializer param_eq samplerate freetype mod mpc dmo mp4 quicktime realvideo qt4 compressor headphone_channel_mixer normvol audiobargraph_a speex mono colorthres extract ball access_imem hotkeys mosaic gaussianblur dbus x264 hqdn3d anaglyph],[-lm]) VLC_ADD_LIBS([adjust wave ripple psychedelic gradient a52tofloat32 dtstofloat32 x264 goom visual panoramix rotate noise grain scene kate flac lua chorus_flanger freetype avcodec avformat access_avio swscale postproc i420_rgb faad twolame equalizer spatializer param_eq samplerate freetype mod mpc dmo mp4 quicktime qt4 compressor headphone_channel_mixer normvol audiobargraph_a speex mono colorthres extract ball access_imem hotkeys mosaic gaussianblur dbus x264 hqdn3d anaglyph],[-lm])
LIBM="-lm" LIBM="-lm"
], [ ], [
LIBM="" LIBM=""
...@@ -660,7 +660,7 @@ AS_IF([test "${have_dynamic_objects}" != "no"], [ ...@@ -660,7 +660,7 @@ AS_IF([test "${have_dynamic_objects}" != "no"], [
AM_CONDITIONAL(HAVE_DYNAMIC_PLUGINS, [test "${have_dynamic_objects}" != "no"]) AM_CONDITIONAL(HAVE_DYNAMIC_PLUGINS, [test "${have_dynamic_objects}" != "no"])
AC_SUBST(LIBDL) AC_SUBST(LIBDL)
VLC_ADD_LIBS([realvideo lua],[$LIBDL]) VLC_ADD_LIBS([lua],[$LIBDL])
dnl Check for thread library dnl Check for thread library
if test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"; then if test "${SYS}" != "mingw32" -a "${SYS}" != "mingwce"; then
...@@ -2602,15 +2602,6 @@ if test "${enable_quicktime}" = "yes"; then ...@@ -2602,15 +2602,6 @@ if test "${enable_quicktime}" = "yes"; then
fi fi
fi fi
dnl
dnl Real plugin
dnl
AC_ARG_ENABLE(real,
[ --enable-real Real video decoder module (default disabled)])
if test "${enable_real}" = "yes"; then
VLC_ADD_PLUGIN([realvideo])
fi
dnl dnl
dnl A52/AC3 decoder plugin dnl A52/AC3 decoder plugin
dnl dnl
...@@ -4072,9 +4063,8 @@ AC_ARG_ENABLE(loader, ...@@ -4072,9 +4063,8 @@ AC_ARG_ENABLE(loader,
AM_CONDITIONAL(LOADER, [test "${enable_loader}" = "yes"]) AM_CONDITIONAL(LOADER, [test "${enable_loader}" = "yes"])
AS_IF([test "${enable_loader}" = "yes"], AS_IF([test "${enable_loader}" = "yes"],
[ VLC_ADD_PLUGIN([dmo]) [ VLC_ADD_PLUGIN([dmo])
VLC_ADD_CPPFLAGS([dmo quicktime realvideo],[-I\\\${top_srcdir}/modules/codec/loader]) VLC_ADD_CPPFLAGS([dmo quicktime ],[-I\\\${top_srcdir}/modules/codec/loader])
VLC_ADD_LIBS([dmo quicktime realvideo],[\\\${top_builddir}/modules/codec/loader/libloader.la]) VLC_ADD_LIBS([dmo quicktime ],[\\\${top_builddir}/modules/codec/loader/libloader.la])
VLC_ADD_CPPFLAGS([realvideo], [-DLOADER])
VLC_ADD_LIBS([dmo quicktime], [-lpthread]) VLC_ADD_LIBS([dmo quicktime], [-lpthread])
]) ])
......
modules/LIST
View file @ 16d2d11b
...@@ -274,7 +274,6 @@ $Id$ ...@@ -274,7 +274,6 @@ $Id$
* rawvid: raw video input module for vlc * rawvid: raw video input module for vlc
* rawvideo: Pseudo audio-decoder for raw video * rawvideo: Pseudo audio-decoder for raw video
* real: partial Real audio/video demuxer * real: partial Real audio/video demuxer
* realvideo: Real video decoder
* remap: audio channel remapping filter * remap: audio channel remapping filter
* remoteosd: Remote-OSD over VNC * remoteosd: Remote-OSD over VNC
* ripple: Ripple video effect * ripple: Ripple video effect
......
modules/codec/realvideo.c deleted 100644 → 0
View file @ cff6fc15
/*****************************************************************************
* realvideo.c: a realvideo decoder that uses the real's dll
*****************************************************************************
* Copyright (C) 2005 the VideoLAN team
* Copyright (C) 2008 Wang Bo
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/*****************************************************************************
* Preamble
*****************************************************************************/
#ifdef HAVE_CONFIG_H
# include "config.h"
#endif
#include <vlc_common.h>
#include <vlc_plugin.h>
#include <vlc_codec.h>
#ifdef LOADER
/* Need the w32dll loader from mplayer */
# include <wine/winerror.h>
# include <ldt_keeper.h>
# include <wine/windef.h>
void *WINAPI LoadLibraryA( char *name );
void *WINAPI GetProcAddress( void *handle, char *func );
int WINAPI FreeLibrary( void *handle );
#endif
#ifndef WINAPI
# define WINAPI
#endif
#ifndef WIN32
# include <dlfcn.h>
#endif
typedef struct cmsg_data_s
{
uint32_t data1;
uint32_t data2;
uint32_t* dimensions;
} cmsg_data_t;
typedef struct transform_in_s
{
uint32_t len;
uint32_t unknown1;
uint32_t chunks;
uint32_t* extra;
uint32_t unknown2;
uint32_t timestamp;
} transform_in_t;
// copypaste from demux_real.c - it should match to get it working!
typedef struct dp_hdr_s
{
uint32_t chunks; // number of chunks
uint32_t timestamp; // timestamp from packet header
uint32_t len; // length of actual data
uint32_t chunktab; // offset to chunk offset array
} dp_hdr_t;
/* we need exact positions */
struct rv_init_t
{
short unk1;
short w;
short h;
short unk3;
int unk2;
unsigned int * subformat;
int unk5;
unsigned int * format;
} rv_init_t;
struct decoder_sys_t
{
/* library */
#ifdef LOADER
ldt_fs_t *ldt_fs;
#endif
void *handle;
void *rv_handle;
int inited;
char *plane;
};
int dll_type = 1;
static unsigned long (*rvyuv_custom_message)(cmsg_data_t* ,void*);
static unsigned long (*rvyuv_free)(void*);
static unsigned long (*rvyuv_init)(void*, void*); // initdata,context
static unsigned long (*rvyuv_transform)(char*, char*,transform_in_t*,unsigned int*,void*);
#ifdef WIN32
static unsigned long WINAPI (*wrvyuv_custom_message)(cmsg_data_t* ,void*);
static unsigned long WINAPI (*wrvyuv_free)(void*);
static unsigned long WINAPI (*wrvyuv_init)(void*, void*); // initdata,context
static unsigned long WINAPI (*wrvyuv_transform)(char*, char*,transform_in_t*,unsigned int*,void*);
#endif
/*****************************************************************************
* Module descriptor
*****************************************************************************/
static int Open ( vlc_object_t * );
static void Close( vlc_object_t * );
//static int OpenPacketizer( vlc_object_t * );
static picture_t *DecodeVideo( decoder_t *, block_t ** );
vlc_module_begin ()
set_description( N_("RealVideo library decoder") )
set_capability( "decoder", 0 )
set_category( CAT_INPUT )
set_subcategory( SUBCAT_INPUT_VCODEC )
set_callbacks( Open, Close )
vlc_module_end ()
/*****************************************************************************
* Local prototypes
*****************************************************************************/
#ifdef WIN32
static void * load_syms(decoder_t *p_dec, const char *path)
{
void *handle;
msg_Dbg( p_dec, "opening win32 dll '%s'", path);
#ifdef LOADER
Setup_LDT_Keeper();
#endif
handle = LoadLibraryA(path);
msg_Dbg( p_dec, "win32 real codec handle=%p",handle);
if (!handle)
{
msg_Err( p_dec, "Error loading dll");
return NULL;
}
wrvyuv_custom_message = GetProcAddress(handle, "RV20toYUV420CustomMessage");
wrvyuv_free = GetProcAddress(handle, "RV20toYUV420Free");
wrvyuv_init = GetProcAddress(handle, "RV20toYUV420Init");
wrvyuv_transform = GetProcAddress(handle, "RV20toYUV420Transform");
if (wrvyuv_custom_message && wrvyuv_free && wrvyuv_init && wrvyuv_transform)
{
dll_type = 1;
return handle;
}
msg_Err( p_dec, "Error resolving symbols! (version incompatibility?)");
FreeLibrary(handle);
return NULL; // error
}
#else
static void * load_syms_linux(decoder_t *p_dec, const char *path)
{
void *handle;
msg_Dbg( p_dec, "opening shared obj '%s'", path);
handle = dlopen (path, RTLD_LAZY);
if (!handle)
{
msg_Err( p_dec,"Error: %s",dlerror());
return NULL;
}
rvyuv_custom_message = dlsym(handle, "RV20toYUV420CustomMessage");
rvyuv_free = dlsym(handle, "RV20toYUV420Free");
rvyuv_init = dlsym(handle, "RV20toYUV420Init");
rvyuv_transform = dlsym(handle, "RV20toYUV420Transform");
if(rvyuv_custom_message && rvyuv_free && rvyuv_init && rvyuv_transform)
{
dll_type = 0;
return handle;
}
msg_Err( p_dec,"Error resolving symbols! (version incompatibility?)");
dlclose(handle);
return 0;
}
#endif
static vlc_mutex_t rm_mutex = VLC_STATIC_MUTEX;
static int InitVideo(decoder_t *p_dec)
{
int result;
struct rv_init_t init_data;
char fcc[4];
char *g_decode_path;
int i_vide = p_dec->fmt_in.i_extra;
unsigned int *p_vide = p_dec->fmt_in.p_extra;
decoder_sys_t *p_sys = calloc( 1, sizeof( decoder_sys_t ) );
if( !p_sys )
return VLC_ENOMEM;
if( i_vide < 8 )
{
msg_Err( p_dec, "missing extra info" );
free( p_sys );
return VLC_EGENERIC;
}
free( p_sys->plane );
p_sys->plane = malloc (p_dec->fmt_in.video.i_width*p_dec->fmt_in.video.i_height*3/2 + 1024 );
if (NULL == p_sys->plane)
{
msg_Err( p_dec, "cannot alloc plane buffer" );
free( p_sys );
return VLC_EGENERIC;
}
p_dec->p_sys = p_sys;
p_dec->pf_decode_video = DecodeVideo;
memcpy( fcc, &p_dec->fmt_in.i_codec, 4 );
init_data.unk1 = 11;
init_data.w = p_dec->fmt_in.video.i_width ;
init_data.h = p_dec->fmt_in.video.i_height ;
init_data.unk3 = 0;
init_data.unk2 = 0;
init_data.subformat = (unsigned int*)p_vide[0];
init_data.unk5 = 1;
init_data.format = (unsigned int*)p_vide[1];
/* first try to load linux dlls, if failed and we're supporting win32 dlls,
then try to load the windows ones */
bool b_so_opened = false;
#ifdef WIN32
g_decode_path="plugins\\drv43260.dll";
if( (p_sys->rv_handle = load_syms(p_dec, g_decode_path)) )
b_so_opened = true;
#else
static const char psz_paths[] =
{
"/usr/lib/win32\0"
"/usr/lib/codecs\0"
"/usr/local/RealPlayer8/Codecs\0"
"/usr/RealPlayer8/Codecs\0"
"/usr/lib/RealPlayer8/Codecs\0"
"/opt/RealPlayer8/Codecs\0"
"/usr/lib/RealPlayer9/users/Real/Codecs\0"
"/usr/lib/RealPlayer10/codecs\0"
"/usr/lib/RealPlayer10GOLD/codecs\0"
"/usr/lib/helix/player/codecs\0"
"/usr/lib64/RealPlayer8/Codecs\0"
"/usr/lib64/RealPlayer9/users/Real/Codecs\0"
"/usr/lib64/RealPlayer10/codecs\0"
"/usr/lib64/RealPlayer10GOLD/codecs\0"
"/usr/local/lib/codecs\0"
"\0"
};
for( size_t i = 0; psz_paths[i]; i += strlen( psz_paths + i ) + 1 )
{
if( asprintf( &g_decode_path, "%s/drv4.so.6.0", psz_paths + i ) != -1 )
{
p_sys->rv_handle = load_syms_linux(p_dec, g_decode_path);
free( g_decode_path );
}
if( p_sys->rv_handle )
{
b_so_opened = true;
break;
}
if( asprintf( &g_decode_path, "%s/drv3.so.6.0", psz_paths + i ) != -1 )
{
p_sys->rv_handle = load_syms_linux(p_dec, g_decode_path);
free( g_decode_path );
}
if( p_sys->rv_handle )
{
b_so_opened = true;
break;
}
msg_Dbg( p_dec, "Cannot load real decoder library: %s", g_decode_path);
}
#endif
if(!b_so_opened )
{
msg_Err( p_dec, "Cannot any real decoder library" );
free( p_sys );
return VLC_EGENERIC;
}
vlc_mutex_lock( &rm_mutex );
p_sys->handle=NULL;
#ifdef WIN32
if (dll_type == 1)
result=(*wrvyuv_init)(&init_data, &p_sys->handle);
else
#endif
result=(*rvyuv_init)(&init_data, &p_sys->handle);
if (result)
{
msg_Err( p_dec, "Cannot Init real decoder library: %s", g_decode_path);
free( p_sys );
return VLC_EGENERIC;
}
/* setup rv30 codec (codec sub-type and image dimensions): */
/*if ( p_dec->fmt_in.i_codec == VLC_CODEC_RV30 )*/
if (p_vide[1]>=0x20200002)
{
int i, cmsg_cnt;
uint32_t cmsg24[16]={p_dec->fmt_in.video.i_width,p_dec->fmt_in.video.i_height};
cmsg_data_t cmsg_data={0x24,1+(p_vide[1]&7), &cmsg24[0]};
cmsg_cnt = (p_vide[1]&7)*2;
if (i_vide - 8 < cmsg_cnt) {
cmsg_cnt = i_vide - 8;
}
for (i = 0; i < cmsg_cnt; i++)
cmsg24[2+i] = p_vide[8+i]*4;
#ifdef WIN32
if (dll_type == 1)
(*wrvyuv_custom_message)(&cmsg_data,p_sys->handle);
else
#endif
(*rvyuv_custom_message)(&cmsg_data,p_sys->handle);
}
/*
es_format_Init( &p_dec->fmt_out, VIDEO_ES, VLC_CODEC_YV12);
es_format_Init( &p_dec->fmt_out, VIDEO_ES, VLC_CODEC_YUYV);
*/
es_format_Init( &p_dec->fmt_out, VIDEO_ES, VLC_CODEC_I420);
p_dec->fmt_out.video.i_width = p_dec->fmt_in.video.i_width;
p_dec->fmt_out.video.i_height= p_dec->fmt_in.video.i_height;
p_dec->fmt_out.video.i_sar_num = 1;
p_dec->fmt_out.video.i_sar_den = 1;
p_sys->inited = 0;
vlc_mutex_unlock( &rm_mutex );
return VLC_SUCCESS;
}
/*****************************************************************************
* Open: probe the decoder and return score
*****************************************************************************
* Tries to launch a decoder and return score so that the interface is able
* to choose.
*****************************************************************************/
static int Open( vlc_object_t *p_this )
{
decoder_t *p_dec = (decoder_t*)p_this;
switch ( p_dec->fmt_in.i_codec )
{
case VLC_CODEC_RV10:
case VLC_CODEC_RV20:
case VLC_CODEC_RV30:
case VLC_CODEC_RV40:
p_dec->p_sys = NULL;
p_dec->pf_decode_video = DecodeVideo;
return InitVideo(p_dec);
default:
return VLC_EGENERIC;
}
}
/*****************************************************************************
* Close:
*****************************************************************************/
static void Close( vlc_object_t *p_this )
{
decoder_t *p_dec = (decoder_t*)p_this;
decoder_sys_t *p_sys = p_dec->p_sys;
/* get lock, avoid segfault */
vlc_mutex_lock( &rm_mutex );
#ifdef WIN32
if (dll_type == 1)
{
if (wrvyuv_free)
wrvyuv_free(p_sys->handle);
}
else
#endif
if (rvyuv_free)
rvyuv_free(p_sys->handle);
#ifdef WIN32
if (dll_type == 1)
{
if (p_sys->rv_handle)
FreeLibrary(p_sys->rv_handle);
}
else
#endif
p_sys->rv_handle=NULL;
free( p_sys->plane );
p_sys->plane = NULL;
msg_Dbg( p_dec, "FreeLibrary ok." );
#ifdef LOADER
Restore_LDT_Keeper( p_sys->ldt_fs );
msg_Dbg( p_dec, "Restore_LDT_Keeper" );
#endif
p_sys->inited = 0;
vlc_mutex_unlock( &rm_mutex );
free( p_sys );
}
/*****************************************************************************
* DecodeVideo:
*****************************************************************************/
static picture_t *DecodeVideo( decoder_t *p_dec, block_t **pp_block )
{
decoder_sys_t *p_sys = p_dec->p_sys;
block_t *p_block;
picture_t *p_pic;
mtime_t i_pts;
int result;
/* We must do open and close in the same thread (unless we do
* Setup_LDT_Keeper in the main thread before all others */
if ( pp_block == NULL || *pp_block == NULL )
{
return NULL;
}
p_block = *pp_block;
*pp_block = NULL;
i_pts = (p_block->i_pts > VLC_TS_INVALID) ? p_block->i_pts : p_block->i_dts;
vlc_mutex_lock( &rm_mutex );
p_pic = decoder_NewPicture( p_dec );
if ( p_pic )
{
unsigned int transform_out[5];
dp_hdr_t dp_hdr;
transform_in_t transform_in;
uint32_t pkg_len = ((uint32_t*)p_block->p_buffer)[0];
char* dp_data=((char*)p_block->p_buffer)+8;
uint32_t* extra=(uint32_t*)(((char*)p_block->p_buffer)+8+pkg_len);
uint32_t img_size;
dp_hdr.len = pkg_len;
dp_hdr.chunktab = 8 + pkg_len;
dp_hdr.chunks = ((uint32_t*)p_block->p_buffer)[1]-1;
dp_hdr.timestamp = i_pts;
memset(&transform_in, 0, sizeof(transform_in_t));
transform_in.len = dp_hdr.len;
transform_in.extra = extra;
transform_in.chunks = dp_hdr.chunks;
transform_in.timestamp = dp_hdr.timestamp;
memset (p_sys->plane, 0, p_dec->fmt_in.video.i_width * p_dec->fmt_in.video.i_height *3/2 );
#ifdef WIN32
if (dll_type == 1)
result=(*wrvyuv_transform)(dp_data, p_sys->plane, &transform_in, transform_out, p_sys->handle);
else
#endif
result=(*rvyuv_transform)(dp_data, p_sys->plane, &transform_in, transform_out, p_sys->handle);
/* msg_Warn(p_dec, "Real Size %d X %d", transform_out[3],
transform_out[4]); */
/* some bug rm file will print the messages :
[00000551] realvideo decoder warning: Real Size 320 X 240
[00000551] realvideo decoder warning: Real Size 480 X 272
[00000551] realvideo decoder warning: Real Size 320 X 240
[00000551] realvideo decoder warning: Real Size 320 X 240
...
so it needs fixing!
*/
if ( p_sys->inited == 0 )
{
/* fix and get the correct image size! */
if ( p_dec->fmt_in.video.i_width != transform_out[3]
|| p_dec->fmt_in.video.i_height != transform_out[4] )
{
msg_Warn(p_dec, "Warning, Real's Header give a wrong "
"information about media's width and height!"
"\tRealHeader: \t %d X %d \t %d X %d",
p_dec->fmt_in.video.i_width,
p_dec->fmt_in.video.i_height,
transform_out[3],transform_out[4]);
if ( p_dec->fmt_in.video.i_width * p_dec->fmt_in.video.i_height >= transform_out[3] * transform_out[4] )
{
p_dec->fmt_out.video.i_width =
p_dec->fmt_out.video.i_visible_width =
p_dec->fmt_in.video.i_width = transform_out[3] ;
p_dec->fmt_out.video.i_height=
p_dec->fmt_out.video.i_visible_height =
p_dec->fmt_in.video.i_height= transform_out[4];
p_dec->fmt_out.video.i_sar_num = 1;
p_dec->fmt_out.video.i_sar_den = 1;
}
else
{
// TODO: realloc plane's size! but [in fact] it maybe not happen!
msg_Err(p_dec,"plane space not enough ,skip");
}
}
p_sys->inited = 1;
}
img_size = p_dec->fmt_in.video.i_width * p_dec->fmt_in.video.i_height;
memcpy( p_pic->p[0].p_pixels, p_sys->plane, img_size);
memcpy( p_pic->p[1].p_pixels, p_sys->plane + img_size, img_size/4);
memcpy( p_pic->p[2].p_pixels, p_sys->plane + img_size * 5/4, img_size/4);
p_pic->date = i_pts ;
/* real video frame is small( frame and frame's time-shift is short),
so it will become late picture easier (when render-time changed)and
droped by video-output.*/
p_pic->b_force = 1;
}
vlc_mutex_unlock( &rm_mutex );
block_Release( p_block );
return p_pic;
}
po/POTFILES.in
View file @ 16d2d11b
...@@ -383,7 +383,6 @@ modules/codec/omxil/utils.c ...@@ -383,7 +383,6 @@ modules/codec/omxil/utils.c
modules/codec/png.c modules/codec/png.c
modules/codec/quicktime.c modules/codec/quicktime.c
modules/codec/rawvideo.c modules/codec/rawvideo.c
modules/codec/realvideo.c
modules/codec/schroedinger.c modules/codec/schroedinger.c
modules/codec/sdl_image.c modules/codec/sdl_image.c
modules/codec/shine/shine_mod.c modules/codec/shine/shine_mod.c
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment