Merge branch 'master' of ssh://git.kde.org/kdenlive

[kdenlive] / src / colorcorrection / waveformgenerator.cpp

diff --git a/src/colorcorrection/waveformgenerator.cpp b/src/colorcorrection/waveformgenerator.cpp
index 5aa4486fd75f3cd7ce4334fc6504dff8b9b44b22..4c60518de93752b52ba0252f2ca970461e8cb776 100644 (file)
--- a/src/colorcorrection/waveformgenerator.cpp
+++ b/src/colorcorrection/waveformgenerator.cpp
@@ -8,7 +8,8 @@
  *   (at your option) any later version.                                   *
  ***************************************************************************/
 
-#include <QColor>
+#include <cmath>
+
 #include <QImage>
 #include <QPainter>
 #include <QSize>
@@ -27,12 +28,12 @@ WaveformGenerator::~WaveformGenerator()
 }
 
 QImage WaveformGenerator::calculateWaveform(const QSize &waveformSize, const QImage &image, WaveformGenerator::PaintMode paintMode,
-                                            const bool &drawAxis, WaveformGenerator::Rec rec, const uint &accelFactor)
+                                            bool drawAxis, WaveformGenerator::Rec rec, uint accelFactor)
 {
     Q_ASSERT(accelFactor >= 1);
 
-    QTime time;
-    time.start();
+    //QTime time;
+    //time.start();
 
     QImage wave(waveformSize, QImage::Format_ARGB32);
 
@@ -45,8 +46,6 @@ QImage WaveformGenerator::calculateWaveform(const QSize &waveformSize, const QIm
         wave.fill(qRgba(0,0,0,0));
 
         QRgb *col;
-        QRgb waveCol;
-        QPoint wavePoint;
 
         double dY, dx, dy;
 
@@ -56,17 +55,31 @@ QImage WaveformGenerator::calculateWaveform(const QSize &waveformSize, const QIm
         const uint ih = image.height();
         const uint byteCount = iw*ih;
 
+        uint waveValues[waveformSize.width()][waveformSize.height()];
+        for (int i = 0; i < waveformSize.width(); ++i) {
+            for (int j = 0; j < waveformSize.height(); j++) {
+                waveValues[i][j] = 0;
+            }
+        }
+
+        // Number of input pixels that will fall on one scope pixel.
+        // Must be a float because the acceleration factor can be high, leading to <1 expected px per px.
+        const float pixelDepth = (float)((byteCount>>2) / accelFactor)/(ww*wh);
+        const float gain = 255/(8*pixelDepth);
+        //qDebug() << "Pixel depth: expected " << pixelDepth << "; Gain: using " << gain << " (acceleration: " << accelFactor << "x)";
+
+
         // Subtract 1 from sizes because we start counting from 0.
         // Not doing it would result in attempts to paint outside of the image.
         const float hPrediv = (float)(wh-1)/255;
         const float wPrediv = (float)(ww-1)/(iw-1);
 
-        const float brightnessAdjustment = accelFactor * ((float) ww*wh/(byteCount>>3));
-
         const uchar *bits = image.bits();
-        const uint stepsize = 4*accelFactor;
+       const int bpp = image.depth() / 8;
 
-        for (uint i = 0, x = 0; i < byteCount; i += stepsize) {
+        for (uint i = 0, x = 0; i < byteCount; i += bpp) {
+
+            Q_ASSERT(bits < image.bits() + byteCount);
 
             col = (QRgb *)bits;
 
@@ -81,27 +94,45 @@ QImage WaveformGenerator::calculateWaveform(const QSize &waveformSize, const QIm
 
             dy = dY*hPrediv;
             dx = x*wPrediv;
-            wavePoint = QPoint((int)dx, (int)(wh-1 - dy));
-
-            waveCol = QRgb(wave.pixel(wavePoint));
-            switch (paintMode) {
-            case PaintMode_Green:
-                wave.setPixel(wavePoint, qRgba(CHOP255(9 + qRed(waveCol)), CHOP255(36 + qGreen(waveCol)),
-                                               CHOP255(18 + qBlue(waveCol)), 255));
-                break;
-            case PaintMode_Yellow:
-                wave.setPixel(wavePoint, qRgba(255, 242,
-                                               0, CHOP255(brightnessAdjustment*10+qAlpha(waveCol))));
-                break;
-            default:
-                wave.setPixel(wavePoint, qRgba(255,255,255,
-                                               CHOP255(brightnessAdjustment*32+qAlpha(waveCol))));
-                break;
+            waveValues[(int)dx][(int)dy]++;
+
+            bits += bpp;
+            x += bpp;
+            if (x > iw) {
+                x -= iw;
+                if (accelFactor > 1) {
+                    bits += bpp*iw*(accelFactor-1);
+                    i += bpp*iw*(accelFactor-1);
+                }
             }
+        }
 
-            bits += stepsize;
-            x += stepsize;
-            x %= iw; // Modulo image width, to represent the current x position in the image
+        switch (paintMode) {
+        case PaintMode_Green:
+            for (int i = 0; i < waveformSize.width(); ++i) {
+                for (int j = 0; j < waveformSize.height(); j++) {
+                    // Logarithmic scale. Needs fine tuning by hand, but looks great.
+                    wave.setPixel(i, waveformSize.height()-j-1, qRgba(CHOP255(52*log(0.1*gain*waveValues[i][j])),
+                                                                      CHOP255(52*log(gain*waveValues[i][j])),
+                                                                      CHOP255(52*log(.25*gain*waveValues[i][j])),
+                                                                      CHOP255(64*log(gain*waveValues[i][j]))));
+                }
+            }
+            break;
+        case PaintMode_Yellow:
+            for (int i = 0; i < waveformSize.width(); ++i) {
+                for (int j = 0; j < waveformSize.height(); j++) {
+                    wave.setPixel(i, waveformSize.height()-j-1, qRgba(255,242,0,   CHOP255(gain*waveValues[i][j])));
+                }
+            }
+            break;
+        default:
+            for (int i = 0; i < waveformSize.width(); ++i) {
+                for (int j = 0; j < waveformSize.height(); j++) {
+                    wave.setPixel(i, waveformSize.height()-j-1, qRgba(255,255,255, CHOP255(2*gain*waveValues[i][j])));
+                }
+            }
+            break;
         }
 
         if (drawAxis) {
@@ -109,7 +140,7 @@ QImage WaveformGenerator::calculateWaveform(const QSize &waveformSize, const QIm
             QRgb opx;
             davinci.setPen(qRgba(150,255,200,32));
             davinci.setCompositionMode(QPainter::CompositionMode_Overlay);
-            for (uint i = 0; i <= 10; i++) {
+            for (uint i = 0; i <= 10; ++i) {
                 dy = (float)i/10 * (wh-1);
                 for (uint x = 0; x < ww; x++) {
                     opx = wave.pixel(x, dy);
@@ -121,9 +152,11 @@ QImage WaveformGenerator::calculateWaveform(const QSize &waveformSize, const QIm
 
     }
 
-    uint diff = time.elapsed();
-    emit signalCalculationFinished(wave, diff);
+    //uint diff = time.elapsed();
+    //emit signalCalculationFinished(wave, diff);
 
     return wave;
 }
 #undef CHOP255
+
+#include "waveformgenerator.moc"