From d4bdd0473d6f43132257c9fb3848d829755167a3 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Mon, 5 Nov 2012 17:02:04 +0100
Subject: Rename directories, move files (step 1 of 2) (does not compile)

Tis drops the silly lib prefixes, and attempts to organize the tree in
a more logical way. Make the top-level directory less cluttered as
well.

Renames the following directories:
    libaf -> audio/filter
    libao2 -> audio/out
    libvo -> video/out
    libmpdemux -> demux

Split libmpcodecs:
    vf* -> video/filter
    vd*, dec_video.* -> video/decode
    mp_image*, img_format*, ... -> video/
    ad*, dec_audio.* -> audio/decode

libaf/format.* is moved to audio/ - this is similar to how mp_image.*
is located in video/.

Move most top-level .c/.h files to core. (talloc.c/.h is left on top-
level, because it's external.) Park some of the more annoying files
in compat/. Some of these are relicts from the time mplayer used
ffmpeg internals.

sub/ is not split, because it's too much of a mess (subtitle code is
mixed with OSD display and rendering).

Maybe the organization of core is not ideal: it mixes playback core
(like mplayer.c) and utility helpers (like bstr.c/h). Should the need
arise, the playback core will be moved somewhere else, while core
contains all helper and common code.
---
 audio/filter/af_tools.c | 110 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 110 insertions(+)
 create mode 100644 audio/filter/af_tools.c

(limited to 'audio/filter/af_tools.c')

diff --git a/audio/filter/af_tools.c b/audio/filter/af_tools.c
new file mode 100644
index 0000000000..0d5dc6c573
--- /dev/null
+++ b/audio/filter/af_tools.c
@@ -0,0 +1,110 @@
+/*
+ * This file is part of MPlayer.
+ *
+ * MPlayer is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * MPlayer is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with MPlayer; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include <math.h>
+#include <string.h>
+#include "af.h"
+
+/* Convert to gain value from dB. Returns AF_OK if of and AF_ERROR if
+   fail */
+int af_from_dB(int n, float* in, float* out, float k, float mi, float ma)
+{
+  int i = 0;
+  // Sanity check
+  if(!in || !out)
+    return AF_ERROR;
+
+  for(i=0;i<n;i++){
+    if(in[i]<=-200)
+      out[i]=0.0;
+    else
+      out[i]=pow(10.0,clamp(in[i],mi,ma)/k);
+  }
+  return AF_OK;
+}
+
+/* Convert from gain value to dB. Returns AF_OK if of and AF_ERROR if
+   fail */
+int af_to_dB(int n, float* in, float* out, float k)
+{
+  int i = 0;
+  // Sanity check
+  if(!in || !out)
+    return AF_ERROR;
+
+  for(i=0;i<n;i++){
+    if(in[i] == 0.0)
+      out[i]=-200.0;
+    else
+      out[i]=k*log10(in[i]);
+  }
+  return AF_OK;
+}
+
+/* Convert from ms to sample time */
+int af_from_ms(int n, float* in, int* out, int rate, float mi, float ma)
+{
+  int i = 0;
+  // Sanity check
+  if(!in || !out)
+    return AF_ERROR;
+
+  for(i=0;i<n;i++)
+    out[i]=(int)((float)rate * clamp(in[i],mi,ma)/1000.0);
+
+  return AF_OK;
+}
+
+/* Convert from sample time to ms */
+int af_to_ms(int n, int* in, float* out, int rate)
+{
+  int i = 0;
+  // Sanity check
+  if(!in || !out || !rate)
+    return AF_ERROR;
+
+  for(i=0;i<n;i++)
+    out[i]=1000.0 * (float)in[i]/((float)rate);
+
+  return AF_OK;
+}
+
+/* Helper function for testing the output format */
+int af_test_output(struct af_instance* af, struct mp_audio* out)
+{
+  if((af->data->format != out->format) ||
+     (af->data->bps    != out->bps)    ||
+     (af->data->rate   != out->rate)   ||
+     (af->data->nch    != out->nch)){
+    memcpy(out,af->data,sizeof(struct mp_audio));
+    return AF_FALSE;
+  }
+  return AF_OK;
+}
+
+/* Soft clipping, the sound of a dream, thanks to Jon Wattes
+   post to Musicdsp.org */
+float af_softclip(float a)
+{
+    if (a >= M_PI/2)
+	return 1.0;
+    else if (a <= -M_PI/2)
+	return -1.0;
+    else
+	return sin(a);
+}
-- 
cgit v1.2.3