hw_partner
/
urmic_digital_encoder_decoder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

uppdate

This commit is contained in:
Devdatt Bhatt 2026-05-24 11:08:25 +00:00
parent 8fc61cd829
commit b575e27ef0
2 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
encoder/output.php
View File

@ -41,7 +41,7 @@ $defaults = [
], ],
'rtmp1' => [ 'rtmp1' => [
'common_backend' => 'disable', 'common_backend' => 'disable',
'resolution' => '720x576', 'resolution' => '702x576',
'data_rate' => '1.5M', 'data_rate' => '1.5M',
'framerate' => '25', 'framerate' => '25',
'gop' => '25', 'gop' => '25',
@ -423,7 +423,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') {
<div class="dropdown"> <div class="dropdown">
<select name="rtmp0_resolution" id="rtmp0_resolution"> <select name="rtmp0_resolution" id="rtmp0_resolution">
<option value="720x480" <?php if ($data['rtmp0']['resolution'] == '720x480') echo 'selected'; ?>>480p 720x480 NTSC DVD</option> <option value="720x480" <?php if ($data['rtmp0']['resolution'] == '720x480') echo 'selected'; ?>>480p 720x480 NTSC DVD</option>
<option value="720x576" <?php if ($data['rtmp0']['resolution'] == '720x576') echo 'selected'; ?>>576p 720x576 PAL DVD</option> <option value="702x576" <?php if ($data['rtmp0']['resolution'] == '702x576') echo 'selected'; ?>>576p 702x576 PAL DVD</option>
<option value="1280x720" <?php if ($data['rtmp0']['resolution'] == '1280x720') echo 'selected'; ?>>720p 1280x720 HD</option> <option value="1280x720" <?php if ($data['rtmp0']['resolution'] == '1280x720') echo 'selected'; ?>>720p 1280x720 HD</option>
<option value="1920x1080" <?php if ($data['rtmp0']['resolution'] == '1920x1080') echo 'selected'; ?>>1080p 1920x1080 FHD</option> <option value="1920x1080" <?php if ($data['rtmp0']['resolution'] == '1920x1080') echo 'selected'; ?>>1080p 1920x1080 FHD</option>
<option value="2560x1440" <?php if ($data['rtmp0']['resolution'] == '2560x1440') echo 'selected'; ?>>2k 2560x1440 QHD</option> <option value="2560x1440" <?php if ($data['rtmp0']['resolution'] == '2560x1440') echo 'selected'; ?>>2k 2560x1440 QHD</option>
@ -562,7 +562,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') {
<div class="dropdown"> <div class="dropdown">
<select name="rtmp1_resolution" id="rtmp1_resolution"> <select name="rtmp1_resolution" id="rtmp1_resolution">
<option value="720x480" <?php if ($data['rtmp1']['resolution'] == '720x480') echo 'selected'; ?>>480p 720x480 NTSC DVD</option> <option value="720x480" <?php if ($data['rtmp1']['resolution'] == '720x480') echo 'selected'; ?>>480p 720x480 NTSC DVD</option>
<option value="720x576" <?php if ($data['rtmp1']['resolution'] == '720x576') echo 'selected'; ?>>576p 720x576 PAL DVD</option> <option value="702x576" <?php if ($data['rtmp1']['resolution'] == '702x576') echo 'selected'; ?>>576p 702x576 PAL DVD</option>
<option value="1280x720" <?php if ($data['rtmp1']['resolution'] == '1280x720') echo 'selected'; ?>>720p 1280x720 HD</option> <option value="1280x720" <?php if ($data['rtmp1']['resolution'] == '1280x720') echo 'selected'; ?>>720p 1280x720 HD</option>
<option value="1920x1080" <?php if ($data['rtmp1']['resolution'] == '1920x1080') echo 'selected'; ?>>1080p 1920x1080 FHD</option> <option value="1920x1080" <?php if ($data['rtmp1']['resolution'] == '1920x1080') echo 'selected'; ?>>1080p 1920x1080 FHD</option>
<option value="2560x1440" <?php if ($data['rtmp1']['resolution'] == '2560x1440') echo 'selected'; ?>>2k 2560x1440 QHD</option> <option value="2560x1440" <?php if ($data['rtmp1']['resolution'] == '2560x1440') echo 'selected'; ?>>2k 2560x1440 QHD</option>
@ -1108,6 +1108,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') {
<select name="srt_format" id="srt_format"> <select name="srt_format" id="srt_format">
<option value="h264_qsv" <?php if ($data['srt']['format'] == 'h264_qsv') echo 'selected'; ?>>h264</option> <option value="h264_qsv" <?php if ($data['srt']['format'] == 'h264_qsv') echo 'selected'; ?>>h264</option>
<option value="hevc_qsv" <?php if ($data['srt']['format'] == 'hevc_qsv') echo 'selected'; ?>>h265</option> <option value="hevc_qsv" <?php if ($data['srt']['format'] == 'hevc_qsv') echo 'selected'; ?>>h265</option>
<option value="vp9_qsv" <?php if ($data['srt']['format'] == 'vp9_qsv') echo 'selected'; ?>>vp9</option>
</select> </select>
</div> </div>
</div> </div>
@ -1116,7 +1117,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') {
<div class="dropdown"> <div class="dropdown">
<select name="srt_resolution" id="srt_resolution"> <select name="srt_resolution" id="srt_resolution">
<option value="720x480" <?php if ($data['srt']['resolution'] == '720x480') echo 'selected'; ?>>480p 720x480 NTSC DVD</option> <option value="720x480" <?php if ($data['srt']['resolution'] == '720x480') echo 'selected'; ?>>480p 720x480 NTSC DVD</option>
<option value="720x576" <?php if ($data['srt']['resolution'] == '720x576') echo 'selected'; ?>>576p 720x576 PAL DVD</option> <option value="702x576" <?php if ($data['srt']['resolution'] == '702x576') echo 'selected'; ?>>576p 702x576 PAL DVD</option>
<option value="1280x720" <?php if ($data['srt']['resolution'] == '1280x720') echo 'selected'; ?>>720p 1280x720 HD</option> <option value="1280x720" <?php if ($data['srt']['resolution'] == '1280x720') echo 'selected'; ?>>720p 1280x720 HD</option>
<option value="1920x1080" <?php if ($data['srt']['resolution'] == '1920x1080') echo 'selected'; ?>>1080p 1920x1080 FHD</option> <option value="1920x1080" <?php if ($data['srt']['resolution'] == '1920x1080') echo 'selected'; ?>>1080p 1920x1080 FHD</option>
<option value="2560x1440" <?php if ($data['srt']['resolution'] == '2560x1440') echo 'selected'; ?>>2k 2560x1440 QHD</option> <option value="2560x1440" <?php if ($data['srt']['resolution'] == '2560x1440') echo 'selected'; ?>>2k 2560x1440 QHD</option>

18
encoder/static.php
View File

@ -398,9 +398,9 @@ function update_service($which_service)
$hdmi_saturation = $data['hdmi']['saturation']; $hdmi_saturation = $data['hdmi']['saturation'];
$hdmi_hue = $data['hdmi']['hue']; $hdmi_hue = $data['hdmi']['hue'];
if ($srt_pass1 == "") if ($srt_pass1 === "")
$srt_pass1 = generateRandomString(16); $srt_pass1 = generateRandomString(16);
if ($srt_pass2 == "") if ($srt_pass2 === "")
$srt_pass2 = generateRandomString(16); $srt_pass2 = generateRandomString(16);
switch ($use_common_backend) { switch ($use_common_backend) {
case "copy_input": case "copy_input":
@ -721,7 +721,7 @@ function update_service($which_service)
switch ($which_service) { switch ($which_service) {
case 'input': case 'input':
if ($use_common_backend == "") { if ($use_common_backend === "") {
exec("sudo systemctl stop encoder-main"); exec("sudo systemctl stop encoder-main");
exec("sudo systemctl disable encoder-main"); exec("sudo systemctl disable encoder-main");
} else { } else {
@ -891,7 +891,7 @@ function update_service($which_service)
break; break;
} }
if ($use_common_backend == "use_common_backend" && ($data['srt']['format'] == "h264_qsv" || $data['srt']['format'] == "hevc_qsv")) { if ($use_common_backend === "use_common_backend" && ($data['srt']['format'] === "h264_qsv" || $data['srt']['format'] === "hevc_qsv")) {
$udp0 = str_replace("ffmpeg -hwaccel auto -hide_banner -fflags +discardcorrupt -i", "ffmpeg -hwaccel qsv -hwaccel_output_format qsv -hide_banner -i ", $srt); $udp0 = str_replace("ffmpeg -hwaccel auto -hide_banner -fflags +discardcorrupt -i", "ffmpeg -hwaccel qsv -hwaccel_output_format qsv -hide_banner -i ", $srt);
$udp0 = str_replace("scale", "vpp_qsv", $srt); $udp0 = str_replace("scale", "vpp_qsv", $srt);
$udp0 = str_replace("resolution_resolution_resolution", toVppScale($data['srt']['resolution']), $srt); $udp0 = str_replace("resolution_resolution_resolution", toVppScale($data['srt']['resolution']), $srt);
@ -949,7 +949,7 @@ function update_service($which_service)
. ' -metadata service_provider=ShreeBhattJI -f mpegts "' . $data['udp0']['udp'] . '?pkt_size=1316&ttl=4&buffer_size=1048576"'; . ' -metadata service_provider=ShreeBhattJI -f mpegts "' . $data['udp0']['udp'] . '?pkt_size=1316&ttl=4&buffer_size=1048576"';
break; break;
} }
if ($use_common_backend == "use_common_backend" && ($data['udp0']['format'] == "h264_qsv" || $data['udp0']['format'] == "hevc_qsv")) { if ($use_common_backend === "use_common_backend" && ($data['udp0']['format'] === "h264_qsv" || $data['udp0']['format'] === "hevc_qsv")) {
$udp0 = str_replace("ffmpeg -hwaccel auto -hide_banner -i", "ffmpeg -hwaccel qsv -hwaccel_output_format qsv -hide_banner -i ", $udp0); $udp0 = str_replace("ffmpeg -hwaccel auto -hide_banner -i", "ffmpeg -hwaccel qsv -hwaccel_output_format qsv -hide_banner -i ", $udp0);
$udp0 = str_replace("scale", "vpp_qsv", $udp0); $udp0 = str_replace("scale", "vpp_qsv", $udp0);
$udp0 = str_replace("resolution_resolution_resolution", toVppScale($data['udp0']['resolution']), $udp0); $udp0 = str_replace("resolution_resolution_resolution", toVppScale($data['udp0']['resolution']), $udp0);
@ -957,7 +957,7 @@ function update_service($which_service)
} else { } else {
$udp0 = str_replace("resolution_resolution_resolution", str_replace("x", ":", $data['udp0']['resolution']), $udp0); $udp0 = str_replace("resolution_resolution_resolution", str_replace("x", ":", $data['udp0']['resolution']), $udp0);
} }
if ($data['udp0']['service_udp0_output'] == "usb") { if ($data['udp0']['service_udp0_output'] === "usb") {
$udp0 = str_replace("pkt_size=1316", "pkt_size=1316&localaddr=172.16.111.111", $udp0); $udp0 = str_replace("pkt_size=1316", "pkt_size=1316&localaddr=172.16.111.111", $udp0);
} }
if ($data['udp0']['udp0_service_name'] != "") { if ($data['udp0']['udp0_service_name'] != "") {
@ -1011,7 +1011,7 @@ function update_service($which_service)
. ' -metadata service_provider=ShreeBhattJI -f mpegts "' . $data['udp1']['udp'] . '?pkt_size=1316&ttl=4&buffer_size=1048576"'; . ' -metadata service_provider=ShreeBhattJI -f mpegts "' . $data['udp1']['udp'] . '?pkt_size=1316&ttl=4&buffer_size=1048576"';
break; break;
} }
if ($use_common_backend == "use_common_backend" && ($data['udp1']['format'] == "h264_qsv" || $data['udp1']['format'] == "hevc_qsv")) { if ($use_common_backend === "use_common_backend" && ($data['udp1']['format'] === "h264_qsv" || $data['udp1']['format'] === "hevc_qsv")) {
$udp1 = str_replace("ffmpeg -hwaccel auto -hide_banner -i", "ffmpeg -hwaccel qsv -hwaccel_output_format qsv -hide_banner -i ", $udp1); $udp1 = str_replace("ffmpeg -hwaccel auto -hide_banner -i", "ffmpeg -hwaccel qsv -hwaccel_output_format qsv -hide_banner -i ", $udp1);
$udp1 = str_replace("scale", "vpp_qsv", $udp1); $udp1 = str_replace("scale", "vpp_qsv", $udp1);
$udp1 = str_replace("resolution_resolution_resolution", toVppScale($data['udp1']['resolution']), $udp1); $udp1 = str_replace("resolution_resolution_resolution", toVppScale($data['udp1']['resolution']), $udp1);
@ -1072,7 +1072,7 @@ function update_service($which_service)
. ' ' . $data['udp2']['extra'] . ' ' . $data['udp2']['extra']
. ' -metadata service_provider=ShreeBhattJI -f mpegts "' . $data['udp2']['udp'] . '?pkt_size=1316&ttl=4&buffer_size=1048576"'; . ' -metadata service_provider=ShreeBhattJI -f mpegts "' . $data['udp2']['udp'] . '?pkt_size=1316&ttl=4&buffer_size=1048576"';
if ($use_common_backend == "use_common_backend" && ($data['udp2']['format'] == "h264_qsv" || $data['udp2']['format'] == "hevc_qsv")) { if ($use_common_backend === "use_common_backend" && ($data['udp2']['format'] === "h264_qsv" || $data['udp2']['format'] === "hevc_qsv")) {
$udp2 = str_replace("ffmpeg -hwaccel auto -hide_banner -i", "ffmpeg -hwaccel qsv -hwaccel_output_format qsv -hide_banner -i ", $udp2); $udp2 = str_replace("ffmpeg -hwaccel auto -hide_banner -i", "ffmpeg -hwaccel qsv -hwaccel_output_format qsv -hide_banner -i ", $udp2);
$udp2 = str_replace("scale", "vpp_qsv", $udp2); $udp2 = str_replace("scale", "vpp_qsv", $udp2);
$udp2 = str_replace("resolution_resolution_resolution", toVppScale($data['udp2']['resolution']), $udp2); $udp2 = str_replace("resolution_resolution_resolution", toVppScale($data['udp2']['resolution']), $udp2);
@ -1080,7 +1080,7 @@ function update_service($which_service)
} else { } else {
$udp2 = str_replace("resolution_resolution_resolution", str_replace("x", ":", $data['udp2']['resolution']), $udp2); $udp2 = str_replace("resolution_resolution_resolution", str_replace("x", ":", $data['udp2']['resolution']), $udp2);
} }
if ($data['udp2']['service_udp2_output'] == "usb") { if ($data['udp2']['service_udp2_output'] === "usb") {
$udp2 = str_replace("pkt_size=1316", "pkt_size=1316&localaddr=172.16.111.111", $udp2); $udp2 = str_replace("pkt_size=1316", "pkt_size=1316&localaddr=172.16.111.111", $udp2);
} }
if ($data['udp2']['udp2_service_name'] != "") { if ($data['udp2']['udp2_service_name'] != "") {