oak-team/oak-editor
3
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

finalized very, very basic OTIO support

Browse Source 
Ironed out various project and footage loading issues, and a single
cache invalidation issue.
This commit is contained in:
itsmattkc
2020-10-23 01:26:17 +11:00
parent 9613730ee8
commit bc60c74562
32 changed files with 473 additions and 301 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/codec/ffmpeg/ffmpegdecoder.cpp
+2 -2
View File
@@ -450,7 +450,7 @@ bool FFmpegDecoder::SupportsAudio()
return true;
}
ItemPtr FFmpegDecoder::Probe(const QString& filename, const QAtomicInt* cancelled) const
FootagePtr FFmpegDecoder::Probe(const QString& filename, const QAtomicInt* cancelled) const
{
// Variable for receiving errors from FFmpeg
int error_code;
@@ -578,7 +578,7 @@ ItemPtr FFmpegDecoder::Probe(const QString& filename, const QAtomicInt* cancelle
if (avstream->duration == AV_NOPTS_VALUE) {
// Loop through stream until we get the whole duration
FFmpegDecoderInstance instance(filename, i);
FFmpegDecoderInstance instance(filename_c, i);
AVPacket* pkt = av_packet_alloc();
AVFrame* frame = av_frame_alloc();
app/codec/ffmpeg/ffmpegdecoder.h
+1 -1
View File
@@ -147,7 +147,7 @@ public:
// Destructor
virtual ~FFmpegDecoder() override;
virtual ItemPtr Probe(const QString& filename, const QAtomicInt* cancelled) const override;
virtual FootagePtr Probe(const QString& filename, const QAtomicInt* cancelled) const override;
virtual bool Open() override;
virtual FramePtr RetrieveVideo(const rational &timecode, const int& divider) override;