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

finished merge of viewer and footage

Browse Source
This commit is contained in:
itsmattkc
2021-04-06 13:08:56 +10:00
parent 57ddae8920
commit 898ea25e89
58 changed files with 783 additions and 719 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/task/export/export.cpp
+5 -4
View File
@@ -76,14 +76,15 @@ bool ExportTask::Run()
if (params_.video_enabled()) {
// If a transformation matrix is applied to this video, create it here
if (viewer()->video_params().width() != params_.video_params().width()
VideoParams vp = viewer()->GetVideoParams();
if (vp.width() != params_.video_params().width()
|| params_.video_params().height() != params_.video_params().height()) {
video_force_size = QSize(params_.video_params().width(), params_.video_params().height());
if (params_.video_scaling_method() != ExportParams::kStretch) {
video_force_matrix = ExportParams::GenerateMatrix(params_.video_scaling_method(),
viewer()->video_params().width(),
viewer()->video_params().height(),
vp.width(),
vp.height(),
params_.video_params().width(),
params_.video_params().height());
}
@@ -162,7 +163,7 @@ void ExportTask::FrameDownloaded(FramePtr f, const QByteArray &hash, const QVect
forever {
rational real_time = Timecode::timestamp_to_time(frame_time_,
viewer()->video_params().time_base());
viewer()->GetVideoParams().time_base());
if (!time_map_.contains(real_time)) {
break;