Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bugfix/use media recorder #1474

Merged
merged 1 commit into from
Sep 26, 2022
Merged

Bugfix/use media recorder #1474

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion docker/base-php/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ FROM php:7.3.28-apache
# p7zip-full - used by LF application for unzipping lexicon uploads
# unzip - used by LF application for unzipping lexicon uploads
# curl - used by LF application
RUN apt-get update && apt-get -y install p7zip-full unzip curl tini && rm -rf /var/lib/apt/lists/*
# ffmpeg - used by LF audio upload method
RUN apt-get update && apt-get -y install p7zip-full unzip curl tini ffmpeg && rm -rf /var/lib/apt/lists/*

# see https://github.com/mlocati/docker-php-extension-installer
# PHP extensions required by the LF application
Expand Down
51 changes: 24 additions & 27 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,14 +37,14 @@
"font-awesome": "^4.7.0",
"intl-tel-input": "9.2.7",
"jquery": "^3.6.0",
"lamejs": "^1.2.0",
"localforage": "^1.7.1",
"ng-drag-to-reorder": "^1.0.8",
"ng-file-upload": "12.0.4",
"ng-table": "^3.0.1",
"npm-run-all": "^4.1.5",
"oclazyload": "^1.1.0",
"offline-js": "0.7.11",
"webm-fix-duration": "^1.0.1",
"zxcvbn": "^4.4.2"
},
"devDependencies": {
Expand All @@ -58,6 +58,7 @@
"@types/bootstrap": "^3.3.35",
"@types/core-js": "^0.9.42",
"@types/deep-diff": "^1.0.1",
"@types/dom-mediacapture-record": "^1.0.11",
"@types/intl-tel-input": "0.0.7",
"@types/jasmine": "^2.8.4",
"@types/jasminewd2": "^2.0.3",
Expand Down
67 changes: 57 additions & 10 deletions src/Api/Model/Languageforge/Lexicon/Command/LexUploadCommands.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ class LexUploadCommands
".lift"
);


/**
* Upload an audio file
*
Expand Down Expand Up @@ -53,9 +54,11 @@ public static function uploadAudioFile($projectId, $mediaType, $tmpFilePath)
$allowedTypes = array(
"application/octet-stream",

// allow m4a audio uploads, which curiously has a mime type of video/mp4
// allow m4a audio uploads, which curiously has a mime type of video/mp4, audio/m4a, audio/mp4, or audio/x-m4a
"video/mp4",

"audio/m4a",
"audio/mp4",
"audio/x-m4a",
"audio/mpeg",
"audio/x-mpeg",
"audio/mp3",
Expand All @@ -66,27 +69,70 @@ public static function uploadAudioFile($projectId, $mediaType, $tmpFilePath)
"audio/x-mpg",
"audio/x-mpegaudio",
"audio/x-wav",
"audio/wav"
"audio/wav",
"audio/flac",
"audio/x-flac",
"audio/ogg",
"audio/webm",
// allow Google Chrome to handle MediaRecorder recordings as video/webm MimeType
"video/webm"
);
$allowedExtensions = array(
".mp3",
".mpa",
".mpg",
".m4a",
".wav"
".wav",
".ogg",
".flac",
".webm",
);

$response = new UploadResponse();

if (in_array(strtolower($fileType), $allowedTypes) && in_array(strtolower($fileExt), $allowedExtensions)) {

// make the folders if they don't exist
$project->createAssetsFolders();
$folderPath = $project->getAudioFolderPath();

// move uploaded file from tmp location to assets
// move uploaded/recorded file from tmp location to assets
$filePath = self::mediaFilePath($folderPath, $fileNamePrefix, $fileName);
$moveOk = copy($tmpFilePath, $filePath);
@unlink($tmpFilePath);

// convert audio file to mp3 or wav format if necessary
// FLEx only supports mp3 or wav format as of 2022-09

if (strcmp(strtolower($fileExt), ".mp3") !== 0 && strcmp(strtolower($fileExt), ".wav") !== 0) {
//First, find the duration of the file
$sanitizedTmpFilePath = escapeshellarg($tmpFilePath);
$ffprobeCommand = `ffprobe -i $sanitizedTmpFilePath -show_entries format=duration -v quiet -of csv="p=0" 2> /dev/null`;
$audioDuration = floatval($ffprobeCommand);

// Convert to .wav if the result will be less than 1 MB at 165Kb/s (recording is shorter than 6 seconds)
// and .mp3 otherwise (recording is longer than 6 seconds)
$extensionlessTmpFilePath = substr($sanitizedTmpFilePath, 0, strrpos($sanitizedTmpFilePath, strtolower($fileExt)));
$extensionlessFileName = substr($fileName, 0, strrpos($fileName, strtolower($fileExt)));

if($audioDuration < 6){
`ffmpeg -i $sanitizedTmpFilePath -b:a 165K -maxrate 165K -bufsize 80K $extensionlessTmpFilePath.wav 2> /dev/null')`;
`mv $sanitizedTmpFilePath $extensionlessTmpFilePath.wav 2> /dev/null`;
$fileName = $extensionlessFileName . '.wav';
$tmpFilePath = $extensionlessTmpFilePath. '.wav';
}
else{
`ffmpeg -i $sanitizedTmpFilePath -b:a 165K -maxrate 165K -bufsize 80K $extensionlessTmpFilePath.mp3 2> /dev/null')`;
`mv $sanitizedTmpFilePath $extensionlessTmpFilePath.mp3 2> /dev/null`;
$fileName = $extensionlessFileName . '.mp3';
$tmpFilePath = $extensionlessTmpFilePath . '.mp3';
}


// move uploaded file from tmp location to assets
$filePath = self::mediaFilePath($folderPath, $fileNamePrefix, $fileName);
$moveOk = copy($tmpFilePath, $filePath);
@unlink($tmpFilePath);
}

// construct server response
if ($moveOk && $tmpFilePath) {
Expand All @@ -95,10 +141,11 @@ public static function uploadAudioFile($projectId, $mediaType, $tmpFilePath)
$data->fileName = $fileNamePrefix . '_' . $fileName;
$response->result = true;

if (array_key_exists('previousFilename', $_POST)) {
$previousFilename = $_POST['previousFilename'];
self::deleteMediaFile($projectId, $mediaType, $previousFilename);
}
//Uncomment to ensure that only one format for each audio file is stored in the assets. We want to keep up to two formats right now (09-2022): the original and if needed, a FLEx-compatible one
// if (array_key_exists('previousFilename', $_POST)) {
// $previousFilename = $_POST['previousFilename'];
// self::deleteMediaFile($projectId, $mediaType, $previousFilename);
// }
} else {
$data = new ErrorResult();
$data->errorType = 'UserMessage';
Expand Down
Loading