]> git.sesse.net Git - kdenlive/blobdiff - src/waveform.cpp
Get rid of buggy "drop B frame" speedup feature
[kdenlive] / src / waveform.cpp
index 794603b66a21c482a92d3373b11bf2f968c56cbb..5bd51f19d2d75f891a5944dd3cb0b99571d38173 100644 (file)
@@ -8,31 +8,53 @@
  *   (at your option) any later version.                                   *
  ***************************************************************************/
 
+#include <QMenu>
+#include <QMouseEvent>
 #include <QPainter>
 #include <QPoint>
-#include <QDebug>
+
+// For reading out the project resolution
+#include "kdenlivesettings.h"
+#include "profilesdialog.h"
 
 #include "renderer.h"
 #include "waveform.h"
 #include "waveformgenerator.h"
 
 
+const QSize Waveform::m_textWidth(35,0);
+const int Waveform::m_paddingBottom(20);
+
 Waveform::Waveform(Monitor *projMonitor, Monitor *clipMonitor, QWidget *parent) :
-    AbstractScopeWidget(projMonitor, clipMonitor, parent),
-    initialDimensionUpdateDone(false)
+    AbstractScopeWidget(projMonitor, clipMonitor, true, parent)
 {
     ui = new Ui::Waveform_UI();
     ui->setupUi(this);
 
     ui->paintMode->addItem(i18n("Yellow"), QVariant(WaveformGenerator::PaintMode_Yellow));
+    ui->paintMode->addItem(i18n("White"), QVariant(WaveformGenerator::PaintMode_White));
     ui->paintMode->addItem(i18n("Green"), QVariant(WaveformGenerator::PaintMode_Green));
 
 
+    m_aRec601 = new QAction(i18n("Rec. 601"), this);
+    m_aRec601->setCheckable(true);
+    m_aRec709 = new QAction(i18n("Rec. 709"), this);
+    m_aRec709->setCheckable(true);
+    m_agRec = new QActionGroup(this);
+    m_agRec->addAction(m_aRec601);
+    m_agRec->addAction(m_aRec709);
+    m_menu->addSeparator()->setText(i18n("Luma mode"));
+    m_menu->addAction(m_aRec601);
+    m_menu->addAction(m_aRec709);
+
+
     bool b = true;
     b &= connect(ui->paintMode, SIGNAL(currentIndexChanged(int)), this, SLOT(forceUpdateScope()));
+    b &= connect(this, SIGNAL(signalMousePositionChanged()), this, SLOT(forceUpdateHUD()));
+    b &= connect(m_aRec601, SIGNAL(toggled(bool)), this, SLOT(forceUpdateScope()));
+    b &= connect(m_aRec709, SIGNAL(toggled(bool)), this, SLOT(forceUpdateScope()));
     Q_ASSERT(b);
 
-
     init();
     m_waveformGenerator = new WaveformGenerator();
 }
@@ -42,6 +64,9 @@ Waveform::~Waveform()
     writeConfig();
 
     delete m_waveformGenerator;
+    delete m_aRec601;
+    delete m_aRec709;
+    delete m_agRec;
 }
 
 void Waveform::readConfig()
@@ -51,6 +76,8 @@ void Waveform::readConfig()
     KSharedConfigPtr config = KGlobal::config();
     KConfigGroup scopeConfig(config, configName());
     ui->paintMode->setCurrentIndex(scopeConfig.readEntry("paintmode", 0));
+    m_aRec601->setChecked(scopeConfig.readEntry("rec601", false));
+    m_aRec709->setChecked(!m_aRec601->isChecked());
 }
 
 void Waveform::writeConfig()
@@ -58,6 +85,7 @@ void Waveform::writeConfig()
     KSharedConfigPtr config = KGlobal::config();
     KConfigGroup scopeConfig(config, configName());
     scopeConfig.writeEntry("paintmode", ui->paintMode->currentIndex());
+    scopeConfig.writeEntry("rec601", m_aRec601->isChecked());
     scopeConfig.sync();
 }
 
@@ -66,7 +94,6 @@ QRect Waveform::scopeRect()
 {
     // Distance from top/left/right
     int offset = 6;
-
     QPoint topleft(offset, ui->verticalSpacer->geometry().y()+offset);
 
     return QRect(topleft, this->size() - QSize(offset+topleft.x(), offset+topleft.y()));
@@ -82,18 +109,75 @@ bool Waveform::isBackgroundDependingOnInput() const { return false; }
 
 QImage Waveform::renderHUD(uint)
 {
+    QImage hud(m_scopeRect.size(), QImage::Format_ARGB32);
+    hud.fill(qRgba(0,0,0,0));
+
+    QPainter davinci(&hud);
+    davinci.setPen(penLight);
+
+    QMap< QString, QString > values = ProfilesDialog::getSettingsFromFile(KdenliveSettings::current_profile());
+//    qDebug() << values.value("width");
+
+    const int rightX = scopeRect().width()-m_textWidth.width()+3;
+    const int x = m_mousePos.x() - scopeRect().x();
+    const int y = m_mousePos.y() - scopeRect().y();
+
+    if (scopeRect().height() > 0 && m_mouseWithinWidget) {
+        const int top = 30;
+        const int bottom = 20;
+        int val = 255*(1-(float)y/scopeRect().height());
+
+        if (val >= 0 && val <= 255) {
+            // Draw a horizontal line through the current mouse position
+            // and show the value of the waveform there
+            davinci.drawLine(0, y, scopeRect().size().width()-m_textWidth.width(), y);
+
+            // Make the value stick to the line unless it is at the top/bottom of the scope
+            int valY = y+5;
+            if (valY < top) {
+                valY = top;
+            } else if (valY > scopeRect().height()-bottom) {
+                valY = scopeRect().height()-bottom;
+            }
+            davinci.drawText(rightX, valY, QVariant(val).toString());
+        }
+
+        if (scopeRect().width() > 0) {
+            // Draw a vertical line and the x position of the source clip
+            bool ok;
+            const int profileWidth = values.value("width").toInt(&ok);
+
+            if (ok) {
+                const int clipX = (float)x/(scopeRect().width()-m_textWidth.width()-1)*(profileWidth-1);
+
+                if (clipX >= 0 && clipX <= profileWidth) {
+                    int valX = x-15;
+                    if (valX < 0) { valX = 0; }
+                    if (valX > scopeRect().width()-55-m_textWidth.width()) { valX = scopeRect().width()-55-m_textWidth.width(); }
+
+                    davinci.drawLine(x, y, x, scopeRect().height()-m_paddingBottom);
+                    davinci.drawText(valX, scopeRect().height()-5, QVariant(clipX).toString() + " px");
+                }
+            }
+        }
+
+    }
+    davinci.drawText(rightX, scopeRect().height()-m_paddingBottom, "0");
+    davinci.drawText(rightX, 10, "255");
+
     emit signalHUDRenderingFinished(0, 1);
-    return QImage();
+    return hud;
 }
 
-QImage Waveform::renderScope(uint accelFactor, QImage qimage)
+QImage Waveform::renderScope(uint accelFactor, const QImage qimage)
 {
     QTime start = QTime::currentTime();
     start.start();
 
     int paintmode = ui->paintMode->itemData(ui->paintMode->currentIndex()).toInt();
-    QImage wave = m_waveformGenerator->calculateWaveform(scopeRect().size(), qimage, (WaveformGenerator::PaintMode) paintmode,
-                                                         true, accelFactor);
+    WaveformGenerator::Rec rec = m_aRec601->isChecked() ? WaveformGenerator::Rec_601 : WaveformGenerator::Rec_709;
+    QImage wave = m_waveformGenerator->calculateWaveform(scopeRect().size() - m_textWidth - QSize(0,m_paddingBottom), qimage,
+                                                         (WaveformGenerator::PaintMode) paintmode, true, rec, accelFactor);
 
     emit signalScopeRenderingFinished(start.elapsed(), 1);
     return wave;