diff --git a/encoder/input.php b/encoder/input.php index 84c6a9b..9039cdb 100755 --- a/encoder/input.php +++ b/encoder/input.php @@ -50,25 +50,6 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') { return isset($_POST[$k]) ? trim((string)$_POST[$k]) : $default; }; global $defaults; - if ($posted('use_common_backend', $defaults['use_common_backend']) === "transcode_every_time") { - switch ($posted('input', $defaults['input'])) { - case "rtmp": - $rtmp_pass = "bhattji"; - break; - case "srt": - $srt_pass_3 = "ji"; - break; - } - } else { - switch ($posted('input', $defaults['input'])) { - case "rtmp": - $rtmp_pass = $posted('rtmp_password', $defaults['rtmp']['password']); - break; - case "srt": - $srt_pass_3 = $posted('srt_stream_id_3', $defaults['srt']['stream_id_3']); - break; - } - } $new = [ 'input' => $posted('input', $defaults['input']), @@ -83,12 +64,12 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') { 'url' => $posted('url', $defaults['url']), 'rtmp' => [ 'mount' => $posted('rtmp_mount', $defaults['rtmp']['mount']), - 'password' => $rtmp_pass, + 'password' => $posted('rtmp_password', $defaults['rtmp']['password']), ], 'srt' => [ 'stream_id_1' => $posted('srt_stream_id_1', $defaults['srt']['stream_id_1']), 'stream_id_2' => $posted('srt_stream_id_2', $defaults['srt']['stream_id_2']), - 'stream_id_3' => $srt_pass_3, + 'stream_id_3' => $posted('srt_stream_id_3', $defaults['srt']['stream_id_3']), ], 'udp' => $posted('udp', $defaults['udp']), 'custom' => $posted('custom', $defaults['custom']), @@ -104,7 +85,17 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') { ] ]; - // write JSON with exclusive lock and pretty print + if($new['use_common_backend']=="transcode_every_time"){ + switch($new['input']){ + case 'rtmp': + $new['rtmp']['rtmp_password']="bhattji"; + break; + case 'srt': + $new['srt']['srt_stream_id_3']="ji"; + break; + } + } + $json = json_encode($new, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES); if (file_put_contents($jsonFile, $json, LOCK_EX) === false) { $saveError = "Failed to write $jsonFile. Check permissions.";