Mike-Solar
eb634b53ef
R7-A (Qwen 3.8 Max): oakengine/display.h rewritten to the POD contract from r7-pure-abi-plan.md - oak_video_params everywhere, opaque texture/frame handles with retain/free protocol (engine-heap control blocks), OakSharedBuffer refcounted wrapper for the QVariant playback path. All TexturePtr/FramePtr gone from app (47 sites). R7-B (Qwen 3.8 Max): liboakengine.so exports 3486 -> 19 C++ symbols (version script oakengine.ver: oakengine_* plus the documented oakgl/oakvulkan dlopen plugin ABI). oakengine-obj OBJECT library feeds both the shared lib and the test binaries (-rdynamic so dlopen'd backends resolve engine objects). Fix (Kimi K3): producer/consumer type mismatch - viewerdisplay unpacks OakSharedBufferPtr but viewer.cpp pushed raw void* handles, so no frame ever reached the display widget (all 5 vulkan viewer tests timed out with 'never received a texture'). Producers now wrap with oak_make_shared_frame / oak_make_shared_texture(retain). Verified: build 0 errors, ctest 45/45, nm U _ZN5olive = 0 in oak-editor/oak-render-worker/oak-cli, 19 exported C++ symbols in liboakengine.so (all documented plugin ABI).
88 lines
1.8 KiB
C++
88 lines
1.8 KiB
C++
/***
|
|
|
|
Olive - Non-Linear Video Editor
|
|
Copyright (C) 2022 Olive Team
|
|
Modifications Copyright (C) 2025 mikesolar
|
|
|
|
This program is free software: you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation, either version 3 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
***/
|
|
|
|
#ifndef OAK_SCOPE_PANEL_H
|
|
#define OAK_SCOPE_PANEL_H
|
|
|
|
#include <QComboBox>
|
|
#include <QStackedWidget>
|
|
|
|
#include "panel/panel.h"
|
|
#include "panel/viewer/viewerbase.h"
|
|
#include "widget/scope/histogram/histogram.h"
|
|
#include "widget/scope/vectorscope/vectorscope.h"
|
|
#include "widget/scope/waveform/waveform.h"
|
|
|
|
namespace olive
|
|
{
|
|
|
|
class ScopePanel : public PanelWidget {
|
|
Q_OBJECT
|
|
public:
|
|
enum Type {
|
|
k_type_waveform,
|
|
k_type_vectorscope,
|
|
k_type_histogram,
|
|
|
|
k_type_count
|
|
};
|
|
|
|
ScopePanel();
|
|
|
|
void set_type(Type t);
|
|
|
|
static QString type_to_name(Type t);
|
|
|
|
void set_viewer_panel(ViewerPanelBase *vp);
|
|
|
|
ViewerPanelBase *get_connected_viewer_panel() const
|
|
{
|
|
return viewer_;
|
|
}
|
|
|
|
public slots:
|
|
void set_reference_buffer(void *frame);
|
|
|
|
void set_color_manager(OakEngineColorManager *manager);
|
|
|
|
protected:
|
|
virtual void retranslate() override;
|
|
|
|
private:
|
|
Type type_;
|
|
|
|
QStackedWidget *stack_;
|
|
|
|
QComboBox *scope_type_combobox_;
|
|
|
|
WaveformScope *waveform_view_;
|
|
|
|
VectorscopeScope *vectorscope_;
|
|
|
|
HistogramScope *histogram_;
|
|
|
|
ViewerPanelBase *viewer_;
|
|
};
|
|
|
|
}
|
|
|
|
#endif // OAK_SCOPE_PANEL_H
|