core: move most mpcommon.c contents to mplayer.c

The contents of mpcommon.c were quite arbitrary; the most common
reason to place some functions in this file had been "MEncoder happens
to need similar code as MPlayer and we want to share some parts, but
we have no clue whatsoever how to organize things in a sensible way,
so we'll just dump those parts we want to share in mpcommon.c". As a
result of containing an essentially random subset of top-level player
functionality the mpcommon.h header required access to central structs
and was unsuitable for inclusion in lower-level code, but was
nonetheless included there for the mplayer_version symbol.

Move almost all contents from mpcommon.c to mplayer.c. mplayer.c is
already big and should perhaps be split further, but keeping a few
random functions in mpcommon.c would not be an improvement.

1 files changed, 0 insertions, 320 deletions

diff --git a/mpcommon.c b/mpcommon.c
index 2af26314bb..47c056a08e 100644
--- a/mpcommon.c
+++ b/mpcommon.c
@@ -16,326 +16,6 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#if defined(__MINGW32__) || defined(__CYGWIN__)
-#include <windows.h>
-#endif
-#include <stdlib.h>
-#include <stdbool.h>
-
-#include "mpcommon.h"
-#include "options.h"
-#include "stream/stream.h"
-#include "libmpdemux/demuxer.h"
-#include "libmpdemux/stheader.h"
-#include "mplayer.h"
-#include "libvo/sub.h"
-#include "libvo/video_out.h"
-#include "cpudetect.h"
-#include "mp_msg.h"
-#include "spudec.h"
 #include "version.h"
-#include "vobsub.h"
-#include "av_sub.h"
-#include "libmpcodecs/dec_teletext.h"
-#include "ffmpeg_files/intreadwrite.h"
-#include "m_option.h"
-#include "mp_core.h"
-
-#ifdef CONFIG_ASS
-#include "ass_mp.h"
-ASS_Track *ass_track = 0; // current track to render
-#endif
 
-const char *mencoder_version = "MEncoder " VERSION;
 const char *mplayer_version  = "MPlayer " VERSION;
-
-void print_version(const char* name)
-{
-    mp_msg(MSGT_CPLAYER, MSGL_INFO, MP_TITLE, name);
-
-    /* Test for CPU capabilities (and corresponding OS support) for optimizing */
-    GetCpuCaps(&gCpuCaps);
-#if ARCH_X86
-    mp_msg(MSGT_CPLAYER, MSGL_V,
-	   "CPUflags:  MMX: %d MMX2: %d 3DNow: %d 3DNowExt: %d SSE: %d SSE2: %d SSSE3: %d\n",
-	   gCpuCaps.hasMMX, gCpuCaps.hasMMX2,
-	   gCpuCaps.has3DNow, gCpuCaps.has3DNowExt,
-	   gCpuCaps.hasSSE, gCpuCaps.hasSSE2, gCpuCaps.hasSSSE3);
-#if CONFIG_RUNTIME_CPUDETECT
-    mp_tmsg(MSGT_CPLAYER,MSGL_V, "Compiled with runtime CPU detection.\n");
-#else
-    mp_tmsg(MSGT_CPLAYER,MSGL_V, "Compiled for x86 CPU with extensions:");
-if (HAVE_MMX)
-    mp_msg(MSGT_CPLAYER,MSGL_V," MMX");
-if (HAVE_MMX2)
-    mp_msg(MSGT_CPLAYER,MSGL_V," MMX2");
-if (HAVE_AMD3DNOW)
-    mp_msg(MSGT_CPLAYER,MSGL_V," 3DNow");
-if (HAVE_AMD3DNOWEXT)
-    mp_msg(MSGT_CPLAYER,MSGL_V," 3DNowExt");
-if (HAVE_SSE)
-    mp_msg(MSGT_CPLAYER,MSGL_V," SSE");
-if (HAVE_SSE2)
-    mp_msg(MSGT_CPLAYER,MSGL_V," SSE2");
-if (HAVE_SSSE3)
-    mp_msg(MSGT_CPLAYER,MSGL_V," SSSE3");
-if (HAVE_CMOV)
-    mp_msg(MSGT_CPLAYER,MSGL_V," CMOV");
-    mp_msg(MSGT_CPLAYER,MSGL_V,"\n");
-#endif /* CONFIG_RUNTIME_CPUDETECT */
-#endif /* ARCH_X86 */
-}
-
-static bool is_text_sub(int type)
-{
-    return type == 't' || type == 'm' || type == 'a';
-}
-
-static bool is_av_sub(int type)
-{
-    return type == 'b' || type == 'p' || type == 'x';
-}
-
-void update_subtitles(struct MPContext *mpctx, struct MPOpts *opts,
-                      sh_video_t *sh_video, double refpts, double sub_offset,
-                      demux_stream_t *d_dvdsub, int reset)
-{
-    double curpts = refpts + sub_delay;
-    unsigned char *packet=NULL;
-    int len;
-    int type = d_dvdsub->sh ? ((sh_sub_t *)d_dvdsub->sh)->type : 'v';
-    static subtitle subs;
-    if (reset) {
-        sub_clear_text(&subs, MP_NOPTS_VALUE);
-        if (vo_sub) {
-            set_osd_subtitle(mpctx, NULL);
-        }
-        if (vo_spudec) {
-            spudec_reset(vo_spudec);
-            vo_osd_changed(OSDTYPE_SPU);
-        }
-#ifdef CONFIG_FFMPEG
-        if (is_av_sub(type))
-            reset_avsub(d_dvdsub->sh);
-#endif
-        return;
-    }
-    // find sub
-    if (mpctx->subdata) {
-        if (sub_fps==0) sub_fps = sh_video ? sh_video->fps : 25;
-        current_module = "find_sub";
-        find_sub(mpctx, mpctx->subdata, curpts *
-                 (mpctx->subdata->sub_uses_time ? 100. : sub_fps));
-        if (vo_sub)
-            mpctx->vo_sub_last = vo_sub;
-    }
-
-    // DVD sub:
-    if (vobsub_id >= 0 || type == 'v') {
-        int timestamp;
-        current_module = "spudec";
-        /* Get a sub packet from the DVD or a vobsub */
-        while(1) {
-            // Vobsub
-            len = 0;
-            if (vo_vobsub) {
-                if (curpts >= 0) {
-                    len = vobsub_get_packet(vo_vobsub, curpts,
-                                            (void**)&packet, &timestamp);
-                    if (len > 0) {
-                        mp_dbg(MSGT_CPLAYER,MSGL_V,"\rVOB sub: len=%d v_pts=%5.3f v_timer=%5.3f sub=%5.3f ts=%d \n",len,refpts,sh_video->timer,timestamp / 90000.0,timestamp);
-                    }
-                }
-            } else {
-                // DVD sub
-                len = ds_get_packet_sub(d_dvdsub, (unsigned char**)&packet);
-                if (len > 0) {
-                    // XXX This is wrong, sh_video->pts can be arbitrarily
-                    // much behind demuxing position. Unfortunately using
-                    // d_video->pts which would have been the simplest
-                    // improvement doesn't work because mpeg specific hacks
-                    // in video.c set d_video->pts to 0.
-                    float x = d_dvdsub->pts - refpts;
-                    if (x > -20 && x < 20) // prevent missing subs on pts reset
-                        timestamp = 90000*d_dvdsub->pts;
-                    else timestamp = 90000*curpts;
-                    mp_dbg(MSGT_CPLAYER, MSGL_V, "\rDVD sub: len=%d  "
-                           "v_pts=%5.3f  s_pts=%5.3f  ts=%d \n", len,
-                           refpts, d_dvdsub->pts, timestamp);
-                }
-            }
-            if (len<=0 || !packet) break;
-            // create it only here, since with some broken demuxers we might
-            // type = v but no DVD sub and we currently do not change the
-            // "original frame size" ever after init, leading to wrong-sized
-            // PGS subtitles.
-            if (!vo_spudec)
-                vo_spudec = spudec_new(NULL);
-            if (vo_vobsub || timestamp >= 0)
-                spudec_assemble(vo_spudec, packet, len, timestamp);
-        }
-    } else if (is_text_sub(type) || is_av_sub(type) || type == 'd') {
-        if (type == 'd' && !d_dvdsub->demuxer->teletext) {
-            tt_stream_props tsp = {0};
-            void *ptr = &tsp;
-            if (teletext_control(NULL, TV_VBI_CONTROL_START, &ptr) == VBI_CONTROL_TRUE)
-                d_dvdsub->demuxer->teletext = ptr;
-        }
-        if (d_dvdsub->non_interleaved)
-            ds_get_next_pts(d_dvdsub);
-
-        int orig_type = type;
-        while (d_dvdsub->first) {
-            double subpts = ds_get_next_pts(d_dvdsub) + sub_offset;
-            type = orig_type;
-            if (subpts > curpts) {
-                // Libass handled subs can be fed to it in advance
-                if (!opts->ass_enabled || !is_text_sub(type))
-                    break;
-                // Try to avoid demuxing whole file at once
-                if (d_dvdsub->non_interleaved && subpts > curpts + 1)
-                    break;
-            }
-            double endpts = d_dvdsub->first->endpts + sub_offset;
-            len = ds_get_packet_sub(d_dvdsub, &packet);
-            if (is_av_sub(type)) {
-#ifdef CONFIG_FFMPEG
-                type = decode_avsub(d_dvdsub->sh, &packet, &len, &subpts, &endpts);
-                if (type <= 0)
-#endif
-                    continue;
-            }
-            if (type == 'm') {
-                if (len < 2) continue;
-                len = FFMIN(len - 2, AV_RB16(packet));
-                packet += 2;
-            }
-            if (type == 'd') {
-                if (d_dvdsub->demuxer->teletext) {
-                    uint8_t *p = packet;
-                    p++;
-                    len--;
-                    while (len >= 46) {
-                        int sublen = p[1];
-                        if (p[0] == 2 || p[0] == 3)
-                            teletext_control(d_dvdsub->demuxer->teletext,
-                                TV_VBI_CONTROL_DECODE_DVB, p + 2);
-                        p   += sublen + 2;
-                        len -= sublen + 2;
-                    }
-                }
-                continue;
-            }
-#ifdef CONFIG_ASS
-            if (opts->ass_enabled) {
-                sh_sub_t* sh = d_dvdsub->sh;
-                ass_track = sh ? sh->ass_track : NULL;
-                if (!ass_track) continue;
-                if (type == 'a') { // ssa/ass subs with libass
-                    ass_process_chunk(ass_track, packet, len,
-                                      (long long)(subpts*1000 + 0.5),
-                                      (long long)((endpts-subpts)*1000 + 0.5));
-                } else { // plaintext subs with libass
-                    if (subpts != MP_NOPTS_VALUE) {
-                        subtitle tmp_subs = {0};
-                        if (endpts == MP_NOPTS_VALUE) endpts = subpts + 3;
-                        sub_add_text(&tmp_subs, packet, len, endpts);
-                        tmp_subs.start = subpts * 100;
-                        tmp_subs.end = endpts * 100;
-                        ass_process_subtitle(ass_track, &tmp_subs);
-                        sub_clear_text(&tmp_subs, MP_NOPTS_VALUE);
-                    }
-                }
-                continue;
-            }
-#endif
-            if (subpts != MP_NOPTS_VALUE) {
-                if (endpts == MP_NOPTS_VALUE)
-                    sub_clear_text(&subs, MP_NOPTS_VALUE);
-                if (type == 'a') { // ssa/ass subs without libass => convert to plaintext
-                    int i;
-                    unsigned char* p = packet;
-                    for (i=0; i < 8 && *p != '\0'; p++)
-                        if (*p == ',')
-                            i++;
-                    if (*p == '\0')  /* Broken line? */
-                        continue;
-                    len -= p - packet;
-                    packet = p;
-                }
-                sub_add_text(&subs, packet, len, endpts);
-                set_osd_subtitle(mpctx, &subs);
-            }
-            if (d_dvdsub->non_interleaved)
-                ds_get_next_pts(d_dvdsub);
-        }
-        if (!opts->ass_enabled)
-            if (sub_clear_text(&subs, curpts))
-                set_osd_subtitle(mpctx, &subs);
-    }
-    if (vo_spudec) {
-        spudec_heartbeat(vo_spudec, 90000*curpts);
-        if (spudec_changed(vo_spudec))
-            vo_osd_changed(OSDTYPE_SPU);
-    }
-
-    current_module=NULL;
-}
-
-void update_teletext(sh_video_t *sh_video, demuxer_t *demuxer, int reset)
-{
-    int page_changed;
-
-    if (!demuxer->teletext)
-        return;
-
-    //Also forcing page update when such ioctl is not supported or call error occured
-    if(teletext_control(demuxer->teletext,TV_VBI_CONTROL_IS_CHANGED,&page_changed)!=VBI_CONTROL_TRUE)
-        page_changed=1;
-
-    if(!page_changed)
-        return;
-
-    if(teletext_control(demuxer->teletext,TV_VBI_CONTROL_GET_VBIPAGE,&vo_osd_teletext_page)!=VBI_CONTROL_TRUE)
-        vo_osd_teletext_page=NULL;
-    if(teletext_control(demuxer->teletext,TV_VBI_CONTROL_GET_HALF_PAGE,&vo_osd_teletext_half)!=VBI_CONTROL_TRUE)
-        vo_osd_teletext_half=0;
-    if(teletext_control(demuxer->teletext,TV_VBI_CONTROL_GET_MODE,&vo_osd_teletext_mode)!=VBI_CONTROL_TRUE)
-        vo_osd_teletext_mode=0;
-    if(teletext_control(demuxer->teletext,TV_VBI_CONTROL_GET_FORMAT,&vo_osd_teletext_format)!=VBI_CONTROL_TRUE)
-        vo_osd_teletext_format=0;
-    vo_osd_changed(OSDTYPE_TELETEXT);
-
-    teletext_control(demuxer->teletext,TV_VBI_CONTROL_MARK_UNCHANGED,NULL);
-}
-
-int select_audio(demuxer_t* demuxer, int audio_id, char* audio_lang)
-{
-    if (audio_id == -1)
-        audio_id = demuxer_audio_track_by_lang_and_default(demuxer, audio_lang);
-    if (audio_id != -1) // -1 (automatic) is the default behaviour of demuxers
-        demuxer_switch_audio(demuxer, audio_id);
-    if (audio_id == -2) { // some demuxers don't yet know how to switch to no sound
-        demuxer->audio->id = -2;
-        demuxer->audio->sh = NULL;
-    }
-    return demuxer->audio->id;
-}
-
-bool attachment_is_font(struct demux_attachment *att)
-{
-    if (!att->name || !att->type || !att->data || !att->data_size)
-        return false;
-    // match against MIME types
-    if (strcmp(att->type, "application/x-truetype-font") == 0
-        || strcmp(att->type, "application/x-font") == 0)
-        return true;
-    // fallback: match against file extension
-    if (strlen(att->name) > 4) {
-        char *ext = att->name + strlen(att->name) - 4;
-        if (strcasecmp(ext, ".ttf") == 0 || strcasecmp(ext, ".ttc") == 0
-            || strcasecmp(ext, ".otf") == 0)
-            return true;
-    }
-    return false;
-}