Skip to content

Commit 64022ee

Browse files
MaikuolanMaikuolan
committed
Fix typos.
1 parent 5df7f65 commit 64022ee

File tree

7 files changed

+42
-42
lines changed

7 files changed

+42
-42
lines changed

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ In order for you to be able to run AVideo, there are certain tools that need to
8181
# What is new on this version?
8282
Since version 4.x+ we separate the streamer website from the encoder website, so that we can distribute the application on different servers.
8383
- The Streamer site, is the main front end and has as main function to attend the visitors of the site, through a layout based on the youtube experience, you can host the streamer site in any common internet host can host it (Windows or Linux).
84-
- The Encoder site, will be better than the original encoder, the new encoder will be in charge of managing a media encoding queue. You can Donwload the encoder here: https://github.com/WWBN/AVideo-Encoder. but to install it you will need ssh access to your server, usually only VPS servers give you that kind of access, that code uses commands that use the Linux shell and consume more CPU.
84+
- The Encoder site, will be better than the original encoder, the new encoder will be in charge of managing a media encoding queue. You can download the encoder here: https://github.com/WWBN/AVideo-Encoder. but to install it you will need ssh access to your server, usually only VPS servers give you that kind of access, that code uses commands that use the Linux shell and consume more CPU.
8585
- I will have to install the encoder and the streamer?
8686
No. We will be providing a public encoder, we will build the encoder in such a way that several streamers can use the same encoder. We are also providing source code for this, so you can install it internally and manage your own encoding priority.
8787

‎index.php

+1-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
<div>
7474
<h2>Error. Oops you've encountered an error</h2>
7575
<p>
76-
It appears that either something went wrong or the mod rewrite configration is not correct.<br />
76+
It appears that either something went wrong or the mod rewrite configuration is not correct.<br />
7777
</p>
7878
<p>We need to allow Apache to read .htaccess files located under the <?php echo getcwd(); ?> directory.
7979

‎objects/ServerMonitor.php

+7-7
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ public static function getMemoryLinux($obj)
77
$obj->command = "free";
88
exec($obj->command . " 2>&1", $output, $return_val);
99
if ($return_val !== 0) {
10-
$obj->error = "Get Memmory ERROR** " . print_r($output, true);
10+
$obj->error = "Get Memory ERROR** " . print_r($output, true);
1111
} else {
1212
$obj->output = $output;
1313

@@ -16,7 +16,7 @@ public static function getMemoryLinux($obj)
1616
$obj->memUsedBytes = $match[2]*1024;
1717
$obj->memFreeBytes = $match[3]*1024;
1818
} else {
19-
$obj->error = "Get Memmory ERROR** " . print_r($output, true);
19+
$obj->error = "Get Memory ERROR** " . print_r($output, true);
2020
}
2121
}
2222
return $obj;
@@ -27,17 +27,17 @@ public static function getMemoryNetBSD($obj)
2727
$obj->command = "/sbin/sysctl hw.pagesize; /usr/bin/vmstat -t";
2828
exec($obj->command . " 2>&1", $output, $return_val);
2929
if ($return_val !== 0) {
30-
$obj->error = "Get Memmory ERROR** (".$obj->command." failed)";
30+
$obj->error = "Get Memory ERROR** (".$obj->command." failed)";
3131
} else {
3232
$obj->output = $output;
3333

3434
$parts = explode(" = ", $output[0]);
3535
if ($parts[0] != "hw.pagesize") {
36-
$obj->error = "Get Memmory ERROR** (unknown page size)";
36+
$obj->error = "Get Memory ERROR** (unknown page size)";
3737
} elseif (($match = preg_split("/ +/", trim($output[3]))) === false) {
38-
$obj->error = "Get Memmory ERROR** (unepxected vmstat output)";
38+
$obj->error = "Get Memory ERROR** (unepxected vmstat output)";
3939
} elseif (!is_numeric($match[4]) || !is_numeric($match[5]) || !is_numeric($match[11])) {
40-
$obj->error = "Get Memmory ERROR** (non numeric memory size?)";
40+
$obj->error = "Get Memory ERROR** (non numeric memory size?)";
4141
} else {
4242
$page_size = $parts[1];
4343
$obj->memTotalBytes = $match[4] * $page_size;
@@ -60,7 +60,7 @@ public static function getMemory()
6060
$getMemoryOsFunction = "getMemory" . $os;
6161

6262
if (!method_exists("ServerMonitor", $getMemoryOsFunction)) {
63-
$obj->error = "Get Memmory error: ".$os." not supported";
63+
$obj->error = "Get Memory error: ".$os." not supported";
6464
} else {
6565
$obj = ServerMonitor::$getMemoryOsFunction($obj);
6666
}

‎objects/functions.php

+10-10
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@ function get_ffmpeg($ignoreGPU = false)
3737
return $ffmpeg . $complement;
3838
}
3939

40-
function getFFmpegScaleToForceOriginalAspectRatio($width, $heigth)
40+
function getFFmpegScaleToForceOriginalAspectRatio($width, $height)
4141
{
42-
return "scale={$width}:{$heigth}:force_original_aspect_ratio=decrease,pad={$width}:{$heigth}:-1:-1:color=black";
42+
return "scale={$width}:{$height}:force_original_aspect_ratio=decrease,pad={$width}:{$height}:-1:-1:color=black";
4343
}
4444

4545
function replaceFFMPEG($cmd)
@@ -330,32 +330,32 @@ function getURLToApplication()
330330
function check_max_execution_time()
331331
{
332332
$max_size = ini_get('max_execution_time');
333-
$recomended_size = 7200;
334-
return !($recomended_size > $max_size);
333+
$recommended_size = 7200;
334+
return !($recommended_size > $max_size);
335335
}
336336

337337
//post_max_size = 100M
338338
function check_post_max_size()
339339
{
340340
$max_size = parse_size(ini_get('post_max_size'));
341-
$recomended_size = parse_size('100M');
342-
return !($recomended_size > $max_size);
341+
$recommended_size = parse_size('100M');
342+
return !($recommended_size > $max_size);
343343
}
344344

345345
//upload_max_filesize = 100M
346346
function check_upload_max_filesize()
347347
{
348348
$max_size = parse_size(ini_get('upload_max_filesize'));
349-
$recomended_size = parse_size('100M');
350-
return !($recomended_size > $max_size);
349+
$recommended_size = parse_size('100M');
350+
return !($recommended_size > $max_size);
351351
}
352352

353353
//memory_limit = 100M
354354
function check_memory_limit()
355355
{
356356
$max_size = parse_size(ini_get('memory_limit'));
357-
$recomended_size = parse_size('512M');
358-
return !($recomended_size > $max_size);
357+
$recommended_size = parse_size('512M');
358+
return !($recommended_size > $max_size);
359359
}
360360

361361
function check_mysqlnd()

‎view/jquery-file-upload/server/php/UploadHandler.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -1477,7 +1477,7 @@ public function delete($print_response = true) {
14771477
}
14781478

14791479
protected function basename($filepath, $suffix = '') {
1480-
$splited = preg_split('/\//', rtrim ($filepath, '/ '));
1481-
return substr(basename('X'.$splited[count($splited)-1], $suffix), 1);
1480+
$split = preg_split('/\//', rtrim ($filepath, '/ '));
1481+
return substr(basename('X' . $split[count($split) - 1], $suffix), 1);
14821482
}
14831483
}

‎view/releaseDate.php

+16-16
Original file line numberDiff line numberDiff line change
@@ -21,50 +21,50 @@
2121
<option value="<?php echo date('Y-m-d H:i'); ?>"><?php echo __('Now'); ?> (<?php echo date('Y-m-d H:i'); ?>)</option>
2222
<optgroup label="<?php echo __('Hours'); ?>">
2323
<?php
24-
$relaseOptions = array();
25-
$relaseOptions[] = '1 ' . __('Hour');
24+
$releaseOptions = array();
25+
$releaseOptions[] = '1 ' . __('Hour');
2626
for ($i = 2; $i < 24; $i++) {
27-
$relaseOptions[] = "{$i} " . __('Hours');
27+
$releaseOptions[] = "{$i} " . __('Hours');
2828
}
29-
foreach ($relaseOptions as $value) {
29+
foreach ($releaseOptions as $value) {
3030
echo "<option value='" . date('Y-m-d H:i', strtotime('+'.$value)) . "'>" . __($value) . "</option>";
3131
}
3232
?>
3333
</optgroup>
3434
<optgroup label="<?php echo __('Days'); ?>">
3535
<?php
36-
$relaseOptions = array();
37-
$relaseOptions[] = array('1 ' . __('Day'), '+1 Day');
36+
$releaseOptions = array();
37+
$releaseOptions[] = array('1 ' . __('Day'), '+1 Day');
3838
for ($i = 2; $i < 31; $i++) {
39-
$relaseOptions[] = array("{$i} " . __('Days'), "+$i Day");
39+
$releaseOptions[] = array("{$i} " . __('Days'), "+$i Day");
4040
}
41-
foreach ($relaseOptions as $value) {
41+
foreach ($releaseOptions as $value) {
4242
echo "<option value='" . date('Y-m-d H:i', strtotime($value[1])) . "'>" . __($value[0]) . "</option>";
4343
}
4444
?>
4545
</optgroup>
4646
<optgroup label="<?php echo __('Months'); ?>">
4747
<?php
48-
$relaseOptions = array();
49-
$relaseOptions[] = array('1 ' . __('Month'), '+1 Month');
48+
$releaseOptions = array();
49+
$releaseOptions[] = array('1 ' . __('Month'), '+1 Month');
5050
for ($i = 2; $i < 12; $i++) {
51-
$relaseOptions[] = array("{$i} " . __('Months'), "+$i Months");
51+
$releaseOptions[] = array("{$i} " . __('Months'), "+$i Months");
5252
}
5353

54-
foreach ($relaseOptions as $value) {
54+
foreach ($releaseOptions as $value) {
5555
echo "<option value='" . date('Y-m-d H:i', strtotime($value[1])) . "'>" . __($value[0]) . "</option>";
5656
}
5757
?>
5858
</optgroup>
5959
<optgroup label="<?php echo __('Years'); ?>">
6060
<?php
61-
$relaseOptions = array();
62-
$relaseOptions[] = array('1 ' . __('Year'), '+1 Year');
61+
$releaseOptions = array();
62+
$releaseOptions[] = array('1 ' . __('Year'), '+1 Year');
6363
for ($i = 2; $i < 10; $i++) {
64-
$relaseOptions[] = array("{$i} " . __('Years'), "+{$i} Years");
64+
$releaseOptions[] = array("{$i} " . __('Years'), "+{$i} Years");
6565
}
6666

67-
foreach ($relaseOptions as $value) {
67+
foreach ($releaseOptions as $value) {
6868
echo "<option value='" . date('Y-m-d H:i', strtotime($value[1])) . "'>" . __($value[0]) . "</option>";
6969
}
7070
?>

‎view/watermark.php

+5-5
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
$watermark_color = "yellow";
55
$watermark_opacity = 0.5;
66
$hls_time = 10;
7-
$skippFirstSegments = 30; // 5 min
7+
$skipFirstSegments = 30; // 5 min
88
$max_process_at_the_same_time = 5;
99
$encrypt = false; // if enable encryption it fails to play, probably an error on .ts timestamp
1010
//$downloadCodec = " -c:v libx264 -acodec copy ";
@@ -679,10 +679,10 @@ function getAllTSFilesInDir($dir) {
679679
}
680680

681681
function getRandomSymlinkTSFileArray($dir, $total) {
682-
global $skippFirstSegments;
682+
global $skipFirstSegments;
683683
$totalTSFiles = getTotalTSFilesInDir($dir);
684684
error_log("getRandomSymlinkTSFileArray: ($totalTSFiles) ($total) {$dir}");
685-
$firstfile = sprintf('%03d.ts', $skippFirstSegments);
685+
$firstfile = sprintf('%03d.ts', $skipFirstSegments);
686686
if (!file_exists("{$dir}/{$firstfile}")) {
687687
$firstfile = "000.ts";
688688
}
@@ -706,8 +706,8 @@ function getRandomSymlinkTSFileArray($dir, $total) {
706706
}
707707

708708
function createFirstSegment() {
709-
global $skippFirstSegments, $outputPath, $localFileDownloadDir;
710-
$firstfile = sprintf('%03d.ts', $skippFirstSegments);
709+
global $skipFirstSegments, $outputPath, $localFileDownloadDir;
710+
$firstfile = sprintf('%03d.ts', $skipFirstSegments);
711711
$inputHLS_ts = "{$localFileDownloadDir}/{$firstfile}";
712712
if (!file_exists($inputHLS_ts)) {
713713
$firstfile = "000.ts";

0 commit comments

Comments
 (0)