[Mplayerxp-cvslog] SF.net SVN: mplayerxp:[567] mplayerxp
Brought to you by:
olov
Menu
▾
▴
[Mplayerxp-cvslog] SF.net SVN: mplayerxp:[567] mplayerxp
|
From: <nic...@us...> - 2012-12-17 08:47:09
|
Revision: 567
http://mplayerxp.svn.sourceforge.net/mplayerxp/?rev=567&view=rev
Author: nickols_k
Date: 2012-12-17 08:47:00 +0000 (Mon, 17 Dec 2012)
Log Message:
-----------
rename libao2 ->libao3 (TRANSACTION END)
Note about subfolders renaming:
It seems that between the computer where i perform development and
SVN server (sourceforge.net) exist intermediate computer (or server) which
holds copy of project's sources. When i'm renaming folders then i free
sources of my project from control of malefactor(s). To confirm that it's
enough to study shangesets of project, exactly changeset.542:
Date: 2012-12-11 16:18:22 +0000 (Tue, 11 Dec 2012)
Log Message:
-----------
rename libvo -> libvo2 (TRANSACTION BEGIN)
Added Paths:
-----------
mplayerxp/libvo2/
mplayerxp/libvo2/sub.cpp
mplayerxp/libvo2/vo_fbdev.cpp
Removed Paths:
-------------
mplayerxp/libvo/Makefile
mplayerxp/libvo/aspect.cpp
mplayerxp/libvo/aspect.h
mplayerxp/libvo/dri_vo.h
mplayerxp/libvo/font_load.cpp
mplayerxp/libvo/font_load.h
mplayerxp/libvo/img_format.cpp
mplayerxp/libvo/img_format.h
mplayerxp/libvo/jpeg_enc.cpp
mplayerxp/libvo/jpeg_enc.h
...
It's clear that computer of malefactor(s) gave 2 files from own repository.
Furthermore, everytime when i' trying to rename some folder, i got the error:
$svn ci -m "renaming oldfodlername -> newfoldername"
SVN: deleting 'oldfoldername'
SVN: item 'oldfoldername' is out of date
$svn --version
svn, version 1.6.19 (r1383947)
compiled Dec 4 2012, 10:30:48
Copyright (C) 2000-2009 CollabNet.
Subversion is open source software, see http://subversion.apache.org/
This product includes software developed by CollabNet (http://www.Collab.Net/).
Revision Links:
--------------
http://mplayerxp.svn.sourceforge.net/mplayerxp/?rev=1383947&view=rev
Modified Paths:
--------------
mplayerxp/Makefile
mplayerxp/libao3/Makefile
mplayerxp/libao3/ao_nas.cpp
mplayerxp/libao3/ao_oss.cpp
mplayerxp/libao3/ao_sdl.cpp
mplayerxp/libmpcodecs/ad.h
mplayerxp/libmpcodecs/ad_a52.cpp
mplayerxp/libmpcodecs/ad_acm.cpp
mplayerxp/libmpcodecs/ad_dca.cpp
mplayerxp/libmpcodecs/ad_dvdpcm.cpp
mplayerxp/libmpcodecs/ad_faad.cpp
mplayerxp/libmpcodecs/ad_hwac3.cpp
mplayerxp/libmpcodecs/ad_lavc.cpp
mplayerxp/libmpcodecs/ad_libdv.cpp
mplayerxp/libmpcodecs/ad_mp3.cpp
mplayerxp/libmpcodecs/ad_pcm.cpp
mplayerxp/libmpcodecs/ad_qtaudio.cpp
mplayerxp/libmpcodecs/ad_real.cpp
mplayerxp/libmpcodecs/ad_twin.cpp
mplayerxp/libmpcodecs/ad_vorbis.cpp
mplayerxp/libmpcodecs/dec_audio.cpp
mplayerxp/libmpconf/m_option.cpp
mplayerxp/libmpdemux/demux_ac3.cpp
mplayerxp/libmpdemux/demux_aiff.cpp
mplayerxp/libmpdemux/demux_dca.cpp
mplayerxp/libmpdemux/demux_flac.cpp
mplayerxp/libmpdemux/demux_lavf.cpp
mplayerxp/libmpdemux/demux_mkv.cpp
mplayerxp/libmpdemux/demux_mov.cpp
mplayerxp/libmpdemux/demux_mp3.cpp
mplayerxp/libmpdemux/demux_musepack.cpp
mplayerxp/libmpdemux/demux_ogg.cpp
mplayerxp/libmpdemux/demux_rawaudio.cpp
mplayerxp/libmpdemux/demux_real.cpp
mplayerxp/libmpdemux/demux_realaud.cpp
mplayerxp/libmpdemux/demux_snd_au.cpp
mplayerxp/libmpdemux/demux_voc.cpp
mplayerxp/libmpdemux/demux_vqf.cpp
mplayerxp/libmpdemux/demux_wav.cpp
mplayerxp/libmpdemux/demuxer.cpp
mplayerxp/libmpstream2/s_oss.cpp
mplayerxp/libmpstream2/s_tv.cpp
mplayerxp/libmpstream2/tvi/tvi_v4l.cpp
mplayerxp/mplayerxp.cpp
mplayerxp/mplayerxp.h
mplayerxp/postproc/Makefile
mplayerxp/postproc/af.cpp
mplayerxp/xmpcore/mp_aframe.cpp
mplayerxp/xmpcore/xmp_aplayer.cpp
mplayerxp/xmpcore/xmp_core.cpp
mplayerxp/xmpcore/xmp_vplayer.cpp
Added Paths:
-----------
mplayerxp/postproc/af_ao3.cpp
Removed Paths:
-------------
mplayerxp/postproc/af_ao2.cpp
Modified: mplayerxp/Makefile
===================================================================
--- mplayerxp/Makefile 2012-12-17 08:02:17 UTC (rev 566)
+++ mplayerxp/Makefile 2012-12-17 08:47:00 UTC (rev 567)
@@ -11,7 +11,7 @@
TARGET_EXE = $(PROGNAME)
# these subdirectories required installation due binaries within them
-SUBDIRS = libmpdemux libmpstream2 libmpsub libplaytree libmpcodecs libmpconf libao2 osdep postproc input2 nls libvo2 xmpcore
+SUBDIRS = libmpdemux libmpstream2 libmpsub libplaytree libmpcodecs libmpconf libao3 osdep postproc input2 nls libvo2 xmpcore
ifeq ($(ENABLE_WIN32LOADER),yes)
SUBDIRS+=loader
endif
@@ -37,7 +37,7 @@
libmpcodecs/libmpcodecs.a \
libmpsub/libmpsub.a \
libplaytree/libplaytree.a \
- libao2/libao2.a \
+ libao3/libao3.a \
postproc/libpostproc.a \
input2/libinput2.a \
libvo2/libvo2.a \
Modified: mplayerxp/libao3/Makefile
===================================================================
--- mplayerxp/libao3/Makefile 2012-12-17 08:02:17 UTC (rev 566)
+++ mplayerxp/libao3/Makefile 2012-12-17 08:47:00 UTC (rev 567)
@@ -1,7 +1,7 @@
include ../mp_config.mak
-LIBNAME = libao2.a
+LIBNAME = libao3.a
# TODO: moveout ao_sdl.c so it's only used when SDL is detected
CXXSRCS=audio_out.cpp afmt.cpp
Modified: mplayerxp/libao3/ao_nas.cpp
===================================================================
--- mplayerxp/libao3/ao_nas.cpp 2012-12-17 08:02:17 UTC (rev 566)
+++ mplayerxp/libao3/ao_nas.cpp 2012-12-17 08:47:00 UTC (rev 567)
@@ -457,7 +457,7 @@
_outburst = NAS_FRAG_SIZE;
buffer_size = bps(); /* buffer 1 second */
- MSG_V("ao2: %d Hz %d chans %s\n",r,c,afmt2str(f));
+ MSG_V("ao3: %d Hz %d chans %s\n",r,c,afmt2str(f));
/*
* round up to multiple of NAS_FRAG_SIZE
Modified: mplayerxp/libao3/ao_oss.cpp
===================================================================
--- mplayerxp/libao3/ao_oss.cpp 2012-12-17 08:02:17 UTC (rev 566)
+++ mplayerxp/libao3/ao_oss.cpp 2012-12-17 08:47:00 UTC (rev 567)
@@ -209,7 +209,7 @@
MPXP_Rc Oss_AO_Interface::configure(unsigned r,unsigned c,unsigned f)
{
- MSG_V("ao2: %d Hz %d chans %s\n",r,c,ao_format_name(f));
+ MSG_V("ao3: %d Hz %d chans %s\n",r,c,ao_format_name(f));
if(f == AFMT_AC3) {
_samplerate=r;
Modified: mplayerxp/libao3/ao_sdl.cpp
===================================================================
--- mplayerxp/libao3/ao_sdl.cpp 2012-12-17 08:02:17 UTC (rev 566)
+++ mplayerxp/libao3/ao_sdl.cpp 2012-12-17 08:47:00 UTC (rev 567)
@@ -2,7 +2,7 @@
#include "osdep/mplib.h"
using namespace mpxp;
/*
- * ao_sdl.c - libao2 SDLlib Audio Output Driver for MPlayer
+ * ao_sdl.c - libao3 SDLlib Audio Output Driver for MPlayer
*
* This driver is under the same license as MPlayer.
* (http://mplayer.sf.net)
Modified: mplayerxp/libmpcodecs/ad.h
===================================================================
--- mplayerxp/libmpcodecs/ad.h 2012-12-17 08:02:17 UTC (rev 566)
+++ mplayerxp/libmpcodecs/ad.h 2012-12-17 08:47:00 UTC (rev 567)
@@ -6,7 +6,7 @@
#include "libmpconf/cfgparser.h"
#include "xmpcore/xmp_enums.h"
-#include "libao2/afmt.h"
+#include "libao3/afmt.h"
struct ad_info_t {
const char *descr; /* driver description ("Autodesk FLI/FLC Animation decoder" */
Modified: mplayerxp/libmpcodecs/ad_a52.cpp
===================================================================
--- mplayerxp/libmpcodecs/ad_a52.cpp 2012-12-17 08:02:17 UTC (rev 566)
+++ mplayerxp/libmpcodecs/ad_a52.cpp 2012-12-17 08:47:00 UTC (rev 567)
@@ -18,8 +18,8 @@
#include "osdep/mm_accel.h"
#include "mplayerxp.h"
#include "liba52/a52.h"
-#include "libao2/afmt.h"
-#include "libao2/audio_out.h"
+#include "libao3/afmt.h"
+#include "libao3/audio_out.h"
#include "postproc/af.h"
struct ad_private_t {
Modified: mplayerxp/libmpcodecs/ad_acm.cpp
===================================================================
--- mplayerxp/libmpcodecs/ad_acm.cpp 2012-12-17 08:02:17 UTC (rev 566)
+++ mplayerxp/libmpcodecs/ad_acm.cpp 2012-12-17 08:47:00 UTC (rev 567)
@@ -10,7 +10,7 @@
#include "codecs_ld.h"
#include "loader/wineacm.h"
#include "libmpdemux/aviprint.h"
-#include "libao2/afmt.h"
+#include "libao3/afmt.h"
#include "help_mp.h"
static const ad_info_t info = {
Modified: mplayerxp/libmpcodecs/ad_dca.cpp
===================================================================
--- mplayerxp/libmpcodecs/ad_dca.cpp 2012-12-17 08:02:17 UTC (rev 566)
+++ mplayerxp/libmpcodecs/ad_dca.cpp 2012-12-17 08:47:00 UTC (rev 567)
@@ -18,8 +18,8 @@
#include "osdep/mm_accel.h"
#include "mplayerxp.h"
#include "osdep/bswap.h"
-#include "libao2/afmt.h"
-#include "libao2/audio_out.h"
+#include "libao3/afmt.h"
+#include "libao3/audio_out.h"
#include "postproc/af.h"
#define MAX_AC5_FRAME 4096
Modified: mplayerxp/libmpcodecs/ad_dvdpcm.cpp
===================================================================
--- mplayerxp/libmpcodecs/ad_dvdpcm.cpp 2012-12-17 08:02:17 UTC (rev 566)
+++ mplayerxp/libmpcodecs/ad_dvdpcm.cpp 2012-12-17 08:47:00 UTC (rev 567)
@@ -6,7 +6,7 @@
#include <unistd.h>
#include "ad_internal.h"
#include "osdep/bswap.h"
-#include "libao2/afmt.h"
+#include "libao3/afmt.h"
struct ad_private_t {
sh_audio_t* sh;
Modified: mplayerxp/libmpcodecs/ad_faad.cpp
===================================================================
--- mplayerxp/libmpcodecs/ad_faad.cpp 2012-12-17 08:02:17 UTC (rev 566)
+++ mplayerxp/libmpcodecs/ad_faad.cpp 2012-12-17 08:47:00 UTC (rev 567)
@@ -18,8 +18,8 @@
#include "mplayerxp.h"
#include "osdep/cpudetect.h"
#include "osdep/mm_accel.h"
-#include "libao2/afmt.h"
-#include "libao2/audio_out.h"
+#include "libao3/afmt.h"
+#include "libao3/audio_out.h"
#include "postproc/af.h"
static const ad_info_t info = {
Modified: mplayerxp/libmpcodecs/ad_hwac3.cpp
===================================================================
--- mplayerxp/libmpcodecs/ad_hwac3.cpp 2012-12-17 08:02:17 UTC (rev 566)
+++ mplayerxp/libmpcodecs/ad_hwac3.cpp 2012-12-17 08:47:00 UTC (rev 567)
@@ -14,7 +14,7 @@
#include "codecs_ld.h"
#include "osdep/cpudetect.h"
#include "osdep/bswap.h"
-#include "libao2/afmt.h"
+#include "libao3/afmt.h"
#define IEC61937_DATA_TYPE_AC3 1
Modified: mplayerxp/libmpcodecs/ad_lavc.cpp
===================================================================
--- mplayerxp/libmpcodecs/ad_lavc.cpp 2012-12-17 08:02:17 UTC (rev 566)
+++ mplayerxp/libmpcodecs/ad_lavc.cpp 2012-12-17 08:47:00 UTC (rev 567)
@@ -8,7 +8,7 @@
#include <unistd.h>
#include <assert.h>
#include <dlfcn.h> /* GLIBC specific. Exists under cygwin too! */
-#include "libao2/afmt.h"
+#include "libao3/afmt.h"
#include "ad_internal.h"
#include "help_mp.h"
Modified: mplayerxp/libmpcodecs/ad_libdv.cpp
===================================================================
--- mplayerxp/libmpcodecs/ad_libdv.cpp 2012-12-17 08:02:17 UTC (rev 566)
+++ mplayerxp/libmpcodecs/ad_libdv.cpp 2012-12-17 08:47:00 UTC (rev 567)
@@ -16,7 +16,7 @@
#include "libmpstream2/stream.h"
#include "libmpdemux/demuxer.h"
#include "libmpdemux/stheader.h"
-#include "libao2/afmt.h"
+#include "libao3/afmt.h"
#include "osdep/bswap.h"
#include "ad_internal.h"
Modified: mplayerxp/libmpcodecs/ad_mp3.cpp
===================================================================
--- mplayerxp/libmpcodecs/ad_mp3.cpp 2012-12-17 08:02:17 UTC (rev 566)
+++ mplayerxp/libmpcodecs/ad_mp3.cpp 2012-12-17 08:47:00 UTC (rev 567)
@@ -12,8 +12,8 @@
#include "osdep/fastmemcpy.h"
#include "osdep/bswap.h"
#include "codecs_ld.h"
-#include "libao2/afmt.h"
-#include "libao2/audio_out.h"
+#include "libao3/afmt.h"
+#include "libao3/audio_out.h"
#include "postproc/af.h"
static const ad_info_t info = {
Modified: mplayerxp/libmpcodecs/ad_pcm.cpp
===================================================================
--- mplayerxp/libmpcodecs/ad_pcm.cpp 2012-12-17 08:02:17 UTC (rev 566)
+++ mplayerxp/libmpcodecs/ad_pcm.cpp 2012-12-17 08:47:00 UTC (rev 567)
@@ -5,7 +5,7 @@
#include <stdlib.h>
#include <unistd.h>
#include "ad_internal.h"
-#include "libao2/afmt.h"
+#include "libao3/afmt.h"
#include "osdep/bswap.h"
struct ad_private_t {
Modified: mplayerxp/libmpcodecs/ad_qtaudio.cpp
===================================================================
--- mplayerxp/libmpcodecs/ad_qtaudio.cpp 2012-12-17 08:02:17 UTC (rev 566)
+++ mplayerxp/libmpcodecs/ad_qtaudio.cpp 2012-12-17 08:47:00 UTC (rev 567)
@@ -11,7 +11,7 @@
#include "osdep/bswap.h"
#include "codecs_ld.h"
#include "mplayerxp.h"
-#include "libao2/afmt.h"
+#include "libao3/afmt.h"
#ifdef WIN32_LOADER
#include "loader/ldt_keeper.h"
#endif
Modified: mplayerxp/libmpcodecs/ad_real.cpp
===================================================================
--- mplayerxp/libmpcodecs/ad_real.cpp 2012-12-17 08:02:17 UTC (rev 566)
+++ mplayerxp/libmpcodecs/ad_real.cpp 2012-12-17 08:47:00 UTC (rev 567)
@@ -13,7 +13,7 @@
#include "codecs_ld.h"
#include "ad_msg.h"
#include "osdep/bswap.h"
-#include "libao2/afmt.h"
+#include "libao3/afmt.h"
static const ad_info_t info = {
"RealAudio decoder",
Modified: mplayerxp/libmpcodecs/ad_twin.cpp
===================================================================
--- mplayerxp/libmpcodecs/ad_twin.cpp 2012-12-17 08:02:17 UTC (rev 566)
+++ mplayerxp/libmpcodecs/ad_twin.cpp 2012-12-17 08:47:00 UTC (rev 567)
@@ -9,7 +9,7 @@
#include "codecs_ld.h"
#include "loader/ldt_keeper.h"
#include "loader/wine/windef.h"
-#include "libao2/afmt.h"
+#include "libao3/afmt.h"
#include "libmpdemux/aviprint.h"
#include "help_mp.h"
Modified: mplayerxp/libmpcodecs/ad_vorbis.cpp
===================================================================
--- mplayerxp/libmpcodecs/ad_vorbis.cpp 2012-12-17 08:02:17 UTC (rev 566)
+++ mplayerxp/libmpcodecs/ad_vorbis.cpp 2012-12-17 08:47:00 UTC (rev 567)
@@ -12,8 +12,8 @@
#include "osdep/bswap.h"
#include "codecs_ld.h"
#include "ad_internal.h"
-#include "libao2/afmt.h"
-#include "libao2/audio_out.h"
+#include "libao3/afmt.h"
+#include "libao3/audio_out.h"
#include "postproc/af.h"
static const ad_info_t info = {
Modified: mplayerxp/libmpcodecs/dec_audio.cpp
===================================================================
--- mplayerxp/libmpcodecs/dec_audio.cpp 2012-12-17 08:02:17 UTC (rev 566)
+++ mplayerxp/libmpcodecs/dec_audio.cpp 2012-12-17 08:47:00 UTC (rev 567)
@@ -18,8 +18,8 @@
#include "libmpconf/codec-cfg.h"
#include "dec_audio.h"
-#include "libao2/afmt.h"
-#include "libao2/audio_out.h"
+#include "libao3/afmt.h"
+#include "libao3/audio_out.h"
#include "mplayerxp.h"
#include "libmpdemux/demuxer_r.h"
#include "postproc/af.h"
Modified: mplayerxp/libmpconf/m_option.cpp
===================================================================
--- mplayerxp/libmpconf/m_option.cpp 2012-12-17 08:02:17 UTC (rev 566)
+++ mplayerxp/libmpconf/m_option.cpp 2012-12-17 08:47:00 UTC (rev 567)
@@ -993,7 +993,7 @@
NULL
};
-#include "libao2/afmt.h"
+#include "libao3/afmt.h"
/* FIXME: sync with af_format.h */
static struct {
Modified: mplayerxp/libmpdemux/demux_ac3.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_ac3.cpp 2012-12-17 08:02:17 UTC (rev 566)
+++ mplayerxp/libmpdemux/demux_ac3.cpp 2012-12-17 08:47:00 UTC (rev 567)
@@ -16,7 +16,7 @@
#include "demuxer_internal.h"
#include "stheader.h"
#include "libmpcodecs/dec_audio.h"
-#include "libao2/afmt.h"
+#include "libao3/afmt.h"
#include "aviprint.h"
#include "osdep/bswap.h"
#include "mp3_hdr.h"
Modified: mplayerxp/libmpdemux/demux_aiff.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_aiff.cpp 2012-12-17 08:02:17 UTC (rev 566)
+++ mplayerxp/libmpdemux/demux_aiff.cpp 2012-12-17 08:47:00 UTC (rev 567)
@@ -11,7 +11,7 @@
#include "stheader.h"
#include "libmpconf/cfgparser.h"
#include "libmpcodecs/dec_audio.h"
-#include "libao2/afmt.h"
+#include "libao3/afmt.h"
#include "demux_msg.h"
Modified: mplayerxp/libmpdemux/demux_dca.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_dca.cpp 2012-12-17 08:02:17 UTC (rev 566)
+++ mplayerxp/libmpdemux/demux_dca.cpp 2012-12-17 08:47:00 UTC (rev 567)
@@ -16,7 +16,7 @@
#include "demuxer_internal.h"
#include "stheader.h"
#include "libmpcodecs/dec_audio.h"
-#include "libao2/afmt.h"
+#include "libao3/afmt.h"
#include "aviprint.h"
#include "osdep/bswap.h"
#include "mp3_hdr.h"
Modified: mplayerxp/libmpdemux/demux_flac.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_flac.cpp 2012-12-17 08:02:17 UTC (rev 566)
+++ mplayerxp/libmpdemux/demux_flac.cpp 2012-12-17 08:47:00 UTC (rev 567)
@@ -16,7 +16,7 @@
#include "demuxer_internal.h"
#include "stheader.h"
#include "libmpcodecs/dec_audio.h"
-#include "libao2/afmt.h"
+#include "libao3/afmt.h"
#include "aviprint.h"
#include "osdep/bswap.h"
#include "mp3_hdr.h"
Modified: mplayerxp/libmpdemux/demux_lavf.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_lavf.cpp 2012-12-17 08:02:17 UTC (rev 566)
+++ mplayerxp/libmpdemux/demux_lavf.cpp 2012-12-17 08:47:00 UTC (rev 567)
@@ -32,7 +32,7 @@
#include "libmpcodecs/codecs_ld.h"
#include "libmpconf/cfgparser.h"
#include "aviprint.h"
-#include "libao2/afmt.h"
+#include "libao3/afmt.h"
#include "demux_msg.h"
#define PROBE_BUF_SIZE 2048
Modified: mplayerxp/libmpdemux/demux_mkv.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_mkv.cpp 2012-12-17 08:02:17 UTC (rev 566)
+++ mplayerxp/libmpdemux/demux_mkv.cpp 2012-12-17 08:47:00 UTC (rev 567)
@@ -38,7 +38,7 @@
#include "libvo2/sub.h"
#include "libmpcodecs/codecs_ld.h"
#include "libmpcodecs/libnuppelvideo/minilzo.h"
-#include "libao2/afmt.h"
+#include "libao3/afmt.h"
#include "demux_msg.h"
#include "loader/qtx/qtxsdk/components.h"
Modified: mplayerxp/libmpdemux/demux_mov.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_mov.cpp 2012-12-17 08:02:17 UTC (rev 566)
+++ mplayerxp/libmpdemux/demux_mov.cpp 2012-12-17 08:47:00 UTC (rev 567)
@@ -41,7 +41,7 @@
#include "loader/qtx/qtxsdk/components.h"
#include "demux_msg.h"
-#include "libao2/afmt.h"
+#include "libao3/afmt.h"
#ifdef HAVE_ZLIB
#include <zlib.h>
Modified: mplayerxp/libmpdemux/demux_mp3.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_mp3.cpp 2012-12-17 08:02:17 UTC (rev 566)
+++ mplayerxp/libmpdemux/demux_mp3.cpp 2012-12-17 08:47:00 UTC (rev 567)
@@ -17,7 +17,7 @@
#include "stheader.h"
#include "genres.h"
#include "libmpcodecs/dec_audio.h"
-#include "libao2/afmt.h"
+#include "libao3/afmt.h"
#include "aviprint.h"
#include "osdep/bswap.h"
#include "mp3_hdr.h"
Modified: mplayerxp/libmpdemux/demux_musepack.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_musepack.cpp 2012-12-17 08:02:17 UTC (rev 566)
+++ mplayerxp/libmpdemux/demux_musepack.cpp 2012-12-17 08:47:00 UTC (rev 567)
@@ -16,7 +16,7 @@
#include "demuxer_internal.h"
#include "stheader.h"
#include "libmpcodecs/dec_audio.h"
-#include "libao2/afmt.h"
+#include "libao3/afmt.h"
#include "aviprint.h"
#include "osdep/bswap.h"
#include "mp3_hdr.h"
Modified: mplayerxp/libmpdemux/demux_ogg.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_ogg.cpp 2012-12-17 08:02:17 UTC (rev 566)
+++ mplayerxp/libmpdemux/demux_ogg.cpp 2012-12-17 08:47:00 UTC (rev 567)
@@ -26,7 +26,7 @@
#include "libmpcodecs/codecs_ld.h"
#include "libmpcodecs/dec_audio.h"
#include "libvo2/video_out.h"
-#include "libao2/afmt.h"
+#include "libao3/afmt.h"
#include "demux_msg.h"
#define BLOCK_SIZE 4096
Modified: mplayerxp/libmpdemux/demux_rawaudio.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_rawaudio.cpp 2012-12-17 08:02:17 UTC (rev 566)
+++ mplayerxp/libmpdemux/demux_rawaudio.cpp 2012-12-17 08:47:00 UTC (rev 567)
@@ -11,7 +11,7 @@
#include "stheader.h"
#include "libmpconf/cfgparser.h"
#include "libmpcodecs/dec_audio.h"
-#include "libao2/afmt.h"
+#include "libao3/afmt.h"
#include "aviprint.h"
int use_rawaudio = 0;
Modified: mplayerxp/libmpdemux/demux_real.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_real.cpp 2012-12-17 08:02:17 UTC (rev 566)
+++ mplayerxp/libmpdemux/demux_real.cpp 2012-12-17 08:47:00 UTC (rev 567)
@@ -35,7 +35,7 @@
#include "osdep/bswap.h"
#include "aviprint.h"
#include "libmpcodecs/dec_audio.h"
-#include "libao2/afmt.h"
+#include "libao3/afmt.h"
#include "demux_msg.h"
#define MKTAG(a, b, c, d) (a | (b << 8) | (c << 16) | (d << 24))
Modified: mplayerxp/libmpdemux/demux_realaud.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_realaud.cpp 2012-12-17 08:02:17 UTC (rev 566)
+++ mplayerxp/libmpdemux/demux_realaud.cpp 2012-12-17 08:47:00 UTC (rev 567)
@@ -18,7 +18,7 @@
#include "demuxer_internal.h"
#include "stheader.h"
#include "osdep/bswap.h"
-#include "libao2/afmt.h"
+#include "libao3/afmt.h"
#include "aviprint.h"
#include "demux_msg.h"
Modified: mplayerxp/libmpdemux/demux_snd_au.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_snd_au.cpp 2012-12-17 08:02:17 UTC (rev 566)
+++ mplayerxp/libmpdemux/demux_snd_au.cpp 2012-12-17 08:47:00 UTC (rev 567)
@@ -16,7 +16,7 @@
#include "demuxer_internal.h"
#include "stheader.h"
#include "libmpcodecs/dec_audio.h"
-#include "libao2/afmt.h"
+#include "libao3/afmt.h"
#include "aviprint.h"
#include "osdep/bswap.h"
#include "mp3_hdr.h"
Modified: mplayerxp/libmpdemux/demux_voc.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_voc.cpp 2012-12-17 08:02:17 UTC (rev 566)
+++ mplayerxp/libmpdemux/demux_voc.cpp 2012-12-17 08:47:00 UTC (rev 567)
@@ -16,7 +16,7 @@
#include "demuxer_internal.h"
#include "stheader.h"
#include "libmpcodecs/dec_audio.h"
-#include "libao2/afmt.h"
+#include "libao3/afmt.h"
#include "aviprint.h"
#include "osdep/bswap.h"
#include "mp3_hdr.h"
Modified: mplayerxp/libmpdemux/demux_vqf.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_vqf.cpp 2012-12-17 08:02:17 UTC (rev 566)
+++ mplayerxp/libmpdemux/demux_vqf.cpp 2012-12-17 08:47:00 UTC (rev 567)
@@ -13,7 +13,7 @@
#include "stheader.h"
#include "libmpconf/cfgparser.h"
#include "libmpcodecs/dec_audio.h"
-#include "libao2/afmt.h"
+#include "libao3/afmt.h"
#include "demux_msg.h"
#define KEYWORD_BYTES 4
Modified: mplayerxp/libmpdemux/demux_wav.cpp
===================================================================
--- mplayerxp/libmpdemux/demux_wav.cpp 2012-12-17 08:02:17 UTC (rev 566)
+++ mplayerxp/libmpdemux/demux_wav.cpp 2012-12-17 08:47:00 UTC (rev 567)
@@ -16,7 +16,7 @@
#include "demuxer_internal.h"
#include "stheader.h"
#include "libmpcodecs/dec_audio.h"
-#include "libao2/afmt.h"
+#include "libao3/afmt.h"
#include "aviprint.h"
#include "osdep/bswap.h"
#include "mp3_hdr.h"
Modified: mplayerxp/libmpdemux/demuxer.cpp
===================================================================
--- mplayerxp/libmpdemux/demuxer.cpp 2012-12-17 08:02:17 UTC (rev 566)
+++ mplayerxp/libmpdemux/demuxer.cpp 2012-12-17 08:47:00 UTC (rev 567)
@@ -18,7 +18,7 @@
#include "input2/input.h"
#include "osdep/fastmemcpy.h"
#include "libvo2/sub.h"
-#include "libao2/afmt.h"
+#include "libao3/afmt.h"
#include "demux_msg.h"
#include "demuxer.h"
Modified: mplayerxp/libmpstream2/s_oss.cpp
===================================================================
--- mplayerxp/libmpstream2/s_oss.cpp 2012-12-17 08:02:17 UTC (rev 566)
+++ mplayerxp/libmpstream2/s_oss.cpp 2012-12-17 08:47:00 UTC (rev 567)
@@ -19,8 +19,8 @@
#include "mplayerxp.h"
#include "xmpcore/mp_aframe.h"
#include "postproc/af.h"
-#include "libao2/afmt.h"
-#include "libao2/audio_out.h"
+#include "libao3/afmt.h"
+#include "libao3/audio_out.h"
#include "loader/wine/mmreg.h"
#include "stream.h"
#include "stream_internal.h"
Modified: mplayerxp/libmpstream2/s_tv.cpp
===================================================================
--- mplayerxp/libmpstream2/s_tv.cpp 2012-12-17 08:02:17 UTC (rev 566)
+++ mplayerxp/libmpstream2/s_tv.cpp 2012-12-17 08:47:00 UTC (rev 567)
@@ -20,7 +20,7 @@
#include "stream.h"
#include "stream_internal.h"
#include "input2/input.h"
-#include "libao2/afmt.h"
+#include "libao3/afmt.h"
#include "mrl.h"
#include "tvi/tv.h"
@@ -32,10 +32,9 @@
#include "libmpdemux/demuxer.h"
#include "libmpdemux/stheader.h"
-#include "libao2/afmt.h"
#include "libvo2/img_format.h"
#include "osdep/fastmemcpy.h"
-#include "libao2/audio_out.h"
+#include "libao3/audio_out.h"
#include "stream_msg.h"
Modified: mplayerxp/libmpstream2/tvi/tvi_v4l.cpp
===================================================================
--- mplayerxp/libmpstream2/tvi/tvi_v4l.cpp 2012-12-17 08:02:17 UTC (rev 566)
+++ mplayerxp/libmpstream2/tvi/tvi_v4l.cpp 2012-12-17 08:47:00 UTC (rev 567)
@@ -27,8 +27,8 @@
#include <stdlib.h>
#include <string.h>
-#include "libao2/afmt.h"
-#include "libao2/audio_out.h"
+#include "libao3/afmt.h"
+#include "libao3/audio_out.h"
#include "libvo2/img_format.h"
#include "tv.h"
Modified: mplayerxp/mplayerxp.cpp
===================================================================
--- mplayerxp/mplayerxp.cpp 2012-12-17 08:02:17 UTC (rev 566)
+++ mplayerxp/mplayerxp.cpp 2012-12-17 08:47:00 UTC (rev 567)
@@ -46,9 +46,6 @@
#include "libmpsub/spudec.h"
#include "libmpsub/vobsub.h"
-#include "libvo2/video_out.h"
-#include "libao2/audio_out.h"
-
#include "osdep/get_path.h"
#include "osdep/cpudetect.h"
#include "osdep/mm_accel.h"
Modified: mplayerxp/mplayerxp.h
===================================================================
--- mplayerxp/mplayerxp.h 2012-12-17 08:02:17 UTC (rev 566)
+++ mplayerxp/mplayerxp.h 2012-12-17 08:47:00 UTC (rev 567)
@@ -12,7 +12,7 @@
#include "xmpcore/xmp_enums.h"
#include "libmpconf/cfgparser.h"
#include "libmpsub/subreader.h"
-#include "libao2/audio_out.h"
+#include "libao3/audio_out.h"
#include "libvo2/video_out.h"
struct audio_decoder_t;
Modified: mplayerxp/postproc/Makefile
===================================================================
--- mplayerxp/postproc/Makefile 2012-12-17 08:02:17 UTC (rev 566)
+++ mplayerxp/postproc/Makefile 2012-12-17 08:47:00 UTC (rev 567)
@@ -8,7 +8,7 @@
CXXSRCS=af.cpp aflib.cpp vf.cpp postprocess.cpp swscale.cpp
-CXXSRCS+=af_ao2.cpp \
+CXXSRCS+=af_ao3.cpp \
af_channels.cpp \
af_crystality.cpp \
af_delay.cpp \
Modified: mplayerxp/postproc/af.cpp
===================================================================
--- mplayerxp/postproc/af.cpp 2012-12-17 08:02:17 UTC (rev 566)
+++ mplayerxp/postproc/af.cpp 2012-12-17 08:47:00 UTC (rev 567)
@@ -8,7 +8,7 @@
#include "af.h"
#include "af_internal.h"
#include "help_mp.h"
-#include "libao2/audio_out.h"
+#include "libao3/audio_out.h"
#include "pp_msg.h"
// Static list of filters
@@ -359,7 +359,7 @@
if(!s->first){
// Add all filters in the list (if there are any)
if(!s->cfg.list){ // To make automatic format conversion work
- if(!af_append(s,s->first,"ao2"))
+ if(!af_append(s,s->first,"ao3"))
return MPXP_False;
}
else{
@@ -373,7 +373,7 @@
}
}
}
- if(strcmp(s->last->info->name,"ao2")!=0) if(!af_append(s,s->last,"ao2")) return MPXP_False;
+ if(strcmp(s->last->info->name,"ao3")!=0) if(!af_append(s,s->last,"ao3")) return MPXP_False;
// Init filters
if(MPXP_Ok != af_reinit(s,s->first))
@@ -575,8 +575,8 @@
MPXP_Rc __FASTCALL__ af_query_fmt (const af_stream_t* s,mpaf_format_e fmt)
{
af_instance_t* filt = s?s->first:NULL;
- const char *filt_name=filt?filt->info->name:"ao2";
- if(strcmp(filt_name,"ao2")==0) return mpxp_context().audio().output->test_format(mpaf2afmt(fmt));
+ const char *filt_name=filt?filt->info->name:"ao3";
+ if(strcmp(filt_name,"ao3")==0) return mpxp_context().audio().output->test_format(mpaf2afmt(fmt));
else if(afmt2mpaf(fmt)==filt->conf.format) return MPXP_True;
return MPXP_False;
}
@@ -584,8 +584,8 @@
MPXP_Rc __FASTCALL__ af_query_rate (const af_stream_t* s,unsigned rate)
{
af_instance_t* filt = s?s->first:NULL;
- const char *filt_name=filt?filt->info->name:"ao2";
- if(strcmp(filt_name,"ao2")==0) return mpxp_context().audio().output->test_rate(rate);
+ const char *filt_name=filt?filt->info->name:"ao3";
+ if(strcmp(filt_name,"ao3")==0) return mpxp_context().audio().output->test_rate(rate);
else if(rate==filt->conf.rate) return MPXP_True;
return MPXP_False;
}
@@ -593,8 +593,8 @@
MPXP_Rc __FASTCALL__ af_query_channels (const af_stream_t* s,unsigned nch)
{
af_instance_t* filt = s?s->first:NULL;
- const char *filt_name=filt?filt->info->name:"ao2";
- if(strcmp(filt_name,"ao2")==0) return mpxp_context().audio().output->test_channels(nch);
+ const char *filt_name=filt?filt->info->name:"ao3";
+ if(strcmp(filt_name,"ao3")==0) return mpxp_context().audio().output->test_channels(nch);
else if(nch==filt->conf.nch) return MPXP_True;
return MPXP_False;
}
Deleted: mplayerxp/postproc/af_ao2.cpp
===================================================================
--- mplayerxp/postproc/af_ao2.cpp 2012-12-17 08:02:17 UTC (rev 566)
+++ mplayerxp/postproc/af_ao2.cpp 2012-12-17 08:47:00 UTC (rev 567)
@@ -1,178 +0,0 @@
-#include "mp_config.h"
-#include "osdep/mplib.h"
-using namespace mpxp;
-/* The name speaks for itself this filter is a dummy and will not blow
- up regardless of what you do with it. */
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include "libao2/audio_out.h"
-#include "libao2/afmt.h"
-
-#include "af.h"
-#include "af_internal.h"
-#include "pp_msg.h"
-
-static unsigned rates[] =
-{ 4000, 5512, 8000, 9600, 11025, 16000, 19200, 22050, 24000, 32000, 38400, 44100, 48000, 64000, 76800, 88200, 96000, 128000, 153600, 176400, 192000 };
-
-static unsigned __FASTCALL__ find_best_rate(unsigned irate)
-{
- unsigned i,ii;
- MPXP_Rc rval;
- rval=mpxp_context().audio().output->test_rate(irate);
- if(rval == MPXP_True) return irate;
- for(i=0;i<sizeof(rates)/sizeof(unsigned)-1;i++) {
- if(irate >= rates[i] && irate < rates[i+1]) break;
- }
- ii=i;
- for(;i<sizeof(rates)/sizeof(unsigned);i++) {
- rval=mpxp_context().audio().output->test_rate(rates[i]);
- if(rval == MPXP_True) return rates[i];
- }
- i=ii;
- for(;i<sizeof(rates)/sizeof(unsigned);i--) {
- rval=mpxp_context().audio().output->test_rate(rates[i]);
- if(rval == MPXP_True) return rates[i];
- }
- for(i=0;i<sizeof(rates)/sizeof(unsigned);i++) {
- rval=mpxp_context().audio().output->test_rate(rates[i]);
- if(rval == MPXP_True) return rates[i];
- }
- return 44100;
-}
-
-static unsigned __FASTCALL__ find_best_ch(unsigned ich)
-{
- unsigned i;
- MPXP_Rc rval;
- rval=mpxp_context().audio().output->test_channels(ich);
- if(rval == MPXP_True) return ich;
- for(i=ich>1?ich:1;i<AF_NCH;i++) {
- rval=mpxp_context().audio().output->test_channels(i);
- if(rval == MPXP_True) return i;
- }
- for(i=1;i<AF_NCH;i++) {
- rval=mpxp_context().audio().output->test_channels(i);
- if(rval == MPXP_True) return i;
- }
- return 2;
-}
-
-struct fmt_cvt_t {
- unsigned base_fourcc;
- unsigned cvt_fourcc[20];
-};
-
-static fmt_cvt_t cvt_list[] =
-{
- { AFMT_FLOAT32, { AFMT_S32_LE, AFMT_S32_BE, AFMT_U32_BE, AFMT_U32_LE, AFMT_S24_LE, AFMT_S24_BE, AFMT_U24_LE, AFMT_U24_BE, AFMT_S16_LE, AFMT_S16_BE, AFMT_U16_LE, AFMT_U16_BE, AFMT_S8, AFMT_U8, 0 }},
- { AFMT_U32_BE, { AFMT_U32_LE, AFMT_S32_BE, AFMT_S32_LE, AFMT_FLOAT32, AFMT_U24_BE, AFMT_U24_LE, AFMT_S24_BE, AFMT_S24_LE, AFMT_U16_BE, AFMT_U16_LE, AFMT_S16_BE, AFMT_S16_LE, AFMT_U8, AFMT_S8, 0 }},
- { AFMT_U32_LE, { AFMT_U32_BE, AFMT_S32_LE, AFMT_S32_BE, AFMT_FLOAT32, AFMT_U24_LE, AFMT_U24_BE, AFMT_S24_LE, AFMT_S24_BE, AFMT_U16_LE, AFMT_U16_BE, AFMT_S16_LE, AFMT_S16_BE, AFMT_U8, AFMT_S8, 0 }},
- { AFMT_S32_BE, { AFMT_S32_LE, AFMT_U32_BE, AFMT_U32_LE, AFMT_FLOAT32, AFMT_S24_BE, AFMT_S24_LE, AFMT_U24_BE, AFMT_U24_LE, AFMT_S16_BE, AFMT_S16_LE, AFMT_U16_BE, AFMT_U16_LE, AFMT_S8, AFMT_U8, 0 }},
- { AFMT_S32_LE, { AFMT_S32_BE, AFMT_U32_LE, AFMT_U32_BE, AFMT_FLOAT32, AFMT_S24_LE, AFMT_S24_BE, AFMT_U24_LE, AFMT_U24_BE, AFMT_S16_LE, AFMT_S16_BE, AFMT_U16_LE, AFMT_U16_BE, AFMT_S8, AFMT_U8, 0 }},
- { AFMT_U24_BE, { AFMT_U24_LE, AFMT_S24_BE, AFMT_S24_LE, AFMT_U32_BE, AFMT_U32_LE, AFMT_S32_BE, AFMT_S32_LE, AFMT_FLOAT32, AFMT_U16_BE, AFMT_U16_LE, AFMT_S16_BE, AFMT_S16_LE, AFMT_U8, AFMT_S8, 0 }},
- { AFMT_U24_LE, { AFMT_U24_BE, AFMT_S24_LE, AFMT_S24_BE, AFMT_U32_LE, AFMT_U32_BE, AFMT_S32_LE, AFMT_S32_BE, AFMT_FLOAT32, AFMT_U16_LE, AFMT_U16_BE, AFMT_S16_LE, AFMT_S16_BE, AFMT_U8, AFMT_S8, 0 }},
- { AFMT_S24_BE, { AFMT_S24_LE, AFMT_U24_BE, AFMT_U24_LE, AFMT_S32_BE, AFMT_S32_LE, AFMT_U32_BE, AFMT_U32_LE, AFMT_FLOAT32, AFMT_S16_BE, AFMT_S16_LE, AFMT_U16_BE, AFMT_U16_LE, AFMT_S8, AFMT_U8, 0 }},
- { AFMT_S24_LE, { AFMT_S24_BE, AFMT_U24_LE, AFMT_U24_BE, AFMT_S32_LE, AFMT_S32_BE, AFMT_U32_LE, AFMT_U32_BE, AFMT_FLOAT32, AFMT_S16_LE, AFMT_S16_BE, AFMT_U16_LE, AFMT_U16_BE, AFMT_S8, AFMT_U8, 0 }},
- { AFMT_U16_BE, { AFMT_U16_LE, AFMT_S16_BE, AFMT_S16_LE, AFMT_U24_BE, AFMT_U24_LE, AFMT_S24_BE, AFMT_S24_LE, AFMT_U32_BE, AFMT_U32_LE, AFMT_S32_BE, AFMT_S32_LE, AFMT_FLOAT32, AFMT_U8, AFMT_S8, 0 }},
- { AFMT_U16_LE, { AFMT_U16_BE, AFMT_S16_LE, AFMT_S16_BE, AFMT_U24_LE, AFMT_U24_BE, AFMT_S24_LE, AFMT_S24_BE, AFMT_U32_LE, AFMT_U32_BE, AFMT_S32_LE, AFMT_S32_BE, AFMT_FLOAT32, AFMT_U8, AFMT_S8, 0 }},
- { AFMT_S16_BE, { AFMT_S16_LE, AFMT_U16_BE, AFMT_U16_LE, AFMT_S24_BE, AFMT_S24_LE, AFMT_U24_BE, AFMT_U24_LE, AFMT_S32_BE, AFMT_S32_LE, AFMT_U32_BE, AFMT_U32_LE, AFMT_FLOAT32, AFMT_S8, AFMT_U8, 0 }},
- { AFMT_S16_LE, { AFMT_S16_BE, AFMT_U16_LE, AFMT_U16_BE, AFMT_S24_LE, AFMT_S24_BE, AFMT_U24_LE, AFMT_U24_BE, AFMT_S32_LE, AFMT_S32_BE, AFMT_U32_LE, AFMT_U32_BE, AFMT_FLOAT32, AFMT_S8, AFMT_U8, 0 }},
- { AFMT_U8, { AFMT_S8, AFMT_U16_LE, AFMT_U16_BE, AFMT_S16_LE, AFMT_S16_BE, AFMT_U24_LE, AFMT_U24_BE, AFMT_S24_LE, AFMT_S24_BE, AFMT_U32_LE, AFMT_U32_BE, AFMT_S32_LE, AFMT_S32_BE, AFMT_FLOAT32, 0 }},
- { AFMT_S8, { AFMT_U8, AFMT_S16_LE, AFMT_S16_BE, AFMT_U16_LE, AFMT_U16_BE, AFMT_S24_LE, AFMT_S24_BE, AFMT_U24_LE, AFMT_U24_BE, AFMT_S32_LE, AFMT_S32_BE, AFMT_U32_LE, AFMT_U32_BE, AFMT_FLOAT32, 0 }},
-};
-
-static unsigned __FASTCALL__ find_best_fmt(unsigned ifmt)
-{
- unsigned i,j,idx;
- MPXP_Rc rval;
- rval=mpxp_context().audio().output->test_format(ifmt);
- if(rval == MPXP_True) return ifmt;
- idx=-1;
- for(i=0;i<sizeof(cvt_list)/sizeof(fmt_cvt_t);i++) {
- if(ifmt==cvt_list[i].base_fourcc) { idx=i; break; }
- }
- if(idx==-1) return 0; /* unknown format */
- i=idx;
- for(j=0;j<20;j++) {
- if(cvt_list[i].cvt_fourcc[j]==0) break;
- rval=mpxp_context().audio().output->test_format(cvt_list[i].cvt_fourcc[j]);
- if(rval == MPXP_True) return cvt_list[i].cvt_fourcc[j];
- }
- return AFMT_S16_LE;
-}
-
-struct af_ao2_t{
- unsigned rate;
- unsigned nch;
- mpaf_format_e format;
-};
-
-// Initialization and runtime control_af
-static MPXP_Rc __FASTCALL__ config_af(af_instance_t* af, const af_conf_t* arg)
-{
- af_ao2_t* s = reinterpret_cast<af_ao2_t*>(af->setup);
- /* Sanity check */
- if(!arg) return MPXP_Error;
- s->rate = af->conf.rate = find_best_rate(arg->rate);
- s->nch = af->conf.nch = find_best_ch(arg->nch);
- s->format = af->conf.format = afmt2mpaf(find_best_fmt(mpaf2afmt(arg->format)));
- return af_test_output(af,arg);
-}
-
-static MPXP_Rc __FASTCALL__ control_af(af_instance_t* af, int cmd, any_t* arg)
-{
- af_ao2_t* s = reinterpret_cast<af_ao2_t*>(af->setup);
- UNUSED(arg);
- switch(cmd){
- case AF_CONTROL_SHOWCONF: {
- char sbuf[256];
- const ao_info_t*info=mpxp_context().audio().output->get_info();
- MSG_INFO("AO-CONF: [%s] %uHz nch=%u %s (%3.1f-kbit)\n"
- ,info->short_name,s->rate,s->nch,mpaf_fmt2str(s->format,sbuf,sizeof(sbuf))
- ,(s->rate*s->nch*(s->format&MPAF_BPS_MASK)*8)*0.001f);
- return MPXP_Ok;
- }
- default: break;
- }
- return MPXP_Unknown;
-}
-
-// Deallocate memory
-static void __FASTCALL__ uninit(af_instance_t* af)
-{
- if(af->setup) delete af->setup;
-}
-
-// Filter data through filter
-static mp_aframe_t* __FASTCALL__ play(af_instance_t* af,const mp_aframe_t* data)
-{
- // Do something necessary to get rid of annoying warning during compile
- if(!af) MSG_ERR("EEEK: Argument af == NULL in af_dummy.c play().");
- return const_cast<mp_aframe_t*>(data);
-}
-
-// Allocate memory and set function pointers
-static MPXP_Rc __FASTCALL__ af_open(af_instance_t* af){
- af->config_af=config_af;
- af->control_af=control_af;
- af->uninit=uninit;
- af->play=play;
- af->mul.d=1;
- af->mul.n=1;
- af->setup=mp_calloc(1,sizeof(af_ao2_t));
- if(af->setup == NULL) return MPXP_Error;
- check_pin("afilter",af->pin,AF_PIN);
- return MPXP_Ok;
-}
-
-// Description of this filter
-extern const af_info_t af_info_ao = {
- "libao wrapper",
- "ao2",
- "Nickols_K",
- "",
- AF_FLAGS_REENTRANT,
- af_open
-};
Copied: mplayerxp/postproc/af_ao3.cpp (from rev 566, mplayerxp/postproc/af_ao2.cpp)
===================================================================
--- mplayerxp/postproc/af_ao3.cpp (rev 0)
+++ mplayerxp/postproc/af_ao3.cpp 2012-12-17 08:47:00 UTC (rev 567)
@@ -0,0 +1,178 @@
+#include "mp_config.h"
+#include "osdep/mplib.h"
+using namespace mpxp;
+/* The name speaks for itself this filter is a dummy and will not blow
+ up regardless of what you do with it. */
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include "libao3/audio_out.h"
+#include "libao3/afmt.h"
+
+#include "af.h"
+#include "af_internal.h"
+#include "pp_msg.h"
+
+static unsigned rates[] =
+{ 4000, 5512, 8000, 9600, 11025, 16000, 19200, 22050, 24000, 32000, 38400, 44100, 48000, 64000, 76800, 88200, 96000, 128000, 153600, 176400, 192000 };
+
+static unsigned __FASTCALL__ find_best_rate(unsigned irate)
+{
+ unsigned i,ii;
+ MPXP_Rc rval;
+ rval=mpxp_context().audio().output->test_rate(irate);
+ if(rval == MPXP_True) return irate;
+ for(i=0;i<sizeof(rates)/sizeof(unsigned)-1;i++) {
+ if(irate >= rates[i] && irate < rates[i+1]) break;
+ }
+ ii=i;
+ for(;i<sizeof(rates)/sizeof(unsigned);i++) {
+ rval=mpxp_context().audio().output->test_rate(rates[i]);
+ if(rval == MPXP_True) return rates[i];
+ }
+ i=ii;
+ for(;i<sizeof(rates)/sizeof(unsigned);i--) {
+ rval=mpxp_context().audio().output->test_rate(rates[i]);
+ if(rval == MPXP_True) return rates[i];
+ }
+ for(i=0;i<sizeof(rates)/sizeof(unsigned);i++) {
+ rval=mpxp_context().audio().output->test_rate(rates[i]);
+ if(rval == MPXP_True) return rates[i];
+ }
+ return 44100;
+}
+
+static unsigned __FASTCALL__ find_best_ch(unsigned ich)
+{
+ unsigned i;
+ MPXP_Rc rval;
+ rval=mpxp_context().audio().output->test_channels(ich);
+ if(rval == MPXP_True) return ich;
+ for(i=ich>1?ich:1;i<AF_NCH;i++) {
+ rval=mpxp_context().audio().output->test_channels(i);
+ if(rval == MPXP_True) return i;
+ }
+ for(i=1;i<AF_NCH;i++) {
+ rval=mpxp_context().audio().output->test_channels(i);
+ if(rval == MPXP_True) return i;
+ }
+ return 2;
+}
+
+struct fmt_cvt_t {
+ unsigned base_fourcc;
+ unsigned cvt_fourcc[20];
+};
+
+static fmt_cvt_t cvt_list[] =
+{
+ { AFMT_FLOAT32, { AFMT_S32_LE, AFMT_S32_BE, AFMT_U32_BE, AFMT_U32_LE, AFMT_S24_LE, AFMT_S24_BE, AFMT_U24_LE, AFMT_U24_BE, AFMT_S16_LE, AFMT_S16_BE, AFMT_U16_LE, AFMT_U16_BE, AFMT_S8, AFMT_U8, 0 }},
+ { AFMT_U32_BE, { AFMT_U32_LE, AFMT_S32_BE, AFMT_S32_LE, AFMT_FLOAT32, AFMT_U24_BE, AFMT_U24_LE, AFMT_S24_BE, AFMT_S24_LE, AFMT_U16_BE, AFMT_U16_LE, AFMT_S16_BE, AFMT_S16_LE, AFMT_U8, AFMT_S8, 0 }},
+ { AFMT_U32_LE, { AFMT_U32_BE, AFMT_S32_LE, AFMT_S32_BE, AFMT_FLOAT32, AFMT_U24_LE, AFMT_U24_BE, AFMT_S24_LE, AFMT_S24_BE, AFMT_U16_LE, AFMT_U16_BE, AFMT_S16_LE, AFMT_S16_BE, AFMT_U8, AFMT_S8, 0 }},
+ { AFMT_S32_BE, { AFMT_S32_LE, AFMT_U32_BE, AFMT_U32_LE, AFMT_FLOAT32, AFMT_S24_BE, AFMT_S24_LE, AFMT_U24_BE, AFMT_U24_LE, AFMT_S16_BE, AFMT_S16_LE, AFMT_U16_BE, AFMT_U16_LE, AFMT_S8, AFMT_U8, 0 }},
+ { AFMT_S32_LE, { AFMT_S32_BE, AFMT_U32_LE, AFMT_U32_BE, AFMT_FLOAT32, AFMT_S24_LE, AFMT_S24_BE, AFMT_U24_LE, AFMT_U24_BE, AFMT_S16_LE, AFMT_S16_BE, AFMT_U16_LE, AFMT_U16_BE, AFMT_S8, AFMT_U8, 0 }},
+ { AFMT_U24_BE, { AFMT_U24_LE, AFMT_S24_BE, AFMT_S24_LE, AFMT_U32_BE, AFMT_U32_LE, AFMT_S32_BE, AFMT_S32_LE, AFMT_FLOAT32, AFMT_U16_BE, AFMT_U16_LE, AFMT_S16_BE, AFMT_S16_LE, AFMT_U8, AFMT_S8, 0 }},
+ { AFMT_U24_LE, { AFMT_U24_BE, AFMT_S24_LE, AFMT_S24_BE, AFMT_U32_LE, AFMT_U32_BE, AFMT_S32_LE, AFMT_S32_BE, AFMT_FLOAT32, AFMT_U16_LE, AFMT_U16_BE, AFMT_S16_LE, AFMT_S16_BE, AFMT_U8, AFMT_S8, 0 }},
+ { AFMT_S24_BE, { AFMT_S24_LE, AFMT_U24_BE, AFMT_U24_LE, AFMT_S32_BE, AFMT_S32_LE, AFMT_U32_BE, AFMT_U32_LE, AFMT_FLOAT32, AFMT_S16_BE, AFMT_S16_LE, AFMT_U16_BE, AFMT_U16_LE, AFMT_S8, AFMT_U8, 0 }},
+ { AFMT_S24_LE, { AFMT_S24_BE, AFMT_U24_LE, AFMT_U24_BE, AFMT_S32_LE, AFMT_S32_BE, AFMT_U32_LE, AFMT_U32_BE, AFMT_FLOAT32, AFMT_S16_LE, AFMT_S16_BE, AFMT_U16_LE, AFMT_U16_BE, AFMT_S8, AFMT_U8, 0 }},
+ { AFMT_U16_BE, { AFMT_U16_LE, AFMT_S16_BE, AFMT_S16_LE, AFMT_U24_BE, AFMT_U24_LE, AFMT_S24_BE, AFMT_S24_LE, AFMT_U32_BE, AFMT_U32_LE, AFMT_S32_BE, AFMT_S32_LE, AFMT_FLOAT32, AFMT_U8, AFMT_S8, 0 }},
+ { AFMT_U16_LE, { AFMT_U16_BE, AFMT_S16_LE, AFMT_S16_BE, AFMT_U24_LE, AFMT_U24_BE, AFMT_S24_LE, AFMT_S24_BE, AFMT_U32_LE, AFMT_U32_BE, AFMT_S32_LE, AFMT_S32_BE, AFMT_FLOAT32, AFMT_U8, AFMT_S8, 0 }},
+ { AFMT_S16_BE, { AFMT_S16_LE, AFMT_U16_BE, AFMT_U16_LE, AFMT_S24_BE, AFMT_S24_LE, AFMT_U24_BE, AFMT_U24_LE, AFMT_S32_BE, AFMT_S32_LE, AFMT_U32_BE, AFMT_U32_LE, AFMT_FLOAT32, AFMT_S8, AFMT_U8, 0 }},
+ { AFMT_S16_LE, { AFMT_S16_BE, AFMT_U16_LE, AFMT_U16_BE, AFMT_S24_LE, AFMT_S24_BE, AFMT_U24_LE, AFMT_U24_BE, AFMT_S32_LE, AFMT_S32_BE, AFMT_U32_LE, AFMT_U32_BE, AFMT_FLOAT32, AFMT_S8, AFMT_U8, 0 }},
+ { AFMT_U8, { AFMT_S8, AFMT_U16_LE, AFMT_U16_BE, AFMT_S16_LE, AFMT_S16_BE, AFMT_U24_LE, AFMT_U24_BE, AFMT_S24_LE, AFMT_S24_BE, AFMT_U32_LE, AFMT_U32_BE, AFMT_S32_LE, AFMT_S32_BE, AFMT_FLOAT32, 0 }},
+ { AFMT_S8, { AFMT_U8, AFMT_S16_LE, AFMT_S16_BE, AFMT_U16_LE, AFMT_U16_BE, AFMT_S24_LE, AFMT_S24_BE, AFMT_U24_LE, AFMT_U24_BE, AFMT_S32_LE, AFMT_S32_BE, AFMT_U32_LE, AFMT_U32_BE, AFMT_FLOAT32, 0 }},
+};
+
+static unsigned __FASTCALL__ find_best_fmt(unsigned ifmt)
+{
+ unsigned i,j,idx;
+ MPXP_Rc rval;
+ rval=mpxp_context().audio().output->test_format(ifmt);
+ if(rval == MPXP_True) return ifmt;
+ idx=-1;
+ for(i=0;i<sizeof(cvt_list)/sizeof(fmt_cvt_t);i++) {
+ if(ifmt==cvt_list[i].base_fourcc) { idx=i; break; }
+ }
+ if(idx==-1) return 0; /* unknown format */
+ i=idx;
+ for(j=0;j<20;j++) {
+ if(cvt_list[i].cvt_fourcc[j]==0) break;
+ rval=mpxp_context().audio().output->test_format(cvt_list[i].cvt_fourcc[j]);
+ if(rval == MPXP_True) return cvt_list[i].cvt_fourcc[j];
+ }
+ return AFMT_S16_LE;
+}
+
+struct af_ao3_t{
+ unsigned rate;
+ unsigned nch;
+ mpaf_format_e format;
+};
+
+// Initialization and runtime control_af
+static MPXP_Rc __FASTCALL__ config_af(af_instance_t* af, const af_conf_t* arg)
+{
+ af_ao3_t* s = reinterpret_cast<af_ao3_t*>(af->setup);
+ /* Sanity check */
+ if(!arg) return MPXP_Error;
+ s->rate = af->conf.rate = find_best_rate(arg->rate);
+ s->nch = af->conf.nch = find_best_ch(arg->nch);
+ s->format = af->conf.format = afmt2mpaf(find_best_fmt(mpaf2afmt(arg->format)));
+ return af_test_output(af,arg);
+}
+
+static MPXP_Rc __FASTCALL__ control_af(af_instance_t* af, int cmd, any_t* arg)
+{
+ af_ao3_t* s = reinterpret_cast<af_ao3_t*>(af->setup);
+ UNUSED(arg);
+ switch(cmd){
+ case AF_CONTROL_SHOWCONF: {
+ char sbuf[256];
+ const ao_info_t*info=mpxp_context().audio().output->get_info();
+ MSG_INFO("AO-CONF: [%s] %uHz nch=%u %s (%3.1f-kbit)\n"
+ ,info->short_name,s->rate,s->nch,mpaf_fmt2str(s->format,sbuf,sizeof(sbuf))
+ ,(s->rate*s->nch*(s->format&MPAF_BPS_MASK)*8)*0.001f);
+ return MPXP_Ok;
+ }
+ default: break;
+ }
+ return MPXP_Unknown;
+}
+
+// Deallocate memory
+static void __FASTCALL__ uninit(af_instance_t* af)
+{
+ if(af->setup) delete af->setup;
+}
+
+// Filter data through filter
+static mp_aframe_t* __FASTCALL__ play(af_instance_t* af,const mp_aframe_t* data)
+{
+ // Do something necessary to get rid of annoying warning during compile
+ if(!af) MSG_ERR("EEEK: Argument af == NULL in af_dummy.c play().");
+ return const_cast<mp_aframe_t*>(data);
+}
+
+// Allocate memory and set function pointers
+static MPXP_Rc __FASTCALL__ af_open(af_instance_t* af){
+ af->config_af=config_af;
+ af->control_af=control_af;
+ af->uninit=uninit;
+ af->play=play;
+ af->mul.d=1;
+ af->mul.n=1;
+ af->setup=mp_calloc(1,sizeof(af_ao3_t));
+ if(af->setup == NULL) return MPXP_Error;
+ check_pin("afilter",af->pin,AF_PIN);
+ return MPXP_Ok;
+}
+
+// Description of this filter
+extern const af_info_t af_info_ao = {
+ "libao wrapper",
+ "ao3",
+ "Nickols_K",
+ "",
+ AF_FLAGS_REENTRANT,
+ af_open
+};
Modified: mplayerxp/xmpcore/mp_aframe.cpp
===================================================================
--- mplayerxp/xmpcore/mp_aframe.cpp 2012-12-17 08:02:17 UTC (rev 566)
+++ mplayerxp/xmpcore/mp_aframe.cpp 2012-12-17 08:47:00 UTC (rev 567)
@@ -5,7 +5,7 @@
#include <stdio.h>
#include "mp_aframe.h"
-#include "libao2/afmt.h"
+#include "libao3/afmt.h"
#include "loader/wine/mmreg.h"
#include "mp_msg.h"
Modified: mplayerxp/xmpcore/xmp_aplayer.cpp
===================================================================
--- mplayerxp/xmpcore/xmp_aplayer.cpp 2012-12-17 08:02:17 UTC (rev 566)
+++ mplayerxp/xmpcore/xmp_aplayer.cpp 2012-12-17 08:47:00 UTC (rev 567)
@@ -14,7 +14,7 @@
#include "libmpdemux/demuxer.h"
#include "libmpcodecs/dec_audio.h"
-#include "libao2/audio_out.h"
+#include "libao3/audio_out.h"
#include "osdep/timer.h"
#include "xmp_core.h"
Modified: mplayerxp/xmpcore/xmp_core.cpp
===================================================================
--- mplayerxp/xmpcore/xmp_core.cpp 2012-12-17 08:02:17 UTC (rev 566)
+++ mplayerxp/xmpcore/xmp_core.cpp 2012-12-17 08:47:00 UTC (rev 567)
@@ -19,7 +19,7 @@
#include <sys/time.h>
#include "xmp_core.h"
-#include "libao2/audio_out.h"
+#include "libao3/audio_out.h"
#include "libvo2/video_out.h"
#include "libmpcodecs/dec_video.h"
Modified: mplayerxp/xmpcore/xmp_vplayer.cpp
===================================================================
--- mplayerxp/xmpcore/xmp_vplayer.cpp 2012-12-17 08:02:17 UTC (rev 566)
+++ mplayerxp/xmpcore/xmp_vplayer.cpp 2012-12-17 08:47:00 UTC (rev 567)
@@ -8,7 +8,7 @@
#include "mp_msg.h"
#include "sig_hand.h"
-#include "libao2/audio_out.h"
+#include "libao3/audio_out.h"
#include "libvo2/video_out.h"
#include "libmpdemux/demuxer_r.h"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
