Changeset 188 for smplayer/trunk/src/mpvprocess.cpp

Timestamp:

Jan 24, 2017, 12:41:54 PM (8 years ago)

Author:

Silvan Scherrer

Message:

SMPlayer: update trunk to version 17.1.0

Location:

smplayer/trunk

Files:

• . (modified) (1 prop)
• src/mpvprocess.cpp (modified) (9 diffs)

smplayer/trunk/src/mpvprocess.cpp

@@ -1 +1 @@
 /*  smplayer, GUI front-end for mplayer.
-    Copyright (C) 2006-2016 Ricardo Villalba <rvm@users.sourceforge.net>
+    Copyright (C) 2006-2017 Ricardo Villalba <rvm@users.sourceforge.net>
 
     This program is free software; you can redistribute it and/or modify
@@ -57 +57 @@
         , dvd_current_title(-1)
         , br_current_title(-1)
+#ifdef OSD_WITH_TIMER
+        , osd_timer(0)
+#endif
 {
         player_id = PlayerID::MPV;
@@ -113 +116 @@
 
 #ifdef CUSTOM_STATUS
-static QRegExp rx_mpv_av("^STATUS: ([0-9\\.-]+) / ([0-9\\.-]+) P: (yes|no) B: (yes|no) I: (yes|no)");
+static QRegExp rx_mpv_av("^STATUS: ([0-9\\.-]+) / ([0-9\\.-]+) P: (yes|no) B: (yes|no) I: (yes|no) VB: ([0-9\\.-]+) AB: ([0-9\\.-]+)");
 #else
 static QRegExp rx_mpv_av("^(\\((.*)\\) |)(AV|V|A): ([0-9]+):([0-9]+):([0-9]+) / ([0-9]+):([0-9]+):([0-9]+)"); //AV: 00:02:15 / 00:09:56
@@ -163 +166 @@
 
 void MPVProcess::parseLine(QByteArray ba) {
-        //qDebug("MPVProcess::parseLine: '%s'", ba.data() );
+        //qDebug() << "MPVProcess::parseLine:" << ba;
 
         if (ba.isEmpty()) return;
@@ -201 +204 @@
                 bool buffering = (rx_mpv_av.cap(4) == "yes");
                 bool idle = (rx_mpv_av.cap(5) == "yes");
+                int video_bitrate = rx_mpv_av.cap(6).toInt();
+                int audio_bitrate = rx_mpv_av.cap(7).toInt();
 
                 if (length != md.duration) {
@@ -237 +242 @@
                 }
                 notified_pause = false;
+
+                if (video_bitrate != md.video_bitrate) {
+                        md.video_bitrate = video_bitrate;
+                        emit receivedVideoBitrate(video_bitrate);
+                }
+                if (audio_bitrate != md.audio_bitrate) {
+                        md.audio_bitrate = audio_bitrate;
+                        emit receivedAudioBitrate(audio_bitrate);
+                }
 
                 #else
@@ -359 +373 @@
 
                         // Wait some secs to ask for bitrate
+                        /*
                         QTimer::singleShot(12000, this, SLOT(requestBitrateInfo()));
+                        */
                 }
 
@@ -720 +736 @@
                         }
                         else
+                        if (tag == "INFO_STREAM_PATH") {
+                                QRegExp rx("edl://%\\d+%(.*)");
+                                if (rx.indexIn(line) > -1) {
+                                        md.stream_path = rx.cap(1);
+                                } else {
+                                        md.stream_path = value;
+                                }
+                        }
+                        else
                         if (tag == "MPV_VERSION") {
                                 mpv_version = value;
-                                //qDebug("MPVProcess::parseLine: mpv version: %s", mpv_version.toUtf8().constData());
+                                if (mpv_version.startsWith("mpv ")) mpv_version = mpv_version.mid(4);
+                                qDebug() << "MPVProcess::parseLine: mpv version:" << mpv_version;
+                                MplayerVersion::mplayerVersion("mpv " + mpv_version + " (C)");
                         }
 #if NOTIFY_VIDEO_CHANGES || NOTIFY_AUDIO_CHANGES || NOTIFY_SUB_CHANGES
@@ -746 +773 @@
 }
 
+/*
 void MPVProcess::requestBitrateInfo() {
         writeToStdin("print_text INFO_VIDEO_BITRATE=${=video-bitrate}");
         writeToStdin("print_text INFO_AUDIO_BITRATE=${=audio-bitrate}");
 }
+*/
 
 #if NOTIFY_AUDIO_CHANGES