Funkwhale/strawberry-audio-player-windows-mac-linux
1
0
Fork 0
mirror of https://github.com/strawberrymusicplayer/strawberry synced 2024-12-15 10:14:43 +01:00
Code Issues Releases Wiki Activity

Handle some chromaprinter error cases

Browse Source
This commit is contained in:
Jonas Kvinge 2021-06-13 23:18:22 +02:00
parent 91eee99bab
commit 35b3bc4522
1 changed files with 24 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/engine/chromaprinter.cpp
View File

@ -74,9 +74,14 @@ QString Chromaprinter::CreateFingerprint() {
Q_ASSERT(QThread::currentThread() != qApp->thread()); Q_ASSERT(QThread::currentThread() != qApp->thread());
buffer_.open(QIODevice::WriteOnly); if (!buffer_.open(QIODevice::WriteOnly)) return QString();
GstElement *pipeline = gst_pipeline_new("pipeline"); GstElement *pipeline = gst_pipeline_new("pipeline");
if (!pipeline) {
buffer_.close();
return QString();
}
GstElement *src = CreateElement("filesrc", pipeline); GstElement *src = CreateElement("filesrc", pipeline);
GstElement *decode = CreateElement("decodebin", pipeline); GstElement *decode = CreateElement("decodebin", pipeline);
GstElement *convert = CreateElement("audioconvert", pipeline); GstElement *convert = CreateElement("audioconvert", pipeline);
@ -84,6 +89,8 @@ QString Chromaprinter::CreateFingerprint() {
GstElement *sink = CreateElement("appsink", pipeline); GstElement *sink = CreateElement("appsink", pipeline);
if (!src || !decode || !convert || !resample || !sink) { if (!src || !decode || !convert || !resample || !sink) {
gst_object_unref(pipeline);
buffer_.close();
return QString(); return QString();
} }
@ -94,12 +101,7 @@ QString Chromaprinter::CreateFingerprint() {
gst_element_link_many(convert, resample, nullptr); gst_element_link_many(convert, resample, nullptr);
// Chromaprint expects mono 16-bit ints at a sample rate of 11025Hz. // Chromaprint expects mono 16-bit ints at a sample rate of 11025Hz.
GstCaps *caps = gst_caps_new_simple( GstCaps *caps = gst_caps_new_simple("audio/x-raw", "format", G_TYPE_STRING, "S16LE", "channels", G_TYPE_INT, kDecodeChannels, "rate", G_TYPE_INT, kDecodeRate, nullptr);
"audio/x-raw",
"format", G_TYPE_STRING, "S16LE",
"channels", G_TYPE_INT, kDecodeChannels,
"rate", G_TYPE_INT, kDecodeRate,
nullptr);
gst_element_link_filtered(resample, sink, caps); gst_element_link_filtered(resample, sink, caps);
gst_caps_unref(caps); gst_caps_unref(caps);
@ -131,24 +133,23 @@ QString Chromaprinter::CreateFingerprint() {
// Wait until EOS or error // Wait until EOS or error
GstMessage *msg = gst_bus_timed_pop_filtered(bus, kTimeoutSecs * GST_SECOND, static_cast<GstMessageType>(GST_MESSAGE_EOS | GST_MESSAGE_ERROR)); GstMessage *msg = gst_bus_timed_pop_filtered(bus, kTimeoutSecs * GST_SECOND, static_cast<GstMessageType>(GST_MESSAGE_EOS | GST_MESSAGE_ERROR));
if (msg != nullptr) { if (msg) {
if (msg->type == GST_MESSAGE_ERROR) { if (msg->type == GST_MESSAGE_ERROR) {
// Report error // Report error
GError *error = nullptr; GError *error = nullptr;
gchar *debugs = nullptr; gchar *debugs = nullptr;
gst_message_parse_error(msg, &error, &debugs); gst_message_parse_error(msg, &error, &debugs);
QString message = QString::fromLocal8Bit(error->message); if (error) {
QString message = QString::fromLocal8Bit(error->message);
g_error_free(error); g_error_free(error);
free(debugs); qLog(Debug) << "Error processing" << filename_ << ":" << message;
}
qLog(Debug) << "Error processing" << filename_ << ":" << message; if (debugs) free(debugs);
} }
gst_message_unref(msg); gst_message_unref(msg);
} }
int decode_time = time.restart(); const int decode_time = time.restart();
buffer_.close(); buffer_.close();
@ -165,18 +166,18 @@ QString Chromaprinter::CreateFingerprint() {
int ret = chromaprint_get_raw_fingerprint(chromaprint, &fprint, &size); int ret = chromaprint_get_raw_fingerprint(chromaprint, &fprint, &size);
QByteArray fingerprint; QByteArray fingerprint;
if (ret == 1) { if (ret == 1) {
char *encoded = nullptr; char *encoded = nullptr;
int encoded_size = 0; int encoded_size = 0;
chromaprint_encode_fingerprint(fprint, size, CHROMAPRINT_ALGORITHM_DEFAULT, &encoded, &encoded_size, 1); ret = chromaprint_encode_fingerprint(fprint, size, CHROMAPRINT_ALGORITHM_DEFAULT, &encoded, &encoded_size, 1);
if (ret == 1) {
fingerprint.append(reinterpret_cast<char*>(encoded), encoded_size); fingerprint.append(reinterpret_cast<char*>(encoded), encoded_size);
chromaprint_dealloc(encoded);
}
chromaprint_dealloc(fprint); chromaprint_dealloc(fprint);
chromaprint_dealloc(encoded);
} }
chromaprint_free(chromaprint); chromaprint_free(chromaprint);
int codegen_time = time.elapsed();
const int codegen_time = time.elapsed();
qLog(Debug) << "Decode time:" << decode_time << "Codegen time:" << codegen_time; qLog(Debug) << "Decode time:" << decode_time << "Codegen time:" << codegen_time;