diff --git a/plugin/Live/standAloneFiles/saveDVR.json.php b/plugin/Live/standAloneFiles/saveDVR.json.php index 86e7c5701..154227def 100644 --- a/plugin/Live/standAloneFiles/saveDVR.json.php +++ b/plugin/Live/standAloneFiles/saveDVR.json.php @@ -1,109 +1,111 @@ error)) { error_log("saveDVR: {$result->msg}"); die('saveDVR: ' . $result->msg); } if (!empty($result->error)) { error_log("saveDVR: ERROR " . json_encode($result)); die('saveDVR: ERROR ' . $result->msg); } $key = $result->response->key; $file = preg_replace("/[^0-9a-z_:-]/i", "", $key); ini_set('memory_limit', '-1'); ini_set('display_errors', 1); ini_set('display_startup_errors', 1); error_reporting(E_ALL); $filename = $record_path . $file . '_' . (date('Y-m-d-H-i-s')) . ".mp4"; $DVRFile = "{$hls_path}{$key}"; $tmpDVRDir = $record_path . $file . uniqid(); $isAdaptive = !is_dir($DVRFile); if (!$isAdaptive) { $copyDir = "cp -R {$DVRFile} {$tmpDVRDir} && chmod -R 777 {$tmpDVRDir} "; error_log("saveDVR: copy dir 1 [{$copyDir}]"); $DVRFile = "{$tmpDVRDir}" . DIRECTORY_SEPARATOR . "{$key}" . DIRECTORY_SEPARATOR . 'index.m3u8'; //$DVRFile .= DIRECTORY_SEPARATOR . 'index.m3u8'; } else { $copyDir = "mkdir {$tmpDVRDir} && cp -R {$DVRFile}* {$tmpDVRDir} && chmod -R 777 {$tmpDVRDir} "; error_log("saveDVR: copy dir 2 [{$copyDir}]"); $DVRFile = "{$tmpDVRDir}" . DIRECTORY_SEPARATOR . "{$key}.m3u8"; //$DVRFile .= ".m3u8"; } exec($copyDir); error_log("saveDVR: copy dir done"); if (!$isAdaptive) { - error_log("saveDVR: append #EXT-X-ENDLIST {$DVRFile}"); - file_put_contents(PHP_EOL . '#EXT-X-ENDLIST', $DVRFile, FILE_APPEND); + //file_put_contents(PHP_EOL . '#EXT-X-ENDLIST', $DVRFile, FILE_APPEND); + $endLine = PHP_EOL . '#EXT-X-ENDLIST'; + $appendCommand = "echo \"{$endLine}\" >> {$DVRFile}"; + error_log("saveDVR: append [{$appendCommand}]"); } else { $dir = $tmpDVRDir . DIRECTORY_SEPARATOR; error_log("saveDVR: adaptive {$dir}"); $list = scandir($dir); foreach ($list as $value) { if ($value != '..' && $value != ".") { $indexFile = $dir . $value . DIRECTORY_SEPARATOR . 'index.m3u8'; error_log("saveDVR: checking {$indexFile}"); if (file_exists($indexFile)) { $endLine = PHP_EOL . '#EXT-X-ENDLIST'; $appendCommand = "echo \"{$endLine}\" >> {$indexFile}"; error_log("saveDVR: append [{$appendCommand}]"); exec($appendCommand); //file_put_contents(PHP_EOL . '#EXT-X-ENDLIST', $indexFile, FILE_APPEND); } } } } if (!file_exists($DVRFile)) { error_log("saveDVR: m3u8 File does not exists {$DVRFile} "); die("saveDVR: m3u8 File does not exists {$DVRFile} "); } $ffmpeg = "ffmpeg -i {$DVRFile} -c copy -bsf:a aac_adtstoasc {$filename} -y"; error_log("saveDVR: FFMPEG {$ffmpeg}"); exec($ffmpeg); error_log("saveDVR: FFMPEG done"); $removeDir = "rm -R {$tmpDVRDir} "; error_log("saveDVR: remove dir {$removeDir}"); exec($removeDir); \ No newline at end of file