eessppeelllloo/vimix
1
0
Fork 0
mirror of https://github.com/brunoherbelin/vimix.git synced 2025-12-13 19:29:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Improved UI media player (info media)

Browse Source
This commit is contained in:
Bruno
2021-05-22 01:34:19 +02:00
parent 74a9b229d0
commit 7f152077e5
2 changed files with 102 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
ImGuiToolkit.cpp
View File

@@ -737,6 +737,28 @@ bool ImGuiToolkit::EditPlotLines(const char* label, float *array, int values_cou
return array_changed; return array_changed;
} }
// Function to create Gaussian filter
void FilterCreation(float GKernel[], int N)
{
// intialising standard deviation to 1.0
float sigma = N * 0.25f;
float s = 2.0 * sigma * sigma;
// sum is for normalization
float max = 0.0;
// generating 5x5 kernel
for (int x = 0 ; x < N; x++) {
float r = x;
GKernel[x] = (exp(-(r * r) / s)) / sqrt(M_PI * 2.0 * sigma);
max = MAX(max, GKernel[x]);
}
// normalising the Kernel
for (int i = 0; i < N; ++i)
GKernel[i] /= max;
}
bool ImGuiToolkit::EditPlotHistoLines(const char* label, float *histogram_array, float *lines_array, bool ImGuiToolkit::EditPlotHistoLines(const char* label, float *histogram_array, float *lines_array,
int values_count, float values_min, float values_max, bool edit_histogram, bool *released, const ImVec2 size) int values_count, float values_min, float values_max, bool edit_histogram, bool *released, const ImVec2 size)
{ {
@@ -761,7 +783,6 @@ bool ImGuiToolkit::EditPlotHistoLines(const char* label, float *histogram_array,
if (!ImGui::ItemAdd(bbox, id)) if (!ImGui::ItemAdd(bbox, id))
return false; return false;
*released = false; *released = false;
// read user input and activate widget // read user input and activate widget
@@ -807,6 +828,9 @@ bool ImGuiToolkit::EditPlotHistoLines(const char* label, float *histogram_array,
if (previous_index == UINT32_MAX) if (previous_index == UINT32_MAX)
previous_index = index; previous_index = index;
const uint left = MIN(previous_index, index);
const uint right = MAX(previous_index, index);
if (edit_histogram){ if (edit_histogram){
static float target_value = values_min; static float target_value = values_min;
@@ -816,12 +840,15 @@ bool ImGuiToolkit::EditPlotHistoLines(const char* label, float *histogram_array,
active = true; active = true;
} }
for (uint i = MIN(previous_index, index); i < MAX(previous_index, index); ++i) for (uint i = left; i < right; ++i)
histogram_array[i] = target_value; histogram_array[i] = target_value;
} }
else { else {
for (uint i = MIN(previous_index, index); i < MAX(previous_index, index); ++i) const float target_value = values_max - y;
lines_array[i] = values_max - y;
for (uint i = left; i < right; ++i)
lines_array[i] = target_value;
} }
previous_index = index; previous_index = index;
@@ -858,12 +885,14 @@ bool ImGuiToolkit::EditPlotHistoLines(const char* label, float *histogram_array,
// draw the cursor bar // draw the cursor bar
if (hovered) { if (hovered) {
mouse_pos_in_canvas.x = CLAMP(mouse_pos_in_canvas.x, _h_space, size.x - _h_space);
if (edit_histogram) if (edit_histogram)
window->DrawList->AddLine( canvas_pos + ImVec2(mouse_pos_in_canvas.x, 4.f), canvas_pos + ImVec2(mouse_pos_in_canvas.x, size.y - 4.f), fg_color); window->DrawList->AddLine( canvas_pos + ImVec2(mouse_pos_in_canvas.x, 4.f), canvas_pos + ImVec2(mouse_pos_in_canvas.x, size.y - 4.f), fg_color);
else { else {
window->DrawList->AddCircle( canvas_pos + mouse_pos_in_canvas, 2.f, fg_color, 6); window->DrawList->AddCircle( canvas_pos + mouse_pos_in_canvas, 2.f, fg_color, 6);
} }
} }
return array_changed; return array_changed;
} }

166
UserInterfaceManager.cpp
View File

@@ -6,6 +6,7 @@
#include <map> #include <map>
#include <iomanip> #include <iomanip>
#include <fstream> #include <fstream>
#include <sstream>
using namespace std; using namespace std;
@@ -2484,7 +2485,7 @@ void SourceController::RenderSelection(size_t i)
ImVec2 image_bottom = ImGui::GetCursorPos(); ImVec2 image_bottom = ImGui::GetCursorPos();
// Play icon lower left corner // Play icon lower left corner
ImGuiToolkit::PushFont(ImGuiToolkit::FONT_MONO); ImGuiToolkit::PushFont(framesize.x > 350.f ? ImGuiToolkit::FONT_LARGE : ImGuiToolkit::FONT_MONO);
ImGui::SetCursorPos(image_top + ImVec2( numcolumns > 1 ? 0.f : _h_space, framesize.y - ImGui::GetTextLineHeightWithSpacing())); ImGui::SetCursorPos(image_top + ImVec2( numcolumns > 1 ? 0.f : _h_space, framesize.y - ImGui::GetTextLineHeightWithSpacing()));
if ((*source)->active()) if ((*source)->active())
ImGui::Text("%s %s", (*source)->playing() ? ICON_FA_PLAY : ICON_FA_PAUSE, GstToolkit::time_to_string((*source)->playtime()).c_str() ); ImGui::Text("%s %s", (*source)->playing() ? ICON_FA_PLAY : ICON_FA_PAUSE, GstToolkit::time_to_string((*source)->playtime()).c_str() );
@@ -2509,7 +2510,7 @@ void SourceController::RenderSelection(size_t i)
ImGui::PushStyleColor(ImGuiCol_Button, ImVec4(0.00f, 0.00f, 0.00f, 0.00f)); ImGui::PushStyleColor(ImGuiCol_Button, ImVec4(0.00f, 0.00f, 0.00f, 0.00f));
ImGui::PushStyleColor(ImGuiCol_FrameBg, ImVec4(0.00f, 0.00f, 0.00f, 0.00f)); ImGui::PushStyleColor(ImGuiCol_FrameBg, ImVec4(0.00f, 0.00f, 0.00f, 0.00f));
ImGui::PushStyleColor(ImGuiCol_FrameBgHovered, ImVec4(0.14f, 0.14f, 0.14f, 0.7f)); ImGui::PushStyleColor(ImGuiCol_FrameBgHovered, ImVec4(0.14f, 0.14f, 0.14f, 0.7f));
ImGui::PushStyleColor(ImGuiCol_ButtonHovered, ImVec4(0.14f, 0.14f, 0.14f, 0.7f)); ImGui::PushStyleColor(ImGuiCol_ButtonHovered, ImVec4(0.14f, 0.14f, 0.14f, 0.5f));
ImGui::SetCursorScreenPos(bottom + ImVec2(rendersize.x * 0.6f, _v_space) ); ImGui::SetCursorScreenPos(bottom + ImVec2(rendersize.x * 0.6f, _v_space) );
ImGui::SetNextItemWidth(-_h_space); ImGui::SetNextItemWidth(-_h_space);
@@ -2520,11 +2521,11 @@ void SourceController::RenderSelection(size_t i)
if ( (*s)->playable() ) { if ( (*s)->playable() ) {
if (std::find(selection_.begin(),selection_.end(),*s) == selection_.end()) { if (std::find(selection_.begin(),selection_.end(),*s) == selection_.end()) {
if (ImGui::MenuItem( (*s)->name().c_str() )) if (ImGui::MenuItem( (*s)->name().c_str() , 0, false ))
Mixer::manager().session()->addToPlayGroup(i, *s); Mixer::manager().session()->addToPlayGroup(i, *s);
} }
else { else {
if (ImGui::MenuItem( (*s)->name().c_str(), ICON_FA_CHECK )) if (ImGui::MenuItem( (*s)->name().c_str(), 0, true ))
Mixer::manager().session()->removeFromPlayGroup(i, *s); Mixer::manager().session()->removeFromPlayGroup(i, *s);
} }
} }
@@ -2534,84 +2535,6 @@ void SourceController::RenderSelection(size_t i)
ImGui::PopStyleColor(4); ImGui::PopStyleColor(4);
// const float preview_height = 4.5f * ImGui::GetFrameHeightWithSpacing();
// ImGui::Columns(2, NULL, true);
// // selection_ = Mixer::manager().session()->getDepthSortedList();
// Source *_toremove = nullptr;
// for (auto source = selection_.begin(); source != selection_.end(); ++source) {
// FrameBuffer *frame = (*source)->frame();
// float width = ImGui::GetColumnWidth();
// float height = width / frame->aspectRatio();
// if (height > preview_height) {
// height = preview_height;
// width = height * frame->aspectRatio();
// }
// ImVec2 top = ImGui::GetCursorPos();
// ImGui::Image((void*)(uintptr_t) (*source)->texture(), ImVec2(width, height));
// ImVec2 bottom = ImGui::GetCursorPos();
// // Context menu button up-left corner
// if (ImGui::IsItemHovered(ImGuiHoveredFlags_RectOnly))
// {
// ImGui::SetCursorPos(top + ImVec2(_h_space, _v_space));
// if (ImGuiToolkit::ButtonIcon(5, 8))
// ImGui::OpenPopup( "MenuSourceControl" );
// if (ImGui::BeginPopup( "MenuSourceControl" ))
// {
// if (ImGui::MenuItem(ICON_FA_MINUS_SQUARE " Remove from selection" )){
// _toremove = *source;
// }
// if (ImGui::MenuItem(ICON_FA_FILM " Open in Player" )){
// }
// ImGui::EndPopup();
// }
// }
// // Play icon lower left corner
// ImGui::SetCursorPos(top + ImVec2(_h_space, height - ImGui::GetTextLineHeightWithSpacing()));
// if ((*source)->active())
// ImGui::Text("%s", (*source)->playing() ? ICON_FA_PLAY : ICON_FA_PAUSE );
// else
// ImGui::Text(ICON_FA_SNOWFLAKE);
// ImGui::SetCursorPos(bottom + ImVec2(0, _v_space));
// ImGui::NextColumn();
// }
// // apply source removal
// if (_toremove)
// selection_.remove(_toremove);
// // Add source in selection
// ImGuiToolkit::PushFont(ImGuiToolkit::FONT_LARGE);
// if (ImGuiToolkit::IconButton(ICON_FA_PLUS_SQUARE))
// ImGui::OpenPopup( "SelectionAddSourceList" );
// ImGui::PopFont();
// if (ImGui::BeginPopup( "SelectionAddSourceList" ))
// {
// uint count = 0;
// for (auto s = Mixer::manager().session()->begin(); s != Mixer::manager().session()->end(); ++s) {
// if ( (*s)->playable() && std::find(selection_.begin(),selection_.end(),*s) == selection_.end()) {
// if (ImGui::MenuItem( (*s)->name().c_str() ))
// selection_.push_back( *s );
// ++count;
// }
// }
// if (count<1)
// ImGui::MenuItem( "No playable source available ", 0, false, false);
// ImGui::EndPopup();
// }
// ImGui::Columns(1);
} }
void SourceController::RenderSelectedSources() void SourceController::RenderSelectedSources()
@@ -2673,7 +2596,7 @@ void SourceController::RenderSelectedSources()
ImVec2 image_bottom = ImGui::GetCursorPos(); ImVec2 image_bottom = ImGui::GetCursorPos();
// Play icon lower left corner // Play icon lower left corner
ImGuiToolkit::PushFont(ImGuiToolkit::FONT_MONO); ImGuiToolkit::PushFont(framesize.x > 350.f ? ImGuiToolkit::FONT_LARGE : ImGuiToolkit::FONT_MONO);
ImGui::SetCursorPos(image_top + ImVec2( numcolumns > 1 ? 0.f : _h_space, framesize.y - ImGui::GetTextLineHeightWithSpacing())); ImGui::SetCursorPos(image_top + ImVec2( numcolumns > 1 ? 0.f : _h_space, framesize.y - ImGui::GetTextLineHeightWithSpacing()));
if ((*source)->active()) if ((*source)->active())
ImGui::Text("%s %s", (*source)->playing() ? ICON_FA_PLAY : ICON_FA_PAUSE, GstToolkit::time_to_string((*source)->playtime()).c_str() ); ImGui::Text("%s %s", (*source)->playing() ? ICON_FA_PLAY : ICON_FA_PAUSE, GstToolkit::time_to_string((*source)->playtime()).c_str() );
@@ -2729,18 +2652,40 @@ void SourceController::RenderSingleSource(Source *s)
framesize.x = tmp.x; framesize.x = tmp.x;
} }
ImGui::SetCursorScreenPos(top + corner); top += corner;
ImGui::SetCursorScreenPos(top);
ImGui::Image((void*)(uintptr_t) s->texture(), framesize); ImGui::Image((void*)(uintptr_t) s->texture(), framesize);
// Play icon lower left corner // Play icon lower left corner
ImGuiToolkit::PushFont(framesize.x > 200.f ? ImGuiToolkit::FONT_LARGE : ImGuiToolkit::FONT_MONO); ImGuiToolkit::PushFont(framesize.x > 350.f ? ImGuiToolkit::FONT_LARGE : ImGuiToolkit::FONT_MONO);
ImGui::SetCursorScreenPos(top + corner + ImVec2(_h_space, framesize.y - ImGui::GetTextLineHeightWithSpacing())); ImGui::SetCursorScreenPos(top + ImVec2(_h_space, framesize.y - ImGui::GetTextLineHeightWithSpacing()));
if (s->active()) if (s->active())
ImGui::Text("%s %s", s->playing() ? ICON_FA_PLAY : ICON_FA_PAUSE, GstToolkit::time_to_string(s->playtime()).c_str() ); ImGui::Text("%s %s", s->playing() ? ICON_FA_PLAY : ICON_FA_PAUSE, GstToolkit::time_to_string(s->playtime()).c_str() );
else else
ImGui::Text("%s %s", ICON_FA_SNOWFLAKE, GstToolkit::time_to_string(s->playtime()).c_str() ); ImGui::Text("%s %s", ICON_FA_SNOWFLAKE, GstToolkit::time_to_string(s->playtime()).c_str() );
ImGui::PopFont(); ImGui::PopFont();
StreamSource *sts = dynamic_cast<StreamSource*>(s);
if (sts !=nullptr){
ImGui::SetCursorScreenPos(top + ImVec2(framesize.x - ImGui::GetTextLineHeightWithSpacing(), _v_space));
ImGui::Text(ICON_FA_INFO_CIRCLE);
if (ImGui::IsItemHovered()){
std::ostringstream tooltip;
std::string desc = sts->stream()->description();
desc = desc.substr(0, desc.find_first_of('!'));
tooltip << desc << "\n ";
tooltip << sts->stream()->width() << " x " << sts->stream()->height() << " px, ";
tooltip << std::fixed << std::setprecision(2) << sts->stream()->updateFrameRate() << " fps ";
float tooltip_height = 2.f * ImGui::GetTextLineHeightWithSpacing();
ImDrawList* draw_list = ImGui::GetWindowDrawList();
draw_list->AddRectFilled(top, top + ImVec2(framesize.x, tooltip_height), IMGUI_COLOR_OVERLAY);
ImGui::SetCursorScreenPos(top + ImVec2(0, _v_space));
ImGui::Text(" %s", tooltip.str().c_str());
}
}
/// ///
/// Play source button bar /// Play source button bar
/// ///
@@ -2773,18 +2718,41 @@ void SourceController::RenderMediaPlayer(MediaPlayer *mp)
framesize.x = tmp.x; framesize.x = tmp.x;
} }
ImGui::SetCursorScreenPos(top + corner); top += corner;
ImGui::SetCursorScreenPos(top);
ImGui::Image((void*)(uintptr_t) mp->texture(), framesize); ImGui::Image((void*)(uintptr_t) mp->texture(), framesize);
// Play icon lower left corner // Play icon lower left corner
ImGuiToolkit::PushFont(framesize.x > 200.f ? ImGuiToolkit::FONT_LARGE : ImGuiToolkit::FONT_MONO); ImGuiToolkit::PushFont(framesize.x > 350.f ? ImGuiToolkit::FONT_LARGE : ImGuiToolkit::FONT_MONO);
ImGui::SetCursorScreenPos(top + corner + ImVec2(_h_space, framesize.y - ImGui::GetTextLineHeightWithSpacing())); ImGui::SetCursorScreenPos(top + ImVec2(_h_space, framesize.y - ImGui::GetTextLineHeightWithSpacing()));
if (mp->isEnabled()) if (mp->isEnabled())
ImGui::Text("%s %s", mp->isPlaying() ? ICON_FA_PLAY : ICON_FA_PAUSE, GstToolkit::time_to_string(mp->position()).c_str() ); ImGui::Text("%s %s", mp->isPlaying() ? ICON_FA_PLAY : ICON_FA_PAUSE, GstToolkit::time_to_string(mp->position()).c_str() );
else else
ImGui::Text("%s %s", ICON_FA_SNOWFLAKE, GstToolkit::time_to_string(mp->position()).c_str() ); ImGui::Text("%s %s", ICON_FA_SNOWFLAKE, GstToolkit::time_to_string(mp->position()).c_str() );
ImGui::PopFont(); ImGui::PopFont();
ImGui::SetCursorScreenPos(top + ImVec2(framesize.x - ImGui::GetTextLineHeightWithSpacing(), _v_space));
ImGui::Text(ICON_FA_INFO_CIRCLE);
if (ImGui::IsItemHovered()){
std::ostringstream tooltip;
tooltip << mp->filename() << "\n ";
tooltip << mp->media().codec_name;
if (Settings::application.render.gpu_decoding && !mp->hardwareDecoderName().empty() )
tooltip << " (" << mp->hardwareDecoderName() << " hardware decoder)";
tooltip << " \n " << mp->width() << " x " << mp->height() << " px, ";
if ( mp->frameRate() > 1.f )
tooltip << std::fixed << std::setprecision(2) << mp->updateFrameRate() << " / " << mp->frameRate() << " fps ";
float tooltip_height = 3.f * ImGui::GetTextLineHeightWithSpacing();
ImDrawList* draw_list = ImGui::GetWindowDrawList();
draw_list->AddRectFilled(top, top + ImVec2(framesize.x, tooltip_height), IMGUI_COLOR_OVERLAY);
ImGui::SetCursorScreenPos(top + ImVec2(0, _v_space));
ImGui::Text(" %s", tooltip.str().c_str());
}
/// ///
/// media player buttons bar /// media player buttons bar
/// ///
@@ -2794,9 +2762,9 @@ void SourceController::RenderMediaPlayer(MediaPlayer *mp)
// buttons style // buttons style
ImGui::PushStyleColor(ImGuiCol_Text, ImVec4(1.f, 1.f, 1.f, 1.0f)); ImGui::PushStyleColor(ImGuiCol_Text, ImVec4(1.f, 1.f, 1.f, 1.0f));
ImGui::PushStyleColor(ImGuiCol_Button, ImVec4(0.00f, 0.00f, 0.00f, 0.00f)); ImGui::PushStyleColor(ImGuiCol_Button, ImVec4(0.00f, 0.00f, 0.00f, 0.00f));
ImGui::PushStyleColor(ImGuiCol_ButtonHovered, ImVec4(0.24f, 0.24f, 0.24f, 0.7f)); ImGui::PushStyleColor(ImGuiCol_ButtonHovered, ImVec4(0.14f, 0.14f, 0.14f, 0.5f));
ImGui::PushStyleColor(ImGuiCol_FrameBg, ImVec4(0.24f, 0.24f, 0.24f, 0.2f)); ImGui::PushStyleColor(ImGuiCol_FrameBg, ImVec4(0.24f, 0.24f, 0.24f, 0.2f));
ImGui::PushStyleColor(ImGuiCol_FrameBgHovered, ImVec4(0.14f, 0.14f, 0.14f, 0.4f)); ImGui::PushStyleColor(ImGuiCol_FrameBgHovered, ImVec4(0.14f, 0.14f, 0.14f, 0.5f));
ImGui::SetCursorScreenPos(bottom + ImVec2(_h_space, _v_space) ); ImGui::SetCursorScreenPos(bottom + ImVec2(_h_space, _v_space) );
if (ImGui::Button(mp->playSpeed() > 0 ? ICON_FA_FAST_BACKWARD :ICON_FA_FAST_FORWARD)) if (ImGui::Button(mp->playSpeed() > 0 ? ICON_FA_FAST_BACKWARD :ICON_FA_FAST_FORWARD))
@@ -2906,7 +2874,8 @@ void SourceController::RenderMediaPlayer(MediaPlayer *mp)
/// ///
/// media player timelines /// media player timelines
/// ///
ImGui::SetCursorScreenPos(bottom + ImVec2(0, _buttons_height + _v_space) ); bottom += ImVec2(0, _buttons_height + _v_space);
ImGui::SetCursorScreenPos(bottom);
// seek position // seek position
guint64 seek_t = mp->position(); guint64 seek_t = mp->position();
@@ -2915,7 +2884,6 @@ void SourceController::RenderMediaPlayer(MediaPlayer *mp)
ImGui::PushStyleVar(ImGuiStyleVar_ItemSpacing, ImVec2(1.f, 1.f)); ImGui::PushStyleVar(ImGuiStyleVar_ItemSpacing, ImVec2(1.f, 1.f));
ImGui::PushStyleVar(ImGuiStyleVar_FrameRounding, 1.f); ImGui::PushStyleVar(ImGuiStyleVar_FrameRounding, 1.f);
ImVec2 top_scrollwindow = ImGui::GetCursorPos();
ImVec2 scrollwindow = ImVec2(ImGui::GetContentRegionAvail().x - slider_zoom_width - 3.0, ImVec2 scrollwindow = ImVec2(ImGui::GetContentRegionAvail().x - slider_zoom_width - 3.0,
2.f * _timeline_height + _scrollbar ); 2.f * _timeline_height + _scrollbar );
@@ -2943,16 +2911,18 @@ void SourceController::RenderMediaPlayer(MediaPlayer *mp)
} }
ImGui::EndChild(); ImGui::EndChild();
ImGui::PopStyleVar(2);
// action mode // action mode
ImGui::SetCursorPos(top_scrollwindow + ImVec2(scrollwindow.x + 3.f, 0)); bottom += ImVec2(scrollwindow.x, 0);
draw_list->AddRectFilled(bottom, bottom + ImVec2(slider_zoom_width+3.f, 0.5f * _timeline_height), ImGui::GetColorU32(ImGuiCol_FrameBg));
ImGui::SetCursorScreenPos(bottom + ImVec2(3.f, 0));
ImGuiToolkit::IconToggle(7,4,8,3, &Settings::application.widget.timeline_editmode); ImGuiToolkit::IconToggle(7,4,8,3, &Settings::application.widget.timeline_editmode);
// zoom slider // zoom slider
ImGui::SetCursorPos(top_scrollwindow + ImVec2(scrollwindow.x + 3.f, 0.5f * _timeline_height + 3.f)); ImGui::SetCursorScreenPos(bottom + ImVec2(3.f, 0.5f * _timeline_height + 3.f));
ImGui::VSliderFloat("##TimelineZoom", ImVec2(slider_zoom_width, 1.5f * _timeline_height - 3.f), &timeline_zoom, 1.0, 5.f, ""); ImGui::VSliderFloat("##TimelineZoom", ImVec2(slider_zoom_width, 1.5f * _timeline_height - 3.f), &timeline_zoom, 1.0, 5.f, "");
ImGui::PopStyleVar(2);
/// ///
/// media player actions /// media player actions
/// ///
@@ -2985,7 +2955,7 @@ void SourceController::DrawButtonBar(ImVec2 bottom, float width)
else { else {
ImGui::PushStyleColor(ImGuiCol_Text, ImVec4(1.f, 1.f, 1.f, 1.0f)); ImGui::PushStyleColor(ImGuiCol_Text, ImVec4(1.f, 1.f, 1.f, 1.0f));
ImGui::PushStyleColor(ImGuiCol_Button, ImVec4(0.00f, 0.00f, 0.00f, 0.00f)); ImGui::PushStyleColor(ImGuiCol_Button, ImVec4(0.00f, 0.00f, 0.00f, 0.00f));
ImGui::PushStyleColor(ImGuiCol_ButtonHovered, ImVec4(0.24f, 0.24f, 0.24f, 0.7f)); ImGui::PushStyleColor(ImGuiCol_ButtonHovered, ImVec4(0.14f, 0.14f, 0.14f, 0.5f));
} }
ImGui::SetCursorScreenPos(bottom + ImVec2(_h_space, _v_space) ); ImGui::SetCursorScreenPos(bottom + ImVec2(_h_space, _v_space) );