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

Player: shoft slider on first frame of MediaPlayer

Browse Source
This commit is contained in:
Bruno
2021-06-20 18:50:12 +02:00
parent f2ecc88955
commit 79fa6082b0
7 changed files with 29 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
ImGuiToolkit.cpp
View File

@@ -456,7 +456,7 @@ void ImGuiToolkit::HelpIcon(const char* desc, int i, int j, const char* shortcut
#define LARGE_TICK_INCREMENT 1 #define LARGE_TICK_INCREMENT 1
#define LABEL_TICK_INCREMENT 3 #define LABEL_TICK_INCREMENT 3
void ImGuiToolkit::RenderTimeline (ImGuiWindow* window, ImRect timeline_bbox, guint64 start, guint64 end, guint64 step, bool verticalflip) void ImGuiToolkit::RenderTimeline (ImGuiWindow* window, ImRect timeline_bbox, guint64 begin, guint64 end, guint64 step, bool verticalflip)
{ {
static guint64 optimal_tick_marks[NUM_MARKS + LABEL_TICK_INCREMENT] = { 100 * MILISECOND, 500 * MILISECOND, 1 * SECOND, 2 * SECOND, 5 * SECOND, 10 * SECOND, 20 * SECOND, 1 * MINUTE, 2 * MINUTE, 5 * MINUTE, 10 * MINUTE, 60 * MINUTE, 60 * MINUTE }; static guint64 optimal_tick_marks[NUM_MARKS + LABEL_TICK_INCREMENT] = { 100 * MILISECOND, 500 * MILISECOND, 1 * SECOND, 2 * SECOND, 5 * SECOND, 10 * SECOND, 20 * SECOND, 1 * MINUTE, 2 * MINUTE, 5 * MINUTE, 10 * MINUTE, 60 * MINUTE, 60 * MINUTE };
@@ -472,7 +472,7 @@ void ImGuiToolkit::RenderTimeline (ImGuiWindow* window, ImRect timeline_bbox, gu
guint64 tick_delta = 0; guint64 tick_delta = 0;
// keep duration // keep duration
const guint64 duration = end - start; const guint64 duration = end - begin;
// how many pixels to represent one frame step? // how many pixels to represent one frame step?
const float step_ = static_cast<float> ( static_cast<double>(tick_step) / static_cast<double>(duration) ); const float step_ = static_cast<float> ( static_cast<double>(tick_step) / static_cast<double>(duration) );
@@ -523,7 +523,7 @@ void ImGuiToolkit::RenderTimeline (ImGuiWindow* window, ImRect timeline_bbox, gu
// render tick and text START // render tick and text START
ImFormatString(text_buf, IM_ARRAYSIZE(text_buf), "%s", ImFormatString(text_buf, IM_ARRAYSIZE(text_buf), "%s",
GstToolkit::time_to_string(start, GstToolkit::TIME_STRING_MINIMAL).c_str()); GstToolkit::time_to_string(begin, GstToolkit::TIME_STRING_MINIMAL).c_str());
ImVec2 beginning_label_size = ImGui::CalcTextSize(text_buf, NULL); ImVec2 beginning_label_size = ImGui::CalcTextSize(text_buf, NULL);
ImVec2 beginning_label_pos = timeline_bbox.GetTL() + ImVec2(3.f, fontsize); ImVec2 beginning_label_pos = timeline_bbox.GetTL() + ImVec2(3.f, fontsize);
if (verticalflip) if (verticalflip)
@@ -540,8 +540,8 @@ void ImGuiToolkit::RenderTimeline (ImGuiWindow* window, ImRect timeline_bbox, gu
ImGui::PushStyleColor(ImGuiCol_Text, style.Colors[ImGuiCol_Text] -ImVec4(0.f,0.f,0.f,0.4f)); ImGui::PushStyleColor(ImGuiCol_Text, style.Colors[ImGuiCol_Text] -ImVec4(0.f,0.f,0.f,0.4f));
ImVec2 pos = verticalflip ? timeline_bbox.GetBL() : timeline_bbox.GetTL(); ImVec2 pos = verticalflip ? timeline_bbox.GetBL() : timeline_bbox.GetTL();
// loop ticks from start to end // loop ticks from begin to end
guint64 tick = tick_step > 0 ? (start / tick_step) * tick_step : 0; guint64 tick = tick_step > 0 ? (begin / tick_step) * tick_step : 0;
while ( tick < end ) while ( tick < end )
{ {
// large tick mark ? // large tick mark ?
@@ -580,7 +580,7 @@ void ImGuiToolkit::RenderTimeline (ImGuiWindow* window, ImRect timeline_bbox, gu
// next tick // next tick
tick += tick_step; tick += tick_step;
float tick_percent = static_cast<float> ( static_cast<double>(tick-start) / static_cast<double>(duration) ); float tick_percent = static_cast<float> ( static_cast<double>(tick-begin) / static_cast<double>(duration) );
if (verticalflip) if (verticalflip)
pos = ImLerp(timeline_bbox.GetBL(), timeline_bbox.GetBR(), tick_percent); pos = ImLerp(timeline_bbox.GetBL(), timeline_bbox.GetBR(), tick_percent);
else else
@@ -591,7 +591,7 @@ void ImGuiToolkit::RenderTimeline (ImGuiWindow* window, ImRect timeline_bbox, gu
} }
bool ImGuiToolkit::TimelineSlider(const char* label, guint64 *time, guint64 start, guint64 end, guint64 step, const float width) bool ImGuiToolkit::TimelineSlider(const char* label, guint64 *time, guint64 begin, guint64 first, guint64 end, guint64 step, const float width)
{ {
// get window // get window
ImGuiWindow* window = ImGui::GetCurrentWindow(); ImGuiWindow* window = ImGui::GetCurrentWindow();
@@ -628,7 +628,7 @@ bool ImGuiToolkit::TimelineSlider(const char* label, guint64 *time, guint64 star
ImRect slider_bbox( timeline_bbox.GetTL() + ImVec2(-cursor_width + 2.f, cursor_width + 4.f ), timeline_bbox.GetBR() + ImVec2( cursor_width - 2.f, 0.f ) ); ImRect slider_bbox( timeline_bbox.GetTL() + ImVec2(-cursor_width + 2.f, cursor_width + 4.f ), timeline_bbox.GetBR() + ImVec2( cursor_width - 2.f, 0.f ) );
// units conversion: from time to float (calculation made with higher precision first) // units conversion: from time to float (calculation made with higher precision first)
float time_ = static_cast<float> ( static_cast<double>(*time - start) / static_cast<double>(end - start) ); float time_ = static_cast<float> ( static_cast<double>(*time - begin) / static_cast<double>(end - begin) );
// //
// SECOND GET USER INPUT AND PERFORM CHANGES AND DECISIONS // SECOND GET USER INPUT AND PERFORM CHANGES AND DECISIONS
@@ -659,8 +659,9 @@ bool ImGuiToolkit::TimelineSlider(const char* label, guint64 *time, guint64 star
bool value_changed = ImGui::SliderBehavior(slider_bbox, id, ImGuiDataType_Float, &time_slider, &time_zero, bool value_changed = ImGui::SliderBehavior(slider_bbox, id, ImGuiDataType_Float, &time_slider, &time_zero,
&time_end, "%.2f", 1.f, ImGuiSliderFlags_None, &grab_slider_bb); &time_end, "%.2f", 1.f, ImGuiSliderFlags_None, &grab_slider_bb);
if (value_changed){ if (value_changed){
// g_print("slider %f %ld \n", time_slider, static_cast<guint64> ( static_cast<double>(time_slider) * static_cast<double>(duration) )); *time = static_cast<guint64> ( 0.1 * static_cast<double>(time_slider) * static_cast<double>(end - begin) );
*time = static_cast<guint64> ( 0.1 * static_cast<double>(time_slider) * static_cast<double>(end - start) ) + start; if (first != -1)
*time -= first;
grab_slider_color = ImGui::GetColorU32(ImGuiCol_SliderGrabActive); grab_slider_color = ImGui::GetColorU32(ImGuiCol_SliderGrabActive);
} }
@@ -673,7 +674,7 @@ bool ImGuiToolkit::TimelineSlider(const char* label, guint64 *time, guint64 star
ImGui::RenderFrame(bbox.Min, bbox.Max, frame_col, true, style.FrameRounding); ImGui::RenderFrame(bbox.Min, bbox.Max, frame_col, true, style.FrameRounding);
// render the timeline // render the timeline
RenderTimeline(window, timeline_bbox, start, end, step); RenderTimeline(window, timeline_bbox, begin, end, step);
// draw slider grab handle // draw slider grab handle
if (grab_slider_bb.Max.x > grab_slider_bb.Min.x) { if (grab_slider_bb.Max.x > grab_slider_bb.Min.x) {
@@ -688,7 +689,7 @@ bool ImGuiToolkit::TimelineSlider(const char* label, guint64 *time, guint64 star
} }
void ImGuiToolkit::Timeline (const char* label, guint64 time, guint64 start, guint64 end, guint64 step, const float width) void ImGuiToolkit::Timeline (const char* label, guint64 time, guint64 begin, guint64 end, guint64 step, const float width)
{ {
// get window // get window
ImGuiWindow* window = ImGui::GetCurrentWindow(); ImGuiWindow* window = ImGui::GetCurrentWindow();
@@ -722,8 +723,8 @@ void ImGuiToolkit::Timeline (const char* label, guint64 time, guint64 start, gui
timeline_bbox.Expand( ImVec2() - style.FramePadding ); timeline_bbox.Expand( ImVec2() - style.FramePadding );
// units conversion: from time to float (calculation made with higher precision first) // units conversion: from time to float (calculation made with higher precision first)
guint64 duration = end - start; guint64 duration = end - begin;
float time_ = static_cast<float> ( static_cast<double>(time - start) / static_cast<double>(duration) ); float time_ = static_cast<float> ( static_cast<double>(time - begin) / static_cast<double>(duration) );
// //
// THIRD RENDER // THIRD RENDER
@@ -733,7 +734,7 @@ void ImGuiToolkit::Timeline (const char* label, guint64 time, guint64 start, gui
ImGui::RenderFrame(bbox.Min, bbox.Max, ImGui::GetColorU32(ImGuiCol_FrameBg), true, style.FrameRounding); ImGui::RenderFrame(bbox.Min, bbox.Max, ImGui::GetColorU32(ImGuiCol_FrameBg), true, style.FrameRounding);
// render the timeline // render the timeline
RenderTimeline(window, timeline_bbox, start, end, step); RenderTimeline(window, timeline_bbox, begin, end, step);
// draw the cursor // draw the cursor
if ( time_ > -FLT_EPSILON && time_ < 1.f ) { if ( time_ > -FLT_EPSILON && time_ < 1.f ) {
@@ -884,7 +885,7 @@ bool ImGuiToolkit::EditPlotLines(const char* label, float *array, int values_cou
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, guint64 start, guint64 end, int values_count, float values_min, float values_max, guint64 begin, guint64 end,
bool edit_histogram, bool *released, const ImVec2 size) bool edit_histogram, bool *released, const ImVec2 size)
{ {
bool array_changed = false; bool array_changed = false;
@@ -936,7 +937,7 @@ bool ImGuiToolkit::EditPlotHistoLines(const char* label, float *histogram_array,
double x = (mouse_pos_in_canvas.x - _h_space) / (size.x - 2.f * _h_space); double x = (mouse_pos_in_canvas.x - _h_space) / (size.x - 2.f * _h_space);
size_t index = CLAMP( (int) floor(static_cast<double>(values_count) * x), 0, values_count); size_t index = CLAMP( (int) floor(static_cast<double>(values_count) * x), 0, values_count);
char cursor_text[64]; char cursor_text[64];
guint64 time = start + (index * end) / static_cast<guint64>(values_count); guint64 time = begin + (index * end) / static_cast<guint64>(values_count);
ImFormatString(cursor_text, IM_ARRAYSIZE(cursor_text), "%s", ImFormatString(cursor_text, IM_ARRAYSIZE(cursor_text), "%s",
GstToolkit::time_to_string(time, GstToolkit::TIME_STRING_MINIMAL).c_str()); GstToolkit::time_to_string(time, GstToolkit::TIME_STRING_MINIMAL).c_str());

8
ImGuiToolkit.h
View File

@@ -35,12 +35,12 @@ namespace ImGuiToolkit
void HelpIcon (const char* desc, int i = 19, int j = 5, const char* shortcut = nullptr); void HelpIcon (const char* desc, int i = 19, int j = 5, const char* shortcut = nullptr);
// sliders // sliders
bool TimelineSlider (const char* label, guint64 *time, guint64 start, guint64 end, guint64 step, const float width); bool TimelineSlider (const char* label, guint64 *time, guint64 begin, guint64 first, guint64 end, guint64 step, const float width);
void RenderTimeline (struct ImGuiWindow* window, struct ImRect timeline_bbox, guint64 start, guint64 end, guint64 step, bool verticalflip = false); void RenderTimeline (struct ImGuiWindow* window, struct ImRect timeline_bbox, guint64 begin, guint64 end, guint64 step, bool verticalflip = false);
void Timeline (const char* label, guint64 time, guint64 start, guint64 end, guint64 step, const float width); void Timeline (const char* label, guint64 time, guint64 begin, guint64 end, guint64 step, const float width);
bool InvisibleSliderInt(const char* label, uint *index, uint min, uint max, const ImVec2 size); bool InvisibleSliderInt(const char* label, uint *index, uint min, uint max, const ImVec2 size);
bool EditPlotLines(const char* label, float *array, int values_count, float values_min, float values_max, const ImVec2 size); bool EditPlotLines(const char* label, float *array, int values_count, float values_min, float values_max, const ImVec2 size);
bool EditPlotHistoLines(const char* label, float *histogram_array, float *lines_array, int values_count, float values_min, float values_max, guint64 start, guint64 end, bool cut, bool *released, const ImVec2 size); bool EditPlotHistoLines(const char* label, float *histogram_array, float *lines_array, int values_count, float values_min, float values_max, guint64 begin, guint64 end, bool cut, bool *released, const ImVec2 size);
void ShowPlotHistoLines(const char* label, float *histogram_array, float *lines_array, int values_count, float values_min, float values_max, const ImVec2 size); void ShowPlotHistoLines(const char* label, float *histogram_array, float *lines_array, int values_count, float values_min, float values_max, const ImVec2 size);
// fonts from ressources 'fonts/' // fonts from ressources 'fonts/'

2
MediaPlayer.cpp
View File

@@ -1112,7 +1112,7 @@ bool MediaPlayer::fill_frame(GstBuffer *buf, FrameStatus status)
frame_[write_index_].position = buf->pts; frame_[write_index_].position = buf->pts;
// set the start position (i.e. pts of first frame we got) // set the start position (i.e. pts of first frame we got)
if (timeline_.begin() == GST_CLOCK_TIME_NONE) { if (timeline_.first() == GST_CLOCK_TIME_NONE) {
timeline_.setFirst(buf->pts); timeline_.setFirst(buf->pts);
} }
} }

2
MediaPlayer.h
View File

@@ -42,7 +42,7 @@ struct MediaInfo {
bitrate = 0; bitrate = 0;
framerate_n = 1; framerate_n = 1;
framerate_d = 25; framerate_d = 25;
codec_name = "unknown"; codec_name = "";
isimage = false; isimage = false;
interlaced = false; interlaced = false;
seekable = false; seekable = false;

3
Timeline.cpp
View File

@@ -38,6 +38,7 @@ Timeline& Timeline::operator = (const Timeline& b)
if (this != &b) { if (this != &b) {
this->timing_ = b.timing_; this->timing_ = b.timing_;
this->step_ = b.step_; this->step_ = b.step_;
this->first_ = b.first_;
this->gaps_ = b.gaps_; this->gaps_ = b.gaps_;
this->gaps_array_need_update_ = b.gaps_array_need_update_; this->gaps_array_need_update_ = b.gaps_array_need_update_;
memcpy( this->gapsArray_, b.gapsArray_, MAX_TIMELINE_ARRAY * sizeof(float)); memcpy( this->gapsArray_, b.gapsArray_, MAX_TIMELINE_ARRAY * sizeof(float));
@@ -51,7 +52,7 @@ void Timeline::reset()
// reset timing // reset timing
timing_.reset(); timing_.reset();
timing_.begin = 0; timing_.begin = 0;
first_ = 0; first_ = GST_CLOCK_TIME_NONE;
step_ = GST_CLOCK_TIME_NONE; step_ = GST_CLOCK_TIME_NONE;
clearGaps(); clearGaps();

5
Timeline.h
View File

@@ -92,19 +92,18 @@ public:
void refresh(); void refresh();
// global properties of the timeline // global properties of the timeline
// timeline is valid only if all 3 are set
void setFirst(GstClockTime first); // TODO : do we really use FIRST ?
void setEnd(GstClockTime end); void setEnd(GstClockTime end);
void setStep(GstClockTime dt); void setStep(GstClockTime dt);
void setFirst(GstClockTime first);
void setTiming(TimeInterval interval, GstClockTime step = GST_CLOCK_TIME_NONE); void setTiming(TimeInterval interval, GstClockTime step = GST_CLOCK_TIME_NONE);
// Timing manipulation // Timing manipulation
inline GstClockTime begin() const { return timing_.begin; } inline GstClockTime begin() const { return timing_.begin; }
inline GstClockTime end() const { return timing_.end; } inline GstClockTime end() const { return timing_.end; }
inline GstClockTime duration() const { return timing_.duration(); }
inline GstClockTime first() const { return first_; } inline GstClockTime first() const { return first_; }
inline GstClockTime last() const { return timing_.end - step_; } inline GstClockTime last() const { return timing_.end - step_; }
inline GstClockTime step() const { return step_; } inline GstClockTime step() const { return step_; }
inline GstClockTime duration() const { return timing_.duration(); }
inline size_t numFrames() const { if (step_) return duration() / step_; else return 1; } inline size_t numFrames() const { if (step_) return duration() / step_; else return 1; }
inline TimeInterval interval() const { return timing_; } inline TimeInterval interval() const { return timing_; }
GstClockTime next(GstClockTime time) const; GstClockTime next(GstClockTime time) const;

2
UserInterfaceManager.cpp
View File

@@ -2963,7 +2963,7 @@ void SourceController::RenderMediaPlayer(MediaPlayer *mp)
// custom timeline slider // custom timeline slider
mediaplayer_slider_pressed_ = ImGuiToolkit::TimelineSlider("##timeline", &seek_t, tl->begin(), mediaplayer_slider_pressed_ = ImGuiToolkit::TimelineSlider("##timeline", &seek_t, tl->begin(),
tl->end(), tl->step(), size.x); tl->first(), tl->end(), tl->step(), size.x);
} }
} }