merged probe functions into decoder class

This commit is contained in:
itsmattkc
2019-08-08 17:22:26 +10:00
parent c6dfab4caf
commit 6833b18829
8 changed files with 141 additions and 187 deletions
+2 -7
View File
@@ -27,7 +27,6 @@
// FIXME: Test code only
#include "decoder/ffmpeg/ffmpegdecoder.h"
#include "decoder/probeserver.h"
#include "render/pixelservice.h"
// End test code
@@ -92,12 +91,8 @@ void MediaInput::Process(const rational &time)
// Otherwise try to get frame of footage from decoder
// Determine which decoder to use
if (decoder_ == nullptr) {
decoder_ = olive::CreateDecoderFromID(footage->decoder());
if (decoder_ == nullptr) {
return;
}
if (decoder_ == nullptr
&& (decoder_ = Decoder::CreateFromID(footage->decoder())) == nullptr) {
}
if (decoder_->stream() == nullptr) {