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

Minor changes in SRT and generator sources to help user

Browse Source 
Clearly state 'listener' and 'call' roles for SRT. Add a '>' indicator to indicate if a generator is playable.
This commit is contained in:
Bruno Herbelin
2022-02-18 19:09:37 +01:00
parent 297d271e63
commit f580673dea
3 changed files with 22 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
PatternSource.cpp
View File

@@ -50,23 +50,23 @@ std::vector<pattern_descriptor> Pattern::patterns_ = {
{ "Blue", "videotestsrc", "videotestsrc pattern=blue", false, false },
{ "Color bars", "videotestsrc", "videotestsrc pattern=smpte100", false, false },
{ "RGB grid", "videotestsrc", "videotestsrc pattern=colors", false, false },
{ "SMPTE test", "videotestsrc", "videotestsrc pattern=smpte", true, false },
{ "Television snow", "videotestsrc", "videotestsrc pattern=snow", true, false },
{ "Blink", "videotestsrc", "videotestsrc pattern=blink", true, false },
{ "Fresnel zone plate", "videotestsrc", "videotestsrc pattern=zone-plate kx2=XXX ky2=YYY kt=4", true, false },
{ "Chroma zone plate", "videotestsrc", "videotestsrc pattern=chroma-zone-plate kx2=XXX ky2=YYY kt=4", true, false },
{ "Bar moving", "videotestsrc", "videotestsrc pattern=bar horizontal-speed=5", true, false },
{ "Ball bouncing", "videotestsrc", "videotestsrc pattern=ball", true, false },
{ "Blob", "frei0r-src-ising0r", "frei0r-src-ising0r", true, false },
{ "Timer", "timeoverlay", "videotestsrc pattern=solid-color foreground-color=0 ! timeoverlay halignment=center valignment=center font-desc=\"Sans, 72\" ", true, false },
{ "Clock", "clockoverlay", "videotestsrc pattern=solid-color foreground-color=0 ! clockoverlay halignment=center valignment=center font-desc=\"Sans, 72\" ", true, false },
{ "SMPTE test >", "videotestsrc", "videotestsrc pattern=smpte", true, false },
{ "Television snow >", "videotestsrc", "videotestsrc pattern=snow", true, false },
{ "Blink >", "videotestsrc", "videotestsrc pattern=blink", true, false },
{ "Fresnel zone plate >", "videotestsrc", "videotestsrc pattern=zone-plate kx2=XXX ky2=YYY kt=4", true, false },
{ "Chroma zone plate >", "videotestsrc", "videotestsrc pattern=chroma-zone-plate kx2=XXX ky2=YYY kt=4", true, false },
{ "Bar moving >", "videotestsrc", "videotestsrc pattern=bar horizontal-speed=5", true, false },
{ "Ball bouncing >", "videotestsrc", "videotestsrc pattern=ball", true, false },
{ "Blob >", "frei0r-src-ising0r", "frei0r-src-ising0r", true, false },
{ "Timer >", "timeoverlay", "videotestsrc pattern=solid-color foreground-color=0 ! timeoverlay halignment=center valignment=center font-desc=\"Sans, 72\" ", true, false },
{ "Clock >", "clockoverlay", "videotestsrc pattern=solid-color foreground-color=0 ! clockoverlay halignment=center valignment=center font-desc=\"Sans, 72\" ", true, false },
{ "Resolution", "textoverlay", "videotestsrc pattern=solid-color foreground-color=0 ! textoverlay text=\"XXXX x YYYY px\" halignment=center valignment=center font-desc=\"Sans, 52\" ", false, false },
{ "Frame", "videobox", "videotestsrc pattern=solid-color foreground-color=0 ! videobox fill=white top=-10 bottom=-10 left=-10 right=-10", false, false },
{ "Cross", "textoverlay", "videotestsrc pattern=solid-color foreground-color=0 ! textoverlay text=\"+\" halignment=center valignment=center font-desc=\"Sans, 22\" ", false, false },
{ "Grid", "frei0r-src-test-pat-g", "frei0r-src-test-pat-g type=0.35", false, false },
{ "Point Grid", "frei0r-src-test-pat-g", "frei0r-src-test-pat-g type=0.4", false, false },
{ "Ruler", "frei0r-src-test-pat-g", "frei0r-src-test-pat-g type=0.9", false, false },
{ "RGB noise", "frei0r-filter-rgbnoise", "videotestsrc pattern=black ! frei0r-filter-rgbnoise noise=0.6", true, false },
{ "RGB noise >", "frei0r-filter-rgbnoise", "videotestsrc pattern=black ! frei0r-filter-rgbnoise noise=0.6", true, false },
{ "Philips test", "frei0r-src-test-pat-b", "frei0r-src-test-pat-b type=0.7 ", false, false }
};

10
UserInterfaceManager.cpp
View File

@@ -2139,6 +2139,10 @@ void SourceController::setVisible(bool on)
if (on && Settings::application.widget.media_player_view != Settings::application.current_view)
Settings::application.widget.media_player_view = -1;
// if no selection in the player and in the source selection, show all sources
if (on && selection_.empty() && Mixer::selection().empty() )
selection_ = playable_only( Mixer::manager().session()->getDepthSortedList() );
Settings::application.widget.media_player = on;
}
@@ -5965,7 +5969,7 @@ void Navigator::RenderNewPannel()
if (custom_connected) {
ImGui::Text("\nConnect to SRT broadcaster:");
ImGui::Text("\nCall an SRT broadcaster:");
ImGui::SetNextItemWidth(IMGUI_RIGHT_ALIGN);
ImGuiToolkit::InputText("IP", &Settings::application.custom_connect_ip, ImGuiInputTextFlags_CharsDecimal | ImGuiInputTextFlags_CharsDecimal);
@@ -5982,9 +5986,9 @@ void Navigator::RenderNewPannel()
ImGui::InputText("##url", bufurl, IM_ARRAYSIZE(bufurl), ImGuiInputTextFlags_ReadOnly);
ImGui::PopStyleColor(1);
ImGui::SameLine(0); ImGuiToolkit::Indication("URL for connecting to a stream on Secure Reliable Transport (SRT) protocol", ICON_SOURCE_SRT);
ImGui::SameLine(0); ImGuiToolkit::Indication("URL for connecting to a stream on Secure Reliable Transport (SRT) protocol, waiting for connections in listener mode.", ICON_SOURCE_SRT);
if ( ImGui::Button("Try to connect", ImVec2(IMGUI_RIGHT_ALIGN, 0)) ) {
if ( ImGui::Button("Call", ImVec2(IMGUI_RIGHT_ALIGN, 0)) ) {
new_source_preview_.setSource( Mixer::manager().createSourceSrt(Settings::application.custom_connect_ip, Settings::application.custom_connect_port), bufurl);
}
}

8
VideoBroadcast.cpp
View File

@@ -103,7 +103,7 @@ std::string VideoBroadcast::init(GstCaps *caps)
// TODO Configure options
// setup SRT streaming sink properties
g_object_set (G_OBJECT (gst_bin_get_by_name (GST_BIN (pipeline_), "sink")),
"latency", 500,
"latency", 1000,
"wait-for-connection", false,
NULL);
@@ -186,11 +186,11 @@ std::string VideoBroadcast::info() const
std::ostringstream ret;
if (!initialized_)
ret << "Starting";
ret << "Starting SRT";
else if (active_)
ret << "SRT Broadcast on Port " << port_;
ret << "SRT Broadcast on Port " << port_ << " (listener mode)";
else
ret << "Terminated";
ret << "SRT Terminated";
return ret.str();
}