[Mplayerxp-cvslog] SF.net SVN: mplayerxp:[577] mplayerxp
Brought to you by:
olov
Menu
▾
▴
[Mplayerxp-cvslog] SF.net SVN: mplayerxp:[577] mplayerxp
|
From: <nic...@us...> - 2012-12-19 09:28:24
|
Revision: 577
http://mplayerxp.svn.sourceforge.net/mplayerxp/?rev=577&view=rev
Author: nickols_k
Date: 2012-12-19 09:28:13 +0000 (Wed, 19 Dec 2012)
Log Message:
-----------
addon for minor antiviral patch
Modified Paths:
--------------
mplayerxp/libmpcodecs/dec_audio.h
mplayerxp/libmpcodecs/dec_video.cpp
mplayerxp/libmpdemux/stheader.h
mplayerxp/libmpstream2/s_oss.cpp
mplayerxp/libvo2/video_out.h
mplayerxp/libvo2/vidix_system.cpp
mplayerxp/libvo2/vo_sdl.cpp
mplayerxp/libvo2/vo_x11.cpp
mplayerxp/libvo2/vo_xv.cpp
mplayerxp/postproc/af.h
mplayerxp/postproc/aflib.h
mplayerxp/postproc/libmenu/menu.cpp
mplayerxp/postproc/libmenu/menu_cmdlist.cpp
mplayerxp/postproc/libmenu/menu_console.cpp
mplayerxp/postproc/libmenu/menu_filesel.cpp
mplayerxp/postproc/libmenu/menu_list.cpp
mplayerxp/postproc/libmenu/menu_param.cpp
mplayerxp/postproc/libmenu/menu_pt.cpp
mplayerxp/postproc/libmenu/menu_txt.cpp
mplayerxp/postproc/vf.cpp
mplayerxp/postproc/vf.h
mplayerxp/postproc/vf_1bpp.cpp
mplayerxp/postproc/vf_2xsai.cpp
mplayerxp/postproc/vf_aspect.cpp
mplayerxp/postproc/vf_delogo.cpp
mplayerxp/postproc/vf_denoise3d.cpp
mplayerxp/postproc/vf_dint.cpp
mplayerxp/postproc/vf_down3dright.cpp
mplayerxp/postproc/vf_eq.cpp
mplayerxp/postproc/vf_expand.cpp
mplayerxp/postproc/vf_flip.cpp
mplayerxp/postproc/vf_format.cpp
mplayerxp/postproc/vf_framestep.cpp
mplayerxp/postproc/vf_il.cpp
mplayerxp/postproc/vf_menu.cpp
mplayerxp/postproc/vf_mirror.cpp
mplayerxp/postproc/vf_noise.cpp
mplayerxp/postproc/vf_ow.cpp
mplayerxp/postproc/vf_palette.cpp
mplayerxp/postproc/vf_panscan.cpp
mplayerxp/postproc/vf_perspective.cpp
mplayerxp/postproc/vf_pp.cpp
mplayerxp/postproc/vf_raw.cpp
mplayerxp/postproc/vf_rectangle.cpp
mplayerxp/postproc/vf_rgb2bgr.cpp
mplayerxp/postproc/vf_rotate.cpp
mplayerxp/postproc/vf_scale.cpp
mplayerxp/postproc/vf_smartblur.cpp
mplayerxp/postproc/vf_softpulldown.cpp
mplayerxp/postproc/vf_swapuv.cpp
mplayerxp/postproc/vf_test.cpp
mplayerxp/postproc/vf_unsharp.cpp
mplayerxp/postproc/vf_vo2.cpp
mplayerxp/postproc/vf_yuvcsp.cpp
mplayerxp/postproc/vf_yuy2.cpp
mplayerxp/postproc/vf_yvu9.cpp
mplayerxp/xmpcore/Makefile
Added Paths:
-----------
mplayerxp/xmpcore/xmp_aframe.cpp
mplayerxp/xmpcore/xmp_aframe.h
mplayerxp/xmpcore/xmp_image.cpp
mplayerxp/xmpcore/xmp_image.h
Removed Paths:
-------------
mplayerxp/xmpcore/mp_aframe.cpp
mplayerxp/xmpcore/mp_aframe.h
mplayerxp/xmpcore/mp_image.cpp
mplayerxp/xmpcore/mp_image.h
Modified: mplayerxp/libmpcodecs/dec_audio.h
===================================================================
--- mplayerxp/libmpcodecs/dec_audio.h 2012-12-19 08:57:43 UTC (rev 576)
+++ mplayerxp/libmpcodecs/dec_audio.h 2012-12-19 09:28:13 UTC (rev 577)
@@ -1,7 +1,7 @@
#ifndef DEC_AUDIO_H_INCLUDED
#define DEC_AUDIO_H_INCLUDED 1
#include "ad.h"
-#include "xmpcore/mp_aframe.h"
+#include "xmpcore/xmp_aframe.h"
#include "xmpcore/xmp_enums.h"
struct audio_decoder_t {
Modified: mplayerxp/libmpcodecs/dec_video.cpp
===================================================================
--- mplayerxp/libmpcodecs/dec_video.cpp 2012-12-19 08:57:43 UTC (rev 576)
+++ mplayerxp/libmpcodecs/dec_video.cpp 2012-12-19 09:28:13 UTC (rev 577)
@@ -620,8 +620,8 @@
return MPXP_True;
}
-// mp_imgtype: buffering type, see mp_image.h
-// mp_imgflag: buffer requirements (read/write, preserve, stride limits), see mp_image.h
+// mp_imgtype: buffering type, see xmp_image.h
+// mp_imgflag: buffer requirements (read/write, preserve, stride limits), see xmp_image.h
// returns NULL or allocated mp_image_t*
// Note: buffer allocation may be moved to mpcodecs_config_vf() later...
mp_image_t* mpcodecs_get_image(video_decoder_t *opaque, int mp_imgtype, int mp_imgflag,int w, int h){
Modified: mplayerxp/libmpdemux/stheader.h
===================================================================
--- mplayerxp/libmpdemux/stheader.h 2012-12-19 08:57:43 UTC (rev 576)
+++ mplayerxp/libmpdemux/stheader.h 2012-12-19 09:28:13 UTC (rev 577)
@@ -11,7 +11,7 @@
#ifdef __cplusplus
}
#endif
-#include "xmpcore/mp_image.h"
+#include "xmpcore/xmp_image.h"
#include "demuxer_stream.h"
struct ImageDescription;
Modified: mplayerxp/libmpstream2/s_oss.cpp
===================================================================
--- mplayerxp/libmpstream2/s_oss.cpp 2012-12-19 08:57:43 UTC (rev 576)
+++ mplayerxp/libmpstream2/s_oss.cpp 2012-12-19 09:28:13 UTC (rev 577)
@@ -17,7 +17,7 @@
#include <string.h>
#include "mplayerxp.h"
-#include "xmpcore/mp_aframe.h"
+#include "xmpcore/xmp_aframe.h"
#include "postproc/af.h"
#include "libao3/afmt.h"
#include "libao3/audio_out.h"
Modified: mplayerxp/libvo2/video_out.h
===================================================================
--- mplayerxp/libvo2/video_out.h 2012-12-19 08:57:43 UTC (rev 576)
+++ mplayerxp/libvo2/video_out.h 2012-12-19 09:28:13 UTC (rev 577)
@@ -25,7 +25,7 @@
#include "sub.h"
#include "libmpsub/subreader.h"
#include "img_format.h"
-#include "xmpcore/mp_image.h"
+#include "xmpcore/xmp_image.h"
#include "xmpcore/xmp_enums.h"
namespace mpxp {
Modified: mplayerxp/libvo2/vidix_system.cpp
===================================================================
--- mplayerxp/libvo2/vidix_system.cpp 2012-12-19 08:57:43 UTC (rev 576)
+++ mplayerxp/libvo2/vidix_system.cpp 2012-12-19 09:28:13 UTC (rev 577)
@@ -27,7 +27,7 @@
#include "vidix_system.h"
#include "osdep/fastmemcpy.h"
-#include "xmpcore/mp_image.h"
+#include "xmpcore/xmp_image.h"
#include "vo_msg.h"
using namespace vidix;
Modified: mplayerxp/libvo2/vo_sdl.cpp
===================================================================
--- mplayerxp/libvo2/vo_sdl.cpp 2012-12-19 08:57:43 UTC (rev 576)
+++ mplayerxp/libvo2/vo_sdl.cpp 2012-12-19 09:28:13 UTC (rev 577)
@@ -129,7 +129,7 @@
#include "input2/input.h"
#include "input2/mouse.h"
#include "osdep/keycodes.h"
-#include "xmpcore/mp_image.h"
+#include "xmpcore/xmp_image.h"
#ifdef CONFIG_VIDIX
#include "vidix_system.h"
#endif
Modified: mplayerxp/libvo2/vo_x11.cpp
===================================================================
--- mplayerxp/libvo2/vo_x11.cpp 2012-12-19 08:57:43 UTC (rev 576)
+++ mplayerxp/libvo2/vo_x11.cpp 2012-12-19 09:28:13 UTC (rev 577)
@@ -48,7 +48,7 @@
#include "vidix_system.h"
#endif
#include "dri_vo.h"
-#include "xmpcore/mp_image.h"
+#include "xmpcore/xmp_image.h"
#include "vo_msg.h"
namespace mpxp {
Modified: mplayerxp/libvo2/vo_xv.cpp
===================================================================
--- mplayerxp/libvo2/vo_xv.cpp 2012-12-19 08:57:43 UTC (rev 576)
+++ mplayerxp/libvo2/vo_xv.cpp 2012-12-19 09:28:13 UTC (rev 577)
@@ -35,7 +35,7 @@
#include "sub.h"
#include "aspect.h"
#include "dri_vo.h"
-#include "xmpcore/mp_image.h"
+#include "xmpcore/xmp_image.h"
#include "vo_msg.h"
Modified: mplayerxp/postproc/af.h
===================================================================
--- mplayerxp/postproc/af.h 2012-12-19 08:57:43 UTC (rev 576)
+++ mplayerxp/postproc/af.h 2012-12-19 09:28:13 UTC (rev 577)
@@ -6,7 +6,7 @@
#include "mpxp_config.h"
#include "af_control.h"
#include "xmpcore/xmp_enums.h"
-#include "xmpcore/mp_aframe.h"
+#include "xmpcore/xmp_aframe.h"
struct af_instance_t;
Modified: mplayerxp/postproc/aflib.h
===================================================================
--- mplayerxp/postproc/aflib.h 2012-12-19 08:57:43 UTC (rev 576)
+++ mplayerxp/postproc/aflib.h 2012-12-19 09:28:13 UTC (rev 577)
@@ -12,7 +12,7 @@
#define _AFLIB_H 1
#include "mpxp_config.h"
-#include "xmpcore/mp_aframe.h"
+#include "xmpcore/xmp_aframe.h"
/* Implementation of routines used for DSP */
/* Size of floating point type used in routines */
Modified: mplayerxp/postproc/libmenu/menu.cpp
===================================================================
--- mplayerxp/postproc/libmenu/menu.cpp 2012-12-19 08:57:43 UTC (rev 576)
+++ mplayerxp/postproc/libmenu/menu.cpp 2012-12-19 09:28:13 UTC (rev 577)
@@ -20,7 +20,7 @@
#include "libvo2/img_format.h"
#include "libvo2/video_out.h"
-#include "xmpcore/mp_image.h"
+#include "xmpcore/xmp_image.h"
#include "libmpconf/m_option.h"
#include "libmpconf/m_struct.h"
#include "menu.h"
Modified: mplayerxp/postproc/libmenu/menu_cmdlist.cpp
===================================================================
--- mplayerxp/postproc/libmenu/menu_cmdlist.cpp 2012-12-19 08:57:43 UTC (rev 576)
+++ mplayerxp/postproc/libmenu/menu_cmdlist.cpp 2012-12-19 09:28:13 UTC (rev 577)
@@ -10,7 +10,7 @@
#include <string.h>
#include "libvo2/img_format.h"
-#include "xmpcore/mp_image.h"
+#include "xmpcore/xmp_image.h"
#include "libmpconf/m_option.h"
#include "libmpconf/m_struct.h"
Modified: mplayerxp/postproc/libmenu/menu_console.cpp
===================================================================
--- mplayerxp/postproc/libmenu/menu_console.cpp 2012-12-19 08:57:43 UTC (rev 576)
+++ mplayerxp/postproc/libmenu/menu_console.cpp 2012-12-19 09:28:13 UTC (rev 577)
@@ -17,7 +17,7 @@
#include <errno.h>
#include "libvo2/img_format.h"
-#include "xmpcore/mp_image.h"
+#include "xmpcore/xmp_image.h"
#include "libmpconf/cfgparser.h"
#include "libmpconf/m_struct.h"
Modified: mplayerxp/postproc/libmenu/menu_filesel.cpp
===================================================================
--- mplayerxp/postproc/libmenu/menu_filesel.cpp 2012-12-19 08:57:43 UTC (rev 576)
+++ mplayerxp/postproc/libmenu/menu_filesel.cpp 2012-12-19 09:28:13 UTC (rev 577)
@@ -20,7 +20,7 @@
#include "libmpconf/cfgparser.h"
#include "libvo2/img_format.h"
-#include "xmpcore/mp_image.h"
+#include "xmpcore/xmp_image.h"
#include "menu.h"
#include "menu_list.h"
Modified: mplayerxp/postproc/libmenu/menu_list.cpp
===================================================================
--- mplayerxp/postproc/libmenu/menu_list.cpp 2012-12-19 08:57:43 UTC (rev 576)
+++ mplayerxp/postproc/libmenu/menu_list.cpp 2012-12-19 09:28:13 UTC (rev 577)
@@ -8,7 +8,7 @@
#include "libvo2/img_format.h"
#include "libvo2/sub.h"
-#include "xmpcore/mp_image.h"
+#include "xmpcore/xmp_image.h"
#include "libmpconf/m_struct.h"
#include "menu.h"
Modified: mplayerxp/postproc/libmenu/menu_param.cpp
===================================================================
--- mplayerxp/postproc/libmenu/menu_param.cpp 2012-12-19 08:57:43 UTC (rev 576)
+++ mplayerxp/postproc/libmenu/menu_param.cpp 2012-12-19 09:28:13 UTC (rev 577)
@@ -20,7 +20,7 @@
#include "libplaytree/asxparser.h"
#include "libvo2/img_format.h"
-#include "xmpcore/mp_image.h"
+#include "xmpcore/xmp_image.h"
#include "menu.h"
#include "menu_list.h"
Modified: mplayerxp/postproc/libmenu/menu_pt.cpp
===================================================================
--- mplayerxp/postproc/libmenu/menu_pt.cpp 2012-12-19 08:57:43 UTC (rev 576)
+++ mplayerxp/postproc/libmenu/menu_pt.cpp 2012-12-19 09:28:13 UTC (rev 577)
@@ -8,7 +8,7 @@
#include "mpxp_help.h"
#include "libvo2/img_format.h"
-#include "xmpcore/mp_image.h"
+#include "xmpcore/xmp_image.h"
#include "libmpconf/m_struct.h"
#include "libmpconf/m_option.h"
Modified: mplayerxp/postproc/libmenu/menu_txt.cpp
===================================================================
--- mplayerxp/postproc/libmenu/menu_txt.cpp 2012-12-19 08:57:43 UTC (rev 576)
+++ mplayerxp/postproc/libmenu/menu_txt.cpp 2012-12-19 09:28:13 UTC (rev 577)
@@ -10,7 +10,7 @@
#include "libvo2/img_format.h"
#include "libvo2/sub.h"
-#include "xmpcore/mp_image.h"
+#include "xmpcore/xmp_image.h"
#include "libmpconf/cfgparser.h"
#include "libmpconf/m_struct.h"
Modified: mplayerxp/postproc/vf.cpp
===================================================================
--- mplayerxp/postproc/vf.cpp 2012-12-19 08:57:43 UTC (rev 576)
+++ mplayerxp/postproc/vf.cpp 2012-12-19 09:28:13 UTC (rev 577)
@@ -11,7 +11,7 @@
#include "libvo2/img_format.h"
#include "libvo2/video_out.h"
-#include "xmpcore/mp_image.h"
+#include "xmpcore/xmp_image.h"
#include "vf.h"
#include "vf_internal.h"
#include "swscale.h"
Modified: mplayerxp/postproc/vf.h
===================================================================
--- mplayerxp/postproc/vf.h 2012-12-19 08:57:43 UTC (rev 576)
+++ mplayerxp/postproc/vf.h 2012-12-19 09:28:13 UTC (rev 577)
@@ -2,7 +2,7 @@
#define __VF_H_INCLUDED 1
#include <stdint.h>
#include "xmpcore/xmp_enums.h"
-#include "xmpcore/mp_image.h"
+#include "xmpcore/xmp_image.h"
#include "libvo2/video_out.h" // for vo_flags_e
#include "vfcap.h"
Modified: mplayerxp/postproc/vf_1bpp.cpp
===================================================================
--- mplayerxp/postproc/vf_1bpp.cpp 2012-12-19 08:57:43 UTC (rev 576)
+++ mplayerxp/postproc/vf_1bpp.cpp 2012-12-19 09:28:13 UTC (rev 577)
@@ -7,7 +7,7 @@
#include <inttypes.h>
#include "libvo2/img_format.h"
-#include "xmpcore/mp_image.h"
+#include "xmpcore/xmp_image.h"
#include "vf.h"
#include "vf_internal.h"
Modified: mplayerxp/postproc/vf_2xsai.cpp
===================================================================
--- mplayerxp/postproc/vf_2xsai.cpp 2012-12-19 08:57:43 UTC (rev 576)
+++ mplayerxp/postproc/vf_2xsai.cpp 2012-12-19 09:28:13 UTC (rev 577)
@@ -7,7 +7,7 @@
#include <inttypes.h>
#include "libvo2/img_format.h"
-#include "xmpcore/mp_image.h"
+#include "xmpcore/xmp_image.h"
#include "vf.h"
#include "vf_internal.h"
#include "pp_msg.h"
Modified: mplayerxp/postproc/vf_aspect.cpp
===================================================================
--- mplayerxp/postproc/vf_aspect.cpp 2012-12-19 08:57:43 UTC (rev 576)
+++ mplayerxp/postproc/vf_aspect.cpp 2012-12-19 09:28:13 UTC (rev 577)
@@ -7,7 +7,7 @@
#include <inttypes.h>
#include "libvo2/img_format.h"
-#include "xmpcore/mp_image.h"
+#include "xmpcore/xmp_image.h"
#include "vf.h"
#include "vf_internal.h"
#include "pp_msg.h"
Modified: mplayerxp/postproc/vf_delogo.cpp
===================================================================
--- mplayerxp/postproc/vf_delogo.cpp 2012-12-19 08:57:43 UTC (rev 576)
+++ mplayerxp/postproc/vf_delogo.cpp 2012-12-19 09:28:13 UTC (rev 577)
@@ -30,7 +30,7 @@
#include "osdep/cpudetect.h"
#include "libvo2/img_format.h"
-#include "xmpcore/mp_image.h"
+#include "xmpcore/xmp_image.h"
#include "vf.h"
#include "vf_internal.h"
#include "osdep/fastmemcpy.h"
Modified: mplayerxp/postproc/vf_denoise3d.cpp
===================================================================
--- mplayerxp/postproc/vf_denoise3d.cpp 2012-12-19 08:57:43 UTC (rev 576)
+++ mplayerxp/postproc/vf_denoise3d.cpp 2012-12-19 09:28:13 UTC (rev 577)
@@ -26,7 +26,7 @@
#include <math.h>
#include "libvo2/img_format.h"
-#include "xmpcore/mp_image.h"
+#include "xmpcore/xmp_image.h"
#include "vf.h"
#include "vf_internal.h"
#include "osdep/fastmemcpy.h"
Modified: mplayerxp/postproc/vf_dint.cpp
===================================================================
--- mplayerxp/postproc/vf_dint.cpp 2012-12-19 08:57:43 UTC (rev 576)
+++ mplayerxp/postproc/vf_dint.cpp 2012-12-19 09:28:13 UTC (rev 577)
@@ -8,7 +8,7 @@
#include "osdep/fastmemcpy.h"
-#include "xmpcore/mp_image.h"
+#include "xmpcore/xmp_image.h"
#include "libvo2/img_format.h"
#include "vf.h"
#include "vf_internal.h"
Modified: mplayerxp/postproc/vf_down3dright.cpp
===================================================================
--- mplayerxp/postproc/vf_down3dright.cpp 2012-12-19 08:57:43 UTC (rev 576)
+++ mplayerxp/postproc/vf_down3dright.cpp 2012-12-19 09:28:13 UTC (rev 577)
@@ -9,7 +9,7 @@
#include "osdep/cpudetect.h"
#include "libvo2/img_format.h"
-#include "xmpcore/mp_image.h"
+#include "xmpcore/xmp_image.h"
#include "vf.h"
#include "vf_internal.h"
Modified: mplayerxp/postproc/vf_eq.cpp
===================================================================
--- mplayerxp/postproc/vf_eq.cpp 2012-12-19 08:57:43 UTC (rev 576)
+++ mplayerxp/postproc/vf_eq.cpp 2012-12-19 09:28:13 UTC (rev 577)
@@ -22,7 +22,7 @@
#include "libvo2/img_format.h"
#include "libvo2/video_out.h"
-#include "xmpcore/mp_image.h"
+#include "xmpcore/xmp_image.h"
#include "vf.h"
#include "vf_internal.h"
Modified: mplayerxp/postproc/vf_expand.cpp
===================================================================
--- mplayerxp/postproc/vf_expand.cpp 2012-12-19 08:57:43 UTC (rev 576)
+++ mplayerxp/postproc/vf_expand.cpp 2012-12-19 09:28:13 UTC (rev 577)
@@ -8,7 +8,7 @@
#include <string.h>
#include "libvo2/img_format.h"
-#include "xmpcore/mp_image.h"
+#include "xmpcore/xmp_image.h"
#include "vf.h"
#include "vf_internal.h"
Modified: mplayerxp/postproc/vf_flip.cpp
===================================================================
--- mplayerxp/postproc/vf_flip.cpp 2012-12-19 08:57:43 UTC (rev 576)
+++ mplayerxp/postproc/vf_flip.cpp 2012-12-19 09:28:13 UTC (rev 577)
@@ -25,7 +25,7 @@
#include "pp_msg.h"
-#include "xmpcore/mp_image.h"
+#include "xmpcore/xmp_image.h"
#include "vf.h"
#include "vf_internal.h"
Modified: mplayerxp/postproc/vf_format.cpp
===================================================================
--- mplayerxp/postproc/vf_format.cpp 2012-12-19 08:57:43 UTC (rev 576)
+++ mplayerxp/postproc/vf_format.cpp 2012-12-19 09:28:13 UTC (rev 577)
@@ -7,7 +7,7 @@
#include <inttypes.h>
#include "libvo2/img_format.h"
-#include "xmpcore/mp_image.h"
+#include "xmpcore/xmp_image.h"
#include "vf.h"
#include "vf_internal.h"
#include "pp_msg.h"
Modified: mplayerxp/postproc/vf_framestep.cpp
===================================================================
--- mplayerxp/postproc/vf_framestep.cpp 2012-12-19 08:57:43 UTC (rev 576)
+++ mplayerxp/postproc/vf_framestep.cpp 2012-12-19 09:28:13 UTC (rev 577)
@@ -58,7 +58,7 @@
#include "osdep/cpudetect.h"
#include "libvo2/img_format.h"
-#include "xmpcore/mp_image.h"
+#include "xmpcore/xmp_image.h"
#include "vf.h"
#include "vf_internal.h"
#include "pp_msg.h"
Modified: mplayerxp/postproc/vf_il.cpp
===================================================================
--- mplayerxp/postproc/vf_il.cpp 2012-12-19 08:57:43 UTC (rev 576)
+++ mplayerxp/postproc/vf_il.cpp 2012-12-19 09:28:13 UTC (rev 577)
@@ -26,7 +26,7 @@
#include <assert.h>
#include "libvo2/img_format.h"
-#include "xmpcore/mp_image.h"
+#include "xmpcore/xmp_image.h"
#include "vf.h"
#include "vf_internal.h"
#include "osdep/fastmemcpy.h"
Modified: mplayerxp/postproc/vf_menu.cpp
===================================================================
--- mplayerxp/postproc/vf_menu.cpp 2012-12-19 08:57:43 UTC (rev 576)
+++ mplayerxp/postproc/vf_menu.cpp 2012-12-19 09:28:13 UTC (rev 577)
@@ -11,7 +11,7 @@
#include "mplayerxp.h"
#include "libvo2/img_format.h"
-#include "xmpcore/mp_image.h"
+#include "xmpcore/xmp_image.h"
#include "vf.h"
#include "vf_internal.h"
Modified: mplayerxp/postproc/vf_mirror.cpp
===================================================================
--- mplayerxp/postproc/vf_mirror.cpp 2012-12-19 08:57:43 UTC (rev 576)
+++ mplayerxp/postproc/vf_mirror.cpp 2012-12-19 09:28:13 UTC (rev 577)
@@ -7,7 +7,7 @@
#include <inttypes.h>
#include "libvo2/img_format.h"
-#include "xmpcore/mp_image.h"
+#include "xmpcore/xmp_image.h"
#include "vf.h"
#include "vf_internal.h"
Modified: mplayerxp/postproc/vf_noise.cpp
===================================================================
--- mplayerxp/postproc/vf_noise.cpp 2012-12-19 08:57:43 UTC (rev 576)
+++ mplayerxp/postproc/vf_noise.cpp 2012-12-19 09:28:13 UTC (rev 577)
@@ -28,7 +28,7 @@
#include "osdep/cpudetect.h"
#include "libvo2/img_format.h"
-#include "xmpcore/mp_image.h"
+#include "xmpcore/xmp_image.h"
#include "vf.h"
#include "vf_internal.h"
#include "osdep/fastmemcpy.h"
Modified: mplayerxp/postproc/vf_ow.cpp
===================================================================
--- mplayerxp/postproc/vf_ow.cpp 2012-12-19 08:57:43 UTC (rev 576)
+++ mplayerxp/postproc/vf_ow.cpp 2012-12-19 09:28:13 UTC (rev 577)
@@ -34,7 +34,7 @@
#include <math.h>
#include "libvo2/img_format.h"
-#include "xmpcore/mp_image.h"
+#include "xmpcore/xmp_image.h"
#include "vf.h"
#include "vf_internal.h"
#include "pp_msg.h"
Modified: mplayerxp/postproc/vf_palette.cpp
===================================================================
--- mplayerxp/postproc/vf_palette.cpp 2012-12-19 08:57:43 UTC (rev 576)
+++ mplayerxp/postproc/vf_palette.cpp 2012-12-19 09:28:13 UTC (rev 577)
@@ -7,7 +7,7 @@
#include <inttypes.h>
#include "libvo2/img_format.h"
-#include "xmpcore/mp_image.h"
+#include "xmpcore/xmp_image.h"
#include "vf.h"
#include "vf_internal.h"
Modified: mplayerxp/postproc/vf_panscan.cpp
===================================================================
--- mplayerxp/postproc/vf_panscan.cpp 2012-12-19 08:57:43 UTC (rev 576)
+++ mplayerxp/postproc/vf_panscan.cpp 2012-12-19 09:28:13 UTC (rev 577)
@@ -10,7 +10,7 @@
#include <string.h>
#include "libvo2/img_format.h"
-#include "xmpcore/mp_image.h"
+#include "xmpcore/xmp_image.h"
#include "vf.h"
#include "vf_internal.h"
Modified: mplayerxp/postproc/vf_perspective.cpp
===================================================================
--- mplayerxp/postproc/vf_perspective.cpp 2012-12-19 08:57:43 UTC (rev 576)
+++ mplayerxp/postproc/vf_perspective.cpp 2012-12-19 09:28:13 UTC (rev 577)
@@ -27,7 +27,7 @@
#include <math.h>
#include "libvo2/img_format.h"
-#include "xmpcore/mp_image.h"
+#include "xmpcore/xmp_image.h"
#include "vf.h"
#include "vf_internal.h"
#include "osdep/fastmemcpy.h"
Modified: mplayerxp/postproc/vf_pp.cpp
===================================================================
--- mplayerxp/postproc/vf_pp.cpp 2012-12-19 08:57:43 UTC (rev 576)
+++ mplayerxp/postproc/vf_pp.cpp 2012-12-19 09:28:13 UTC (rev 577)
@@ -10,7 +10,7 @@
#include "osdep/cpudetect.h"
#include "libvo2/img_format.h"
-#include "xmpcore/mp_image.h"
+#include "xmpcore/xmp_image.h"
#include "vf.h"
#include "vf_internal.h"
Modified: mplayerxp/postproc/vf_raw.cpp
===================================================================
--- mplayerxp/postproc/vf_raw.cpp 2012-12-19 08:57:43 UTC (rev 576)
+++ mplayerxp/postproc/vf_raw.cpp 2012-12-19 09:28:13 UTC (rev 577)
@@ -11,7 +11,7 @@
#include <inttypes.h>
#include "libvo2/img_format.h"
-#include "xmpcore/mp_image.h"
+#include "xmpcore/xmp_image.h"
#include "vf.h"
#include "vf_internal.h"
Modified: mplayerxp/postproc/vf_rectangle.cpp
===================================================================
--- mplayerxp/postproc/vf_rectangle.cpp 2012-12-19 08:57:43 UTC (rev 576)
+++ mplayerxp/postproc/vf_rectangle.cpp 2012-12-19 09:28:13 UTC (rev 577)
@@ -4,7 +4,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
-#include "xmpcore/mp_image.h"
+#include "xmpcore/xmp_image.h"
#include "vf.h"
#include "vf_internal.h"
Modified: mplayerxp/postproc/vf_rgb2bgr.cpp
===================================================================
--- mplayerxp/postproc/vf_rgb2bgr.cpp 2012-12-19 08:57:43 UTC (rev 576)
+++ mplayerxp/postproc/vf_rgb2bgr.cpp 2012-12-19 09:28:13 UTC (rev 577)
@@ -7,7 +7,7 @@
#include <inttypes.h>
#include "libvo2/img_format.h"
-#include "xmpcore/mp_image.h"
+#include "xmpcore/xmp_image.h"
#include "vf.h"
#include "vf_internal.h"
Modified: mplayerxp/postproc/vf_rotate.cpp
===================================================================
--- mplayerxp/postproc/vf_rotate.cpp 2012-12-19 08:57:43 UTC (rev 576)
+++ mplayerxp/postproc/vf_rotate.cpp 2012-12-19 09:28:13 UTC (rev 577)
@@ -7,7 +7,7 @@
#include <inttypes.h>
#include "libvo2/img_format.h"
-#include "xmpcore/mp_image.h"
+#include "xmpcore/xmp_image.h"
#include "vf.h"
#include "vf_internal.h"
Modified: mplayerxp/postproc/vf_scale.cpp
===================================================================
--- mplayerxp/postproc/vf_scale.cpp 2012-12-19 08:57:43 UTC (rev 576)
+++ mplayerxp/postproc/vf_scale.cpp 2012-12-19 09:28:13 UTC (rev 577)
@@ -9,7 +9,7 @@
#include "osdep/cpudetect.h"
#include "libvo2/img_format.h"
-#include "xmpcore/mp_image.h"
+#include "xmpcore/xmp_image.h"
#include "vf.h"
#include "vf_internal.h"
Modified: mplayerxp/postproc/vf_smartblur.cpp
===================================================================
--- mplayerxp/postproc/vf_smartblur.cpp 2012-12-19 08:57:43 UTC (rev 576)
+++ mplayerxp/postproc/vf_smartblur.cpp 2012-12-19 09:28:13 UTC (rev 577)
@@ -30,7 +30,7 @@
#endif
#include "libvo2/img_format.h"
-#include "xmpcore/mp_image.h"
+#include "xmpcore/xmp_image.h"
#include "vf.h"
#include "vf_internal.h"
#include "osdep/fastmemcpy.h"
Modified: mplayerxp/postproc/vf_softpulldown.cpp
===================================================================
--- mplayerxp/postproc/vf_softpulldown.cpp 2012-12-19 08:57:43 UTC (rev 576)
+++ mplayerxp/postproc/vf_softpulldown.cpp 2012-12-19 09:28:13 UTC (rev 577)
@@ -6,7 +6,7 @@
#include <string.h>
#include "libvo2/img_format.h"
-#include "xmpcore/mp_image.h"
+#include "xmpcore/xmp_image.h"
#include "vf.h"
#include "vf_internal.h"
Modified: mplayerxp/postproc/vf_swapuv.cpp
===================================================================
--- mplayerxp/postproc/vf_swapuv.cpp 2012-12-19 08:57:43 UTC (rev 576)
+++ mplayerxp/postproc/vf_swapuv.cpp 2012-12-19 09:28:13 UTC (rev 577)
@@ -26,7 +26,7 @@
#include <assert.h>
#include "libvo2/img_format.h"
-#include "xmpcore/mp_image.h"
+#include "xmpcore/xmp_image.h"
#include "vf.h"
#include "vf_internal.h"
#include "osdep/fastmemcpy.h"
Modified: mplayerxp/postproc/vf_test.cpp
===================================================================
--- mplayerxp/postproc/vf_test.cpp 2012-12-19 08:57:43 UTC (rev 576)
+++ mplayerxp/postproc/vf_test.cpp 2012-12-19 09:28:13 UTC (rev 577)
@@ -26,7 +26,7 @@
#include <inttypes.h>
#include "libvo2/img_format.h"
-#include "xmpcore/mp_image.h"
+#include "xmpcore/xmp_image.h"
#include "vf.h"
#include "vf_internal.h"
#include "swscale.h"
Modified: mplayerxp/postproc/vf_unsharp.cpp
===================================================================
--- mplayerxp/postproc/vf_unsharp.cpp 2012-12-19 08:57:43 UTC (rev 576)
+++ mplayerxp/postproc/vf_unsharp.cpp 2012-12-19 09:28:13 UTC (rev 577)
@@ -34,7 +34,7 @@
#endif
#include "libvo2/img_format.h"
-#include "xmpcore/mp_image.h"
+#include "xmpcore/xmp_image.h"
#include "vf.h"
#include "vf_internal.h"
#include "osdep/fastmemcpy.h"
Modified: mplayerxp/postproc/vf_vo2.cpp
===================================================================
--- mplayerxp/postproc/vf_vo2.cpp 2012-12-19 08:57:43 UTC (rev 576)
+++ mplayerxp/postproc/vf_vo2.cpp 2012-12-19 09:28:13 UTC (rev 577)
@@ -5,7 +5,7 @@
#include <stdlib.h>
#include <string.h>
-#include "xmpcore/mp_image.h"
+#include "xmpcore/xmp_image.h"
#include "vf.h"
#include "vf_internal.h"
#include "vfcap.h"
Modified: mplayerxp/postproc/vf_yuvcsp.cpp
===================================================================
--- mplayerxp/postproc/vf_yuvcsp.cpp 2012-12-19 08:57:43 UTC (rev 576)
+++ mplayerxp/postproc/vf_yuvcsp.cpp 2012-12-19 09:28:13 UTC (rev 577)
@@ -7,7 +7,7 @@
#include <inttypes.h>
#include "libvo2/img_format.h"
-#include "xmpcore/mp_image.h"
+#include "xmpcore/xmp_image.h"
#include "vf.h"
#include "vf_internal.h"
#include "pp_msg.h"
Modified: mplayerxp/postproc/vf_yuy2.cpp
===================================================================
--- mplayerxp/postproc/vf_yuy2.cpp 2012-12-19 08:57:43 UTC (rev 576)
+++ mplayerxp/postproc/vf_yuy2.cpp 2012-12-19 09:28:13 UTC (rev 577)
@@ -7,7 +7,7 @@
#include <inttypes.h>
#include "libvo2/img_format.h"
-#include "xmpcore/mp_image.h"
+#include "xmpcore/xmp_image.h"
#include "vf.h"
#include "vf_internal.h"
Modified: mplayerxp/postproc/vf_yvu9.cpp
===================================================================
--- mplayerxp/postproc/vf_yvu9.cpp 2012-12-19 08:57:43 UTC (rev 576)
+++ mplayerxp/postproc/vf_yvu9.cpp 2012-12-19 09:28:13 UTC (rev 577)
@@ -7,7 +7,7 @@
#include <inttypes.h>
#include "libvo2/img_format.h"
-#include "xmpcore/mp_image.h"
+#include "xmpcore/xmp_image.h"
#include "vf.h"
#include "vf_internal.h"
Modified: mplayerxp/xmpcore/Makefile
===================================================================
--- mplayerxp/xmpcore/Makefile 2012-12-19 08:57:43 UTC (rev 576)
+++ mplayerxp/xmpcore/Makefile 2012-12-19 09:28:13 UTC (rev 577)
@@ -9,7 +9,7 @@
xmp_vdecoder.cpp \
xmp_adecoder.cpp
-SRCS+=sig_hand.cpp mp_image.cpp mp_aframe.cpp
+SRCS+=sig_hand.cpp xmp_image.cpp xmp_aframe.cpp
OBJS=$(SRCS:.cpp=.o)
CXXFLAGS = $(OPTXXFLAGS) -I. -I.. -Wall
Deleted: mplayerxp/xmpcore/mp_aframe.cpp
===================================================================
--- mplayerxp/xmpcore/mp_aframe.cpp 2012-12-19 08:57:43 UTC (rev 576)
+++ mplayerxp/xmpcore/mp_aframe.cpp 2012-12-19 09:28:13 UTC (rev 577)
@@ -1,328 +0,0 @@
-#include "mpxp_config.h"
-#include "osdep/mplib.h"
-using namespace mpxp;
-#include <string.h>
-#include <stdio.h>
-
-#include "mp_aframe.h"
-#include "libao3/afmt.h"
-#include "loader/wine/mmreg.h"
-#include "mpxp_msg.h"
-
-namespace mpxp {
-
-enum { AFMT_AF_FLAGS=0x70000000 };
-
-/* Decodes the format from mplayer format to libaf format */
-mpaf_format_e __FASTCALL__ afmt2mpaf(unsigned ifmt)
-{
- mpaf_format_e ofmt = mpaf_format_e(0);
- // Check input ifmt
- switch(ifmt){
- case AFMT_U8: ofmt = mpaf_format_e(MPAF_PCM|MPAF_LE|MPAF_US|1); break;
- case AFMT_S8: ofmt = mpaf_format_e(MPAF_PCM|MPAF_LE|MPAF_SI|1); break;
- case AFMT_S16_LE: ofmt = mpaf_format_e(MPAF_PCM|MPAF_LE|MPAF_SI|2); break;
- case AFMT_S16_BE: ofmt = mpaf_format_e(MPAF_PCM|MPAF_BE|MPAF_SI|2); break;
- case AFMT_U16_LE: ofmt = mpaf_format_e(MPAF_PCM|MPAF_LE|MPAF_US|2); break;
- case AFMT_U16_BE: ofmt = mpaf_format_e(MPAF_PCM|MPAF_BE|MPAF_US|2); break;
- case AFMT_S24_LE: ofmt = mpaf_format_e(MPAF_PCM|MPAF_LE|MPAF_SI|3); break;
- case AFMT_S24_BE: ofmt = mpaf_format_e(MPAF_PCM|MPAF_BE|MPAF_SI|3); break;
- case AFMT_U24_LE: ofmt = mpaf_format_e(MPAF_PCM|MPAF_LE|MPAF_US|3); break;
- case AFMT_U24_BE: ofmt = mpaf_format_e(MPAF_PCM|MPAF_BE|MPAF_US|3); break;
- case AFMT_S32_LE: ofmt = mpaf_format_e(MPAF_PCM|MPAF_LE|MPAF_SI|4); break;
- case AFMT_S32_BE: ofmt = mpaf_format_e(MPAF_PCM|MPAF_BE|MPAF_SI|4); break;
- case AFMT_U32_LE: ofmt = mpaf_format_e(MPAF_PCM|MPAF_LE|MPAF_US|4); break;
- case AFMT_U32_BE: ofmt = mpaf_format_e(MPAF_PCM|MPAF_BE|MPAF_US|4); break;
- case AFMT_FLOAT32:ofmt = mpaf_format_e(MPAF_PCM|MPAF_F |MPAF_NE|4); break;
-
- case AFMT_IMA_ADPCM: ofmt = mpaf_format_e(MPAF_IMA_ADPCM|1); break;
- case AFMT_MPEG: ofmt = mpaf_format_e(MPAF_MPEG2|1); break;
- case AFMT_AC3: ofmt = mpaf_format_e(MPAF_AC3|1); break;
- default:
- if ((ifmt & AFMT_AF_FLAGS) == AFMT_AF_FLAGS) {
- ofmt = mpaf_format_e((ifmt&(~AFMT_AF_FLAGS))|2);
- break;
- }
- //This can not happen ....
- MSG_FATAL("[af_mp] Unrecognized input audio format %i\n",ifmt);
- break;
- }
- return ofmt;
-}
-
-/* Encodes the format from libaf format to mplayer (OSS) format */
-unsigned __FASTCALL__ mpaf2afmt(mpaf_format_e fmt)
-{
- switch(fmt&MPAF_SPECIAL_MASK) {
- case 0: // PCM:
- if((fmt&MPAF_POINT_MASK)==MPAF_I) {
- if((fmt&MPAF_SIGN_MASK)==MPAF_SI){
- // signed int PCM:
- switch(fmt&MPAF_BPS_MASK){
- case MPAF_BPS_1: return AFMT_S8;
- default:
- case MPAF_BPS_2: return (fmt&MPAF_LE)?AFMT_S16_LE:AFMT_S16_BE;
- case MPAF_BPS_3: return (fmt&MPAF_LE)?AFMT_S24_LE:AFMT_S24_BE;
- case MPAF_BPS_4: return (fmt&MPAF_LE)?AFMT_S32_LE:AFMT_S32_BE;
- }
- } else {
- // unsigned int PCM:
- switch(fmt&MPAF_BPS_MASK){
- case MPAF_BPS_1: return AFMT_U8;
- default:
- case MPAF_BPS_2: return (fmt&MPAF_LE)?AFMT_U16_LE:AFMT_U16_BE;
- case MPAF_BPS_3: return (fmt&MPAF_LE)?AFMT_U24_LE:AFMT_U24_BE;
- case MPAF_BPS_4: return (fmt&MPAF_LE)?AFMT_U32_LE:AFMT_U32_BE;
- }
- }
- } else {
- // float PCM:
- return AFMT_FLOAT32; // FIXME?
- }
- break;
- default:
- case MPAF_MPEG2: return AFMT_MPEG;
- case MPAF_AC3: return AFMT_AC3;
- case MPAF_IMA_ADPCM: return AFMT_IMA_ADPCM;
- }
- return fmt|AFMT_AF_FLAGS;
-}
-
-static const struct fmt_alias_s {
- const char *name;
- unsigned short wtag;
-} fmt_aliases[]= {
- { "adpcm", WAVE_FORMAT_ADPCM },
- { "vselp", WAVE_FORMAT_VSELP },
- { "cvsd", WAVE_FORMAT_IBM_CVSD },
- { "dts", WAVE_FORMAT_DTS },
- { "oki_adpcm", WAVE_FORMAT_OKI_ADPCM },
- { "dvi_adpcm", WAVE_FORMAT_DVI_ADPCM },
- { "ima_adpcm", WAVE_FORMAT_IMA_ADPCM },
- { "mediaspace_adpcm", WAVE_FORMAT_MEDIASPACE_ADPCM },
- { "sierra_adpcm", WAVE_FORMAT_SIERRA_ADPCM },
- { "g723_adpcm", WAVE_FORMAT_G723_ADPCM },
- { "digistd", WAVE_FORMAT_DIGISTD },
- { "digifix", WAVE_FORMAT_DIGIFIX },
- { "dialogic_oki_adpcm", WAVE_FORMAT_DIALOGIC_OKI_ADPCM },
- { "mediavision_adpcm", WAVE_FORMAT_MEDIAVISION_ADPCM },
- { "cu_codec", WAVE_FORMAT_CU_CODEC },
- { "yamaha_adpcm", WAVE_FORMAT_YAMAHA_ADPCM },
- { "sonarc", WAVE_FORMAT_SONARC },
- { "dspgroup_truespeech", WAVE_FORMAT_DSPGROUP_TRUESPEECH },
- { "echosc1", WAVE_FORMAT_ECHOSC1 },
- { "audiofile_af36", WAVE_FORMAT_AUDIOFILE_AF36 },
- { "aptx", WAVE_FORMAT_APTX },
- { "audiofile_af10", WAVE_FORMAT_AUDIOFILE_AF10 },
- { "prosody_1612", WAVE_FORMAT_PROSODY_1612 },
- { "lrc", WAVE_FORMAT_LRC },
- { "dolby_ac2", WAVE_FORMAT_DOLBY_AC2 },
- { "gsm610", WAVE_FORMAT_GSM610 },
- { "msnaudio", WAVE_FORMAT_MSNAUDIO },
- { "antex_adpcme", WAVE_FORMAT_ANTEX_ADPCME },
- { "control_res_vqlpc", WAVE_FORMAT_CONTROL_RES_VQLPC },
- { "digireal", WAVE_FORMAT_DIGIREAL },
- { "digiadpcm", WAVE_FORMAT_DIGIADPCM },
- { "control_res_cr10", WAVE_FORMAT_CONTROL_RES_CR10 },
- { "nms_vbxadpcm", WAVE_FORMAT_NMS_VBXADPCM },
- { "cs_imaadpcm", WAVE_FORMAT_CS_IMAADPCM },
- { "echosc3", WAVE_FORMAT_ECHOSC3 },
- { "rockwell_adpcm", WAVE_FORMAT_ROCKWELL_ADPCM },
- { "rockwell_digitalk", WAVE_FORMAT_ROCKWELL_DIGITALK },
- { "xebec", WAVE_FORMAT_XEBEC },
- { "g721_adpcm", WAVE_FORMAT_G721_ADPCM },
- { "g728_celp", WAVE_FORMAT_G728_CELP },
- { "msg723", WAVE_FORMAT_MSG723 },
- { "mp2", WAVE_FORMAT_MPEG },
- { "rt24", WAVE_FORMAT_RT24 },
- { "pac", WAVE_FORMAT_PAC },
- { "mp3", WAVE_FORMAT_MPEGLAYER3 },
- { "lucent_g723", WAVE_FORMAT_LUCENT_G723 },
- { "cirrus", WAVE_FORMAT_CIRRUS },
- { "espcm", WAVE_FORMAT_ESPCM },
- { "voxware", WAVE_FORMAT_VOXWARE },
- { "canopus_atrac", WAVE_FORMAT_CANOPUS_ATRAC },
- { "g726_adpcm", WAVE_FORMAT_G726_ADPCM },
- { "g722_adpcm", WAVE_FORMAT_G722_ADPCM },
- { "dsat_display", WAVE_FORMAT_DSAT_DISPLAY },
- { "voxware_byte_aligned", WAVE_FORMAT_VOXWARE_BYTE_ALIGNED },
- { "voxware_ac8", WAVE_FORMAT_VOXWARE_AC8 },
- { "voxware_ac10", WAVE_FORMAT_VOXWARE_AC10 },
- { "voxware_ac16", WAVE_FORMAT_VOXWARE_AC16 },
- { "voxware_ac20", WAVE_FORMAT_VOXWARE_AC20 },
- { "voxware_rt24", WAVE_FORMAT_VOXWARE_RT24 },
- { "voxware_rt29", WAVE_FORMAT_VOXWARE_RT29 },
- { "voxware_rt29hw", WAVE_FORMAT_VOXWARE_RT29HW },
- { "voxware_vr12", WAVE_FORMAT_VOXWARE_VR12 },
- { "voxware_vr18", WAVE_FORMAT_VOXWARE_VR18 },
- { "voxware_tq40", WAVE_FORMAT_VOXWARE_TQ40 },
- { "softsound", WAVE_FORMAT_SOFTSOUND },
- { "voxware_tq60", WAVE_FORMAT_VOXWARE_TQ60 },
- { "msrt24", WAVE_FORMAT_MSRT24 },
- { "g729a", WAVE_FORMAT_G729A },
- { "mvi2", WAVE_FORMAT_MVI_MVI2 },
- { "df_g726", WAVE_FORMAT_DF_G726 },
- { "df_gsm610", WAVE_FORMAT_DF_GSM610 },
- { "isiaudio", WAVE_FORMAT_ISIAUDIO },
- { "onlive", WAVE_FORMAT_ONLIVE },
- { "sbc24", WAVE_FORMAT_SBC24 },
- { "dolby_ac3_spdif", WAVE_FORMAT_DOLBY_AC3_SPDIF },
- { "mediasonic_g723", WAVE_FORMAT_MEDIASONIC_G723 },
- { "prosody_8k", WAVE_FORMAT_PROSODY_8KBPS },
- { "zyxel_adpcm", WAVE_FORMAT_ZYXEL_ADPCM },
- { "philips_lpcbb", WAVE_FORMAT_PHILIPS_LPCBB },
- { "packed", WAVE_FORMAT_PACKED },
- { "malden_phonytalk", WAVE_FORMAT_MALDEN_PHONYTALK },
- { "phetorex_adpcm", WAVE_FORMAT_RHETOREX_ADPCM },
- { "irat", WAVE_FORMAT_IRAT },
- { "vivo_g723", WAVE_FORMAT_VIVO_G723 },
- { "vivo_siren", WAVE_FORMAT_VIVO_SIREN },
- { "digital_g723", WAVE_FORMAT_DIGITAL_G723 },
- { "sanyo_ld_adpcm", WAVE_FORMAT_SANYO_LD_ADPCM },
- { "siprolab_acelpnet", WAVE_FORMAT_SIPROLAB_ACEPLNET },
- { "siprolab_acelp4800", WAVE_FORMAT_SIPROLAB_ACELP4800 },
- { "siprolab_acelp8v3", WAVE_FORMAT_SIPROLAB_ACELP8V3 },
- { "siprolab_g729", WAVE_FORMAT_SIPROLAB_G729 },
- { "siprolab_g729a", WAVE_FORMAT_SIPROLAB_G729A },
- { "siprolab_kelvin", WAVE_FORMAT_SIPROLAB_KELVIN },
- { "g726adpcm", WAVE_FORMAT_G726ADPCM },
- { "qualcomm_purevoice", WAVE_FORMAT_QUALCOMM_PUREVOICE },
- { "qualcomm_halfrate", WAVE_FORMAT_QUALCOMM_HALFRATE },
- { "tubgsm", WAVE_FORMAT_TUBGSM },
- { "msaudio1", WAVE_FORMAT_MSAUDIO1 },
- { "creative_adpcm", WAVE_FORMAT_CREATIVE_ADPCM },
- { "creative_fastspeech8", WAVE_FORMAT_CREATIVE_FASTSPEECH8 },
- { "creative_fastspeech10", WAVE_FORMAT_CREATIVE_FASTSPEECH10 },
- { "uher_adpcm", WAVE_FORMAT_UHER_ADPCM },
- { "quarterdeck", WAVE_FORMAT_QUARTERDECK },
- { "ilink_vc", WAVE_FORMAT_ILINK_VC },
- { "raw_sport", WAVE_FORMAT_RAW_SPORT },
- { "ipi_hsx", WAVE_FORMAT_IPI_HSX },
- { "ipi_rpelp", WAVE_FORMAT_IPI_RPELP },
- { "cs2", WAVE_FORMAT_CS2 },
- { "sony_scx", WAVE_FORMAT_SONY_SCX },
- { "fm_towns_snd", WAVE_FORMAT_FM_TOWNS_SND },
- { "btv_digital", WAVE_FORMAT_BTV_DIGITAL },
- { "qdesign_music", WAVE_FORMAT_QDESIGN_MUSIC },
- { "vme_vmpcm", WAVE_FORMAT_VME_VMPCM },
- { "tpc", WAVE_FORMAT_TPC },
- { "oligsm", WAVE_FORMAT_OLIGSM },
- { "oliadpcm", WAVE_FORMAT_OLIADPCM },
- { "olicelp", WAVE_FORMAT_OLICELP },
- { "olisbc", WAVE_FORMAT_OLISBC },
- { "oliopr", WAVE_FORMAT_OLIOPR },
- { "lh_codec", WAVE_FORMAT_LH_CODEC },
- { "norris", WAVE_FORMAT_NORRIS },
- { "soundspace_musicompress", WAVE_FORMAT_SOUNDSPACE_MUSICOMPRESS },
- { "ac3", WAVE_FORMAT_DVM }
-};
-
-// Convert from string to format
-mpaf_format_e mpaf_str2fmt(const char *str)
-{
- unsigned i,fmt;
- char val[3];
- fmt=0;
- if(strlen(str)<3) goto bad_fmt;
- /* check for special cases */
- if(strncmp(str,"float",5)==0 || strncmp(str,"FLOAT",5)==0) { fmt |= MPAF_F; str = &str[4]; }
- else
- if(str[0]=='S' || str[0]=='s') fmt|=MPAF_SI;
- else
- if(str[0]=='U' || str[0]=='u') fmt|=MPAF_US;
- else goto try_special;
- val[0]=str[1];
- val[1]=str[2];
- val[2]='\0';
- if(strcmp(val,"08")==0) fmt|=1;
- else
- if(strcmp(val,"16")==0) fmt|=2;
- else
- if(strcmp(val,"24")==0) fmt|=3;
- else
- if(strcmp(val,"32")==0) fmt|=4;
- else
- if(strcmp(val,"64")==0) fmt|=8;
- else goto try_special;
- if(str[3]=='\0') {
-#ifdef WORDS_BIGENDIAN
- fmt|=MPAF_BE;
-#else
- fmt|=MPAF_LE;
-#endif
- }
- else if(strcmp(&str[3],"LE")==0 || strcmp(&str[3],"le")==0) fmt |= MPAF_LE;
- else if(strcmp(&str[3],"BE")==0 || strcmp(&str[3],"be")==0) fmt |= MPAF_BE;
- else goto try_special;
- return mpaf_format_e(fmt);
-
- try_special:
- for(i=0;i<sizeof(fmt_aliases)/sizeof(struct fmt_alias_s);i++) {
- if(strcasecmp(str,fmt_aliases[i].name)==0) return mpaf_format_e(fmt_aliases[i].wtag<<16);
- }
- bad_fmt:
- MSG_ERR("[af_format] Bad value %s. Examples: S08LE U24BE S32 MP3 AC3\n",str);
- return mpaf_format_e(MPAF_BE);
-}
-
-/* Convert format to str input str is a buffer for the
- converted string, size is the size of the buffer */
-char* mpaf_fmt2str(mpaf_format_e format, char* str, size_t size)
-{
- int i=0;
- // Print endinaness
-
- if(format & MPAF_SPECIAL_MASK) {
- unsigned short wtag;
- unsigned j;
- wtag = format >> 16;
- for(j=0;j<sizeof(fmt_aliases)/sizeof(struct fmt_alias_s);j++) {
- if(fmt_aliases[j].wtag==wtag) {
- i+=snprintf(&str[i],size-i,fmt_aliases[j].name);
- break;
- }
- }
- } else {
- // Type
- if(MPAF_F == (format & MPAF_POINT_MASK)) i+=snprintf(&str[i],size,"FLOAT");
- else {
- if(MPAF_US == (format & MPAF_SIGN_MASK)) i+=snprintf(&str[i],size-i,"U");
- else i+=snprintf(&str[i],size-i,"S");
- }
- // size
- i+=snprintf(&str[i],size,"%d",(format&MPAF_BPS_MASK)*8);
- // endian
- if(MPAF_LE == (format & MPAF_END_MASK)) i+=snprintf(&str[i],size,"LE");
- else i+=snprintf(&str[i],size,"BE");
- }
- return str;
-}
-
-
-mp_aframe_t* new_mp_aframe(unsigned rate,unsigned nch,mpaf_format_e format,unsigned xp_idx) {
- mp_aframe_t* mpaf = new(zeromem) mp_aframe_t;
- if(!mpaf) return NULL;
- mpaf->rate = rate;
- mpaf->nch = nch;
- mpaf->format = format;
- mpaf->xp_idx = xp_idx;
- return mpaf;
-}
-
-int free_mp_aframe(mp_aframe_t* mpaf) {
- if(!mpaf) return 0;
- if(mpaf->audio) delete mpaf->audio;
- delete mpaf;
- return 1;
-}
-
-mp_aframe_t* new_mp_aframe_genome(const mp_aframe_t* in) {
- mp_aframe_t* out = new(zeromem) mp_aframe_t;
- memcpy(out,in,sizeof(mp_aframe_t));
- out->audio = NULL;
- return out;
-}
-
-void mp_alloc_aframe(mp_aframe_t* it) { it->audio = new uint8_t[it->len]; }
-
-} // namespace mpxp
\ No newline at end of file
Deleted: mplayerxp/xmpcore/mp_aframe.h
===================================================================
--- mplayerxp/xmpcore/mp_aframe.h 2012-12-19 08:57:43 UTC (rev 576)
+++ mplayerxp/xmpcore/mp_aframe.h 2012-12-19 09:28:13 UTC (rev 577)
@@ -1,82 +0,0 @@
-#ifndef __MP_AUDIO_FRAME_INCLUDED_H
-#define __MP_AUDIO_FRAME_INCLUDED_H 1
-
-#include "mpxp_config.h"
-#include <stdlib.h>
-#include <stdint.h>
-
-namespace mpxp {
-
- /* The sample format system is based on bitmasks. The
- format definition only refers to the storage format not the
- resolution. */
- typedef enum mpaf_format_enum{
- MPAF_BPS_MASK =0x00000FFFUL, /* byte per sample */
- MPAF_BPS_1 =0x00000001UL,
- MPAF_BPS_2 =0x00000002UL,
- MPAF_BPS_3 =0x00000003UL,
- MPAF_BPS_4 =0x00000004UL,
-// Endianess
- MPAF_BE =0x00000000UL, // Big Endian
- MPAF_LE =0x00001000UL, // Little Endian
- MPAF_END_MASK =0x00001000UL,
-#if WORDS_BIGENDIAN // Native endian of cpu
- MPAF_NE =MPAF_BE,
-#else
- MPAF_NE =MPAF_LE,
-#endif
-// Signed/unsigned
- MPAF_SI =0x00000000UL, // SIgned
- MPAF_US =0x00002000UL, // Un Signed
- MPAF_SIGN_MASK =0x00002000UL,
-// Fixed or floating point
- MPAF_I =0x00000000UL, // Integer
- MPAF_F =0x00004000UL, // Foating point
- MPAF_POINT_MASK =0x00004000UL,
-// Special flags refering to non pcm data
- MPAF_PCM =0x00000000UL, //
- MPAF_IMA_ADPCM =0x00110000UL, // Same as 16 bit signed int
- MPAF_MPEG2 =0x00500000UL, // MPEG1 layer2 audio
- MPAF_MPEG3 =0x00550000UL, // MPEG1 layer3 audio
- MPAF_AC3 =0x20000000UL, // Dolby Digital AC3
- MPAF_SPECIAL_MASK=0xFFFF0000UL
- }mpaf_format_e;
- inline mpaf_format_e operator~(mpaf_format_e a) { return static_cast<mpaf_format_e>(~static_cast<unsigned>(a)); }
- inline mpaf_format_e operator|(mpaf_format_e a, mpaf_format_e b) { return static_cast<mpaf_format_e>(static_cast<unsigned>(a)|static_cast<unsigned>(b)); }
- inline mpaf_format_e operator&(mpaf_format_e a, mpaf_format_e b) { return static_cast<mpaf_format_e>(static_cast<unsigned>(a)&static_cast<unsigned>(b)); }
- inline mpaf_format_e operator^(mpaf_format_e a, mpaf_format_e b) { return static_cast<mpaf_format_e>(static_cast<unsigned>(a)^static_cast<unsigned>(b)); }
- inline mpaf_format_e operator|=(mpaf_format_e a, mpaf_format_e b) { return (a=static_cast<mpaf_format_e>(static_cast<unsigned>(a)|static_cast<unsigned>(b))); }
- inline mpaf_format_e operator&=(mpaf_format_e a, mpaf_format_e b) { return (a=static_cast<mpaf_format_e>(static_cast<unsigned>(a)&static_cast<unsigned>(b))); }
- inline mpaf_format_e operator^=(mpaf_format_e a, mpaf_format_e b) { return (a=static_cast<mpaf_format_e>(static_cast<unsigned>(a)^static_cast<unsigned>(b))); }
-
- /* Decodes the format from mplayer format to libaf format */
- mpaf_format_e __FASTCALL__ afmt2mpaf(unsigned format);
- unsigned __FASTCALL__ mpaf2afmt(mpaf_format_e fmt);
- char* __FASTCALL__ mpaf_fmt2str(mpaf_format_e format, char* str, size_t size);
- mpaf_format_e __FASTCALL__ mpaf_str2fmt(const char *str);
-
- inline int mpaf_test(mpaf_format_e f,unsigned bits) { return f&bits; }
- inline int mpaf_testa(mpaf_format_e f,unsigned bits) { return (f&bits)==bits; }
-
- enum {
- MP_AFLG_FINALIZED =0x80000000
- };
-
- struct mp_aframe_t {
- unsigned flags; /* currently unused */
- float pts; /* PTS if this frame */
- unsigned xp_idx;/* index in ring buffer */
- uint8_t* audio; /* data of audio frame */
- unsigned len; /* length of data */
- /*------ stream description ----------*/
- unsigned rate; /* rate of audio */
- unsigned nch; /* number of channels */
- mpaf_format_e format;/* PCM format of audio */
- };
-
- mp_aframe_t* new_mp_aframe(unsigned rate,unsigned nch,mpaf_format_e format,unsigned xp_idx);
- mp_aframe_t* new_mp_aframe_genome(const mp_aframe_t* in);
- void mp_alloc_aframe(mp_aframe_t* it);
- int free_mp_aframe(mp_aframe_t* mpaf);
-} // namespace
-#endif
Deleted: mplayerxp/xmpcore/mp_image.cpp
===================================================================
--- mplayerxp/xmpcore/mp_image.cpp 2012-12-19 08:57:43 UTC (rev 576)
+++ mplayerxp/xmpcore/mp_image.cpp 2012-12-19 09:28:13 UTC (rev 577)
@@ -1,224 +0,0 @@
-#include "mpxp_config.h"
-#include "osdep/mplib.h"
-using namespace mpxp;
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "mplayerxp.h"
-#include "libvo2/img_format.h"
-#include "mp_image.h"
-#include "osdep/fastmemcpy.h"
-#define MSGT_CLASS MSGT_CPLAYER
-#include "mpxp_msg.h"
-
-namespace mpxp {
-void mp_image_setfmt(mp_image_t* mpi,unsigned int out_fmt){
- mpi->flags&=~(MP_IMGFLAG_PLANAR|MP_IMGFLAG_YUV|MP_IMGFLAG_SWAPPED);
- mpi->imgfmt=out_fmt;
- if(out_fmt == IMGFMT_MPEGPES){
- mpi->bpp=0;
- return;
- }
- if(out_fmt == IMGFMT_ZRMJPEGNI ||
- out_fmt == IMGFMT_ZRMJPEGIT ||
- out_fmt == IMGFMT_ZRMJPEGIB){
- mpi->bpp=0;
- return;
- }
- if(IMGFMT_IS_XVMC(out_fmt)){
- mpi->bpp=0;
- return;
- }
- mpi->num_planes=1;
- if (IMGFMT_IS_RGB(out_fmt) || IMGFMT_IS_BGR(out_fmt)) {
- mpi->bpp = rgbfmt_depth(out_fmt);
- if(IMGFMT_IS_BGR(out_fmt)) mpi->flags|=MP_IMGFLAG_SWAPPED;
- return;
- }
- mpi->flags|=MP_IMGFLAG_YUV;
- mpi->num_planes=3;
- switch(out_fmt){
- case IMGFMT_I420:
- case IMGFMT_IYUV:
- mpi->flags|=MP_IMGFLAG_SWAPPED;
- case IMGFMT_YV12:
- mpi->flags|=MP_IMGFLAG_PLANAR;
- mpi->bpp=12;
- mpi->chroma_width=(mpi->width>>1);
- mpi->chroma_height=(mpi->height>>1);
- mpi->chroma_x_shift=1;
- mpi->chroma_y_shift=1;
- return;
- case IMGFMT_420A:
- case IMGFMT_IF09:
- mpi->num_planes=4;
- case IMGFMT_YVU9:
- mpi->flags|=MP_IMGFLAG_PLANAR;
- mpi->bpp=9;
- mpi->chroma_width=(mpi->width>>2);
- mpi->chroma_height=(mpi->height>>2);
- mpi->chroma_x_shift=2;
- mpi->chroma_y_shift=2;
- return;
- case IMGFMT_444P16_LE:
- case IMGFMT_444P16_BE:
- mpi->flags|=MP_IMGFLAG_PLANAR;
- mpi->bpp=48;
- mpi->chroma_width=(mpi->width);
- mpi->chroma_height=(mpi->height);
- mpi->chroma_x_shift=0;
- mpi->chroma_y_shift=0;
- return;
- case IMGFMT_444P:
- mpi->flags|=MP_IMGFLAG_PLANAR;
- mpi->bpp=24;
- mpi->chroma_width=(mpi->width);
- mpi->chroma_height=(mpi->height);
- mpi->chroma_x_shift=0;
- mpi->chroma_y_shift=0;
- return;
- case IMGFMT_422P16_LE:
- case IMGFMT_422P16_BE:
- mpi->flags|=MP_IMGFLAG_PLANAR;
- mpi->bpp=32;
- mpi->chroma_width=(mpi->width>>1);
- mpi->chroma_height=(mpi->height);
- mpi->chroma_x_shift=1;
- mpi->chroma_y_shift=0;
- return;
- case IMGFMT_422P:
- mpi->flags|=MP_IMGFLAG_PLANAR;
- mpi->bpp=16;
- mpi->chroma_width=(mpi->width>>1);
- mpi->chroma_height=(mpi->height);
- mpi->chroma_x_shift=1;
- mpi->chroma_y_shift=0;
- return;
- case IMGFMT_420P16_LE:
- case IMGFMT_420P16_BE:
- mpi->flags|=MP_IMGFLAG_PLANAR;
- mpi->bpp=24;
- mpi->chroma_width=(mpi->width>>2);
- mpi->chroma_height=(mpi->height);
- mpi->chroma_x_shift=2;
- mpi->chroma_y_shift=0;
- return;
- case IMGFMT_411P:
- mpi->flags|=MP_IMGFLAG_PLANAR;
- mpi->bpp=12;
- mpi->chroma_width=(mpi->width>>2);
- mpi->chroma_height=(mpi->height);
- mpi->chroma_x_shift=2;
- mpi->chroma_y_shift=0;
- return;
- case IMGFMT_Y800:
- case IMGFMT_Y8:
- /* they're planar ones, but for easier handling use them as packed */
-// mpi->flags|=MP_IMGFLAG_PLANAR;
- mpi->bpp=8;
- mpi->num_planes=1;
- return;
- case IMGFMT_UYVY:
- mpi->flags|=MP_IMGFLAG_SWAPPED;
- case IMGFMT_YUY2:
- mpi->bpp=16;
- mpi->num_planes=1;
- return;
- case IMGFMT_NV12:
- mpi->flags|=MP_IMGFLAG_SWAPPED;
- case IMGFMT_NV21:
- mpi->flags|=MP_IMGFLAG_PLANAR;
- mpi->bpp=12;
- mpi->num_planes=2;
- mpi->chroma_width=(mpi->width>>0);
- mpi->chroma_height=(mpi->height>>1);
- mpi->chroma_x_shift=0;
- mpi->chroma_y_shift=1;
- return;
- }
- MSG_WARN("mp_image: Unknown out_fmt: 0x%X\n",out_fmt);
- show_backtrace("outfmt",10);
- mpi->bpp=0;
-}
-
-mp_image_t* new_mp_image(unsigned w,unsigned h,unsigned xp_idx){
- mp_image_t* mpi=new(zeromem) mp_image_t;
- if(!mpi) return NULL; // error!
- mpi->xp_idx = xp_idx;
- mpi->width=mpi->w=w;
- mpi->height=mpi->h=h;
- return mpi;
-}
-
-void free_mp_image(mp_image_t* mpi){
- if(!mpi) return;
- if(mpi->flags&MP_IMGFLAG_ALLOCATED){
- /* becouse we allocate the whole image in once */
- if(mpi->planes[0]) delete mpi->planes[0];
- }
- delete mpi;
-}
-
-mp_image_t* alloc_mpi(unsigned w, unsigned h, unsigned int fmt,unsigned xp_idx) {
- mp_image_t* mpi = new_mp_image(w,h,xp_idx);
-
- mp_image_setfmt(mpi,fmt);
- mpi_alloc_planes(mpi);
- return mpi;
-}
-
-void mpi_alloc_planes(mp_image_t *mpi) {
- unsigned size,delta;
- size=mpi->bpp*mpi->width*(mpi->height+2)/8;
- delta=0;
- // IF09 - allocate space for 4. plane delta info - unused
- if (mpi->imgfmt == IMGFMT_IF09) delta=mpi->chroma_width*mpi->chroma_height;
- mpi->planes[0]=new(alignmem,64) unsigned char[size+delta];
- if(delta) /* delta table, just for fun ;) */
- mpi->planes[3]=mpi->planes[0]+2*(mpi->chroma_width*mpi->chroma_height);
- if(mpi->flags&MP_IMGFLAG_PLANAR){
- // YV12/I420/YVU9/IF09. feel mp_free to add other planar formats here...
- if(!mpi->stride[0]) mpi->stride[0]=mpi->width;
- if(!mpi->stride[1]) mpi->stride[1]=mpi->stride[2]=mpi->chroma_width;
- if(mpi->flags&MP_IMGFLAG_SWAPPED){
- // I420/IYUV (Y,U,V)
- mpi->planes[1]=mpi->planes[0]+mpi->width*mpi->height;
- mpi->planes[2]=mpi->planes[1]+mpi->chroma_width*mpi->chroma_height;
- } else {
- // YV12,YVU9,IF09 (Y,V,U)
- mpi->planes[2]=mpi->planes[0]+mpi->width*mpi->height;
- mpi->planes[1]=mpi->planes[2]+mpi->chroma_width*mpi->chroma_height;
- }
- } else {
- if(!mpi->stride[0]) mpi->stride[0]=mpi->width*mpi->bpp/8;
- }
- mpi->flags|=MP_IMGFLAG_ALLOCATED;
-}
-
-void copy_mpi(mp_image_t *dmpi,const mp_image_t *mpi) {
- if(mpi->flags&MP_IMGFLAG_PLANAR){
- memcpy_pic(dmpi->planes[0],mpi->planes[0], mpi->w, mpi->h,
- dmpi->stride[0],mpi->stride[0]);
- memcpy_pic(dmpi->planes[1],mpi->planes[1], mpi->chroma_width, mpi->chroma_height,
- dmpi->stride[1],mpi->stride[1]);
- memcpy_pic(dmpi->planes[2], mpi->planes[2], mpi->chroma_width, mpi->chroma_height,
- dmpi->stride[2],mpi->stride[2]);
- } else {
- memcpy_pic(dmpi->planes[0],mpi->planes[0],
- mpi->w*(dmpi->bpp/8), mpi->h,
- dmpi->stride[0],mpi->stride[0]);
- }
-}
-
-void mpi_fake_slice(mp_image_t *dmpi,const mp_image_t *mpi,unsigned y,unsigned h)
-{
- *dmpi = *mpi;
- dmpi->y = y;
- dmpi->h = h;
- dmpi->chroma_height = h >> mpi->chroma_y_shift;
- dmpi->xp_idx = mpi->xp_idx;
- dmpi->flags&=~MP_IMGFLAG_ALLOCATED;
-}
-
-} // namespace mpxp
Deleted: mplayerxp/xmpcore/mp_image.h
===================================================================
--- mplayerxp/xmpcore/mp_image.h 2012-12-19 08:57:43 UTC (rev 576)
+++ mplayerxp/xmpcore/mp_image.h 2012-12-19 09:28:13 UTC (rev 577)
@@ -1,100 +0,0 @@
-#ifndef __MP_IMAGE_H
-#define __MP_IMAGE_H 1
-
-#include <stdlib.h>
-#include <limits.h>
-
-#include "mpxp_config.h"
-
-namespace mpxp {
- //--- buffer content restrictions:
- enum {
- MP_IMGFLAG_PRESERVE=0x00001, // set if buffer content shouldn't be modified:
- MP_IMGFLAG_READABLE=0x00002 // set if buffer content will be READ for next frame's MC: (I/P mpeg frames)
- };
-
- //--- buffer width/stride/plane restrictions: (used for direct rendering)
- enum {
-// stride _have_to_ be aligned to MB boundary: [for DR restrictions]
- MP_IMGFLAG_ACCEPT_ALIGNED_STRIDE=0x00004, /* no flag - should be neg value of MP_IMGFLAG_ACCEPT_STRIDE */
-// stride should be aligned to MB boundary: [for buffer allocation]
- MP_IMGFLAG_PREFER_ALIGNED_STRIDE=0x00008, /* sould be no flag - everything prefer aligned strides */
- MP_IMGFLAG_ACCEPT_STRIDE =0x00010, // codec accept any stride (>=width):
- MP_IMGFLAG_ACCEPT_WIDTH =0x00020, // codec accept any width (width*bpp=stride -> stride%bpp==0) (>=width):
-//--- for planar formats only:
-// uses only stride[0], and stride[1]=stride[2]=stride[0]>>mpi->chroma_x_shift
- MP_IMGFLAG_COMMON_STRIDE =0x00040, /* UNUSED */
-// uses only planes[0], and calculates planes[1,2] from width,height,imgfmt
- MP_IMGFLAG_COMMON_PLANE =0x00080, /* UNUSED */
- MP_IMGFLAGMASK_RESTRICTIONS =0x000FF,
-//--------- color info (filled by mp_image_setfmt() ) -----------
- MP_IMGFLAG_PLANAR =0x00100, // set if number of planes > 1
- MP_IMGFLAG_YUV =0x00200, // set if it's YUV colorspace
- MP_IMGFLAG_SWAPPED =0x00400, // set if it's swapped (BGR or YVU) plane/byteorder
- MP_IMGFLAG_RGB_PALETTE =0x00800, // using palette for RGB data
- MP_IMGFLAGMASK_COLORS =0x00F00,
-// codec uses drawing/rendering callbacks (draw_slice()-like thing, DR method 2)
-// [the codec will set this flag if it supports callbacks, and the vo _may_
-// clear it in get_image() if draw_slice() not implemented]
- MP_IMGFLAG_DRAW_CALLBACK =0x01000,
- MP_IMGFLAG_DIRECT =0x02000, // set if it's in video buffer/memory: [set by vo/vf's get_image() !!!]
- MP_IMGFLAG_ALLOCATED =0x04000, // set if buffer is allocated (used in destination images):
- MP_IMGFLAG_TYPE_DISPLAYED =0x08000, // buffer type was printed (do NOT set this flag - it's for INTERNAL USE!!!)
- MP_IMGFLAG_FINAL =0x10000, // buffer is video memory
- MP_IMGFLAG_RENDERED =0x20000, // final buffer was already painted
- MP_IMGFLAG_FINALIZED =0x40000 // indicates final step of image processing from CPU side!!!
- };
-
- /* codec doesn't support any form of direct rendering - it has own buffer */
- enum {
- MP_IMGTYPE_EXPORT =0, // allocation. so we just export its buffer pointers:
- MP_IMGTYPE_STATIC =1, // codec requires a static WO buffer, but it does only partial updates later:
- MP_IMGTYPE_TEMP =2, // codec just needs some WO memory, where it writes/copies the whole frame to:
- MP_IMGTYPE_IP =3, // I+P type, requires 2+ independent static R/W buffers
- MP_IMGTYPE_IPB =4, // I+P+B type, requires 2+ independent static R/W and 1+ temp WO buffers
-
- MP_MAX_PLANES =4
- };
- enum {
- MP_IMGFIELD_ORDERED =0x01,
- MP_IMGFIELD_TOP_FIRST =0x02,
- MP_IMGFIELD_REPEAT_FIRST=0x04,
- MP_IMGFIELD_TOP =0x08,
- MP_IMGFIELD_BOTTOM =0x10,
- MP_IMGFIELD_INTERLACED =0x20
- };
-
- enum { XP_IDX_INVALID=UINT_MAX };
- struct mp_image_t {
- unsigned xp_idx; /* index of xp_frame associated with this image */
- unsigned int flags;
- unsigned char type;
- unsigned char bpp; // bits/pixel. NOT depth! for RGB it will be n*8
- unsigned int imgfmt;
- unsigned width,height; // stored dimensions
- int x,y,w,h; // slice dimensions
- unsigned num_planes;
- unsigned char* planes[MP_MAX_PLANES];
- unsigned int stride[MP_MAX_PLANES];
- char * qscale;
- unsigned qstride;
- unsigned qscale_type; // 0->mpeg1/4/h263, 1->mpeg2
- unsigned pict_type; // 0->unknown, 1->I, 2->P, 3->B
- unsigned fields;
- /* these are only used by planar formats Y,U(Cb),V(Cr) */
- int chroma_width;
- int chroma_height;
- int chroma_x_shift; // horizontal
- int chroma_y_shift; // vertical
- any_t* priv; /* for private use by filter or vo driver (to store buffer id or dmpi) */
- };
-
- void mp_image_setfmt(mp_image_t* mpi,unsigned int out_fmt);
- mp_image_t* new_mp_image(unsigned w,unsigned h,unsigned xp_idx);
- void free_mp_image(mp_image_t* mpi);
- mp_image_t* alloc_mpi(unsigned w, unsigned h, unsigned int fmt,unsigned xp_idx);
- void mpi_alloc_planes(mp_image_t *mpi);
- void copy_mpi(mp_image_t *dmpi,const mp_image_t *mpi);
- void mpi_fake_slice(mp_image_t *dmpi,const mp_image_t *mpi,unsigned y,unsigned height);
-}// namespace
-#endif
Copied: mplayerxp/xmpcore/xmp_aframe.cpp (from rev 576, mplayerxp/xmpcore/mp_aframe.cpp)
===================================================================
--- mplayerxp/xmpcore/xmp_aframe.cpp (rev 0)
+++ mplayerxp/xmpcore/xmp_aframe.cpp 2012-12-19 09:28:13 UTC (rev 577)
@@ -0,0 +1,328 @@
+#include "mpxp_config.h"
+#include "osdep/mplib.h"
+using namespace mpxp;
+#include <string.h>
+#include <stdio.h>
+
+#include "xmp_aframe.h"
+#include "libao3/afmt.h"
+#include "loader/wine/mmreg.h"
+#include "mpxp_msg.h"
+
+namespace mpxp {
+
+enum { AFMT_AF_FLAGS=0x70000000 };
+
+/* Decodes the format from mplayer format to libaf format */
+mpaf_format_e __FASTCALL__ afmt2mpaf(unsigned ifmt)
+{
+ mpaf_format_e ofmt = mpaf_format_e(0);
+ // Check input ifmt
+ switch(ifmt){
+ case AFMT_U8: ofmt = mpaf_format_e(MPAF_PCM|MPAF_LE|MPAF_US|1); break;
+ case AFMT_S8: ofmt = mpaf_format_e(MPAF_PCM|MPAF_LE|MPAF_SI|1); break;
+ case AFMT_S16_LE: ofmt = mpaf_format_e(MPAF_PCM|MPAF_LE|MPAF_SI|2); break;
+ case AFMT_S16_BE: ofmt = mpaf_format_e(MPAF_PCM|MPAF_BE|MPAF_SI|2); break;
+ case AFMT_U16_LE: ofmt = mpaf_format_e(MPAF_PCM|MPAF_LE|MPAF_US|2); break;
+ case AFMT_U16_BE: ofmt = mpaf_format_e(MPAF_PCM|MPAF_BE|MPAF_US|2); break;
+ case AFMT_S24_LE: ofmt = mpaf_format_e(MPAF_PCM|MPAF_LE|MPAF_SI|3); break;
+ case AFMT_S24_BE: ofmt = mpaf_format_e(MPAF_PCM|MPAF_BE|MPAF_SI|3); break;
+ case AFMT_U24_LE: ofmt = mpaf_format_e(MPAF_PCM|MPAF_LE|MPAF_US|3); break;
+ case AFMT_U24_BE: ofmt = mpaf_format_e(MPAF_PCM|MPAF_BE|MPAF_US|3); break;
+ case AFMT_S32_LE: ofmt = mpaf_format_e(MPAF_PCM|MPAF_LE|MPAF_SI|4); break;
+ case AFMT_S32_BE: ofmt = mpaf_format_e(MPAF_PCM|MPAF_BE|MPAF_SI|4); break;
+ case AFMT_U32_LE: ofmt = mpaf_format_e(MPAF_PCM|MPAF_LE|MPAF_US|4); break;
+ case AFMT_U32_BE: ofmt = mpaf_format_e(MPAF_PCM|MPAF_BE|MPAF_US|4); break;
+ case AFMT_FLOAT32:ofmt = mpaf_format_e(MPAF_PCM|MPAF_F |MPAF_NE|4); break;
+
+ case AFMT_IMA_ADPCM: ofmt = mpaf_format_e(MPAF_IMA_ADPCM|1); break;
+ case AFMT_MPEG: ofmt = mpaf_format_e(MPAF_MPEG2|1); break;
+ case AFMT_AC3: ofmt = mpaf_format_e(MPAF_AC3|1); break;
+ default:
+ if ((ifmt & AFMT_AF_FLAGS) == AFMT_AF_FLAGS) {
+ ofmt = mpaf_format_e((ifmt&(~AFMT_AF_FLAGS))|2);
+ break;
+ }
+ //This can not happen ....
+ MSG_FATAL("[af_mp] Unrecognized input audio format %i\n",ifmt);
+ break;
+ }
+ return ofmt;
+}
+
+/* Encodes the format from libaf format to mplayer (OSS) format */
+unsigned __FASTCALL__ mpaf2afmt(mpaf_format_e fmt)
+{
+ switch(fmt&MPAF_SPECIAL_MASK) {
+ case 0: // PCM:
+ if((fmt&MPAF_POINT_MASK)==MPAF_I) {
+ if((fmt&MPAF_SIGN_MASK)==MPAF_SI){
+ // signed int PCM:
+ switch(fmt&MPAF_BPS_MASK){
+ case MPAF_BPS_1: return AFMT_S8;
+ default:
+ case MPAF_BPS_2: return (fmt&MPAF_LE)?AFMT_S16_LE:AFMT_S16_BE;
+ case MPAF_BPS_3: return (fmt&MPAF_LE)?AFMT_S24_LE:AFMT_S24_BE;
+ case MPAF_BPS_4: return (fmt&MPAF_LE)?AFMT_S32_LE:AFMT_S32_BE;
+ }
+ } else {
+ // unsigned int PCM:
+ switch(fmt&MPAF_BPS_MASK){
+ case MPAF_BPS_1: return AFMT_U8;
+ default:
+ case MPAF_BPS_2: return (fmt&MPAF_LE)?AFMT_U16_LE:AFMT_U16_BE;
+ case MPAF_BPS_3: return (fmt&MPAF_LE)?AFMT_U24_LE:AFMT_U24_BE;
+ case MPAF_BPS_4: return (fmt&MPAF_LE)?AFMT_U32_LE:AFMT_U32_BE;
+ }
+ }
+ } else {
+ // float PCM:
+ return AFMT_FLOAT32; // FIXME?
+ }
+ break;
+ default:
+ case MPAF_MPEG2: return AFMT_MPEG;
+ case MPAF_AC3: return AFMT_AC3;
+ case MPAF_IMA_ADPCM: return AFMT_IMA_ADPCM;
+ }
+ return fmt|AFMT_AF_FLAGS;
+}
+
+static const struct fmt_alias_s {
+ const char *name;
+ unsigned short wtag;
+} fmt_aliases[]= {
+ { "adpcm", WAVE_...
[truncated message content] |
