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/widget/viewer/footageviewer.cpp
+8 -4
View File
@@ -42,6 +42,8 @@ FootageViewerWidget::FootageViewerWidget(QWidget *parent) :
void FootageViewerWidget::ConnectNodeInternal(ViewerOutput *n)
{
super::ConnectNodeInternal(n);
SetTimestamp(cached_timestamps_.value(n, 0));
}
@@ -50,6 +52,8 @@ void FootageViewerWidget::DisconnectNodeInternal(ViewerOutput *n)
// Cache timestamp in case this footage is opened again later
cached_timestamps_.insert(n, GetTimestamp());
SetTimestamp(0);
super::DisconnectNodeInternal(n);
}
void FootageViewerWidget::StartFootageDragInternal(bool enable_video, bool enable_audio)
@@ -64,15 +68,15 @@ void FootageViewerWidget::StartFootageDragInternal(bool enable_video, bool enabl
QByteArray encoded_data;
QDataStream data_stream(&encoded_data, QIODevice::WriteOnly);
QVector<Footage::StreamReference> streams = GetConnectedNode()->GetEnabledStreamsAsReferences();
QVector<Track::Reference> streams = GetConnectedNode()->GetEnabledStreamsAsReferences();
// Disable streams that have been disabled
if (!enable_video || !enable_audio) {
for (int i=0; i<streams.size(); i++) {
const Footage::StreamReference& ref = streams.at(i);
const Track::Reference& ref = streams.at(i);
if ((ref.type() == Stream::kVideo && !enable_video)
|| (ref.type() == Stream::kAudio && !enable_audio)) {
if ((ref.type() == Track::kVideo && !enable_video)
|| (ref.type() == Track::kAudio && !enable_audio)) {
streams.removeAt(i);
i--;
}
app/widget/viewer/viewer.cpp
+36 -47
View File
@@ -54,7 +54,6 @@ ViewerWidget::ViewerWidget(QWidget *parent) :
playback_speed_(0),
frame_cache_job_time_(0),
color_menu_enabled_(true),
override_color_manager_(nullptr),
time_changed_from_timer_(false),
pause_autocache_during_playback_(false),
prequeuing_(false)
@@ -183,30 +182,22 @@ void ViewerWidget::ConnectNodeInternal(ViewerOutput *n)
connect(n->video_frame_cache(), &FrameHashCache::Shifted, this, &ViewerWidget::ViewerShiftedRange);
connect(n, &ViewerOutput::TextureInputChanged, this, &ViewerWidget::UpdateStack);
InterlacingChangedSlot(n->video_params().interlacing());
VideoParams vp = n->GetVideoParams();
InterlacingChangedSlot(vp.interlacing());
ruler()->SetPlaybackCache(n->video_frame_cache());
SetViewerResolution(n->video_params().width(), n->video_params().height());
SetViewerPixelAspect(n->video_params().pixel_aspect_ratio());
SetViewerResolution(vp.width(), vp.height());
SetViewerPixelAspect(vp.pixel_aspect_ratio());
last_length_ = rational();
LengthChangedSlot(n->GetLength());
ColorManager* using_manager;
if (override_color_manager_) {
using_manager = override_color_manager_;
} else if (n->parent()) {
using_manager = n->project()->color_manager();
} else {
qWarning() << "Failed to find a suitable color manager for the connected viewer node";
using_manager = nullptr;
}
ColorManager* color_manager = n->project()->color_manager();
auto_cacher_.SetColorManager(using_manager);
display_widget_->ConnectColorManager(using_manager);
display_widget_->ConnectColorManager(color_manager);
foreach (ViewerWindow* window, windows_) {
window->display_widget()->ConnectColorManager(using_manager);
window->display_widget()->ConnectColorManager(color_manager);
}
UpdateStack();
@@ -244,7 +235,6 @@ void ViewerWidget::DisconnectNodeInternal(ViewerOutput *n)
foreach (ViewerWindow* window, windows_) {
window->display_widget()->DisconnectColorManager();
}
auto_cacher_.SetColorManager(nullptr);
waveform_view_->SetViewer(nullptr);
waveform_view_->ConnectTimelinePoints(nullptr);
@@ -286,13 +276,6 @@ bool ViewerWidget::IsPlaying() const
return playback_speed_ != 0;
}
void ViewerWidget::ConnectViewerNode(ViewerOutput *node, ColorManager* color_manager)
{
override_color_manager_ = color_manager;
super::ConnectViewerNode(node);
}
void ViewerWidget::SetColorMenuEnabled(bool enabled)
{
color_menu_enabled_ = enabled;
@@ -332,7 +315,7 @@ void ViewerWidget::SetFullScreen(QScreen *screen)
connect(vw->display_widget(), &ViewerDisplayWidget::customContextMenuRequested, this, &ViewerWidget::ShowContextMenu);
if (GetConnectedNode()) {
vw->SetVideoParams(GetConnectedNode()->video_params());
vw->SetVideoParams(GetConnectedNode()->GetVideoParams());
vw->display_widget()->SetDeinterlacing(vw->display_widget()->IsDeinterlacing());
}
@@ -541,26 +524,28 @@ void ViewerWidget::PauseInternal()
void ViewerWidget::PushScrubbedAudio()
{
if (!IsPlaying() && Config::Current()["AudioScrubbing"].toBool()) {
if (!IsPlaying() && GetConnectedNode() && Config::Current()["AudioScrubbing"].toBool()) {
// Get audio src device from renderer
AudioPlaybackCache::PlaybackDevice* audio_src = GetConnectedNode()->audio_playback_cache()->CreatePlaybackDevice();
const AudioParams& params = GetConnectedNode()->audio_playback_cache()->GetParameters();
if (audio_src->open(QIODevice::ReadOnly)) {
const AudioParams& params = GetConnectedNode()->audio_playback_cache()->GetParameters();
if (params.is_valid()) {
AudioPlaybackCache::PlaybackDevice* audio_src = GetConnectedNode()->audio_playback_cache()->CreatePlaybackDevice();
// FIXME: Hardcoded scrubbing interval (20ms)
int size_of_sample = params.time_to_bytes(rational(20, 1000));
if (audio_src->open(QIODevice::ReadOnly)) {
// FIXME: Hardcoded scrubbing interval (20ms)
int size_of_sample = params.time_to_bytes(rational(20, 1000));
// Push audio
audio_src->seek(params.time_to_bytes(GetTime()));
QByteArray frame_audio = audio_src->read(size_of_sample);
AudioManager::instance()->SetOutputParams(params);
AudioManager::instance()->PushToOutput(frame_audio);
// Push audio
audio_src->seek(params.time_to_bytes(GetTime()));
QByteArray frame_audio = audio_src->read(size_of_sample);
AudioManager::instance()->SetOutputParams(params);
AudioManager::instance()->PushToOutput(frame_audio);
audio_src->close();
audio_src->close();
}
delete audio_src;
}
delete audio_src;
}
}
@@ -656,10 +641,12 @@ void ViewerWidget::FinishPlayPreprocess()
int64_t playback_start_time = ruler()->GetTime();
AudioPlaybackCache* audio_cache = GetConnectedNode()->audio_playback_cache();
AudioManager::instance()->SetOutputParams(audio_cache->GetParameters());
AudioManager::instance()->StartOutput(audio_cache,
audio_cache->GetParameters().time_to_bytes(GetTime()),
playback_speed_);
if (audio_cache->GetParameters().is_valid()) {
AudioManager::instance()->SetOutputParams(audio_cache->GetParameters());
AudioManager::instance()->StartOutput(audio_cache,
audio_cache->GetParameters().time_to_bytes(GetTime()),
playback_speed_);
}
playback_timer_.Start(playback_start_time, playback_speed_, timebase_dbl());
display_widget_->ResetFPSTimer();
@@ -869,7 +856,7 @@ void ViewerWidget::ShowContextMenu(const QPoint &pos)
{
// Deinterlace Option
if (GetConnectedNode()->video_params().interlacing() != VideoParams::kInterlaceNone) {
if (GetConnectedNode()->GetVideoParams().interlacing() != VideoParams::kInterlaceNone) {
QAction* deinterlace_action = menu.addAction(tr("Deinterlace"));
deinterlace_action->setCheckable(true);
deinterlace_action->setChecked(display_widget_->IsDeinterlacing());
@@ -1176,9 +1163,11 @@ void ViewerWidget::InterlacingChangedSlot(VideoParams::Interlacing interlacing)
void ViewerWidget::UpdateRendererVideoParameters()
{
display_widget_->SetVideoParams(GetConnectedNode()->video_params());
VideoParams vp = GetConnectedNode()->GetVideoParams();
display_widget_->SetVideoParams(vp);
foreach (ViewerWindow* window, windows_) {
window->display_widget()->SetVideoParams(GetConnectedNode()->video_params());
window->display_widget()->SetVideoParams(vp);
}
}
app/widget/viewer/viewer.h
+1 -5
View File
@@ -63,8 +63,6 @@ public:
bool IsPlaying() const;
void ConnectViewerNode(ViewerOutput *node, ColorManager *color_manager = nullptr);
/**
* @brief Enable or disable the color management menu
*
@@ -155,7 +153,7 @@ protected:
virtual void ConnectNodeInternal(ViewerOutput *) override;
virtual void DisconnectNodeInternal(ViewerOutput *) override;
virtual void ConnectedNodeChanged(ViewerOutput*n) override;
virtual void ConnectedNodeChanged(ViewerOutput *) override;
virtual void ScaleChangedEvent(const double& s) override;
@@ -217,8 +215,6 @@ private:
bool color_menu_enabled_;
ColorManager* override_color_manager_;
bool time_changed_from_timer_;
bool play_in_to_out_only_;
app/widget/viewer/viewerdisplay.cpp
+25 -5
View File
@@ -37,8 +37,10 @@
namespace olive {
#define super ManagedDisplayWidget
ViewerDisplayWidget::ViewerDisplayWidget(QWidget *parent) :
ManagedDisplayWidget(parent),
super(parent),
deinterlace_texture_(nullptr),
signal_cursor_color_(false),
gizmos_(nullptr),
@@ -219,7 +221,7 @@ void ViewerDisplayWidget::mousePressEvent(QMouseEvent *event)
emit DragStarted();
}
ManagedDisplayWidget::mousePressEvent(event);
super::mousePressEvent(event);
}
}
@@ -246,7 +248,7 @@ void ViewerDisplayWidget::mouseMoveEvent(QMouseEvent *event)
} else {
// Default behavior
ManagedDisplayWidget::mouseMoveEvent(event);
super::mouseMoveEvent(event);
}
}
@@ -269,11 +271,29 @@ void ViewerDisplayWidget::mouseReleaseEvent(QMouseEvent *event)
} else {
// Default behavior
ManagedDisplayWidget::mouseReleaseEvent(event);
super::mouseReleaseEvent(event);
}
}
void ViewerDisplayWidget::dragEnterEvent(QDragEnterEvent *event)
{
emit DragEntered();
super::dragEnterEvent(event);
}
void ViewerDisplayWidget::dragLeaveEvent(QDragLeaveEvent *event)
{
emit DragLeft();
super::dragLeaveEvent(event);
}
void ViewerDisplayWidget::dropEvent(QDropEvent *event)
{
emit Dropped();
super::dropEvent(event);
}
void ViewerDisplayWidget::OnPaint()
{
// Clear background to empty
@@ -402,7 +422,7 @@ void ViewerDisplayWidget::OnPaint()
void ViewerDisplayWidget::OnDestroy()
{
ManagedDisplayWidget::OnDestroy();
super::OnDestroy();
texture_ = nullptr;
}
app/widget/viewer/viewerdisplay.h
+12
View File
@@ -170,6 +170,12 @@ signals:
*/
void CursorColor(const Color& reference, const Color& display);
void DragEntered();
void DragLeft();
void Dropped();
protected:
/**
* @brief Override the mouse press event for the DragStarted() signal and gizmos
@@ -186,6 +192,12 @@ protected:
*/
virtual void mouseReleaseEvent(QMouseEvent* event) override;
virtual void dragEnterEvent(QDragEnterEvent* event) override;
virtual void dragLeaveEvent(QDragLeaveEvent* event) override;
virtual void dropEvent(QDropEvent* event) override;
protected slots:
/**
* @brief Paint function to display the texture (received in SetTexture()) on screen.