Changeset 176 for smplayer/trunk/src/videopreview

Timestamp:

May 3, 2016, 5:25:45 PM (9 years ago)

Author:

Silvan Scherrer

Message:

smplayer: update trunk to version 16.4

Location:

smplayer/trunk

Files:

• . (modified) (1 prop)
• src/videopreview/main.cpp (modified) (2 diffs)
• src/videopreview/videopreview.cpp (modified) (9 diffs)
• src/videopreview/videopreview.h (modified) (3 diffs)
• src/videopreview/videopreview.pro (modified) (2 diffs)
• src/videopreview/videopreviewconfigdialog.cpp (modified) (1 diff)
• src/videopreview/videopreviewconfigdialog.h (modified) (2 diffs)

smplayer/trunk/src/videopreview/main.cpp

@@ -1 +1 @@
 /*  smplayer, GUI front-end for mplayer.
-    Copyright (C) 2006-2014 Ricardo Villalba <rvm@users.sourceforge.net>
+    Copyright (C) 2006-2016 Ricardo Villalba <rvm@users.sourceforge.net>
 
     This program is free software; you can redistribute it and/or modify
@@ -35 +35 @@
         QSettings set(QSettings::IniFormat, QSettings::UserScope, "RVM", "videopreview");
 
-        VideoPreview vp("mplayer");
+        //VideoPreview vp("mplayer");
+        VideoPreview vp("mpv");
         vp.setSettings(&set);
 

smplayer/trunk/src/videopreview/videopreview.cpp

@@ -1 +1 @@
 /*  smplayer, GUI front-end for mplayer.
-    Copyright (C) 2006-2014 Ricardo Villalba <rvm@users.sourceforge.net>
+    Copyright (C) 2006-2016 Ricardo Villalba <rvm@users.sourceforge.net>
 
     This program is free software; you can redistribute it and/or modify
@@ -19 +19 @@
 #include "videopreview.h"
 #include "videopreviewconfigdialog.h"
+#include "playerid.h"
 #include <QProcess>
 #include <QRegExp>
@@ -43 +44 @@
 #define RENAME_PICTURES 0
 
+#define N_OUTPUT_FRAMES 1
+
+// MPlayer2 doesn't support png outdir
+/* #define VP_USE_PNG_OUTDIR */
+
 VideoPreview::VideoPreview(QString mplayer_path, QWidget * parent) : QWidget(parent, Qt::Window)
 {
@@ -63 +69 @@
         full_output_dir = QDir::tempPath() +"/"+ output_dir;
 
-        progress = new QProgressDialog(this);
+        progress = new QProgressDialog(parent != 0 ? parent : this);
         progress->setMinimumDuration(0);
         connect( progress, SIGNAL(canceled()), this, SLOT(cancelPressed()) );
@@ -167 +173 @@
 
 QString VideoPreview::framePicture() {
-        if (prop.extract_format == PNG)
-                return "00000005.png";
-        else
-                return "00000005.jpg";
+        return QString("0000000%1.%2").arg(N_OUTPUT_FRAMES == 1 ? 1 : N_OUTPUT_FRAMES-1).arg(prop.extract_format == PNG ? "png" : "jpg");
 }
 
@@ -242 +245 @@
                 if (canceled) return false;
 
-                if (!runMplayer(current_time, aspect_ratio)) return false;
+                if (!runPlayer(current_time, aspect_ratio)) return false;
 
                 QString frame_picture = full_output_dir + "/" + framePicture();
@@ -268 +271 @@
 }
 
-bool VideoPreview::runMplayer(int seek, double aspect_ratio) {
+bool VideoPreview::runPlayer(int seek, double aspect_ratio) {
         QStringList args;
-        args << "-nosound";
-
-        if (prop.extract_format == PNG) {
-                args << "-vo"
-                << "png:outdir=\""+full_output_dir+"\"";
-        } else {
-                args << "-vo"
-                << "jpeg:outdir=\""+full_output_dir+"\"";
-        }
-
-        args << "-frames" << "6" << "-ss" << QString::number(seek);
-
-        if (aspect_ratio != 0) {
-                args << "-aspect" << QString::number(aspect_ratio) << "-zoom";
-        }
-
-        if (!prop.dvd_device.isEmpty()) {
-                args << "-dvd-device" << prop.dvd_device;
-        }
-
-        /*
-        if (display_osd) {
-                args << "-vf" << "expand=osd=1" << "-osdlevel" << "2";
-        }
-        */
+
+        if (PlayerID::player(mplayer_bin) == PlayerID::MPV) {
+                #ifdef MPV_SUPPORT
+                // MPV
+                args << "--no-config" << "--no-audio" << "--no-cache";
+                args << "--frames=" + QString::number(N_OUTPUT_FRAMES);
+                args << "--framedrop=no" << "--start=" + QString::number(seek);
+                if (aspect_ratio != 0) {
+                        args << "--video-aspect=" + QString::number(aspect_ratio);
+                }
+                if (!prop.dvd_device.isEmpty()) args << "--dvd-device=" + prop.dvd_device;
+                QString format = (prop.extract_format == PNG) ? "png:png-compression=0" : "jpg";
+                args << QString("--vo=image=format=%1:outdir=\"%2\"").arg(format).arg(full_output_dir);
+                
+                #ifdef Q_OS_WIN
+                args << "--use-text-osd=no";
+                #endif
+                #endif // MPV_SUPPORT
+        }
+        else {
+                #ifdef MPLAYER_SUPPORT
+                // MPlayer
+                args << "-nosound" << "-nocache" << "-noframedrop";
+
+                if (prop.extract_format == PNG) {
+                        args << "-vo"
+                        #ifdef VP_USE_PNG_OUTDIR
+                        << "png:outdir=\""+full_output_dir+"\"";
+                        #else
+                        << "png";
+                        #endif
+                } else {
+                        args << "-vo"
+                        << "jpeg:outdir=\""+full_output_dir+"\"";
+                }
+
+                args << "-frames" << QString::number(N_OUTPUT_FRAMES) << "-ss" << QString::number(seek);
+
+                if (aspect_ratio != 0) {
+                        args << "-aspect" << QString::number(aspect_ratio) << "-zoom";
+                }
+
+                if (!prop.dvd_device.isEmpty()) {
+                        args << "-dvd-device" << prop.dvd_device;
+                }
+
+                #ifdef Q_OS_WIN
+                args << "-nofontconfig";
+                #endif
+
+                /*
+                if (display_osd) {
+                        args << "-vf" << "expand=osd=1" << "-osdlevel" << "2";
+                }
+                */
+                #endif // MPLAYER_SUPPORT
+        }
 
         args << prop.input_video;
@@ -303 +338 @@
 
         QProcess p;
+        #ifndef VP_USE_PNG_OUTDIR
+        p.setWorkingDirectory(full_output_dir);
+        #endif
         p.start(mplayer_bin, args);
         if (!p.waitForFinished()) {
@@ -443 +481 @@
 
         QStringList args;
-        args << "-vo" << "null" << "-ao" << "null" << "-frames" << "1" << "-identify" << "-nocache" << "-noquiet" << filename;
-
-        if (!prop.dvd_device.isEmpty()) {
-                args << "-dvd-device" << prop.dvd_device;
+
+        if (PlayerID::player(mplayer_path) == PlayerID::MPV) {
+                #ifdef MPV_SUPPORT
+                // MPV
+                args << "--term-playing-msg="
+                "ID_LENGTH=${=length}\n"
+                "ID_VIDEO_WIDTH=${=width}\n"
+                "ID_VIDEO_HEIGHT=${=height}\n"
+                "ID_VIDEO_FPS=${=fps}\n"
+                "ID_VIDEO_ASPECT=${=video-aspect}\n"
+                "ID_VIDEO_BITRATE=${=video-bitrate}\n"
+                "ID_AUDIO_BITRATE=${=audio-bitrate}\n"
+                "ID_AUDIO_RATE=${=audio-samplerate}\n"
+                "ID_VIDEO_FORMAT=${=video-format}";
+
+                args << "--vo=null" << "-ao=null" << "--frames=1" << "--no-quiet" << "--no-cache" << "--no-config";
+                if (!prop.dvd_device.isEmpty()) args << "--dvd-device=" + prop.dvd_device;
+                args << filename;
+                #endif // MPV_SUPPORT
+        }
+        else {
+                #ifdef MPLAYER_SUPPORT
+                // MPlayer
+                args << "-vo" << "null" << "-ao" << "null" << "-frames" << "1" << "-identify" << "-nocache" << "-noquiet";
+                if (!prop.dvd_device.isEmpty()) args << "-dvd-device" << prop.dvd_device;
+
+                #ifdef Q_OS_WIN
+                args << "-nofontconfig";
+                #endif
+
+                args << filename;
+                #endif // MPLAYER_SUPPORT
         }
 

smplayer/trunk/src/videopreview/videopreview.h

@@ -1 +1 @@
 /*  smplayer, GUI front-end for mplayer.
-    Copyright (C) 2006-2014 Ricardo Villalba <rvm@users.sourceforge.net>
+    Copyright (C) 2006-2016 Ricardo Villalba <rvm@users.sourceforge.net>
 
     This program is free software; you can redistribute it and/or modify
@@ -17 +17 @@
 */
 
-#ifndef _VIDEOPREVIEW_H_
-#define _VIDEOPREVIEW_H_
+#ifndef VIDEOPREVIEW_H
+#define VIDEOPREVIEW_H
 
 #include <QWidget>
@@ -118 +118 @@
 protected:
         bool extractImages();
-        bool runMplayer(int seek, double aspect_ratio);
+        bool runPlayer(int seek, double aspect_ratio);
         bool addPicture(const QString & filename, int num, int time); 
         void displayVideoInfo(const VideoInfo & i);

smplayer/trunk/src/videopreview/videopreview.pro

@@ -1 +1 @@
 CONFIG += debug
 
-HEADERS = ../lineedit_with_icon.h ../filechooser.h videopreviewconfigdialog.h videopreview.h 
-SOURCES = ../lineedit_with_icon.cpp ../filechooser.cpp videopreviewconfigdialog.cpp videopreview.cpp main.cpp
+HEADERS = ../lineedit_with_icon.h ../filechooser.h ../playerid.h videopreviewconfigdialog.h videopreview.h 
+SOURCES = ../lineedit_with_icon.cpp ../filechooser.cpp ../playerid.cpp videopreviewconfigdialog.cpp videopreview.cpp main.cpp
 
 FORMS = videopreviewconfigdialog.ui
@@ -8 +8 @@
 INCLUDEPATH += ..
 DEPENDPATH += ..
-DEFINES += NO_SMPLAYER_SUPPORT
+DEFINES += NO_SMPLAYER_SUPPORT MPV_SUPPORT MPLAYER_SUPPORT
 
 isEqual(QT_MAJOR_VERSION, 5) {

smplayer/trunk/src/videopreview/videopreviewconfigdialog.cpp

@@ -1 +1 @@
 /*  smplayer, GUI front-end for mplayer.
-    Copyright (C) 2006-2014 Ricardo Villalba <rvm@users.sourceforge.net>
+    Copyright (C) 2006-2016 Ricardo Villalba <rvm@users.sourceforge.net>
 
     This program is free software; you can redistribute it and/or modify

smplayer/trunk/src/videopreview/videopreviewconfigdialog.h

@@ -1 +1 @@
 /*  smplayer, GUI front-end for mplayer.
-    Copyright (C) 2006-2014 Ricardo Villalba <rvm@users.sourceforge.net>
+    Copyright (C) 2006-2016 Ricardo Villalba <rvm@users.sourceforge.net>
 
     This program is free software; you can redistribute it and/or modify
@@ -17 +17 @@
 */
 
-#ifndef _VIDEOPREVIEWCONFIGDIALOG_H_
-#define _VIDEOPREVIEWCONFIGDIALOG_H_
+#ifndef VIDEOPREVIEWCONFIGDIALOG_H
+#define VIDEOPREVIEWCONFIGDIALOG_H
 
 #include "ui_videopreviewconfigdialog.h"