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.

1 files changed, 274 insertions, 0 deletions

diff --git a/audio/filter/af_bs2b.c b/audio/filter/af_bs2b.c
new file mode 100644
index 0000000000..ccbf3794c5
--- /dev/null
+++ b/audio/filter/af_bs2b.c
@@ -0,0 +1,274 @@
+/*
+ * The Bauer stereophonic-to-binaural DSP using bs2b library:
+ * http://bs2b.sourceforge.net/
+ *
+ * Copyright (c) 2009 Andrew Savchenko
+ *
+ * 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 <bs2b.h>
+#include <inttypes.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "af.h"
+#include "subopt-helper.h"
+
+/// Internal specific data of the filter
+struct af_bs2b {
+    int fcut;           ///< cut frequency in Hz
+    int feed;           ///< feed level for low frequencies in 0.1*dB
+    char *profile;      ///< profile (available crossfeed presets)
+    t_bs2bdp filter;    ///< instance of a library filter
+};
+
+#define PLAY(name, type) \
+static struct mp_audio *play_##name(struct af_instance *af, struct mp_audio *data) \
+{ \
+    /* filter is called for all pairs of samples available in the buffer */ \
+    bs2b_cross_feed_##name(((struct af_bs2b*)(af->setup))->filter, \
+        (type*)(data->audio), data->len/data->bps/2); \
+\
+    return data; \
+}
+
+PLAY(f, float)
+PLAY(fbe, float)
+PLAY(fle, float)
+PLAY(s32be, int32_t)
+PLAY(u32be, uint32_t)
+PLAY(s32le, int32_t)
+PLAY(u32le, uint32_t)
+PLAY(s24be, bs2b_int24_t)
+PLAY(u24be, bs2b_uint24_t)
+PLAY(s24le, bs2b_int24_t)
+PLAY(u24le, bs2b_uint24_t)
+PLAY(s16be, int16_t)
+PLAY(u16be, uint16_t)
+PLAY(s16le, int16_t)
+PLAY(u16le, uint16_t)
+PLAY(s8, int8_t)
+PLAY(u8, uint8_t)
+
+/// Sanity check for fcut value
+static int test_fcut(void *par)
+{
+    const int val = *(int*)par;
+    if (val >= BS2B_MINFCUT && val <= BS2B_MAXFCUT)
+        return 1;
+
+    mp_msg(MSGT_AFILTER, MSGL_ERR,
+           "[bs2b] Cut frequency must be in range [%d..%d], but current value is %d.\n",
+           BS2B_MINFCUT, BS2B_MAXFCUT, val);
+    return 0;
+}
+
+/// Sanity check for feed value
+static int test_feed(void *par)
+{
+    const int val = *(int*)par;
+    if (val >= BS2B_MINFEED && val <= BS2B_MAXFEED)
+        return 1;
+
+    mp_msg(MSGT_AFILTER, MSGL_ERR,
+           "[bs2b] Feed level must be in range [%d..%d], but current value is %d.\n",
+           BS2B_MINFEED, BS2B_MAXFEED, val);
+    return 0;
+}
+
+/// Initialization and runtime control
+static int control(struct af_instance *af, int cmd, void *arg)
+{
+    struct af_bs2b *s = af->setup;
+
+    switch (cmd) {
+    case AF_CONTROL_REINIT: {
+        int format;
+        char buf[256];
+        // Sanity check
+        if (!arg) return AF_ERROR;
+
+        format           = ((struct mp_audio*)arg)->format;
+        af->data->rate   = ((struct mp_audio*)arg)->rate;
+        af->data->nch    = 2;     // bs2b is useful only for 2ch audio
+        af->data->bps    = ((struct mp_audio*)arg)->bps;
+        af->data->format = format;
+
+        /* check for formats supported by libbs2b
+           and assign corresponding handlers */
+        switch (format) {
+            case AF_FORMAT_FLOAT_BE:
+                af->play = play_fbe;
+                break;
+            case AF_FORMAT_FLOAT_LE:
+                af->play = play_fle;
+                break;
+            case AF_FORMAT_S32_BE:
+                af->play = play_s32be;
+                break;
+            case AF_FORMAT_U32_BE:
+                af->play = play_u32be;
+                break;
+            case AF_FORMAT_S32_LE:
+                af->play = play_s32le;
+                break;
+            case AF_FORMAT_U32_LE:
+                af->play = play_u32le;
+                break;
+            case AF_FORMAT_S24_BE:
+                af->play = play_s24be;
+                break;
+            case AF_FORMAT_U24_BE:
+                af->play = play_u24be;
+                break;
+            case AF_FORMAT_S24_LE:
+                af->play = play_s24le;
+                break;
+            case AF_FORMAT_U24_LE:
+                af->play = play_u24le;
+                break;
+            case AF_FORMAT_S16_BE:
+                af->play = play_s16be;
+                break;
+            case AF_FORMAT_U16_BE:
+                af->play = play_u16be;
+                break;
+            case AF_FORMAT_S16_LE:
+                af->play = play_s16le;
+                break;
+            case AF_FORMAT_U16_LE:
+                af->play = play_u16le;
+                break;
+            case AF_FORMAT_S8:
+                af->play = play_s8;
+                break;
+            case AF_FORMAT_U8:
+                af->play = play_u8;
+                break;
+            default:
+                af->play = play_f;
+                af->data->format = AF_FORMAT_FLOAT_NE;
+                af->data->bps = 4;
+                break;
+        }
+
+        // bs2b have srate limits, try to resample if needed
+        if (af->data->rate > BS2B_MAXSRATE || af->data->rate < BS2B_MINSRATE) {
+            af->data->rate = BS2B_DEFAULT_SRATE;
+            mp_msg(MSGT_AFILTER, MSGL_WARN,
+                   "[bs2b] Requested sample rate %d Hz is out of bounds [%d..%d] Hz.\n"
+                   "[bs2b] Trying to resample to %d Hz.\n",
+                   af->data->rate, BS2B_MINSRATE, BS2B_MAXSRATE, BS2B_DEFAULT_SRATE);
+        }
+        bs2b_set_srate(s->filter, (long)af->data->rate);
+        mp_msg(MSGT_AFILTER, MSGL_V, "[bs2b] using format %s\n",
+               af_fmt2str(af->data->format,buf,256));
+
+        return af_test_output(af,(struct mp_audio*)arg);
+    }
+    case AF_CONTROL_COMMAND_LINE: {
+        const opt_t subopts[] = {
+            {"fcut",    OPT_ARG_INT,   &s->fcut,    test_fcut},
+            {"feed",    OPT_ARG_INT,   &s->feed,    test_feed},
+            {"profile", OPT_ARG_MSTRZ, &s->profile, NULL},
+            {NULL}
+        };
+        if (subopt_parse(arg, subopts) != 0) {
+            mp_msg(MSGT_AFILTER, MSGL_ERR, "[bs2b] Invalid option specified.\n");
+            free(s->profile);
+            return AF_ERROR;
+        }
+        // parse profile if specified
+        if (s->profile) {
+            if (!strcmp(s->profile, "default"))
+                bs2b_set_level(s->filter, BS2B_DEFAULT_CLEVEL);
+            else if (!strcmp(s->profile, "cmoy"))
+                bs2b_set_level(s->filter, BS2B_CMOY_CLEVEL);
+            else if (!strcmp(s->profile, "jmeier"))
+                bs2b_set_level(s->filter, BS2B_JMEIER_CLEVEL);
+            else {
+                mp_msg(MSGT_AFILTER, MSGL_ERR,
+                       "[bs2b] Invalid profile specified: %s.\n"
+                       "[bs2b] Available profiles are: default, cmoy, jmeier.\n",
+                       s->profile);
+                free(s->profile);
+                return AF_ERROR;
+            }
+        }
+        // set fcut and feed only if specified, otherwise defaults will be used
+        if (s->fcut)
+            bs2b_set_level_fcut(s->filter, s->fcut);
+        if (s->feed)
+            bs2b_set_level_feed(s->filter, s->feed);
+
+        mp_msg(MSGT_AFILTER, MSGL_V,
+               "[bs2b] using cut frequency %d, LF feed level %d\n",
+               bs2b_get_level_fcut(s->filter), bs2b_get_level_feed(s->filter));
+        free(s->profile);
+        return AF_OK;
+    }
+    }
+    return AF_UNKNOWN;
+}
+
+/// Deallocate memory and close library
+static void uninit(struct af_instance *af)
+{
+    struct af_bs2b *s = af->setup;
+    free(af->data);
+    if (s && s->filter)
+        bs2b_close(s->filter);
+    free(s);
+}
+
+/// Allocate memory, set function pointers and init library
+static int af_open(struct af_instance *af)
+{
+    struct af_bs2b *s;
+    af->control = control;
+    af->uninit  = uninit;
+    af->mul     = 1;
+    if (!(af->data = calloc(1, sizeof(struct mp_audio))))
+        return AF_ERROR;
+    if (!(af->setup = s = calloc(1, sizeof(struct af_bs2b)))) {
+        free(af->data);
+        return AF_ERROR;
+    }
+
+    // NULL means failed initialization
+    if (!(s->filter = bs2b_open())) {
+        free(af->data);
+        free(af->setup);
+        return AF_ERROR;
+    }
+    // Set zero defaults indicating no option was specified.
+    s->profile = NULL;
+    s->fcut    = 0;
+    s->feed    = 0;
+    return AF_OK;
+}
+
+/// Description of this filter
+struct af_info af_info_bs2b = {
+    "Bauer stereophonic-to-binaural audio filter",
+    "bs2b",
+    "Andrew Savchenko",
+    "",
+    AF_FLAGS_REENTRANT,
+    af_open
+};