mirror/musikcube
1
0
Fork 0
mirror of https://github.com/clangen/musikcube.git synced 2025-03-14 13:21:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes to ensure FFMPEG_DECODER is defined on *nix builds.

Browse Source
This commit is contained in:
casey langen 2018-12-27 11:34:09 -08:00
parent 0ebf17de14
commit 056ec704f5
3 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -96,7 +96,6 @@ if (${FFMPEG_DECODER} MATCHES "false")
add_dependencies(musikcube m4adecoder oggdecoder nomaddecoder flacdecoder)
else()
message(STATUS "[ffmpeg] decoder enabled = true")
add_definitions(-DFFMPEG_DECODER)
add_subdirectory(src/plugins/ffmpegdecoder)
add_dependencies(musikcube ffmpegdecoder)
endif()

23
src/plugins/ffmpegdecoder/FfmpegDecoder.cpp
View File

@ -35,6 +35,7 @@
#include "FfmpegDecoder.h"
#include <core/sdk/IDebug.h>
#include <algorithm>
#include <string>
#ifdef WIN32
#define DLLEXPORT __declspec(dllexport)
@ -144,7 +145,9 @@ bool FfmpegDecoder::GetBuffer(IBuffer *buffer) {
buffer->SetChannels((long) this->channels);
buffer->SetSamples(0);
if (!av_read_frame(this->formatContext, &this->packet)) {
int readFrameResult = av_read_frame(this->formatContext, &this->packet);
if (!readFrameResult) {
int frameDecoded = 0;
avcodec_decode_audio4(
@ -196,13 +199,23 @@ bool FfmpegDecoder::GetBuffer(IBuffer *buffer) {
buffer->SetSamples(convertedSamplesPerChannel * this->channels);
}
}
else {
::debug->Warning(TAG, "avcodec_decode_audio4() failed");
}
av_frame_unref(this->decodedFrame);
return true;
}
else {
std::string err =
"av_read_frame() failed: " +
std::string(av_err2str(readFrameResult));
::debug->Warning(TAG, err.c_str());
}
}
::debug->Warning(TAG, "finished decoding.");
::debug->Info(TAG, "finished decoding.");
this->exhausted = true;
return false;
}
@ -287,7 +300,11 @@ bool FfmpegDecoder::Open(musik::core::sdk::IDataStream *stream) {
if (avcodec_open2(codecContext, codec, nullptr) < 0) {
goto reset_and_fail;
}
::debug->Info(TAG, "resolved a codec!");
std::string codecName =
std::string("resolved codec: ") +
std::string(codec->long_name);
::debug->Info(TAG, codecName.c_str());
}
else {
::debug->Error(TAG, "couldn't find a codec.");

7
src/plugins/taglib_plugin/CMakeLists.txt
View File

@ -4,6 +4,13 @@ set (taglibreader_SOURCES
TaglibMetadataReader.cpp
)
if (${FFMPEG_DECODER} MATCHES "false")
message(STATUS "[taglibmetadatareader] *not* defining FFMPEG_DECODER")
else()
message(STATUS "[taglibmetadatareader] defining FFMPEG_DECODER")
add_definitions(-DFFMPEG_DECODER)
endif()
add_library(taglibreader SHARED ${taglibreader_SOURCES})
if (${USE_BUNDLED_TAGLIB} MATCHES "true")