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, 0 insertions, 379 deletions

diff --git a/libmpcodecs/vf_delogo.c b/libmpcodecs/vf_delogo.c
deleted file mode 100644
index add6dc6b0c..0000000000
--- a/libmpcodecs/vf_delogo.c
+++ /dev/null
@@ -1,379 +0,0 @@
-/*
- * Copyright (C) 2002 Jindrich Makovicka <makovick@gmail.com>
- *
- * 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.
- */
-
-/* A very simple tv station logo remover */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <inttypes.h>
-#include <limits.h>
-#include <errno.h>
-#include <math.h>
-
-#include "mp_msg.h"
-#include "cpudetect.h"
-#include "img_format.h"
-#include "mp_image.h"
-#include "vf.h"
-#include "libvo/fastmemcpy.h"
-
-#include "m_option.h"
-#include "m_struct.h"
-
-//===========================================================================//
-
-static struct vf_priv_s {
-    unsigned int outfmt;
-    int xoff, yoff, lw, lh, band, show;
-    const char *file;
-    struct timed_rectangle {
-        int ts, x, y, w, h, b;
-    } *timed_rect;
-    int n_timed_rect;
-    int cur_timed_rect;
-} const vf_priv_dflt = {
-    0,
-    0, 0, 0, 0, 0, 0,
-    NULL, NULL, 0, 0,
-};
-
-#define MIN(a,b) (((a) < (b)) ? (a) : (b))
-#define MAX(a,b) (((a) > (b)) ? (a) : (b))
-
-/**
- * Adjust the coordinates to suit the band width
- * Also print a notice in verbose mode
- */
-static void fix_band(struct vf_priv_s *p)
-{
-    p->show = 0;
-    if (p->band < 0) {
-        p->band = 4;
-        p->show = 1;
-    }
-    p->lw += p->band*2;
-    p->lh += p->band*2;
-    p->xoff -= p->band;
-    p->yoff -= p->band;
-    mp_msg(MSGT_VFILTER, MSGL_V, "delogo: %d x %d, %d x %d, band = %d\n",
-           p->xoff, p->yoff, p->lw, p->lh, p->band);
-}
-
-static void update_sub(struct vf_priv_s *p, double pts)
-{
-    int ipts = pts * 1000;
-    int tr = p->cur_timed_rect;
-    while (tr < p->n_timed_rect - 1 && ipts >= p->timed_rect[tr + 1].ts)
-        tr++;
-    while (tr >= 0 && ipts < p->timed_rect[tr].ts)
-        tr--;
-    if (tr == p->cur_timed_rect)
-        return;
-    p->cur_timed_rect = tr;
-    if (tr >= 0) {
-        p->xoff = p->timed_rect[tr].x;
-        p->yoff = p->timed_rect[tr].y;
-        p->lw   = p->timed_rect[tr].w;
-        p->lh   = p->timed_rect[tr].h;
-        p->band = p->timed_rect[tr].b;
-    } else {
-        p->xoff = p->yoff = p->lw = p->lh = p->band = 0;
-    }
-    fix_band(p);
-}
-
-static void delogo(uint8_t *dst, uint8_t *src, int dstStride, int srcStride, int width, int height,
-                   int logo_x, int logo_y, int logo_w, int logo_h, int band, int show, int direct) {
-    int y, x;
-    int interp, dist;
-    uint8_t *xdst, *xsrc;
-
-    uint8_t *topleft, *botleft, *topright;
-    int xclipl, xclipr, yclipt, yclipb;
-    int logo_x1, logo_x2, logo_y1, logo_y2;
-
-    xclipl = MAX(-logo_x, 0);
-    xclipr = MAX(logo_x+logo_w-width, 0);
-    yclipt = MAX(-logo_y, 0);
-    yclipb = MAX(logo_y+logo_h-height, 0);
-
-    logo_x1 = logo_x + xclipl;
-    logo_x2 = logo_x + logo_w - xclipr;
-    logo_y1 = logo_y + yclipt;
-    logo_y2 = logo_y + logo_h - yclipb;
-
-    topleft = src+logo_y1*srcStride+logo_x1;
-    topright = src+logo_y1*srcStride+logo_x2-1;
-    botleft = src+(logo_y2-1)*srcStride+logo_x1;
-
-    if (!direct) memcpy_pic(dst, src, width, height, dstStride, srcStride);
-
-    dst += (logo_y1+1)*dstStride;
-    src += (logo_y1+1)*srcStride;
-
-    for(y = logo_y1+1; y < logo_y2-1; y++)
-    {
-        for (x = logo_x1+1, xdst = dst+logo_x1+1, xsrc = src+logo_x1+1; x < logo_x2-1; x++, xdst++, xsrc++) {
-            interp = ((topleft[srcStride*(y-logo_y-yclipt)]
-                       + topleft[srcStride*(y-logo_y-1-yclipt)]
-                       + topleft[srcStride*(y-logo_y+1-yclipt)])*(logo_w-(x-logo_x))/logo_w
-                      + (topright[srcStride*(y-logo_y-yclipt)]
-                         + topright[srcStride*(y-logo_y-1-yclipt)]
-                         + topright[srcStride*(y-logo_y+1-yclipt)])*(x-logo_x)/logo_w
-                      + (topleft[x-logo_x-xclipl]
-                         + topleft[x-logo_x-1-xclipl]
-                         + topleft[x-logo_x+1-xclipl])*(logo_h-(y-logo_y))/logo_h
-                      + (botleft[x-logo_x-xclipl]
-                         + botleft[x-logo_x-1-xclipl]
-                         + botleft[x-logo_x+1-xclipl])*(y-logo_y)/logo_h
-                )/6;
-/*                interp = (topleft[srcStride*(y-logo_y)]*(logo_w-(x-logo_x))/logo_w
-                          + topright[srcStride*(y-logo_y)]*(x-logo_x)/logo_w
-                          + topleft[x-logo_x]*(logo_h-(y-logo_y))/logo_h
-                          + botleft[x-logo_x]*(y-logo_y)/logo_h
-                          )/2;*/
-            if (y >= logo_y+band && y < logo_y+logo_h-band && x >= logo_x+band && x < logo_x+logo_w-band) {
-                    *xdst = interp;
-            } else {
-                dist = 0;
-                if (x < logo_x+band) dist = MAX(dist, logo_x-x+band);
-                else if (x >= logo_x+logo_w-band) dist = MAX(dist, x-(logo_x+logo_w-1-band));
-                if (y < logo_y+band) dist = MAX(dist, logo_y-y+band);
-                else if (y >= logo_y+logo_h-band) dist = MAX(dist, y-(logo_y+logo_h-1-band));
-                *xdst = (*xsrc*dist + interp*(band-dist))/band;
-                if (show && (dist == band-1)) *xdst = 0;
-            }
-        }
-
-        dst+= dstStride;
-        src+= srcStride;
-    }
-}
-
-static int config(struct vf_instance *vf,
-                  int width, int height, int d_width, int d_height,
-                  unsigned int flags, unsigned int outfmt){
-
-    return vf_next_config(vf,width,height,d_width,d_height,flags,outfmt);
-}
-
-
-static void get_image(struct vf_instance *vf, mp_image_t *mpi){
-    if(mpi->flags&MP_IMGFLAG_PRESERVE) return; // don't change
-    if(mpi->imgfmt!=vf->priv->outfmt) return; // colorspace differ
-    // ok, we can do pp in-place (or pp disabled):
-    mpi->priv =
-    vf->dmpi=vf_get_image(vf->next,mpi->imgfmt,
-                          mpi->type, mpi->flags, mpi->w, mpi->h);
-    mpi->planes[0]=vf->dmpi->planes[0];
-    mpi->stride[0]=vf->dmpi->stride[0];
-    mpi->width=vf->dmpi->width;
-    if(mpi->flags&MP_IMGFLAG_PLANAR){
-        mpi->planes[1]=vf->dmpi->planes[1];
-        mpi->planes[2]=vf->dmpi->planes[2];
-        mpi->stride[1]=vf->dmpi->stride[1];
-        mpi->stride[2]=vf->dmpi->stride[2];
-    }
-    mpi->flags|=MP_IMGFLAG_DIRECT;
-}
-
-static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts){
-    mp_image_t *dmpi;
-
-    if(mpi->flags&MP_IMGFLAG_DIRECT) {
-        vf->dmpi = mpi->priv;
-        mpi->priv = NULL;
-    } else {
-        // no DR, so get a new image! hope we'll get DR buffer:
-        vf->dmpi=vf_get_image(vf->next,vf->priv->outfmt,
-                              MP_IMGTYPE_TEMP, MP_IMGFLAG_ACCEPT_STRIDE,
-                              mpi->w,mpi->h);
-    }
-    dmpi= vf->dmpi;
-
-    if (vf->priv->timed_rect)
-        update_sub(vf->priv, pts);
-    delogo(dmpi->planes[0], mpi->planes[0], dmpi->stride[0], mpi->stride[0], mpi->w, mpi->h,
-           vf->priv->xoff, vf->priv->yoff, vf->priv->lw, vf->priv->lh, vf->priv->band, vf->priv->show,
-           mpi->flags&MP_IMGFLAG_DIRECT);
-    delogo(dmpi->planes[1], mpi->planes[1], dmpi->stride[1], mpi->stride[1], mpi->w/2, mpi->h/2,
-           vf->priv->xoff/2, vf->priv->yoff/2, vf->priv->lw/2, vf->priv->lh/2, vf->priv->band/2, vf->priv->show,
-           mpi->flags&MP_IMGFLAG_DIRECT);
-    delogo(dmpi->planes[2], mpi->planes[2], dmpi->stride[2], mpi->stride[2], mpi->w/2, mpi->h/2,
-           vf->priv->xoff/2, vf->priv->yoff/2, vf->priv->lw/2, vf->priv->lh/2, vf->priv->band/2, vf->priv->show,
-           mpi->flags&MP_IMGFLAG_DIRECT);
-
-    vf_clone_mpi_attributes(dmpi, mpi);
-
-    return vf_next_put_image(vf,dmpi, pts);
-}
-
-static void uninit(struct vf_instance *vf){
-    if(!vf->priv) return;
-
-    free(vf->priv);
-    vf->priv=NULL;
-}
-
-//===========================================================================//
-
-static int query_format(struct vf_instance *vf, unsigned int fmt){
-    switch(fmt)
-    {
-    case IMGFMT_YV12:
-    case IMGFMT_I420:
-    case IMGFMT_IYUV:
-        return vf_next_query_format(vf,vf->priv->outfmt);
-    }
-    return 0;
-}
-
-static const unsigned int fmt_list[]={
-    IMGFMT_YV12,
-    IMGFMT_I420,
-    IMGFMT_IYUV,
-    0
-};
-
-static int load_timed_rectangles(struct vf_priv_s *delogo)
-{
-    FILE *f;
-    char line[2048];
-    int lineno = 0, p;
-    double ts, last_ts = 0;
-    struct timed_rectangle *rect = NULL, *nr;
-    int n_rect = 0, alloc_rect = 0;
-
-    f = fopen(delogo->file, "r");
-    if (!f) {
-        mp_msg(MSGT_VFILTER, MSGL_ERR, "delogo: unable to load %s: %s\n",
-               delogo->file, strerror(errno));
-        return -1;
-    }
-    while (fgets(line, sizeof(line), f)) {
-        lineno++;
-        if (*line == '#' || *line == '\n')
-            continue;
-        if (n_rect == alloc_rect) {
-            if (alloc_rect > INT_MAX / 2 / (int)sizeof(*rect)) {
-                mp_msg(MSGT_VFILTER, MSGL_WARN,
-                       "delogo: too many rectangles\n");
-                goto load_error;
-            }
-            alloc_rect = alloc_rect ? 2 * alloc_rect : 256;
-            nr = realloc(rect, alloc_rect * sizeof(*rect));
-            if (!nr) {
-                mp_msg(MSGT_VFILTER, MSGL_WARN, "delogo: out of memory\n");
-                goto load_error;
-            }
-            rect = nr;
-        }
-        nr = rect + n_rect;
-        memset(nr, 0, sizeof(*nr));
-        p = sscanf(line, "%lf %d:%d:%d:%d:%d",
-                   &ts, &nr->x, &nr->y, &nr->w, &nr->h, &nr->b);
-        if ((p == 2 && !nr->x) || p == 5 || p == 6) {
-            if (ts <= last_ts)
-                mp_msg(MSGT_VFILTER, MSGL_WARN, "delogo: %s:%d: wrong time\n",
-                       delogo->file, lineno);
-            nr->ts = 1000 * ts + 0.5;
-            n_rect++;
-        } else {
-            mp_msg(MSGT_VFILTER, MSGL_WARN, "delogo: %s:%d: syntax error\n",
-                   delogo->file, lineno);
-        }
-    }
-    fclose(f);
-    if (!n_rect) {
-        mp_msg(MSGT_VFILTER, MSGL_ERR, "delogo: %s: no rectangles found\n",
-               delogo->file);
-        free(rect);
-        return -1;
-    }
-    nr = realloc(rect, n_rect * sizeof(*rect));
-    if (nr)
-        rect = nr;
-    delogo->timed_rect   = rect;
-    delogo->n_timed_rect = n_rect;
-    return 0;
-
-load_error:
-    free(rect);
-    fclose(f);
-    return -1;
-}
-
-static int vf_open(vf_instance_t *vf, char *args){
-    vf->config=config;
-    vf->put_image=put_image;
-    vf->get_image=get_image;
-    vf->query_format=query_format;
-    vf->uninit=uninit;
-
-    if (vf->priv->file) {
-        if (load_timed_rectangles(vf->priv))
-            return 0;
-        mp_msg(MSGT_VFILTER, MSGL_V, "delogo: %d from %s\n",
-               vf->priv->n_timed_rect, vf->priv->file);
-        vf->priv->cur_timed_rect = -1;
-    }
-    fix_band(vf->priv);
-
-    // check csp:
-    vf->priv->outfmt=vf_match_csp(&vf->next,fmt_list,IMGFMT_YV12);
-    if(!vf->priv->outfmt)
-    {
-        uninit(vf);
-        return 0; // no csp match :(
-    }
-
-    return 1;
-}
-
-#define ST_OFF(f) M_ST_OFF(struct vf_priv_s,f)
-static const m_option_t vf_opts_fields[] = {
-    { "x", ST_OFF(xoff), CONF_TYPE_INT, 0, 0, 0, NULL },
-    { "y", ST_OFF(yoff), CONF_TYPE_INT, 0, 0, 0, NULL },
-    { "w", ST_OFF(lw), CONF_TYPE_INT, 0, 0, 0, NULL },
-    { "h", ST_OFF(lh), CONF_TYPE_INT, 0, 0, 0, NULL },
-    { "t", ST_OFF(band), CONF_TYPE_INT, 0, 0, 0, NULL },
-    { "band", ST_OFF(band), CONF_TYPE_INT, 0, 0, 0, NULL }, // alias
-    { "file", ST_OFF(file), CONF_TYPE_STRING, 0, 0, 0, NULL },
-    { NULL, NULL, 0, 0, 0, 0, NULL }
-};
-
-static const m_struct_t vf_opts = {
-    "delogo",
-    sizeof(struct vf_priv_s),
-    &vf_priv_dflt,
-    vf_opts_fields
-};
-
-const vf_info_t vf_info_delogo = {
-    "simple logo remover",
-    "delogo",
-    "Jindrich Makovicka, Alex Beregszaszi",
-    "",
-    vf_open,
-    &vf_opts
-};
-
-//===========================================================================//