Skip to content

cherrypick(release-1.4): stop relying on ubuntu stock ffmpeg #3894

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

Merged
aslushnikov merged 1 commit into from
Sep 16, 2020
Merged

cherrypick(release-1.4): stop relying on ubuntu stock ffmpeg #3894

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
13 changes: 4 additions & 9 deletions src/server/chromium/videoRecorder.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ import { assert } from '../../utils/utils';
import { launchProcess } from '../processLauncher';
import { Progress, runAbortableTask } from '../progress';
import * as types from '../types';
import { spawnAsync } from '../validateDependencies';

const fps = 25;

Expand Down Expand Up @@ -60,16 +59,12 @@ export class VideoRecorder {

let ffmpegPath = 'ffmpeg';
const binPath = path.join(__dirname, '../../../third_party/ffmpeg/');
if (os.platform() === 'win32') {
if (os.platform() === 'win32')
ffmpegPath = path.join(binPath, os.arch() === 'x64' ? 'ffmpeg-win64.exe' : 'ffmpeg-win32.exe');
} else if (os.platform() === 'darwin') {
else if (os.platform() === 'darwin')
ffmpegPath = path.join(binPath, 'ffmpeg-mac');
} else {
// Look for ffmpeg in PATH.
const {code, error} = await spawnAsync(ffmpegPath, ['-version'], {});
if (code !== 0 || error)
throw new Error('ffmpeg not found.\nInstall missing packages with:\n sudo apt-get install ffmpeg');
}
else
ffmpegPath = path.join(binPath, 'ffmpeg-linux');
const { launchedProcess, gracefullyClose } = await launchProcess({
executablePath: ffmpegPath,
args,
Expand Down
Binary file added third_party/ffmpeg/ffmpeg-linux
View file
Open in desktop
Binary file not shown.