[Mplayerxp-cvslog] SF.net SVN: mplayerxp:[445] mplayerxp

[<nic...@us...>]

Revision: 445
          http://mplayerxp.svn.sourceforge.net/mplayerxp/?rev=445&view=rev
Author:   nickols_k
Date:     2012-11-24 07:35:40 +0000 (Sat, 24 Nov 2012)
Log Message:
-----------
minor fixes

Modified Paths:
--------------
    TODO
    mplayerxp/configure
    mplayerxp/libmpcodecs/ad_vorbis.cpp
    mplayerxp/libmpcodecs/dec_video.cpp
    mplayerxp/libmpcodecs/vd.h
    mplayerxp/libmpcodecs/vd_divx4.cpp
    mplayerxp/libmpcodecs/vd_dmo.cpp
    mplayerxp/libmpcodecs/vd_dshow.cpp
    mplayerxp/libmpcodecs/vd_huffyuv.cpp
    mplayerxp/libmpcodecs/vd_lavc.cpp
    mplayerxp/libmpcodecs/vd_libdv.cpp
    mplayerxp/libmpcodecs/vd_libmpeg2.cpp
    mplayerxp/libmpcodecs/vd_mpegpes.cpp
    mplayerxp/libmpcodecs/vd_nuv.cpp
    mplayerxp/libmpcodecs/vd_qtvideo.cpp
    mplayerxp/libmpcodecs/vd_raw.cpp
    mplayerxp/libmpcodecs/vd_real.cpp
    mplayerxp/libmpcodecs/vd_theora.cpp
    mplayerxp/libmpcodecs/vd_vfw.cpp
    mplayerxp/libmpcodecs/vd_xanim.cpp
    mplayerxp/libmpcodecs/vd_xvid.cpp

Modified: TODO
===================================================================
--- TODO	2012-11-23 17:08:19 UTC (rev 444)
+++ TODO	2012-11-24 07:35:40 UTC (rev 445)
@@ -1,5 +1,7 @@
 TODO for mplayerxp:
 
+- Move vo_data and ao_data into private of vf_vo and af_ao2 or into
+  MPXPCtx at least.
 - Problem: it seems that demuxer doesn't differ bitmap-based subtitles from
   Closed Caption (plain ascii-text) ones. Because of this some demuxer's
   parser call video-driver directly to render subtitle on screen that breaks

Modified: mplayerxp/configure
===================================================================
--- mplayerxp/configure	2012-11-23 17:08:19 UTC (rev 444)
+++ mplayerxp/configure	2012-11-24 07:35:40 UTC (rev 445)
@@ -684,6 +684,7 @@
 enabled sdl && check_pkg sdl sdl
 enabled sdl && require2 sdl SDL/SDL.h SDL_CreateYUVOverlay
 print_config HAVE_ mp_config.h mp_config.mak sdl
+disabled sdl && disable sdl_image
 if enabled sdl; then
 enabled sdl_image	&& require2 sdl_image SDL/SDL_image.h IMG_Load_RW -lSDL_image
 print_config HAVE_ mp_config.h mp_config.mak sdl_image
@@ -803,7 +804,7 @@
 # Checking for VIDIX
 enabled vidix	&& xxrequire2 vidix "vidix/vidix.h vidix/vidixlibxx.h" Vidix -lvidixxx
 print_config CONFIG_ mp_config.h mp_config.mak vidix
-enabled x11	&& enabled vidix	&& vomodules="vidix $vomodules" || novomodules="vidix $novomodules"
+enabled x11	&& enabled vidix	&& vomodules=":vidix $vomodules" || novomodules=":vidix $novomodules"
 
 
 enabled joystick	&& test linux	|| disable joystick

Modified: mplayerxp/libmpcodecs/ad_vorbis.cpp
===================================================================
--- mplayerxp/libmpcodecs/ad_vorbis.cpp	2012-11-23 17:08:19 UTC (rev 444)
+++ mplayerxp/libmpcodecs/ad_vorbis.cpp	2012-11-24 07:35:40 UTC (rev 445)
@@ -5,11 +5,12 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <dlfcn.h>
+#include "osdep/bswap.h"
 #include "codecs_ld.h"
 #include "ad_internal.h"
 #include "libao2/afmt.h"
 #include "libao2/audio_out.h"
-#include "osdep/bswap.h"
+#include "postproc/af.h"
 
 static const ad_info_t info = {
     "Ogg/Vorbis audio decoder",
@@ -113,7 +114,9 @@
 #define OGG_FMT16 AFMT_S16_LE
 #endif
     sh->afmt=OGG_FMT16;
-    if(ao_control(ao_data,AOCONTROL_QUERY_FORMAT,OGG_FMT32) == MPXP_Ok) {
+    if(af_query_fmt(sh->afilter,mpaf_format_e(AFMT_FLOAT32)) == MPXP_Ok||
+	af_query_fmt(sh->afilter,mpaf_format_e(OGG_FMT32)) == MPXP_Ok ||
+	af_query_fmt(sh->afilter,mpaf_format_e(OGG_FMT24)) == MPXP_Ok) {
 	sh->afmt=OGG_FMT32;
     }
     // assume 128kbit if bitrate not specified in the header

Modified: mplayerxp/libmpcodecs/dec_video.cpp
===================================================================
--- mplayerxp/libmpcodecs/dec_video.cpp	2012-11-23 17:08:19 UTC (rev 444)
+++ mplayerxp/libmpcodecs/dec_video.cpp	2012-11-24 07:35:40 UTC (rev 445)
@@ -401,7 +401,7 @@
 
 #include "libvo/video_out.h"
 
-MPXP_Rc mpcodecs_config_vo(sh_video_t *sh, int w, int h, any_t* libinput){
+MPXP_Rc mpcodecs_config_vf(sh_video_t *sh, int w, int h, any_t* libinput){
     priv_t* priv=(priv_t*)sh->decoder;
     int i,j;
     unsigned int out_fmt=0;
@@ -573,7 +573,7 @@
 // mp_imgtype: buffering type, see mp_image.h
 // mp_imgflag: buffer requirements (read/write, preserve, stride limits), see mp_image.h
 // returns NULL or allocated mp_image_t*
-// Note: buffer allocation may be moved to mpcodecs_config_vo() later...
+// Note: buffer allocation may be moved to mpcodecs_config_vf() later...
 mp_image_t* mpcodecs_get_image(sh_video_t *sh, int mp_imgtype, int mp_imgflag,int w, int h){
     MSG_DBG2("mpcodecs_get_image(vf_%s,%i,%i,%i,%i) was called\n",((vf_instance_t *)(sh->vfilter))->info->name,mp_imgtype,mp_imgflag,w,h);
     mp_image_t* mpi=vf_get_new_image(sh->vfilter,sh->codec->outfmt[sh->outfmtidx],mp_imgtype,mp_imgflag,w,h,dae_curr_vdecoded(xp_core));

Modified: mplayerxp/libmpcodecs/vd.h
===================================================================
--- mplayerxp/libmpcodecs/vd.h	2012-11-23 17:08:19 UTC (rev 444)
+++ mplayerxp/libmpcodecs/vd.h	2012-11-24 07:35:40 UTC (rev 445)
@@ -70,7 +70,7 @@
     VDCTRL_RESYNC_STREAM	=7 /* resync video stream if needed */
 };
 // callbacks:
-MPXP_Rc		__FASTCALL__ mpcodecs_config_vo(sh_video_t *sh, int w, int h, any_t* libinput);
+MPXP_Rc		__FASTCALL__ mpcodecs_config_vf(sh_video_t *sh, int w, int h, any_t* libinput);
 mp_image_t*	__FASTCALL__ mpcodecs_get_image(sh_video_t *sh, int mp_imgtype, int mp_imgflag,int w, int h);
 void		__FASTCALL__ mpcodecs_draw_slice(sh_video_t* sh, mp_image_t*);
 void		__FASTCALL__ mpcodecs_draw_image(sh_video_t* sh, mp_image_t *mpi);

Modified: mplayerxp/libmpcodecs/vd_divx4.cpp
===================================================================
--- mplayerxp/libmpcodecs/vd_divx4.cpp	2012-11-23 17:08:19 UTC (rev 444)
+++ mplayerxp/libmpcodecs/vd_divx4.cpp	2012-11-24 07:35:40 UTC (rev 445)
@@ -214,7 +214,7 @@
     priv_t*p;
     int bits=12;
     if(!load_lib("libdivx"SLIBSUFFIX)) return MPXP_False;
-    if(!(mpcodecs_config_vo(sh,sh->src_w,sh->src_h,libinput))) return MPXP_False;
+    if(!(mpcodecs_config_vf(sh,sh->src_w,sh->src_h,libinput))) return MPXP_False;
     switch(sh->codec->outfmt[sh->outfmtidx]){
 	case IMGFMT_YV12:
 	case IMGFMT_I420:

Modified: mplayerxp/libmpcodecs/vd_dmo.cpp
===================================================================
--- mplayerxp/libmpcodecs/vd_dmo.cpp	2012-11-23 17:08:19 UTC (rev 444)
+++ mplayerxp/libmpcodecs/vd_dmo.cpp	2012-11-24 07:35:40 UTC (rev 445)
@@ -55,7 +55,7 @@
 		 "package from:  ftp://mplayerhq.hu/MPlayer/releases/w32codec.tar.bz2!\n");
 	return MPXP_False;
     }
-    if(!mpcodecs_config_vo(sh,sh->src_w,sh->src_h,libinput)) return MPXP_False;
+    if(!mpcodecs_config_vf(sh,sh->src_w,sh->src_h,libinput)) return MPXP_False;
     out_fmt=sh->codec->outfmt[sh->outfmtidx];
     switch(out_fmt){
     case IMGFMT_YUY2:

Modified: mplayerxp/libmpcodecs/vd_dshow.cpp
===================================================================
--- mplayerxp/libmpcodecs/vd_dshow.cpp	2012-11-23 17:08:19 UTC (rev 444)
+++ mplayerxp/libmpcodecs/vd_dshow.cpp	2012-11-24 07:35:40 UTC (rev 445)
@@ -74,7 +74,7 @@
 	MSG_HINT("package from:  ftp://mplayerhq.hu/MPlayer/releases/w32codec.zip  !\n");
 	return MPXP_False;
     }
-    if(!mpcodecs_config_vo(sh,sh->src_w,sh->src_h,libinput)) return MPXP_False;
+    if(!mpcodecs_config_vf(sh,sh->src_w,sh->src_h,libinput)) return MPXP_False;
     out_fmt=sh->codec->outfmt[sh->outfmtidx];
     switch(out_fmt){
 	case IMGFMT_YUY2:

Modified: mplayerxp/libmpcodecs/vd_huffyuv.cpp
===================================================================
--- mplayerxp/libmpcodecs/vd_huffyuv.cpp	2012-11-23 17:08:19 UTC (rev 444)
+++ mplayerxp/libmpcodecs/vd_huffyuv.cpp	2012-11-24 07:35:40 UTC (rev 445)
@@ -328,7 +328,7 @@
     switch (priv->bitmaptype) {
 	case BMPTYPE_RGB:
 	case BMPTYPE_YUV:
-	    vo_ret = mpcodecs_config_vo(sh,sh->src_w,sh->src_h,libinput);
+	    vo_ret = mpcodecs_config_vf(sh,sh->src_w,sh->src_h,libinput);
 	    break;
 	case BMPTYPE_RGBA:
 	    MSG_ERR( "[HuffYUV] RGBA not supported yet.\n");

Modified: mplayerxp/libmpcodecs/vd_lavc.cpp
===================================================================
--- mplayerxp/libmpcodecs/vd_lavc.cpp	2012-11-23 17:08:19 UTC (rev 444)
+++ mplayerxp/libmpcodecs/vd_lavc.cpp	2012-11-24 07:35:40 UTC (rev 445)
@@ -425,7 +425,7 @@
 	}
 	if(pp_flags) ppContext=pp2_get_context(sh->src_w,sh->src_h,pp_flags);
     }
-    return mpcodecs_config_vo(sh,sh->src_w,sh->src_h,libinput);
+    return mpcodecs_config_vf(sh,sh->src_w,sh->src_h,libinput);
 }
 
 // uninit driver

Modified: mplayerxp/libmpcodecs/vd_libdv.cpp
===================================================================
--- mplayerxp/libmpcodecs/vd_libdv.cpp	2012-11-23 17:08:19 UTC (rev 444)
+++ mplayerxp/libmpcodecs/vd_libdv.cpp	2012-11-24 07:35:40 UTC (rev 445)
@@ -81,7 +81,7 @@
 static MPXP_Rc init(sh_video_t *sh,any_t* libinput)
 {
     sh->context = (any_t*)init_global_rawdv_decoder();
-    return mpcodecs_config_vo(sh,sh->src_w,sh->src_h,libinput);
+    return mpcodecs_config_vf(sh,sh->src_w,sh->src_h,libinput);
 }
 
 // uninit driver

Modified: mplayerxp/libmpcodecs/vd_libmpeg2.cpp
===================================================================
--- mplayerxp/libmpcodecs/vd_libmpeg2.cpp	2012-11-23 17:08:19 UTC (rev 444)
+++ mplayerxp/libmpcodecs/vd_libmpeg2.cpp	2012-11-24 07:35:40 UTC (rev 445)
@@ -262,7 +262,7 @@
     if(!load_lib("libmpeg2"SLIBSUFFIX)) return MPXP_False;
     sh->context=priv=new(zeromem) priv_t;
     if(!(priv->mpeg2dec=mpeg2_init(MPXPCtx->mplayer_accel))) return MPXP_False;
-    return mpcodecs_config_vo(sh,sh->src_w,sh->src_h,libinput);
+    return mpcodecs_config_vf(sh,sh->src_w,sh->src_h,libinput);
 }
 
 // uninit driver

Modified: mplayerxp/libmpcodecs/vd_mpegpes.cpp
===================================================================
--- mplayerxp/libmpcodecs/vd_mpegpes.cpp	2012-11-23 17:08:19 UTC (rev 444)
+++ mplayerxp/libmpcodecs/vd_mpegpes.cpp	2012-11-24 07:35:40 UTC (rev 445)
@@ -102,7 +102,7 @@
 
 // init driver
 static MPXP_Rc init(sh_video_t *sh,any_t* libinput){
-    return mpcodecs_config_vo(sh,sh->src_w,sh->src_h,libinput);
+    return mpcodecs_config_vf(sh,sh->src_w,sh->src_h,libinput);
 }
 
 // uninit driver

Modified: mplayerxp/libmpcodecs/vd_nuv.cpp
===================================================================
--- mplayerxp/libmpcodecs/vd_nuv.cpp	2012-11-23 17:08:19 UTC (rev 444)
+++ mplayerxp/libmpcodecs/vd_nuv.cpp	2012-11-24 07:35:40 UTC (rev 445)
@@ -50,7 +50,7 @@
 
 // init driver
 static MPXP_Rc init(sh_video_t *sh,any_t* libinput){
-    return mpcodecs_config_vo(sh,sh->src_w,sh->src_h,libinput);
+    return mpcodecs_config_vf(sh,sh->src_w,sh->src_h,libinput);
 }
 
 // uninit driver

Modified: mplayerxp/libmpcodecs/vd_qtvideo.cpp
===================================================================
--- mplayerxp/libmpcodecs/vd_qtvideo.cpp	2012-11-23 17:08:19 UTC (rev 444)
+++ mplayerxp/libmpcodecs/vd_qtvideo.cpp	2012-11-24 07:35:40 UTC (rev 445)
@@ -293,9 +293,9 @@
     }
     MSG_V("imgfmt: %s qt_imgfmt: %.4s\n", vo_format_name(imgfmt), &qt_imgfmt);
     sh->context = (any_t*)qt_imgfmt;
-    if(!mpcodecs_config_vo(sh,sh->src_w,sh->src_h,libinput)) return MPXP_False;
+    if(!mpcodecs_config_vf(sh,sh->src_w,sh->src_h,libinput)) return MPXP_False;
 #else
-    if(!mpcodecs_config_vo(sh,sh->src_w,sh->src_h,libinput)) return MPXP_False;
+    if(!mpcodecs_config_vf(sh,sh->src_w,sh->src_h,libinput)) return MPXP_False;
 #endif
     return MPXP_Ok;
 }

Modified: mplayerxp/libmpcodecs/vd_raw.cpp
===================================================================
--- mplayerxp/libmpcodecs/vd_raw.cpp	2012-11-23 17:08:19 UTC (rev 444)
+++ mplayerxp/libmpcodecs/vd_raw.cpp	2012-11-24 07:35:40 UTC (rev 445)
@@ -101,7 +101,7 @@
 	    MSG_WARN("RAW: depth %d not supported\n",sh->bih->biBitCount);
 	}
     }
-    return mpcodecs_config_vo(sh,sh->src_w,sh->src_h,libinput);
+    return mpcodecs_config_vf(sh,sh->src_w,sh->src_h,libinput);
 }
 
 // uninit driver

Modified: mplayerxp/libmpcodecs/vd_real.cpp
===================================================================
--- mplayerxp/libmpcodecs/vd_real.cpp	2012-11-23 17:08:19 UTC (rev 444)
+++ mplayerxp/libmpcodecs/vd_real.cpp	2012-11-24 07:35:40 UTC (rev 445)
@@ -180,7 +180,7 @@
     if(!load_syms(sh->codec->dll_name)) return MPXP_False;
 
     // only I420 supported
-    if(!mpcodecs_config_vo(sh,sh->src_w,sh->src_h,libinput)) return MPXP_False;
+    if(!mpcodecs_config_vf(sh,sh->src_w,sh->src_h,libinput)) return MPXP_False;
     // init codec:
     sh->context=NULL;
     result=(*rvyuv_init)(&init_data, &sh->context);

Modified: mplayerxp/libmpcodecs/vd_theora.cpp
===================================================================
--- mplayerxp/libmpcodecs/vd_theora.cpp	2012-11-23 17:08:19 UTC (rev 444)
+++ mplayerxp/libmpcodecs/vd_theora.cpp	2012-11-24 07:35:40 UTC (rev 445)
@@ -127,7 +127,7 @@
 
     MSG_V("INFO: Theora video init ok!\n");
 
-    return mpcodecs_config_vo (sh,sh->src_w,sh->src_h,libinput);
+    return mpcodecs_config_vf(sh,sh->src_w,sh->src_h,libinput);
 }
 
 /*

Modified: mplayerxp/libmpcodecs/vd_vfw.cpp
===================================================================
--- mplayerxp/libmpcodecs/vd_vfw.cpp	2012-11-23 17:08:19 UTC (rev 444)
+++ mplayerxp/libmpcodecs/vd_vfw.cpp	2012-11-24 07:35:40 UTC (rev 445)
@@ -259,7 +259,7 @@
     priv->ex = vfw_ex;
     if(init_vfw_video_codec(sh)!=MPXP_Ok) return MPXP_False;
     MSG_V("INFO: Win32/VFW init OK!\n");
-    return mpcodecs_config_vo(sh,sh->src_w,sh->src_h,libinput);
+    return mpcodecs_config_vf(sh,sh->src_w,sh->src_h,libinput);
 }
 
 // uninit driver

Modified: mplayerxp/libmpcodecs/vd_xanim.cpp
===================================================================
--- mplayerxp/libmpcodecs/vd_xanim.cpp	2012-11-23 17:08:19 UTC (rev 444)
+++ mplayerxp/libmpcodecs/vd_xanim.cpp	2012-11-24 07:35:40 UTC (rev 445)
@@ -897,7 +897,7 @@
 // init driver
 static MPXP_Rc init(sh_video_t *sh,any_t* libinput){
     if(xacodec_init_video(sh,sh->codec->outfmt[sh->outfmtidx]))
-	return mpcodecs_config_vo(sh,sh->src_w,sh->src_h,libinput);
+	return mpcodecs_config_vf(sh,sh->src_w,sh->src_h,libinput);
     return MPXP_False;
 }
 

Modified: mplayerxp/libmpcodecs/vd_xvid.cpp
===================================================================
--- mplayerxp/libmpcodecs/vd_xvid.cpp	2012-11-23 17:08:19 UTC (rev 444)
+++ mplayerxp/libmpcodecs/vd_xvid.cpp	2012-11-24 07:35:40 UTC (rev 445)
@@ -434,7 +434,7 @@
 	    priv->img_type = MP_IMGTYPE_TEMP;
 	    break;
     }
-    return mpcodecs_config_vo(sh, sh->src_w, sh->src_h,libinput);
+    return mpcodecs_config_vf(sh, sh->src_w, sh->src_h,libinput);
 }
 
 // uninit driver

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.