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

Happy new year 2022

Browse Source
This commit is contained in:
Bruno Herbelin
2022-01-02 23:17:22 +01:00
parent 7547d1179d
commit 2718e83132
64 changed files with 86 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Stream.cpp
View File

@@ -1,7 +1,7 @@
/*
* This file is part of vimix - video live mixer
*
* **Copyright** (C) 2020-2021 Bruno Herbelin <bruno.herbelin@gmail.com>
* **Copyright** (C) 2019-2022 Bruno Herbelin <bruno.herbelin@gmail.com>
*
* 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
@@ -159,13 +159,14 @@ StreamInfo StreamDiscoverer(const std::string &description, guint w, guint h)
std::unique_lock<std::mutex> lck(mtx);
if ( info.discovered.wait_for(lck,std::chrono::seconds(TIMEOUT)) == std::cv_status::timeout)
info.message = "Time out";
// stop and delete pipeline
GstStateChangeReturn ret = gst_element_set_state (_pipeline, GST_STATE_NULL);
if (ret == GST_STATE_CHANGE_ASYNC)
gst_element_get_state (_pipeline, NULL, NULL, 1000000);
gst_object_unref (_pipeline);
}
// stop and delete pipeline
GstStateChangeReturn ret = gst_element_set_state (_pipeline, GST_STATE_NULL);
if (ret == GST_STATE_CHANGE_ASYNC)
gst_element_get_state (_pipeline, NULL, NULL, GST_CLOCK_TIME_NONE);
gst_object_unref (_pipeline);
}
else
info.message = error->message;