Filip/playwright
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

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

Browse source 
Cherry-pick:
- PR #3882 SHA 430f2bedaa

References #3845
This commit is contained in:
Andrey Lushnikov 2020-09-16 10:08:48 -07:00 committed by GitHub
parent 8bc84ff349
commit bf97758cf2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/server/chromium/videoRecorder.ts
View file

@ -21,7 +21,6 @@ import { assert } from '../../utils/utils';
import { launchProcess } from '../processLauncher'; import { launchProcess } from '../processLauncher';
import { Progress, runAbortableTask } from '../progress'; import { Progress, runAbortableTask } from '../progress';
import * as types from '../types'; import * as types from '../types';
import { spawnAsync } from '../validateDependencies';
const fps = 25; const fps = 25;
@ -60,16 +59,12 @@ export class VideoRecorder {
let ffmpegPath = 'ffmpeg'; let ffmpegPath = 'ffmpeg';
const binPath = path.join(__dirname, '../../../third_party/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'); 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'); ffmpegPath = path.join(binPath, 'ffmpeg-mac');
} else { else
// Look for ffmpeg in PATH. ffmpegPath = path.join(binPath, 'ffmpeg-linux');
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');
}
const { launchedProcess, gracefullyClose } = await launchProcess({ const { launchedProcess, gracefullyClose } = await launchProcess({
executablePath: ffmpegPath, executablePath: ffmpegPath,
args, args,

BIN
third_party/ffmpeg/ffmpeg-linux vendored Executable file
View file

Binary file not shown.