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

diff --git a/libmpdemux/demuxer.h b/libmpdemux/demuxer.h
deleted file mode 100644
index f44c728c1e..0000000000
--- a/libmpdemux/demuxer.h
+++ /dev/null
@@ -1,414 +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.
- */
-
-#ifndef MPLAYER_DEMUXER_H
-#define MPLAYER_DEMUXER_H
-
-#include <sys/types.h>
-#include <stdint.h>
-#include <stdlib.h>
-#include <string.h>
-#include <stdbool.h>
-
-#include "bstr.h"
-#include "mpcommon.h"
-#include "demux_packet.h"
-#include "stheader.h"
-
-struct MPOpts;
-
-#ifdef HAVE_BUILTIN_EXPECT
-#define likely(x) __builtin_expect((x) != 0, 1)
-#define unlikely(x) __builtin_expect((x) != 0, 0)
-#else
-#define likely(x) (x)
-#define unlikely(x) (x)
-#endif
-
-#define MAX_PACKS 4096
-#define MAX_PACK_BYTES 0x8000000  // 128 MiB
-
-enum demuxer_type {
-    DEMUXER_TYPE_UNKNOWN = 0,
-    DEMUXER_TYPE_MPEG_PS,
-    DEMUXER_TYPE_AVI,
-    DEMUXER_TYPE_AVI_NI,
-    DEMUXER_TYPE_AVI_NINI,
-    DEMUXER_TYPE_ASF,
-    DEMUXER_TYPE_TV,
-    DEMUXER_TYPE_Y4M,
-    DEMUXER_TYPE_MF,
-    DEMUXER_TYPE_RAWAUDIO,
-    DEMUXER_TYPE_RAWVIDEO,
-    DEMUXER_TYPE_MPEG_ES,
-    DEMUXER_TYPE_MPEG4_ES,
-    DEMUXER_TYPE_H264_ES,
-    DEMUXER_TYPE_MPEG_PES,
-    DEMUXER_TYPE_MPEG_GXF,
-    DEMUXER_TYPE_GIF,
-    DEMUXER_TYPE_MPEG_TS,
-    DEMUXER_TYPE_MATROSKA,
-    DEMUXER_TYPE_LAVF,
-    DEMUXER_TYPE_NSV,
-    DEMUXER_TYPE_AVS,
-    DEMUXER_TYPE_AAC,
-    DEMUXER_TYPE_MPC,
-    DEMUXER_TYPE_LAVF_PREFERRED,
-    DEMUXER_TYPE_MNG,
-    DEMUXER_TYPE_EDL,
-    DEMUXER_TYPE_CUE,
-
-    /* Values after this are for internal use and can not be selected
-     * as demuxer type by the user (-demuxer option). */
-    DEMUXER_TYPE_END,
-
-    DEMUXER_TYPE_PLAYLIST,
-};
-
-enum timestamp_type {
-    TIMESTAMP_TYPE_PTS,
-    TIMESTAMP_TYPE_SORT,
-};
-
-
-// DEMUXER control commands/answers
-#define DEMUXER_CTRL_NOTIMPL -1
-#define DEMUXER_CTRL_DONTKNOW 0
-#define DEMUXER_CTRL_OK 1
-#define DEMUXER_CTRL_GUESS 2
-#define DEMUXER_CTRL_GET_TIME_LENGTH 10
-#define DEMUXER_CTRL_GET_PERCENT_POS 11
-#define DEMUXER_CTRL_SWITCH_AUDIO 12
-#define DEMUXER_CTRL_RESYNC 13
-#define DEMUXER_CTRL_SWITCH_VIDEO 14
-#define DEMUXER_CTRL_IDENTIFY_PROGRAM 15
-#define DEMUXER_CTRL_CORRECT_PTS 16
-#define DEMUXER_CTRL_AUTOSELECT_SUBTITLE 17
-
-#define SEEK_ABSOLUTE (1 << 0)
-#define SEEK_FACTOR   (1 << 1)
-#define SEEK_FORWARD  (1 << 2)
-#define SEEK_BACKWARD (1 << 3)
-
-// demux_lavf can pass lavf buffers using FF_INPUT_BUFFER_PADDING_SIZE instead
-#define MP_INPUT_BUFFER_PADDING_SIZE 16
-
-typedef struct demux_stream {
-    enum stream_type stream_type;
-    int buffer_pos;        // current buffer position
-    int buffer_size;       // current buffer size
-    unsigned char *buffer; // current buffer, never free() it, always use free_demux_packet(buffer_ref);
-    double pts;            // current buffer's pts
-    int pts_bytes;         // number of bytes read after last pts stamp
-    int eof;               // end of demuxed stream? (true if all buffer empty)
-    off_t pos;               // position in the input stream (file)
-    off_t dpos;              // position in the demuxed stream
-    int pack_no;           // serial number of packet
-    bool keyframe;         // keyframe flag of current packet
-//---------------
-    int packs;            // number of packets in buffer
-    int bytes;            // total bytes of packets in buffer
-    demux_packet_t *first; // read to current buffer from here
-    demux_packet_t *last; // append new packets from input stream to here
-    demux_packet_t *current; // needed for refcounting of the buffer
-    int id;               // stream ID  (for multiple audio/video streams)
-    struct demuxer *demuxer; // parent demuxer structure (stream handler)
-// ---- asf -----
-    struct demux_packet *asf_packet; // read asf fragments here
-    int asf_seq;
-// ---- mov -----
-    unsigned int ss_mul, ss_div;
-// ---- stream header ----
-    void *sh;              // points to sh_audio or sh_video
-} demux_stream_t;
-
-typedef struct demuxer_info {
-    char *name;
-    char *author;
-    char *encoder;
-    char *comments;
-    char *copyright;
-} demuxer_info_t;
-
-#define MAX_SH_STREAMS 256
-#define MAX_A_STREAMS MAX_SH_STREAMS
-#define MAX_V_STREAMS MAX_SH_STREAMS
-#define MAX_S_STREAMS MAX_SH_STREAMS
-
-struct demuxer;
-
-/**
- * Demuxer description structure
- */
-typedef struct demuxer_desc {
-    const char *info;      // What is it (long name and/or description)
-    const char *name;      // Demuxer name, used with -demuxer switch
-    const char *shortdesc; // Description printed at demuxer detection
-    const char *author;    // Demuxer author(s)
-    const char *comment;   // Comment, printed with -demuxer help
-
-    enum demuxer_type type;
-    // If 1 detection is safe and fast, do it before file extension check
-    int safe_check;
-
-    // Check if can demux the file, return DEMUXER_TYPE_xxx on success
-    // Mandatory if safe_check == 1, else optional
-    int (*check_file)(struct demuxer *demuxer);
-    /// Get packets from file, return 0 on eof. Mandatory
-    int (*fill_buffer)(struct demuxer *demuxer, struct demux_stream *ds);
-    /// Open the demuxer, return demuxer on success, NULL on failure
-    struct demuxer *(*open)(struct demuxer *demuxer); // Optional
-    /// Close the demuxer
-    void (*close)(struct demuxer *demuxer); // Optional
-    // Seek. Optional
-    void (*seek)(struct demuxer *demuxer, float rel_seek_secs,
-                 float audio_delay, int flags);
-    // Various control functions. Optional
-    int (*control)(struct demuxer *demuxer, int cmd, void *arg);
-} demuxer_desc_t;
-
-typedef struct demux_chapter
-{
-    uint64_t start, end;
-    char *name;
-} demux_chapter_t;
-
-struct matroska_data {
-    unsigned char segment_uid[16];
-    // Ordered chapter information if any
-    struct matroska_chapter {
-        uint64_t start;
-        uint64_t end;
-        bool has_segment_uid;
-        unsigned char segment_uid[16];
-        char *name;
-    } *ordered_chapters;
-    int num_ordered_chapters;
-};
-
-typedef struct demux_attachment
-{
-    char *name;
-    char *type;
-    void *data;
-    unsigned int data_size;
-} demux_attachment_t;
-
-struct demuxer_params {
-    unsigned char (*matroska_wanted_uids)[16];
-};
-
-typedef struct demuxer {
-    const demuxer_desc_t *desc; ///< Demuxer description structure
-    const char *filetype; // format name when not identified by demuxer (libavformat)
-    off_t filepos;  // input stream current pos.
-    off_t movi_start;
-    off_t movi_end;
-    struct stream *stream;
-    double stream_pts;     // current stream pts, if applicable (e.g. dvd)
-    double reference_clock;
-    char *filename;  // Needed by avs_check_file
-    int synced;      // stream synced (used by mpeg)
-    enum demuxer_type type;
-    /* Normally the file_format field is just a copy of the type field above.
-     * There are 2 exceptions I noticed. Internal demux_avi may force
-     * ->type to DEMUXER_TYPE_AVI_[NI|NINI] while leaving ->file_format at
-     * DEMUXER_TYPE_AVI. Internal demux_mov may set ->type to
-     * DEMUXER_TYPE_PLAYLIST and also return that from the check function
-     * or not (looks potentially buggy). */
-    enum demuxer_type file_format;
-    int seekable; // flag
-    /* Set if using absolute seeks for small movements is OK (no pts resets
-     * that would make pts ambigious, preferably supports back/forward flags */
-    bool accurate_seek;
-    enum timestamp_type timestamp_type;
-
-    struct demux_stream *ds[STREAM_TYPE_COUNT]; // video/audio/sub buffers
-
-    // These correspond to ds[], e.g.: audio == ds[STREAM_AUDIO]
-    struct demux_stream *audio; // audio buffer/demuxer
-    struct demux_stream *video; // video buffer/demuxer
-    struct demux_stream *sub;   // dvd subtitle buffer/demuxer
-
-    // stream headers:
-    struct sh_audio *a_streams[MAX_SH_STREAMS];
-    struct sh_video *v_streams[MAX_SH_STREAMS];
-    struct sh_sub   *s_streams[MAX_SH_STREAMS];
-
-    struct sh_stream **streams;
-    int num_streams;
-
-    int num_editions;
-    int edition;
-
-    struct demux_chapter *chapters;
-    int num_chapters;
-
-    struct demux_attachment *attachments;
-    int num_attachments;
-
-    struct matroska_data matroska_data;
-    // for trivial demuxers which just read the whole file for codec to use
-    struct bstr file_contents;
-
-    void *priv;   // demuxer-specific internal data
-    char **info;  // metadata
-    struct MPOpts *opts;
-    struct demuxer_params *params;
-} demuxer_t;
-
-typedef struct {
-    int progid;      //program id
-    int aid, vid, sid; //audio, video and subtitle id
-} demux_program_t;
-
-struct demux_packet *new_demux_packet(size_t len);
-// data must already have suitable padding
-struct demux_packet *new_demux_packet_fromdata(void *data, size_t len);
-void resize_demux_packet(struct demux_packet *dp, size_t len);
-struct demux_packet *clone_demux_packet(struct demux_packet *pack);
-void free_demux_packet(struct demux_packet *dp);
-
-#ifndef SIZE_MAX
-#define SIZE_MAX ((size_t)-1)
-#endif
-
-static inline void *realloc_struct(void *ptr, size_t nmemb, size_t size)
-{
-    if (nmemb > SIZE_MAX / size) {
-        free(ptr);
-        return NULL;
-    }
-    return realloc(ptr, nmemb * size);
-}
-
-struct demuxer *new_demuxer(struct MPOpts *opts, struct stream *stream,
-                            int type, int a_id, int v_id, int s_id,
-                            char *filename);
-void free_demuxer(struct demuxer *demuxer);
-
-struct sh_stream *ds_gsh(struct demux_stream *ds);
-
-void ds_add_packet(struct demux_stream *ds, struct demux_packet *dp);
-void ds_read_packet(struct demux_stream *ds, struct stream *stream, int len,
-                    double pts, off_t pos, bool keyframe);
-
-int demux_fill_buffer(struct demuxer *demux, struct demux_stream *ds);
-int ds_fill_buffer(struct demux_stream *ds);
-
-static inline off_t ds_tell(struct demux_stream *ds)
-{
-    return (ds->dpos - ds->buffer_size) + ds->buffer_pos;
-}
-
-static inline int ds_tell_pts(struct demux_stream *ds)
-{
-    return (ds->pts_bytes - ds->buffer_size) + ds->buffer_pos;
-}
-
-int demux_read_data(struct demux_stream *ds, unsigned char *mem, int len);
-int demux_pattern_3(struct demux_stream *ds, unsigned char *mem, int maxlen,
-                    int *read, uint32_t pattern);
-
-#define demux_peekc(ds) ( \
-        (likely(ds->buffer_pos<ds->buffer_size)) ? ds->buffer[ds->buffer_pos] \
-        : ((unlikely(!ds_fill_buffer(ds))) ? (-1) : ds->buffer[ds->buffer_pos]))
-#define demux_getc(ds) ( \
-        (likely(ds->buffer_pos<ds->buffer_size)) ? ds->buffer[ds->buffer_pos++] \
-        : ((unlikely(!ds_fill_buffer(ds))) ? (-1) : ds->buffer[ds->buffer_pos++]))
-
-void ds_free_packs(struct demux_stream *ds);
-int ds_get_packet(struct demux_stream *ds, unsigned char **start);
-int ds_get_packet_pts(struct demux_stream *ds, unsigned char **start,
-                      double *pts);
-int ds_get_packet_sub(struct demux_stream *ds, unsigned char **start);
-struct demux_packet *ds_get_packet2(struct demux_stream *ds, bool repeat_last);
-double ds_get_next_pts(struct demux_stream *ds);
-int ds_parse(struct demux_stream *sh, uint8_t **buffer, int *len, double pts,
-             off_t pos);
-void ds_clear_parser(struct demux_stream *sh);
-
-static inline int avi_stream_id(unsigned int id)
-{
-    unsigned char a, b;
-    a = id - '0';
-    b = (id >> 8) - '0';
-    if (a>9 || b>9)
-        return 100;          // invalid ID
-    return a * 10 + b;
-}
-
-struct demuxer *demux_open(struct MPOpts *opts, struct stream *stream,
-                           int file_format, int aid, int vid, int sid,
-                           char *filename);
-
-struct demuxer *demux_open_withparams(struct MPOpts *opts,
-                                      struct stream *stream, int file_format,
-                                      char *force_format, int audio_id,
-                                      int video_id, int sub_id, char *filename,
-                                      struct demuxer_params *params);
-
-void demux_flush(struct demuxer *demuxer);
-int demux_seek(struct demuxer *demuxer, float rel_seek_secs, float audio_delay,
-               int flags);
-
-// AVI demuxer params:
-extern int index_mode;  // -1=untouched  0=don't use index  1=use (generate) index
-extern int force_ni;
-extern int pts_from_bps;
-
-int demux_info_add(struct demuxer *demuxer, const char *opt, const char *param);
-int demux_info_add_bstr(struct demuxer *demuxer, struct bstr opt,
-                        struct bstr param);
-char *demux_info_get(struct demuxer *demuxer, const char *opt);
-int demux_info_print(struct demuxer *demuxer);
-int demux_control(struct demuxer *demuxer, int cmd, void *arg);
-
-void demuxer_switch_track(struct demuxer *demuxer, enum stream_type type,
-                          struct sh_stream *stream);
-
-int demuxer_type_by_filename(char *filename);
-
-void demuxer_help(void);
-
-int demuxer_add_attachment(struct demuxer *demuxer, struct bstr name,
-                           struct bstr type, struct bstr data);
-int demuxer_add_chapter(struct demuxer *demuxer, struct bstr name,
-                        uint64_t start, uint64_t end);
-int demuxer_seek_chapter(struct demuxer *demuxer, int chapter,
-                         double *seek_pts);
-
-/// Get current chapter index if available.
-int demuxer_get_current_chapter(struct demuxer *demuxer, double time_now);
-/// Get chapter name by index if available.
-char *demuxer_chapter_name(struct demuxer *demuxer, int chapter);
-/// Get chapter start time and end time by index if available.
-float demuxer_chapter_time(struct demuxer *demuxer, int chapter, float *end);
-/// Get total chapter number.
-int demuxer_chapter_count(struct demuxer *demuxer);
-/// Get current angle index.
-int demuxer_get_current_angle(struct demuxer *demuxer);
-/// Set angle.
-int demuxer_set_angle(struct demuxer *demuxer, int angle);
-/// Get number of angles.
-int demuxer_angles_count(struct demuxer *demuxer);
-
-struct sh_stream *demuxer_stream_by_demuxer_id(struct demuxer *d,
-                                               enum stream_type t, int id);
-
-#endif /* MPLAYER_DEMUXER_H */