izackp/Apollo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add default_value parameter to get_env for use in make_launch_session (#1490)

Browse Source
This commit is contained in:
Django
2023-08-02 05:08:45 +02:00
committed by GitHub
parent 172a2193d3
commit 43463a9d1e
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/nvhttp.cpp
View File

@@ -153,9 +153,13 @@ namespace nvhttp {
}; };
std::string std::string
get_arg(const args_t &args, const char *name) { get_arg(const args_t &args, const char *name, const char *default_value = nullptr) {
auto it = args.find(name); auto it = args.find(name);
if (it == std::end(args)) { if (it == std::end(args)) {
if (default_value != NULL) {
return std::string(default_value);
}
throw std::out_of_range(name); throw std::out_of_range(name);
} }
return it->second; return it->second;
@@ -268,7 +272,7 @@ namespace nvhttp {
launch_session.host_audio = host_audio; launch_session.host_audio = host_audio;
launch_session.gcm_key = util::from_hex<crypto::aes_t>(get_arg(args, "rikey"), true); launch_session.gcm_key = util::from_hex<crypto::aes_t>(get_arg(args, "rikey"), true);
std::stringstream mode = std::stringstream(get_arg(args, "mode")); std::stringstream mode = std::stringstream(get_arg(args, "mode", "0x0x0"));
// Split mode by the char "x", to populate width/height/fps // Split mode by the char "x", to populate width/height/fps
int x = 0; int x = 0;
std::string segment; std::string segment;
@@ -278,16 +282,13 @@ namespace nvhttp {
if (x == 2) launch_session.fps = atoi(segment.c_str()); if (x == 2) launch_session.fps = atoi(segment.c_str());
x++; x++;
} }
launch_session.unique_id = (get_arg(args, "uniqueid")); launch_session.unique_id = (get_arg(args, "uniqueid", "unknown"));
launch_session.uuid = (get_arg(args, "uuid")); launch_session.appid = util::from_view(get_arg(args, "appid", "unknown"));
launch_session.appid = util::from_view(get_arg(args, "appid")); launch_session.enable_sops = util::from_view(get_arg(args, "sops", "0"));
launch_session.enable_sops = util::from_view(get_arg(args, "sops")); launch_session.surround_info = util::from_view(get_arg(args, "surroundAudioInfo", "196610"));
launch_session.surround_info = util::from_view(get_arg(args, "surroundAudioInfo")); launch_session.gcmap = util::from_view(get_arg(args, "gcmap", "0"));
launch_session.gcmap = util::from_view(get_arg(args, "gcmap")); launch_session.enable_hdr = util::from_view(get_arg(args, "enableHdr", "0"));
launch_session.enable_hdr = 0;
if (args.find("enableHdr"s) != std::end(args)) {
launch_session.enable_hdr = util::from_view(get_arg(args, "enableHdr"));
}
uint32_t prepend_iv = util::endian::big<uint32_t>(util::from_view(get_arg(args, "rikeyid"))); uint32_t prepend_iv = util::endian::big<uint32_t>(util::from_view(get_arg(args, "rikeyid")));
auto prepend_iv_p = (uint8_t *) &prepend_iv; auto prepend_iv_p = (uint8_t *) &prepend_iv;

1
src/rtsp.h
View File

@@ -18,7 +18,6 @@ namespace rtsp_stream {
bool host_audio; bool host_audio;
std::string unique_id; std::string unique_id;
std::string uuid;
int width; int width;
int height; int height;
int fps; int fps;