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, 396 deletions

diff --git a/libvo/gl_common.h b/libvo/gl_common.h
deleted file mode 100644
index 9816566097..0000000000
--- a/libvo/gl_common.h
+++ /dev/null
@@ -1,396 +0,0 @@
-/*
- * 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.
- *
- * You can alternatively redistribute this file and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- */
-
-#ifndef MPLAYER_GL_COMMON_H
-#define MPLAYER_GL_COMMON_H
-
-#include <stdio.h>
-#include <stdint.h>
-
-#include "config.h"
-#include "mp_msg.h"
-
-#include "video_out.h"
-#include "csputils.h"
-
-#include "libmpcodecs/mp_image.h"
-
-#if defined(CONFIG_GL_COCOA) && !defined(CONFIG_GL_X11)
-#ifdef GL_VERSION_3_0
-#include <OpenGL/gl3.h>
-#else
-#include <OpenGL/gl.h>
-#endif
-#include <OpenGL/glext.h>
-#else
-#include <GL/gl.h>
-#include <GL/glext.h>
-#endif
-
-#include "libvo/gl_header_fixes.h"
-
-struct GL;
-typedef struct GL GL;
-
-void glAdjustAlignment(GL *gl, int stride);
-
-int glFindFormat(uint32_t format, int have_texture_rg, int *bpp,
-                 GLint *gl_texfmt, GLenum *gl_format, GLenum *gl_type);
-int glFmt2bpp(GLenum format, GLenum type);
-void glCreateClearTex(GL *gl, GLenum target, GLenum fmt, GLenum format,
-                      GLenum type, GLint filter, int w, int h,
-                      unsigned char val);
-int glCreatePPMTex(GL *gl, GLenum target, GLenum fmt, GLint filter,
-                   FILE *f, int *width, int *height, int *maxval);
-void glUploadTex(GL *gl, GLenum target, GLenum format, GLenum type,
-                 const void *dataptr, int stride,
-                 int x, int y, int w, int h, int slice);
-void glClearTex(GL *gl, GLenum target, GLenum format, GLenum type,
-                int x, int y, int w, int h, uint8_t val, void **scratch);
-void glDownloadTex(GL *gl, GLenum target, GLenum format, GLenum type,
-                   void *dataptr, int stride);
-void glDrawTex(GL *gl, GLfloat x, GLfloat y, GLfloat w, GLfloat h,
-               GLfloat tx, GLfloat ty, GLfloat tw, GLfloat th,
-               int sx, int sy, int rect_tex, int is_yv12, int flip);
-int loadGPUProgram(GL *gl, GLenum target, char *prog);
-void glCheckError(GL *gl, const char *info);
-mp_image_t *glGetWindowScreenshot(GL *gl);
-
-/** \addtogroup glconversion
- * \{ */
-//! do not use YUV conversion, this should always stay 0
-#define YUV_CONVERSION_NONE 0
-//! use nVidia specific register combiners for YUV conversion
-//! implementation has been removed
-#define YUV_CONVERSION_COMBINERS 1
-//! use a fragment program for YUV conversion
-#define YUV_CONVERSION_FRAGMENT 2
-//! use a fragment program for YUV conversion with gamma using POW
-#define YUV_CONVERSION_FRAGMENT_POW 3
-//! use a fragment program with additional table lookup for YUV conversion
-#define YUV_CONVERSION_FRAGMENT_LOOKUP 4
-//! use ATI specific register combiners ("fragment program")
-#define YUV_CONVERSION_COMBINERS_ATI 5
-//! use a fragment program with 3D table lookup for YUV conversion
-#define YUV_CONVERSION_FRAGMENT_LOOKUP3D 6
-//! use ATI specific "text" register combiners ("fragment program")
-#define YUV_CONVERSION_TEXT_FRAGMENT 7
-//! use normal bilinear scaling for textures
-#define YUV_SCALER_BILIN 0
-//! use higher quality bicubic scaling for textures
-#define YUV_SCALER_BICUB 1
-//! use cubic scaling in X and normal linear scaling in Y direction
-#define YUV_SCALER_BICUB_X 2
-//! use cubic scaling without additional lookup texture
-#define YUV_SCALER_BICUB_NOTEX 3
-#define YUV_SCALER_UNSHARP 4
-#define YUV_SCALER_UNSHARP2 5
-//! mask for conversion type
-#define YUV_CONVERSION_MASK 0xF
-//! mask for scaler type
-#define YUV_SCALER_MASK 0xF
-//! shift value for luminance scaler type
-#define YUV_LUM_SCALER_SHIFT 8
-//! shift value for chrominance scaler type
-#define YUV_CHROM_SCALER_SHIFT 12
-//! extract conversion out of type
-#define YUV_CONVERSION(t) ((t) & YUV_CONVERSION_MASK)
-//! extract luminance scaler out of type
-#define YUV_LUM_SCALER(t) (((t) >> YUV_LUM_SCALER_SHIFT) & YUV_SCALER_MASK)
-//! extract chrominance scaler out of type
-#define YUV_CHROM_SCALER(t) (((t) >> YUV_CHROM_SCALER_SHIFT) & YUV_SCALER_MASK)
-#define SET_YUV_CONVERSION(c)   ((c) & YUV_CONVERSION_MASK)
-#define SET_YUV_LUM_SCALER(s)   (((s) & YUV_SCALER_MASK) << YUV_LUM_SCALER_SHIFT)
-#define SET_YUV_CHROM_SCALER(s) (((s) & YUV_SCALER_MASK) << YUV_CHROM_SCALER_SHIFT)
-//! returns whether the yuv conversion supports large brightness range etc.
-static inline int glYUVLargeRange(int conv)
-{
-    switch (conv) {
-    case YUV_CONVERSION_NONE:
-    case YUV_CONVERSION_COMBINERS_ATI:
-    case YUV_CONVERSION_FRAGMENT_LOOKUP3D:
-    case YUV_CONVERSION_TEXT_FRAGMENT:
-        return 0;
-    }
-    return 1;
-}
-/** \} */
-
-typedef struct {
-    GLenum target;
-    int type;
-    struct mp_csp_params csp_params;
-    int texw;
-    int texh;
-    int chrom_texw;
-    int chrom_texh;
-    float filter_strength;
-    float noise_strength;
-} gl_conversion_params_t;
-
-int glAutodetectYUVConversion(GL *gl);
-void glSetupYUVConversion(GL *gl, gl_conversion_params_t *params);
-void glEnableYUVConversion(GL *gl, GLenum target, int type);
-void glDisableYUVConversion(GL *gl, GLenum target, int type);
-
-#define GL_3D_RED_CYAN        1
-#define GL_3D_GREEN_MAGENTA   2
-#define GL_3D_QUADBUFFER      3
-
-void glEnable3DLeft(GL *gl, int type);
-void glEnable3DRight(GL *gl, int type);
-void glDisable3D(GL *gl, int type);
-
-enum MPGLType {
-    GLTYPE_AUTO,
-    GLTYPE_COCOA,
-    GLTYPE_W32,
-    GLTYPE_X11,
-};
-
-enum {
-    MPGL_CAP_GL                 = (1 << 0),     // GL was successfully loaded
-    MPGL_CAP_GL_LEGACY          = (1 << 1),     // GL 1.1 (but not 3.x)
-    MPGL_CAP_GL2                = (1 << 2),     // GL 2.0 (3.x core subset)
-    MPGL_CAP_GL21               = (1 << 3),     // GL 2.1 (3.x core subset)
-    MPGL_CAP_GL3                = (1 << 4),     // GL 3.x core
-    MPGL_CAP_FB                 = (1 << 5),
-    MPGL_CAP_VAO                = (1 << 6),
-    MPGL_CAP_SRGB_TEX           = (1 << 7),
-    MPGL_CAP_SRGB_FB            = (1 << 8),
-    MPGL_CAP_FLOAT_TEX          = (1 << 9),
-    MPGL_CAP_TEX_RG             = (1 << 10),    // GL_ARB_texture_rg / GL 3.x
-    MPGL_CAP_NO_SW              = (1 << 30),    // used to block sw. renderers
-};
-
-#define MPGL_VER(major, minor) (((major) << 16) | (minor))
-#define MPGL_VER_GET_MAJOR(ver) ((ver) >> 16)
-#define MPGL_VER_GET_MINOR(ver) ((ver) & ((1 << 16) - 1))
-
-#define MPGL_VER_P(ver) MPGL_VER_GET_MAJOR(ver), MPGL_VER_GET_MINOR(ver)
-
-typedef struct MPGLContext {
-    GL *gl;
-    enum MPGLType type;
-    struct vo *vo;
-
-    // Bit size of each component in the created framebuffer. 0 if unknown.
-    int depth_r, depth_g, depth_b;
-
-    // GL version requested from create_window_gl3 backend.
-    // (Might be different from the actual version in gl->version.)
-    int requested_gl_version;
-
-    void (*swapGlBuffers)(struct MPGLContext *);
-    int (*check_events)(struct vo *vo);
-    void (*fullscreen)(struct vo *vo);
-    int (*vo_init)(struct vo *vo);
-    void (*vo_uninit)(struct vo *vo);
-    void (*releaseGlContext)(struct MPGLContext *);
-
-    // Creates GL 1.x/2.x legacy context.
-    bool (*create_window_old)(struct MPGLContext *ctx, uint32_t d_width,
-                              uint32_t d_height, uint32_t flags);
-
-    // Creates GL 3.x core context.
-    bool (*create_window_gl3)(struct MPGLContext *ctx, uint32_t d_width,
-                              uint32_t d_height, uint32_t flags);
-
-    // optional
-    void (*pause)(struct vo *vo);
-    void (*resume)(struct vo *vo);
-    void (*ontop)(struct vo *vo);
-    void (*border)(struct vo *vo);
-    void (*update_xinerama_info)(struct vo *vo);
-
-    // For free use by the backend.
-    void *priv;
-    // Internal to gl_common.c.
-    bool (*selected_create_window)(struct MPGLContext *ctx, uint32_t d_width,
-                                   uint32_t d_height, uint32_t flags);
-    bool vo_init_ok;
-} MPGLContext;
-
-int mpgl_find_backend(const char *name);
-
-MPGLContext *mpgl_init(enum MPGLType type, struct vo *vo);
-void mpgl_uninit(MPGLContext *ctx);
-
-// Create a VO window and create a GL context on it.
-// (Calls create_window_gl3 or create_window+setGlWindow.)
-// gl_caps: bitfield of MPGL_CAP_* (required GL version and feature set)
-// flags: passed to the backend's create window function
-// Returns success.
-bool mpgl_create_window(struct MPGLContext *ctx, int gl_caps, uint32_t d_width,
-                        uint32_t d_height, uint32_t flags);
-
-// Destroy the window, without resetting GL3 vs. GL2 context choice.
-// If this fails (false), mpgl_uninit(ctx) must be called.
-bool mpgl_destroy_window(struct MPGLContext *ctx);
-
-// print a multi line string with line numbers (e.g. for shader sources)
-// mod, lev: module and log level, as in mp_msg()
-void mp_log_source(int mod, int lev, const char *src);
-
-//function pointers loaded from the OpenGL library
-struct GL {
-    int version;                // MPGL_VER() mangled
-    int glsl_version;           // e.g. 130 for GLSL 1.30
-    char *extensions;           // Equivalent to GL_EXTENSIONS
-    int mpgl_caps;              // Bitfield of MPGL_CAP_* constants
-
-    void (GLAPIENTRY *Begin)(GLenum);
-    void (GLAPIENTRY *End)(void);
-    void (GLAPIENTRY *Viewport)(GLint, GLint, GLsizei, GLsizei);
-    void (GLAPIENTRY *MatrixMode)(GLenum);
-    void (GLAPIENTRY *LoadIdentity)(void);
-    void (GLAPIENTRY *Translated)(double, double, double);
-    void (GLAPIENTRY *Scaled)(double, double, double);
-    void (GLAPIENTRY *Ortho)(double, double, double, double, double,double);
-    void (GLAPIENTRY *PushMatrix)(void);
-    void (GLAPIENTRY *PopMatrix)(void);
-    void (GLAPIENTRY *Clear)(GLbitfield);
-    GLuint (GLAPIENTRY *GenLists)(GLsizei);
-    void (GLAPIENTRY *DeleteLists)(GLuint, GLsizei);
-    void (GLAPIENTRY *NewList)(GLuint, GLenum);
-    void (GLAPIENTRY *EndList)(void);
-    void (GLAPIENTRY *CallList)(GLuint);
-    void (GLAPIENTRY *CallLists)(GLsizei, GLenum, const GLvoid *);
-    void (GLAPIENTRY *GenTextures)(GLsizei, GLuint *);
-    void (GLAPIENTRY *DeleteTextures)(GLsizei, const GLuint *);
-    void (GLAPIENTRY *TexEnvi)(GLenum, GLenum, GLint);
-    void (GLAPIENTRY *Color4ub)(GLubyte, GLubyte, GLubyte, GLubyte);
-    void (GLAPIENTRY *Color4f)(GLfloat, GLfloat, GLfloat, GLfloat);
-    void (GLAPIENTRY *ClearColor)(GLclampf, GLclampf, GLclampf, GLclampf);
-    void (GLAPIENTRY *Enable)(GLenum);
-    void (GLAPIENTRY *Disable)(GLenum);
-    const GLubyte *(GLAPIENTRY * GetString)(GLenum);
-    void (GLAPIENTRY *DrawBuffer)(GLenum);
-    void (GLAPIENTRY *DepthMask)(GLboolean);
-    void (GLAPIENTRY *BlendFunc)(GLenum, GLenum);
-    void (GLAPIENTRY *Flush)(void);
-    void (GLAPIENTRY *Finish)(void);
-    void (GLAPIENTRY *PixelStorei)(GLenum, GLint);
-    void (GLAPIENTRY *TexImage1D)(GLenum, GLint, GLint, GLsizei, GLint,
-                                  GLenum, GLenum, const GLvoid *);
-    void (GLAPIENTRY *TexImage2D)(GLenum, GLint, GLint, GLsizei, GLsizei,
-                                  GLint, GLenum, GLenum, const GLvoid *);
-    void (GLAPIENTRY *TexSubImage2D)(GLenum, GLint, GLint, GLint,
-                                     GLsizei, GLsizei, GLenum, GLenum,
-                                     const GLvoid *);
-    void (GLAPIENTRY *GetTexImage)(GLenum, GLint, GLenum, GLenum, GLvoid *);
-    void (GLAPIENTRY *TexParameteri)(GLenum, GLenum, GLint);
-    void (GLAPIENTRY *TexParameterf)(GLenum, GLenum, GLfloat);
-    void (GLAPIENTRY *TexParameterfv)(GLenum, GLenum, const GLfloat *);
-    void (GLAPIENTRY *TexCoord2f)(GLfloat, GLfloat);
-    void (GLAPIENTRY *TexCoord2fv)(const GLfloat *);
-    void (GLAPIENTRY *Vertex2f)(GLfloat, GLfloat);
-    void (GLAPIENTRY *GetIntegerv)(GLenum, GLint *);
-    void (GLAPIENTRY *GetBooleanv)(GLenum, GLboolean *);
-    void (GLAPIENTRY *ColorMask)(GLboolean, GLboolean, GLboolean, GLboolean);
-    void (GLAPIENTRY *ReadPixels)(GLint, GLint, GLsizei, GLsizei, GLenum,
-                                  GLenum, GLvoid *);
-    void (GLAPIENTRY *ReadBuffer)(GLenum);
-    void (GLAPIENTRY *VertexPointer)(GLint, GLenum, GLsizei, const GLvoid *);
-    void (GLAPIENTRY *ColorPointer)(GLint, GLenum, GLsizei, const GLvoid *);
-    void (GLAPIENTRY *TexCoordPointer)(GLint, GLenum, GLsizei, const GLvoid *);
-    void (GLAPIENTRY *DrawArrays)(GLenum, GLint, GLsizei);
-    void (GLAPIENTRY *EnableClientState)(GLenum);
-    void (GLAPIENTRY *DisableClientState)(GLenum);
-    GLenum (GLAPIENTRY *GetError)(void);
-
-    void (GLAPIENTRY *GenBuffers)(GLsizei, GLuint *);
-    void (GLAPIENTRY *DeleteBuffers)(GLsizei, const GLuint *);
-    void (GLAPIENTRY *BindBuffer)(GLenum, GLuint);
-    GLvoid * (GLAPIENTRY * MapBuffer)(GLenum, GLenum);
-    GLboolean (GLAPIENTRY *UnmapBuffer)(GLenum);
-    void (GLAPIENTRY *BufferData)(GLenum, intptr_t, const GLvoid *, GLenum);
-    void (GLAPIENTRY *ActiveTexture)(GLenum);
-    void (GLAPIENTRY *BindTexture)(GLenum, GLuint);
-    void (GLAPIENTRY *MultiTexCoord2f)(GLenum, GLfloat, GLfloat);
-    void (GLAPIENTRY *GenPrograms)(GLsizei, GLuint *);
-    void (GLAPIENTRY *DeletePrograms)(GLsizei, const GLuint *);
-    void (GLAPIENTRY *BindProgram)(GLenum, GLuint);
-    void (GLAPIENTRY *ProgramString)(GLenum, GLenum, GLsizei, const GLvoid *);
-    void (GLAPIENTRY *GetProgramivARB)(GLenum, GLenum, GLint *);
-    void (GLAPIENTRY *ProgramEnvParameter4f)(GLenum, GLuint, GLfloat, GLfloat,
-                                             GLfloat, GLfloat);
-    int (GLAPIENTRY *SwapInterval)(int);
-    void (GLAPIENTRY *TexImage3D)(GLenum, GLint, GLenum, GLsizei, GLsizei,
-                                  GLsizei, GLint, GLenum, GLenum,
-                                  const GLvoid *);
-
-    void (GLAPIENTRY *BeginFragmentShader)(void);
-    void (GLAPIENTRY *EndFragmentShader)(void);
-    void (GLAPIENTRY *SampleMap)(GLuint, GLuint, GLenum);
-    void (GLAPIENTRY *ColorFragmentOp2)(GLenum, GLuint, GLuint, GLuint, GLuint,
-                                        GLuint, GLuint, GLuint, GLuint, GLuint);
-    void (GLAPIENTRY *ColorFragmentOp3)(GLenum, GLuint, GLuint, GLuint, GLuint,
-                                        GLuint, GLuint, GLuint, GLuint, GLuint,
-                                        GLuint, GLuint, GLuint);
-    void (GLAPIENTRY *SetFragmentShaderConstant)(GLuint, const GLfloat *);
-
-    void (GLAPIENTRY *GenVertexArrays)(GLsizei, GLuint *);
-    void (GLAPIENTRY *BindVertexArray)(GLuint);
-    GLint (GLAPIENTRY *GetAttribLocation)(GLuint, const GLchar *);
-    void (GLAPIENTRY *EnableVertexAttribArray)(GLuint);
-    void (GLAPIENTRY *DisableVertexAttribArray)(GLuint);
-    void (GLAPIENTRY *VertexAttribPointer)(GLuint, GLint, GLenum, GLboolean,
-                                           GLsizei, const GLvoid *);
-    void (GLAPIENTRY *DeleteVertexArrays)(GLsizei, const GLuint *);
-    void (GLAPIENTRY *UseProgram)(GLuint);
-    GLint (GLAPIENTRY *GetUniformLocation)(GLuint, const GLchar *);
-    void (GLAPIENTRY *CompileShader)(GLuint);
-    GLuint (GLAPIENTRY *CreateProgram)(void);
-    GLuint (GLAPIENTRY *CreateShader)(GLenum);
-    void (GLAPIENTRY *ShaderSource)(GLuint, GLsizei, const GLchar **,
-                                    const GLint *);
-    void (GLAPIENTRY *LinkProgram)(GLuint);
-    void (GLAPIENTRY *AttachShader)(GLuint, GLuint);
-    void (GLAPIENTRY *DeleteShader)(GLuint);
-    void (GLAPIENTRY *DeleteProgram)(GLuint);
-    void (GLAPIENTRY *GetShaderInfoLog)(GLuint, GLsizei, GLsizei *, GLchar *);
-    void (GLAPIENTRY *GetShaderiv)(GLuint, GLenum, GLint *);
-    void (GLAPIENTRY *GetProgramInfoLog)(GLuint, GLsizei, GLsizei *, GLchar *);
-    void (GLAPIENTRY *GetProgramiv)(GLenum, GLenum, GLint *);
-    const GLubyte* (GLAPIENTRY *GetStringi)(GLenum, GLuint);
-    void (GLAPIENTRY *BindAttribLocation)(GLuint, GLuint, const GLchar *);
-    void (GLAPIENTRY *BindFramebuffer)(GLenum, GLuint);
-    void (GLAPIENTRY *GenFramebuffers)(GLsizei, GLuint *);
-    void (GLAPIENTRY *DeleteFramebuffers)(GLsizei, const GLuint *);
-    GLenum (GLAPIENTRY *CheckFramebufferStatus)(GLenum);
-    void (GLAPIENTRY *FramebufferTexture2D)(GLenum, GLenum, GLenum, GLuint,
-                                            GLint);
-
-    void (GLAPIENTRY *Uniform1f)(GLint, GLfloat);
-    void (GLAPIENTRY *Uniform2f)(GLint, GLfloat, GLfloat);
-    void (GLAPIENTRY *Uniform3f)(GLint, GLfloat, GLfloat, GLfloat);
-    void (GLAPIENTRY *Uniform4f)(GLint, GLfloat, GLfloat, GLfloat, GLfloat);
-    void (GLAPIENTRY *Uniform1i)(GLint, GLint);
-    void (GLAPIENTRY *UniformMatrix3fv)(GLint, GLsizei, GLboolean,
-                                        const GLfloat *);
-    void (GLAPIENTRY *UniformMatrix4x3fv)(GLint, GLsizei, GLboolean,
-                                          const GLfloat *);
-};
-
-#endif /* MPLAYER_GL_COMMON_H */