morgan/UxPlay
1
0
Fork 0
mirror of https://github.com/morgan9e/UxPlay synced 2026-04-14 00:04:13 +09:00
Code Issues Packages Projects Releases Wiki Activity

further fixes for #496 (transition from mirror_mode to HLS)

Browse Source
This commit is contained in:
F. Duncanh
2026-02-10 17:03:54 -05:00
parent c7d1ca83f0
commit 99642b4a47
4 changed files with 26 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
uxplay.cpp
View File

@@ -2113,14 +2113,25 @@ static bool check_blocked_client(char *deviceid) {
//to be simplified
static const char *reset_name[] = {
[RESET_TYPE_NOHOLD] = "Nohold",
[RESET_TYPE_RTP_SHUTDOWN] = "RTP_Shutdown",
[RESET_TYPE_HLS_SHUTDOWN] = "HLS_Shutdown",
[RESET_TYPE_HLS_EOS] = "HLS_eos",
[RESET_TYPE_ON_VIDEO_PLAY] = "on_video_play",
[RESET_TYPE_RTP_TO_HLS_TEARDOWN] = "RTP_to_HLS_Shutdown"
};
extern "C" void video_reset(void *cls, reset_type_t type) {
LOGD("video_reset");
LOGD("video_reset: type = %s", reset_name[type]);
switch (type) {
case RESET_TYPE_NOHOLD:
if (hls_support) {
url.erase();
raop_destroy_airplay_video(raop, -1);
}
case RESET_TYPE_HLS_EOS:
if (use_video) {
video_renderer_stop();
/* reset the video renderer immediately to avoid a timing issue if we wait for main_loop to reset */
@@ -2136,6 +2147,8 @@ extern "C" void video_reset(void *cls, reset_type_t type) {
remote_clock_offset = 0;
relaunch_video = true;
break;
case RESET_TYPE_RTP_TO_HLS_TEARDOWN:
preserve_connections = true;
case RESET_TYPE_RTP_SHUTDOWN:
if (use_video) {
video_renderer_stop();
@@ -2156,27 +2169,6 @@ extern "C" void video_reset(void *cls, reset_type_t type) {
remote_clock_offset = 0;
relaunch_video = true;
break;
case RESET_TYPE_HLS_EOS:
if (use_video) {
/* reset the video renderer immediately to avoid a timing issue if we wait for main_loop to reset */
video_renderer_stop();
video_renderer_destroy();
video_renderer_init(render_logger, server_name.c_str(), videoflip, video_parser.c_str(), rtp_pipeline.c_str(),
video_decoder.c_str(), video_converter.c_str(), videosink.c_str(),
videosink_options.c_str(), fullscreen, video_sync, h265_support,
render_coverart, playbin_version, NULL);
video_renderer_start();
close_window = false; // we already closed the window
}
remote_clock_offset = 0;
relaunch_video = true;
break;
case RESET_TYPE_TEARDOWN_110:
if (use_video) {
video_renderer_stop();
}
relaunch_video = true;
break;
case RESET_TYPE_ON_VIDEO_PLAY:
break;
default:
@@ -2282,12 +2274,6 @@ extern "C" void conn_reset (void *cls, int reason) {
reset_loop = true;
}
extern "C" void conn_teardown(void *cls, bool *teardown_96, bool *teardown_110) {
if (*teardown_110 && close_window) {
video_reset(cls,RESET_TYPE_TEARDOWN_110);
}
}
extern "C" void report_client_request(void *cls, char *deviceid, char * model, char *name, bool * admit) {
LOGI("connection request from %s (%s) with deviceID = %s\n", name, model, deviceid);
if (restrict_clients) {
@@ -2717,7 +2703,6 @@ static int start_raop_server (unsigned short display[5], unsigned short tcp[3],
raop_cbs.conn_destroy = conn_destroy;
raop_cbs.conn_reset = conn_reset;
raop_cbs.conn_feedback = conn_feedback;
raop_cbs.conn_teardown = conn_teardown;
raop_cbs.audio_process = audio_process;
raop_cbs.video_process = video_process;
raop_cbs.audio_flush = audio_flush;