Split mplayer.c

mplayer.c was a bit too big. Split it into multiple files. I hope the
way it's split makes sense. Maybe some things don't make too much sense,
or go against intuition. These will fixed as soon as I notice them.

Some files are a bit questionable (misc.c, osd.c, configfiles.c), and
suggestions how to organize this better are welcome.

Regressions are possible due to reorganized include statements.
Obviously I didn't just copy mplayer.c's orgy of include statements, but
recreated them for each file. It's easily possible that there are
oversights and mistakes, which will show up on other platforms.

There is one actual change: the public avutil.h include is removed from
encode.h, and I tried to replace most FFMIN/FFMAX/av_clip uses. I
consider using libavutil too much as dangerous, because the set of
include files they recursively pull in is rather arbitrary and is
different between FFmpeg and Libav.

1 files changed, 174 insertions, 0 deletions

diff --git a/mpvcore/player/misc.c b/mpvcore/player/misc.c
new file mode 100644
index 0000000000..b1853bcfa0
--- /dev/null
+++ b/mpvcore/player/misc.c
@@ -0,0 +1,174 @@
+/*
+ * 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 <stddef.h>
+#include <stdbool.h>
+#include <assert.h>
+
+#include "config.h"
+#include "talloc.h"
+
+#include "osdep/io.h"
+#include "osdep/timer.h"
+
+#include "mpvcore/mp_msg.h"
+#include "mpvcore/options.h"
+#include "mpvcore/m_property.h"
+#include "mpvcore/mp_common.h"
+#include "mpvcore/resolve.h"
+#include "mpvcore/encode.h"
+#include "mpvcore/input/input.h"
+
+#include "stream/stream.h"
+#include "video/out/vo.h"
+
+#include "mp_core.h"
+#include "command.h"
+
+double get_relative_time(struct MPContext *mpctx)
+{
+    int64_t new_time = mp_time_us();
+    int64_t delta = new_time - mpctx->last_time;
+    mpctx->last_time = new_time;
+    return delta * 0.000001;
+}
+
+double rel_time_to_abs(struct MPContext *mpctx, struct m_rel_time t,
+                       double fallback_time)
+{
+    double length = get_time_length(mpctx);
+    switch (t.type) {
+    case REL_TIME_ABSOLUTE:
+        return t.pos;
+    case REL_TIME_NEGATIVE:
+        if (length != 0)
+            return MPMAX(length - t.pos, 0.0);
+        break;
+    case REL_TIME_PERCENT:
+        if (length != 0)
+            return length * (t.pos / 100.0);
+        break;
+    case REL_TIME_CHAPTER:
+        if (chapter_start_time(mpctx, t.pos) >= 0)
+            return chapter_start_time(mpctx, t.pos);
+        break;
+    }
+    return fallback_time;
+}
+
+double get_play_end_pts(struct MPContext *mpctx)
+{
+    struct MPOpts *opts = mpctx->opts;
+    if (opts->play_end.type) {
+        return rel_time_to_abs(mpctx, opts->play_end, MP_NOPTS_VALUE);
+    } else if (opts->play_length.type) {
+        double startpts = get_start_time(mpctx);
+        double start = rel_time_to_abs(mpctx, opts->play_start, startpts);
+        double length = rel_time_to_abs(mpctx, opts->play_length, -1);
+        if (start != -1 && length != -1)
+            return start + length;
+    }
+    return MP_NOPTS_VALUE;
+}
+
+// Time used to seek external tracks to.
+double get_main_demux_pts(struct MPContext *mpctx)
+{
+    double main_new_pos = MP_NOPTS_VALUE;
+    if (mpctx->demuxer) {
+        for (int n = 0; n < mpctx->demuxer->num_streams; n++) {
+            if (main_new_pos == MP_NOPTS_VALUE)
+                main_new_pos = demux_get_next_pts(mpctx->demuxer->streams[n]);
+        }
+    }
+    return main_new_pos;
+}
+
+double get_start_time(struct MPContext *mpctx)
+{
+    struct demuxer *demuxer = mpctx->demuxer;
+    if (!demuxer)
+        return 0;
+    return demuxer_get_start_time(demuxer);
+}
+
+int mp_get_cache_percent(struct MPContext *mpctx)
+{
+    if (mpctx->stream) {
+        int64_t size = -1;
+        int64_t fill = -1;
+        stream_control(mpctx->stream, STREAM_CTRL_GET_CACHE_SIZE, &size);
+        stream_control(mpctx->stream, STREAM_CTRL_GET_CACHE_FILL, &fill);
+        if (size > 0 && fill >= 0)
+            return fill / (size / 100);
+    }
+    return -1;
+}
+
+bool mp_get_cache_idle(struct MPContext *mpctx)
+{
+    int idle = 0;
+    if (mpctx->stream)
+        stream_control(mpctx->stream, STREAM_CTRL_GET_CACHE_IDLE, &idle);
+    return idle;
+}
+
+void update_vo_window_title(struct MPContext *mpctx)
+{
+    if (!mpctx->video_out)
+        return;
+    char *title = mp_property_expand_string(mpctx, mpctx->opts->wintitle);
+    if (!mpctx->video_out->window_title ||
+        strcmp(title, mpctx->video_out->window_title))
+    {
+        talloc_free(mpctx->video_out->window_title);
+        mpctx->video_out->window_title = talloc_steal(mpctx, title);
+        vo_control(mpctx->video_out, VOCTRL_UPDATE_WINDOW_TITLE, title);
+    } else {
+        talloc_free(title);
+    }
+}
+
+void stream_dump(struct MPContext *mpctx)
+{
+    struct MPOpts *opts = mpctx->opts;
+    char *filename = opts->stream_dump;
+    stream_t *stream = mpctx->stream;
+    assert(stream && filename);
+
+    stream_set_capture_file(stream, filename);
+
+    while (mpctx->stop_play == KEEP_PLAYING && !stream->eof) {
+        if (!opts->quiet && ((stream->pos / (1024 * 1024)) % 2) == 1) {
+            uint64_t pos = stream->pos - stream->start_pos;
+            uint64_t end = stream->end_pos - stream->start_pos;
+            char *line = talloc_asprintf(NULL, "Dumping %lld/%lld...",
+                (long long int)pos, (long long int)end);
+            write_status_line(mpctx, line);
+            talloc_free(line);
+        }
+        stream_fill_buffer(stream);
+        for (;;) {
+            mp_cmd_t *cmd = mp_input_get_cmd(mpctx->input, 0, false);
+            if (!cmd)
+                break;
+            run_command(mpctx, cmd);
+            talloc_free(cmd);
+        }
+    }
+}