Add sample thumbnails

include/AutomationEditor.h

@@ -38,6 +38,7 @@
 #include "SampleClip.h"
 #include "TimePos.h"
 #include "lmms_basics.h"
+#include "SampleThumbnail.h"
 
 class QPainter;
 class QPixmap;
@@ -290,6 +291,8 @@ protected slots:
 	QColor m_ghostNoteColor;
 	QColor m_detuningNoteColor;
 	QColor m_ghostSampleColor;
+
+	SampleThumbnail m_sampleThumbnail;
 
 	friend class AutomationEditorWindow;
 

include/SampleClipView.h

@@ -27,6 +27,8 @@
 
 #include "ClipView.h"
 
+#include "SampleThumbnail.h"
+
 namespace lmms
 {
 
@@ -63,6 +65,7 @@ public slots:
 
 private:
 	SampleClip * m_clip;
+	SampleThumbnail m_sampleThumbnail;
 	QPixmap m_paintPixmap;
 	bool splitClip( const TimePos pos ) override;
 } ;

include/SampleThumbnail.h

@@ -0,0 +1,107 @@
+/*
+ * SampleThumbnail.h
+ *
+ * Copyright (c) 2024 Khoi Dau <[email protected]>
+ *
+ * This file is part of LMMS - https://lmms.io
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program (see COPYING); if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301 USA.
+ *
+ */
+
+#ifndef LMMS_SAMPLE_THUMBNAIL_H
+#define LMMS_SAMPLE_THUMBNAIL_H
+
+#include <QPainter>
+#include <QRect>
+#include <memory>
+
+#include "lmms_export.h"
+
+namespace lmms {
+
+class Sample;
+class SampleFrame;
+
+/**
+   Insert this into your class when you want to implement
+   thumbnails. This is optional, but without this class, there will be no
+   indication that this thumbnail list is being used and it will be destroyed
+   when you generate thumbnails somewhere else, and have to be regenerated
+   before being rendered, which is slower than rendering the sample directly.
+*/
+class LMMS_EXPORT SampleThumbnail
+{
+public:
+	struct Bit
+	{
+		Bit() = default;
+		Bit(const SampleFrame&);
+
+		void merge(const Bit&);
+		void merge(const SampleFrame&);
+
+		float max = -100.0f;
+		float min = 100.0f;
+		float rms = 0.0f;
+	};
+
+	struct VisualizeParameters
+	{
+		bool allowHighResolution = false;
+
+		float amplification = 1.0f; //!< The amount of amplification to apply to the waveform.
+		bool reversed = false;		//!< Determines if the waveform is drawn in reverse or not.
+
+		/*
+			You can set these members when there's no easy way to calculate sampRect.
+			These will stretch the viewed region to the dimensions of the clipRect.
+		*/
+		float sampleStart = 0.0f; //!< Where the sample begins for drawing.
+		float sampleEnd = 1.0f;	  //!< Where the sample ends for drawing.
+
+		QRect sampRect = QRect(); 	//!< Dimensions of the fully rendered sample on the Song editor; Can move around. = clipRect when null.
+		QRect clipRect;				//!< Region that the sample will be rendered into; Fixed in place.
+		QRect viewRect = QRect(); 	//!< Region of clipRect that is visible. = clipRect when null.
+	};
+
+	using Thumbnail = std::vector<Bit>;
+	using ThumbnailCache = std::vector<Thumbnail>;
+
+	SampleThumbnail() = default;
+	SampleThumbnail(const Sample& sample);
+
+	void visualize(const VisualizeParameters& parameters, QPainter& painter) const;
+	void visualizeOriginal(const VisualizeParameters& parameters, QPainter& painter) const;
+
+	bool selectFromGlobalThumbnailMap(const Sample&);
+	static void cleanUpGlobalThumbnailMap();
+
+private:
+	static void draw(QPainter& painter, const Bit& bit, float lineX, int centerY, float scalingFactor,
+		const QColor& color, const QColor& rmsColor);
+
+	static Thumbnail generate(const size_t thumbnailSize, const SampleFrame* buffer, const size_t size);
+
+	std::shared_ptr<ThumbnailCache> m_thumbnailCache = nullptr;
+
+	/* DEPRECATED; functionality is kept for testing conveniences */
+	inline static std::map<const QString, std::shared_ptr<ThumbnailCache>> s_sampleThumbnailCacheMap;
+};
+
+} // namespace lmms
+
+#endif // LMMS_SAMPLE_THUMBNAIL_H

plugins/AudioFileProcessor/AudioFileProcessorWaveView.cpp

@@ -24,9 +24,10 @@
 
 #include "AudioFileProcessorWaveView.h"
 
+#include "Sample.h"
 #include "ConfigManager.h"
+#include "SampleThumbnail.h"
 #include "FontHelper.h"
-#include "SampleWaveform.h"
 
 #include <QPainter>
 #include <QMouseEvent>
@@ -81,7 +82,8 @@ AudioFileProcessorWaveView::AudioFileProcessorWaveView(QWidget* parent, int w, i
 	m_isDragging(false),
 	m_reversed(false),
 	m_framesPlayed(0),
-	m_animation(ConfigManager::inst()->value("ui", "animateafp").toInt())
+	m_animation(ConfigManager::inst()->value("ui", "animateafp").toInt()),
+	m_sampleThumbnail(*buf)
 {
 	setFixedSize(w, h);
 	setMouseTracking(true);
@@ -338,13 +340,18 @@ void AudioFileProcessorWaveView::updateGraph()
 	m_graph.fill(Qt::transparent);
 	QPainter p(&m_graph);
 	p.setPen(QColor(255, 255, 255));
-
-	const auto dataOffset = m_reversed ? m_sample->sampleSize() - m_to : m_from;
 
-	const auto rect = QRect{0, 0, m_graph.width(), m_graph.height()};
-	const auto waveform = SampleWaveform::Parameters{
-		m_sample->data() + dataOffset, static_cast<size_t>(range()), m_sample->amplification(), m_sample->reversed()};
-	SampleWaveform::visualize(waveform, p, rect);
+	m_sampleThumbnail = SampleThumbnail{*m_sample};
+
+	auto param = SampleThumbnail::VisualizeParameters{};
+	param.allowHighResolution = true;
+	param.amplification = m_sample->amplification();
+	param.reversed = m_sample->reversed();
+	param.sampleStart = static_cast<float>(m_from) / m_sample->sampleSize();
+	param.sampleEnd = static_cast<float>(m_to) / m_sample->sampleSize();
+	param.clipRect = m_graph.rect();
+
+	m_sampleThumbnail.visualize(param, p);
 }
 
 void AudioFileProcessorWaveView::zoom(const bool out)
@@ -469,7 +476,7 @@ void AudioFileProcessorWaveView::reverse()
 			- m_sample->endFrame()
 			- m_sample->startFrame()
 	);
-	
+
 	const int fromTmp = m_from;
 
 	setFrom(m_sample->sampleSize() - m_to);

plugins/AudioFileProcessor/AudioFileProcessorWaveView.h

@@ -27,6 +27,7 @@
 
 
 #include "Knob.h"
+#include "SampleThumbnail.h"
 
 
 namespace lmms
@@ -144,6 +145,7 @@ public slots:
 	bool m_reversed;
 	f_cnt_t m_framesPlayed;
 	bool m_animation;
+	SampleThumbnail m_sampleThumbnail;
 
 	friend class AudioFileProcessorView;
 

plugins/SlicerT/SlicerTWaveform.cpp

@@ -27,7 +27,7 @@
 #include <QBitmap>
 #include <qpainterpath.h>
 
-#include "SampleWaveform.h"
+#include "SampleThumbnail.h"
 #include "SlicerT.h"
 #include "SlicerTView.h"
 #include "embed.h"
@@ -115,10 +115,15 @@ void SlicerTWaveform::drawSeekerWaveform()
 	brush.setPen(s_waveformColor);
 
 	const auto& sample = m_slicerTParent->m_originalSample;
-	const auto waveform
-		= SampleWaveform::Parameters{sample.data(), sample.sampleSize(), sample.amplification(), sample.reversed()};
-	const auto rect = QRect(0, 0, m_seekerWaveform.width(), m_seekerWaveform.height());
-	SampleWaveform::visualize(waveform, brush, rect);
+
+	m_sampleThumbnail = SampleThumbnail{sample};
+
+	auto param = SampleThumbnail::VisualizeParameters{};
+	param.amplification = sample.amplification();
+	param.reversed = sample.reversed();
+	param.clipRect = m_seekerWaveform.rect();
+	m_sampleThumbnail.visualize(param, brush);
+
 
 	// increase brightness in inner color
 	QBitmap innerMask = m_seekerWaveform.createMaskFromColor(s_waveformMaskColor, Qt::MaskMode::MaskOutColor);
@@ -168,16 +173,31 @@ void SlicerTWaveform::drawEditorWaveform()
 
 	QPainter brush(&m_editorWaveform);
 	size_t startFrame = m_seekerStart * m_slicerTParent->m_originalSample.sampleSize();
-	size_t endFrame = m_seekerEnd * m_slicerTParent->m_originalSample.sampleSize();
+	size_t   endFrame = m_seekerEnd * m_slicerTParent->m_originalSample.sampleSize();
 
 	brush.setPen(s_waveformColor);
-	float zoomOffset = (m_editorHeight - m_zoomLevel * m_editorHeight) / 2;
+	long zoomOffset = (m_editorHeight - m_zoomLevel * m_editorHeight) / 2;
 
+	// Visualize
 	const auto& sample = m_slicerTParent->m_originalSample;
-	const auto waveform = SampleWaveform::Parameters{
-		sample.data() + startFrame, endFrame - startFrame, sample.amplification(), sample.reversed()};
-	const auto rect = QRect(0, zoomOffset, m_editorWidth, m_zoomLevel * m_editorHeight);
-	SampleWaveform::visualize(waveform, brush, rect);
+
+	m_sampleThumbnail = SampleThumbnail{sample};
+
+	auto param = SampleThumbnail::VisualizeParameters{};
+	param.allowHighResolution = true;
+	param.amplification = sample.amplification();
+	param.reversed = sample.reversed();
+	param.sampleStart = static_cast<float>(startFrame) / sample.sampleSize();
+	param.sampleEnd = static_cast<float>(endFrame) / sample.sampleSize();
+	param.sampRect =
+		QRect(
+			0,
+			zoomOffset,
+			m_editorWidth,
+			static_cast<long>(m_zoomLevel * m_editorHeight)
+		);
+	param.clipRect = m_editorWaveform.rect();
+	m_sampleThumbnail.visualize(param, brush);
 
 	// increase brightness in inner color
 	QBitmap innerMask = m_editorWaveform.createMaskFromColor(s_waveformMaskColor, Qt::MaskMode::MaskOutColor);

plugins/SlicerT/SlicerTWaveform.h

@@ -32,6 +32,8 @@
 #include <QMouseEvent>
 #include <QPainter>
 
+#include "SampleThumbnail.h"
+
 namespace lmms {
 
 class SlicerT;
@@ -108,6 +110,8 @@ public slots:
 	QPixmap m_editorWaveform;
 	QPixmap m_sliceEditor;
 	QPixmap m_emptySampleIcon;
+
+	SampleThumbnail m_sampleThumbnail;
 
 	SlicerT* m_slicerTParent;
 

src/gui/CMakeLists.txt

@@ -35,6 +35,7 @@ SET(LMMS_SRCS
 	gui/RowTableView.cpp
 	gui/SampleLoader.cpp
 	gui/SampleTrackWindow.cpp
+	gui/SampleThumbnail.cpp
 	gui/SampleWaveform.cpp
 	gui/SendButtonIndicator.cpp
 	gui/SideBar.cpp