Mercurial > mplayer.hg
changeset 3201:039a973b3dda
Newest DXR3 patch (improved 1.0rc2) by David Holm.
| author | atmos4 |
|---|---|
| date | Thu, 29 Nov 2001 17:31:58 +0000 |
| parents | a3fa0a5dcf37 |
| children | e9b18714e3dc |
| files | DOCS/DXR3 Makefile configure libao2/ao_dxr3.c libvo/video_out.c libvo/video_out.h libvo/vo_dxr3.c mplayer.c |
| diffstat | 8 files changed, 176 insertions(+), 433 deletions(-) [+] |
line wrap: on
line diff
--- a/DOCS/DXR3 Thu Nov 29 17:13:37 2001 +0000 +++ b/DOCS/DXR3 Thu Nov 29 17:31:58 2001 +0000 @@ -1,6 +1,12 @@ DXR3/H+ video/audio output plugins manual by David Holm ======================================================= +2001-11-28: ffmpeg replaced with mp1e, divx playback + won't get much faster than this, huge thanks + goes out to Ivan Kalvachev for helping me + fix the final mp1e bugs (and contributing + to the libvo2 development) + 2001-11-27: -ao dxr3 now works, still a few bugs though you might have to reload the em8300 modules after a playback or you might get static the @@ -45,20 +51,13 @@ the CVS version since most of the time I use the latest features which are only available through cvs) - * <mplayerdir>/libavcodec from ffmpeg (only required if you intend to - play formats other than mpeg-(1/2), highly recommended!) there are - two ways of doing this: - 1. Download and install ffmpeg from ffmpeg.sourceforge.net. - Configure it with --enable-shared - 2. Download ffmpeg from ffmpeg.sourceforge.net, copy the entire - contents from <ffmpegdir>/libavcodec into <mplayer>/libavcodec - (symlinking won't work!). Then edit <mplayerdir>/libavcodec/utils.c - and move the line containing register_avcodec(&mpeg1video_encoder); - out of the CONFIG_ENCODERS #ifdef block and place it outside, for - instance below register_avcodec(&rawvideo_encoder); - + * Second, if you want DivX playback you need to download and install + RTE from zapping.sourceforge.net compile and install it BEFORE + running configure in the mplayer dir. + * Run <mplayerdir>/configure and make sure that DXR3/H+ support =yes - and optionally that libavcodec or ffmpeg.so = yes + and optionally that mp1e rte = yes, if it's = no, please mail me + your configure.log and I'll fix it. From here on compilation (of at least my code ;) should go without problems. @@ -83,9 +82,8 @@ any of these video types _without_ "-vo dxr3"! DIVX Notes -When playing divx's add "-vc odivx", if you get any other divx codec -to run faster tell me which one because I'll be interested in how it -could possibly be any faster than OpenDivX4Linux... +When playing divx's add "-vc odivx" +I've switched to mp1e from ffmpeg so it should be lightning fast now. Other codecs: Currently they don't work. I'm working on implementing libvo2 which
--- a/Makefile Thu Nov 29 17:13:37 2001 +0000 +++ b/Makefile Thu Nov 29 17:31:58 2001 +0000 @@ -146,14 +146,14 @@ endif $(PRG): $(MPLAYER_DEP) - $(CC) $(CFLAGS) -o $(PRG) $(OBJS_MPLAYER) -Llibmpdemux -lmpdemux $(AV_LIB) $(EXTRA_LIB) $(LIRC_LIB) $(LIB_LOADER) -Llibmpeg2 -lmpeg2 -Llibao2 -lao2 $(A_LIBS) $(VO_LIBS) $(CSS_LIB) $(ARCH_LIB) $(OSDEP_LIBS) $(PP_LIBS) $(XA_LIBS) $(DECORE_LIB) $(TERMCAP_LIB) -lm $(STATIC_LIB) $(GUI_LIBS) $(PNG_LIB) $(Z_LIB) + $(CC) $(CFLAGS) -o $(PRG) $(OBJS_MPLAYER) -Llibmpdemux -lmpdemux $(EXTRA_LIB) $(LIRC_LIB) $(LIB_LOADER) $(AV_LIB) $(MP1E_LIB) -Llibmpeg2 -lmpeg2 -Llibao2 -lao2 $(A_LIBS) $(VO_LIBS) $(CSS_LIB) $(ARCH_LIB) $(OSDEP_LIBS) $(PP_LIBS) $(XA_LIBS) $(DECORE_LIB) $(TERMCAP_LIB) -lm $(STATIC_LIB) $(GUI_LIBS) $(PNG_LIB) $(Z_LIB) $(PRG_FIBMAP): fibmap_mplayer.o $(CC) -o $(PRG_FIBMAP) fibmap_mplayer.o ifeq ($(MENCODER),yes) $(PRG_MENCODER): $(MENCODER_DEP) - $(CC) $(CFLAGS) -o $(PRG_MENCODER) $(OBJS_MENCODER) -Llibmpeg2 -lmpeg2 -Llibmpdemux -lmpdemux $(X_LIBS) $(LIB_LOADER) $(AV_LIB) -lmp3lame $(A_LIBS) $(CSS_LIB) $(GUI_LIBS) $(PNG_LIB) $(Z_LIB) $(ARCH_LIB) $(OSDEP_LIBS) $(PP_LIBS) $(XA_LIBS) $(DECORE_LIB) $(ENCORE_LIB) $(TERMCAP_LIB) -lm + $(CC) $(CFLAGS) -o $(PRG_MENCODER) $(OBJS_MENCODER) -Llibmpeg2 -lmpeg2 -Llibmpdemux -lmpdemux $(X_LIBS) $(LIB_LOADER) $(AV_LIB) $(MP1E_LIB) -lmp3lame $(A_LIBS) $(CSS_LIB) $(GUI_LIBS) $(PNG_LIB) $(Z_LIB) $(ARCH_LIB) $(OSDEP_LIBS) $(PP_LIBS) $(XA_LIBS) $(DECORE_LIB) $(ENCORE_LIB) $(TERMCAP_LIB) -lm endif # $(PRG_HQ): depfile mplayerHQ.o $(OBJS) loader/libloader.a libmpeg2/libmpeg2.a opendivx/libdecore.a $(COMMONLIBS) encore/libencore.a
--- a/configure Thu Nov 29 17:13:37 2001 +0000 +++ b/configure Thu Nov 29 17:31:58 2001 +0000 @@ -150,6 +150,7 @@ --disable-alsa disable alsa sound support [autodetect] --disable-sunaudio disable Sun sound support [autodetect] --disable-mad disable mad audio support [autodetect] + --disable-mp1e disable mp1e codec support [autodetect] --disable-select disable using select() on OSS audio device [enable] Miscellaneous options: @@ -733,6 +734,8 @@ --disable-ossaudio) _ossaudio=no ;; --enable-mad) _mad=yes ;; --disable-mad) _mad=no ;; + --enable-mp1e) _mp1e=yes ;; + --disable-mp1e) _mp1e=no ;; --enable-vorbis) _vorbis=yes ;; --disable-vorbis) _vorbis=no ;; --enable-css) _css=yes ;; @@ -1453,7 +1456,7 @@ cat > $TMPC << EOF #include <X11/Xlib.h> #include <X11/extensions/xf86dga.h> -int main (void) { return 0; } +int main (void) { (void) XDGAQueryExtension(0, 0, 0); return 0; } EOF _dga=no cc_check $_inc_x11 $_ld_x11 -lXxf86dga -lXxf86vm && _dga=yes @@ -1997,18 +2000,20 @@ if test "$_mp1e" = auto ; then _mp1e=no cat > $TMPC << EOF +#include <unistd.h> #include <sys/types.h> -#include <unistd.h> #include <rte.h> int main(void) { return 0; } EOF - cc_check -lrte && _mp1e=yes + cc_check -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -lrte && _mp1e=yes fi if test "$_mp1e" = yes ; then + _largefiles=yes _def_mp1e='#define USE_MP1E 1' _ld_mp1e='-lrte' else _def_mp1e='#undef USE_MP1E' + _ld_mp1e='' fi echores "$_mp1e" @@ -2459,9 +2464,9 @@ fi # 64 bit file offsets? -if test "$_largefiles" = yes || freebsd ; then +if test "$_largefiles" = yes || test "$_mp1e" = yes || freebsd ; then CFLAGS="$CFLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" - if test "$_dvdread" = yes ; then + if test "$_dvdread" = yes || test "$_mp1e" = yes ; then # dvdread support requires this (for off64_t) CFLAGS="$CFLAGS -D_LARGEFILE64_SOURCE" fi @@ -2545,7 +2550,6 @@ DS_LIB = $_ld_dshow AV_DEP = $_dep_libavcodec AV_LIB = $_ld_libavcodec -MP1E_DEP = $_dep_mp1e MP1E_LIB = $_ld_mp1e ARCH_LIB = $_ld_arch $_ld_iconv DIVX4LINUX = $_divx4linux
--- a/libao2/ao_dxr3.c Thu Nov 29 17:13:37 2001 +0000 +++ b/libao2/ao_dxr3.c Thu Nov 29 17:31:58 2001 +0000 @@ -146,6 +146,7 @@ static void audio_pause() { int ioval; + reset(); fd_control = open( "/dev/em8300", O_WRONLY ); if( fd_control < 0 ) printf( "AO: [dxr3] Oops, unable to pause playback\n" ); @@ -184,25 +185,28 @@ return ao_data.outburst; } space = ao_data.buffersize - space; + space /= ao_data.outburst; /* This is a smart way of doing a fast modulo reduction */ + space *= ao_data.outburst; /* fetched from ao_mpegpes.c */ return space; } static int play(void* data,int len,int flags) { if( ioctl( fd_audio, EM8300_IOCTL_AUDIO_SETPTS, &ao_data.pts ) < 0 ) - printf( "AO: [dxr3] Unable to set pts\n" ); + printf( "AO: [dxr3] Unable to set PTS\n" ); return write(fd_audio,data,len); } // return: how many unplayed bytes are in the buffer static float get_delay() { - int r=0; +/* int r=0; if( ioctl(fd_audio, SNDCTL_DSP_GETODELAY, &r) < 0 ) { printf( "AO: [dxr3] Unable to get unplayed bytes in buffer\n" ); return ((float)ao_data.buffersize)/(float)ao_data.bps; } - return (((float)r)/(float)ao_data.bps); + return (((float)r)/(float)ao_data.bps);*/ + return 0.0; }
--- a/libvo/video_out.c Thu Nov 29 17:13:37 2001 +0000 +++ b/libvo/video_out.c Thu Nov 29 17:31:58 2001 +0000 @@ -44,6 +44,7 @@ int vo_fsmode = 0; int vo_pts=0; // for hw decoding +float vo_fps=0; // for mp1e rte char *vo_subdevice = NULL;
--- a/libvo/video_out.h Thu Nov 29 17:13:37 2001 +0000 +++ b/libvo/video_out.h Thu Nov 29 17:31:58 2001 +0000 @@ -115,6 +115,7 @@ extern int vo_fsmode; extern int vo_pts; +extern float vo_fps; extern char *vo_subdevice;
--- a/libvo/vo_dxr3.c Thu Nov 29 17:13:37 2001 +0000 +++ b/libvo/vo_dxr3.c Thu Nov 29 17:31:58 2001 +0000 @@ -33,25 +33,19 @@ LIBVO_EXTERN (dxr3) -#ifdef USE_LIBAVCODEC - -#ifdef USE_LIBAVCODEC_SO -#include <libffmpeg/avcodec.h> -#else -#include "../libavcodec/avcodec.h" -#endif -static AVPicture picture; -static AVCodec *codec=NULL; -static AVCodecContext codec_context; -extern int avcodec_inited; +#ifdef USE_MP1E +#include <rte.h> +rte_context* mp1e_context = NULL; +rte_codec* mp1e_codec = NULL; +rte_buffer mp1e_buffer; #endif -static unsigned char *picture_buf=NULL; -static unsigned char *outbuf=NULL; +static unsigned char *picture_data[3]; +static unsigned int picture_linesize[3]; static unsigned char *spubuf=NULL; -static int outbuf_size = 0; static int v_width,v_height; static int s_width,s_height; +static int c_width,c_height; static int s_pos_x,s_pos_y; static int d_pos_x,d_pos_y; static int osd_w,osd_h; @@ -70,12 +64,18 @@ "" }; +#ifdef USE_MP1E +void write_dxr3( rte_context* context, void* data, size_t size, void* user_data ) +{ + if( ioctl( fd_video, EM8300_IOCTL_VIDEO_SETPTS, &vo_pts ) < 0 ) + printf( "VO: [dxr3] Unable to set PTS\n" ); + write( fd_video, data, size ); +} +#endif + static uint32_t init(uint32_t scr_width, uint32_t scr_height, uint32_t width, uint32_t height, uint32_t fullscreen, char *title, uint32_t format) { - int i; - char tmp; - fd_control = open( "/dev/em8300", O_WRONLY ); if( fd_control < 1 ) { @@ -120,284 +120,126 @@ img_format = format; v_width = width; v_height = height; + s_width = scr_width; + s_height = scr_height; spubuf = malloc(53220); /* 53220 bytes is the standardized max size of a subpic */ - picture_buf=NULL; if( format == IMGFMT_YV12 ) { -#ifdef USE_LIBAVCODEC - +#ifdef USE_MP1E int size; - - printf("VO: [dxr3] Format: YV12\n"); + enum rte_frame_rate frame_rate; - if(!avcodec_inited){ - avcodec_init(); - avcodec_register_all(); - avcodec_inited=1; - } - - /* find the mpeg1 video encoder */ - codec = avcodec_find_encoder(CODEC_ID_MPEG1VIDEO); - if (!codec) + if( !rte_init() ) { - printf( "VO: [dxr3] mpeg1 codec not found! Read DOCS/DXR3!\n"); - return -1; - } - - memset(&codec_context,0,sizeof(codec_context)); - codec_context.bit_rate=100000; // not used - codec_context.frame_rate=25*FRAME_RATE_BASE; - codec_context.gop_size=0; - codec_context.flags=CODEC_FLAG_QSCALE; - codec_context.quality=1; - codec_context.pix_fmt = PIX_FMT_YUV420P; + printf( "VO: [dxr3] Unable to initialize RTE!\n" ); + return -1; + } + if(width<=352 && height<=288){ - codec_context.width=352; - codec_context.height=288; + c_width=352; + c_height=288; } else if(width<=352 && height<=576){ - codec_context.width=352; - codec_context.height=576; + c_width=352; + c_height=576; } else if(width<=480 && height<=576){ - codec_context.width=480; - codec_context.height=576; + c_width=480; + c_height=576; } else if(width<=544 && height<=576){ - codec_context.width=544; - codec_context.height=576; + c_width=544; + c_height=576; } else { - codec_context.width=704; - codec_context.height=576; + c_width=704; + c_height=576; } - s_width = codec_context.width; - s_height = codec_context.height;; + + mp1e_context = rte_context_new( c_width, c_height, "mp1e", (void*)0xdeadbeef ); + rte_set_verbosity( mp1e_context, 0 ); + + if( !mp1e_context ) + { + printf( "VO: [dxr3] Unable to create context!\n" ); + return -1; + } + + if( !rte_set_format( mp1e_context, "mpeg1" ) ) + { + printf( "VO: [dxr3] Unable to set format\n" ); + return -1; + } + + rte_set_mode( mp1e_context, RTE_VIDEO ); + mp1e_codec = rte_codec_set( mp1e_context, RTE_STREAM_VIDEO, 0, "mpeg1-video" ); - + if( vo_fps < 24.0 ) frame_rate = RTE_RATE_1; + else if( vo_fps < 25.0 ) frame_rate = RTE_RATE_2; + else if( vo_fps < 29.97 ) frame_rate = RTE_RATE_3; + else if( vo_fps < 30.0 ) frame_rate = RTE_RATE_4; + else if( vo_fps < 50.0 ) frame_rate = RTE_RATE_5; + else if( vo_fps < 59.97 ) frame_rate = RTE_RATE_6; + else if( vo_fps < 60.0 ) frame_rate = RTE_RATE_7; + else if( vo_fps > 60.0 ) frame_rate = RTE_RATE_8; + else frame_rate = RTE_RATE_NORATE; + + if( !rte_set_video_parameters( mp1e_context, RTE_YUV420, mp1e_context->width, + mp1e_context->height, frame_rate, + 3e6, "I" ) ) + { + printf( "VO: [dxr3] Unable to set RTE context!\n" ); + rte_context_destroy( mp1e_context ); + return -1; + } + + rte_set_input( mp1e_context, RTE_VIDEO, RTE_PUSH, TRUE, NULL, NULL, NULL ); + rte_set_output( mp1e_context, write_dxr3, NULL, NULL ); + + if( !rte_init_context( mp1e_context ) ) + { + printf( "VO: [dxr3] Unable to init RTE context!\n" ); + rte_context_delete( mp1e_context ); + return -1; + } + osd_w=scr_width; - d_pos_x=(codec_context.width-(int)scr_width)/2; + d_pos_x=(c_width-(int)scr_width)/2; if(d_pos_x<0){ s_pos_x=-d_pos_x;d_pos_x=0; - osd_w=codec_context.width; + osd_w=c_width; } else s_pos_x=0; osd_h=scr_height; - d_pos_y=(codec_context.height-(int)scr_height)/2; + d_pos_y=(c_height-(int)scr_height)/2; if(d_pos_y<0){ s_pos_y=-d_pos_y;d_pos_y=0; - osd_h=codec_context.height; + osd_h=c_height; } else s_pos_y=0; printf("VO: [dxr3] position mapping: %d;%d => %d;%d\n",s_pos_x,s_pos_y,d_pos_x,d_pos_y); - - /* open it */ - if (avcodec_open(&codec_context, codec) < 0) + + size = c_width*c_height; + + picture_data[0] = malloc((size * 3)/2); + picture_data[1] = picture_data[0] + size; + picture_data[2] = picture_data[1] + size / 4; + picture_linesize[0] = c_width; + picture_linesize[1] = c_width / 2; + picture_linesize[2] = c_width / 2; + memset(picture_data[0],0,size); + + if( !rte_start_encoding( mp1e_context ) ) { - printf( "VO: [dxr3] Could not open codec\n"); - return -1; - } - - outbuf_size=10000+width*height; - outbuf = malloc(outbuf_size); - - size = codec_context.width*codec_context.height; - picture_buf = malloc((size * 3)/2); /* size for YUV 420 */ - - picture.data[0] = picture_buf; - picture.data[1] = picture.data[0] + size; - picture.data[2] = picture.data[1] + size / 4; - picture.linesize[0] = codec_context.width; - picture.linesize[1] = codec_context.width / 2; - picture.linesize[2] = codec_context.width / 2; + printf( "VO: [dxr3] Unable to start mp1e encoding!\n" ); + uninit(); + return -1; + } return 0; #endif return -1; } - else if(format==IMGFMT_BGR24) - { -#ifdef USE_LIBAVCODEC - int size = 0; - printf("VO: [dxr3] Format: BGR24\n"); - - if(!avcodec_inited) - { - avcodec_init(); - avcodec_register_all(); - avcodec_inited=1; - } - - /* find the mpeg1 video encoder */ - codec = avcodec_find_encoder(CODEC_ID_MPEG1VIDEO); - if (!codec) - { - printf( "VO: [dxr3] mpeg1 codec not found! Read DOCS/DXR3!\n"); - return -1; - } - - outbuf_size=10000+width*height; - outbuf = malloc(outbuf_size); - - memset(&codec_context,0,sizeof(codec_context)); - codec_context.bit_rate=100000; - codec_context.frame_rate=25*FRAME_RATE_BASE; - codec_context.gop_size=0; - codec_context.flags=CODEC_FLAG_QSCALE; - codec_context.quality=1; - codec_context.pix_fmt = PIX_FMT_YUV420P; - - if(width<=352 && height<=288){ - codec_context.width=352; - codec_context.height=288; - } else - if(width<=352 && height<=576){ - codec_context.width=352; - codec_context.height=576; - } else - if(width<=480 && height<=576){ - codec_context.width=480; - codec_context.height=576; - } else - if(width<=544 && height<=576){ - codec_context.width=544; - codec_context.height=576; - } else { - codec_context.width=704; - codec_context.height=576; - } -/* s_width = codec_context.width = width; - s_height = codec_context.height = height; -*/ - osd_w=scr_width; - d_pos_x=(codec_context.width-(int)scr_width)/2; - if(d_pos_x<0){ - s_pos_x=-d_pos_x;d_pos_x=0; - osd_w=codec_context.width; - } else s_pos_x=0; - - osd_h=scr_height; - d_pos_y=(codec_context.height-(int)scr_height)/2; - if(d_pos_y<0){ - s_pos_y=-d_pos_y;d_pos_y=0; - osd_h=codec_context.height; - } else s_pos_y=0; - - printf("VO: [dxr3] position mapping: %d;%d => %d;%d\n",s_pos_x,s_pos_y,d_pos_x,d_pos_y); - - /* open it */ - if (avcodec_open(&codec_context, codec) < 0) - { - printf( "VO: [dxr3] could not open codec\n"); - return -1; - } - - size = 10000+codec_context.width*codec_context.height; - picture_buf = malloc((size * 3)/2); - - picture.data[0] = picture_buf; - picture.data[1] = picture.data[0] + size; - picture.data[2] = picture.data[1] + size / 4; - picture.linesize[0] = codec_context.width; - picture.linesize[1] = codec_context.width / 2; - picture.linesize[2] = codec_context.width / 2; - return 0; -#endif - return -1; - } - else if(format==IMGFMT_YUY2) - { -#ifdef USE_LIBAVCODEC - int size = 0; - printf("VO: [dxr3] Format: YUY2\n"); - - if(!avcodec_inited) - { - avcodec_init(); - avcodec_register_all(); - avcodec_inited=1; - } - - /* find the mpeg1 video encoder */ - codec = avcodec_find_encoder(CODEC_ID_MPEG1VIDEO); - if (!codec) - { - printf( "VO: [dxr3] mpeg1 codec not found! Read DOCS/DXR3!\n"); - return -1; - } - - outbuf_size=10000+width*height; - outbuf = malloc(outbuf_size); - - memset(&codec_context,0,sizeof(codec_context)); - codec_context.bit_rate=100000; - codec_context.frame_rate=25*FRAME_RATE_BASE; - codec_context.gop_size=0; - codec_context.flags=CODEC_FLAG_QSCALE; - codec_context.quality=1; - codec_context.pix_fmt = PIX_FMT_YUV420P; - - if(width<=352 && height<=288){ - codec_context.width=352; - codec_context.height=288; - } else - if(width<=352 && height<=576){ - codec_context.width=352; - codec_context.height=576; - } else - if(width<=480 && height<=576){ - codec_context.width=480; - codec_context.height=576; - } else - if(width<=544 && height<=576){ - codec_context.width=544; - codec_context.height=576; - } else { - codec_context.width=704; - codec_context.height=576; - } - s_width = codec_context.width; - s_height = codec_context.height;; - /* FOR DEBUGGING ONLY!! */ - codec_context.width = width; - codec_context.height = height; - - osd_w=scr_width; - d_pos_x=(codec_context.width-(int)scr_width)/2; - if(d_pos_x<0){ - s_pos_x=-d_pos_x;d_pos_x=0; - osd_w=codec_context.width; - } else s_pos_x=0; - - osd_h=scr_height; - d_pos_y=(codec_context.height-(int)scr_height)/2; - if(d_pos_y<0){ - s_pos_y=-d_pos_y;d_pos_y=0; - osd_h=codec_context.height; - } else s_pos_y=0; - - printf("VO: [dxr3] position mapping: %d;%d => %d;%d\n",s_pos_x,s_pos_y,d_pos_x,d_pos_y); - - /* open it */ - if (avcodec_open(&codec_context, codec) < 0) - { - printf( "VO: [dxr3] Could not open codec\n" ); - return -1; - } - - size = 10000+codec_context.width*codec_context.height; - picture_buf = malloc((size * 3)/2); - - picture.data[0] = picture_buf; - picture.data[1] = picture.data[0] + size; - picture.data[2] = picture.data[1] + size / 4; - picture.linesize[0] = codec_context.width; - picture.linesize[1] = codec_context.width / 2; - picture.linesize[2] = codec_context.width / 2; - return 0; -#endif - return -1; - } else if(format==IMGFMT_MPEGPES) { printf( "VO: [dxr3] Format: MPEG-PES (no conversion needed)\n" ); @@ -419,7 +261,6 @@ static void draw_osd(void) { -// vo_draw_text(osd_w,osd_h,draw_alpha); } static uint32_t draw_frame(uint8_t * src[]) @@ -428,120 +269,16 @@ { int data_left; vo_mpegpes_t *p=(vo_mpegpes_t *)src[0]; - unsigned char *data = p->data; + + if( ioctl( fd_video, EM8300_IOCTL_VIDEO_SETPTS, &vo_pts ) < 0 ) + printf( "VO: [dxr3] Unable to set PTS\n" ); data_left = p->size; - if( ioctl( fd_video, EM8300_IOCTL_VIDEO_SETPTS, &vo_pts ) < 0 ) - printf( "VO: [dxr3] Unable to set PTS in draw_frame\n" ); while( data_left ) data_left -= write( fd_video, &((unsigned char*)p->data)[p->size-data_left], data_left ); return 0; } -#ifdef USE_LIBAVCODEC - else if( img_format == IMGFMT_YV12 ) - { - printf("VO: [dxr3] ERROR: Uninplemented\n"); - } - else if( img_format == IMGFMT_BGR24 ) - { - int tmp_size, out_size; - int wrap, wrap3, x, y; - int r, g, b, R, G, B, h = v_height, w = v_width; - unsigned char *s, *Y, *U, *V; - - if(d_pos_x+w>picture.linesize[0]) w=picture.linesize[0]-d_pos_x; - if(d_pos_y+h>codec_context.height) h=codec_context.height-d_pos_y; - - Y = picture.data[0]+d_pos_x+(d_pos_y*picture.linesize[0]); - U = picture.data[1]+(d_pos_x/2)+((d_pos_y/2)*picture.linesize[1]); - V = picture.data[2]+(d_pos_x/2)+((d_pos_y/2)*picture.linesize[2]); - - //BGR24->YUV420P from ffmpeg, see ffmpeg.sourceforge.net for terms of license -#define SCALEBITS 8 -#define ONE_HALF (1 << (SCALEBITS - 1)) -#define FIX(x) ((int) ((x) * (1L<<SCALEBITS) + 0.5)) - wrap = s_width; - wrap3 = w * 3; - s = src[0]+s_pos_x+(s_pos_y*wrap3); - for( y = 0; y < h; y+=2 ) - { - for( x = 0; x < w; x+=2 ) - { - b = s[0]; - g = s[1]; - r = s[2]; - R = r; - G = g; - B = b; - Y[0] = (FIX(0.29900) * r + FIX(0.58700) * g + FIX(0.11400) * b + ONE_HALF) >> SCALEBITS; - b = s[3]; - g = s[4]; - r = s[5]; - R += r; - G += g; - B += b; - Y[1] = (FIX(0.29900) * r + FIX(0.58700) * g + FIX(0.11400) * b + ONE_HALF) >> SCALEBITS; - s += wrap3; - Y += wrap; - - b = s[0]; - g = s[1]; - r = s[2]; - R += r; - G += g; - B += b; - Y[0] = (FIX(0.29900) * r + FIX(0.58700) * g + FIX(0.11400) * b + ONE_HALF) >> SCALEBITS; - b = s[3]; - g = s[4]; - r = s[5]; - R += r; - G += g; - B += b; - Y[1] = (FIX(0.29900) * r + FIX(0.58700) * g + FIX(0.11400) * b + ONE_HALF) >> SCALEBITS; - U[0] = ((- FIX(0.16874) * R - FIX(0.33126) * G - FIX(0.50000) * B + 4 * ONE_HALF - 1) >> (SCALEBITS + 2)) + 128; - V[0] = ((FIX(0.50000) * R - FIX(0.41869) * G - FIX(0.08131) * B + 4 * ONE_HALF - 1) >> (SCALEBITS + 2)) + 128; - - U++; - V++; - s -= (wrap3-6); - Y -= (wrap-(3/2)); - } - s += wrap3; - Y += wrap; - } -#undef SCALEBITS -#undef ONE_HALF -#undef FIX(x) - //End of ffmpeg code, see ffmpeg.sourceforge.net for terms of license - if( ioctl( fd_video, EM8300_IOCTL_VIDEO_SETPTS, &vo_pts ) < 0 ) - printf( "VO: [dxr3] Unable to set PTS in draw_frame\n" ); - tmp_size = out_size = avcodec_encode_video(&codec_context, outbuf, outbuf_size, &picture); - while( out_size ) - out_size -= write( fd_video, &outbuf[tmp_size-out_size], out_size ); - return 0; - } - else if( img_format == IMGFMT_YUY2 ) - { - int tmp_size, out_size; - int x, y, w = v_width, h = v_height; - - for( y = 0; y < h; y++ ) - { - for( x = 0; x < w; x++ ) - { - } - } - - if( ioctl( fd_video, EM8300_IOCTL_VIDEO_SETPTS, &vo_pts ) < 0 ) - printf( "VO: [dxr3] Unable to set PTS in draw_frame\n" ); - tmp_size = out_size = avcodec_encode_video(&codec_context, outbuf, outbuf_size, &picture); - while( out_size ) - out_size -= write( fd_video, &outbuf[tmp_size-out_size], out_size ); - - return 0; - } -#endif printf( "VO: [dxr3] Error in draw_frame(...)\n" ); return -1; @@ -549,67 +286,64 @@ static void flip_page (void) { + if( img_format == IMGFMT_YV12 ) + { + mp1e_buffer.data = picture_data[0]; + mp1e_buffer.time = vo_pts/90000.0; + mp1e_buffer.user_data = NULL; + rte_push_video_buffer( mp1e_context, &mp1e_buffer ); + } } static uint32_t draw_slice( uint8_t *srcimg[], int stride[], int w, int h, int x0, int y0 ) { - int y, pts; + int y; unsigned char* s; unsigned char* d; - int data_left; - vo_mpegpes_t *p = (vo_mpegpes_t *)srcimg[0]; - + if( img_format == IMGFMT_YV12 ) - { -#ifdef USE_LIBAVCODEC - int out_size, tmp_size; + { +#ifdef USE_MP1E x0+=d_pos_x; y0+=d_pos_y; - if(x0+w>picture.linesize[0]) w=picture.linesize[0]-x0; // !! - if(y0+h>codec_context.height) h=codec_context.height-y0; + if(x0+w>picture_linesize[0]) w=picture_linesize[0]-x0; + if(y0+h>c_height) h=c_height-y0; // Y s=srcimg[0]+s_pos_x+s_pos_y*stride[0]; - d=picture.data[0]+x0+y0*picture.linesize[0]; + d=picture_data[0]+x0+y0*picture_linesize[0]; for( y = 0; y < h; y++) { - memcpy(d,s,w); - s+=stride[0]; - d+=picture.linesize[0]; + memcpy(d,s,w); + s+=stride[0]; + d+=picture_linesize[0]; } w/=2;h/=2;x0/=2;y0/=2; // U s=srcimg[1]+(s_pos_x/2)+(s_pos_y/2)*stride[1]; - d=picture.data[1]+x0+y0*picture.linesize[1]; + d=picture_data[1]+x0+y0*picture_linesize[1]; for( y = 0; y < h; y++) { memcpy(d,s,w); s+=stride[1]; - d+=picture.linesize[1]; + d+=picture_linesize[1]; } // V s=srcimg[2]+(s_pos_x/2)+(s_pos_y/2)*stride[2]; - d=picture.data[2]+x0+y0*picture.linesize[2]; + d=picture_data[2]+x0+y0*picture_linesize[2]; for(y=0;y<h;y++) { memcpy(d,s,w); s+=stride[2]; - d+=picture.linesize[2]; + d+=picture_linesize[2]; } - pts = vo_pts; - - if( ioctl( fd_video, EM8300_IOCTL_VIDEO_SETPTS, &pts ) < 0 ) - printf( "VO: [dxr3] Unable to set PTS in draw_slice\n" ); - tmp_size = out_size = avcodec_encode_video(&codec_context, outbuf, outbuf_size, &picture); - while( out_size ) - out_size -= write( fd_video, &outbuf[tmp_size-out_size], out_size ); return 0; #endif - printf( "VO: [dxr3] You need to install ffmpeg.so or libavcodec, read DOCS/DXR3\n" ); + printf( "VO: [dxr3] You need to install mp1e rte, read DOCS/DXR3\n" ); return -1; } @@ -621,15 +355,12 @@ query_format(uint32_t format) { if(format==IMGFMT_MPEGPES) return 1; -#ifdef USE_LIBAVCODEC +#ifdef USE_MP1E if(format==IMGFMT_YV12) return 1; -// if(format==IMGFMT_YUY2) return 0x1|0x4; - if(format==IMGFMT_BGR24) return 1; #else - if(format==IMGFMT_YV12) {printf("VO: [dxr3] You need to compile with libavcodec or ffmpeg.so to play this file!\n" ); return 0;} - if(format==IMGFMT_YUY2) {printf("VO: [dxr3] You need to compile with libavcodec or ffmpeg.so to play this file!\n" ); return 0;} - if(format==IMGFMT_BGR24) {printf("VO: [dxr3] You need to compile with libavcodec or ffmpeg.so to play this file!\n" ); return 0;} -#endif + if(format==IMGFMT_YV12) {printf("VO: [dxr3] You need to compile with mp1e rte to play this file! (http://zapping.sf.net)\n" ); return 0;} +#endif + else printf( "If this is a DivX add \"-vc odivx\" or if it is an mpeg add \"-vc mpegpes\" otherwise this video format is currently unsupported\n" ); return 0; } @@ -637,11 +368,14 @@ uninit(void) { printf( "VO: [dxr3] Uninitializing\n" ); - free(outbuf); - free(picture_buf); - free(spubuf); - close(fd_video); - close(fd_spu); +#ifdef USE_MP1E + if( mp1e_context ) rte_stop( mp1e_context ); + if( mp1e_context ) rte_context_delete( mp1e_context ); + if( picture_data[0] ) free(picture_data[0]); +#endif + if( spubuf ) free(spubuf); + if( fd_video ) close(fd_video); + if( fd_spu ) close(fd_spu); }