Remove the {ffmpeg} variable

Remove the `{ffmpeg}` variable from the default configuration, and its use
from the job compiler scripts. Now that the Worker can find its bundled
FFmpeg, it's no longer needed to configure its location on the Manager.

internal/manager/config/defaults.go

@@ -67,13 +67,6 @@ var defaultConfig = Conf{
 				VariableValue{Platform: "darwin", Value: "blender " + DefaultBlenderArguments},
 			},
 		},
-		"ffmpeg": {
-			Values: VariableValues{
-				VariableValue{Platform: "linux", Value: "ffmpeg"},
-				VariableValue{Platform: "windows", Value: "ffmpeg.exe"},
-				VariableValue{Platform: "darwin", Value: "ffmpeg"},
-			},
-		},
 		// TODO: determine useful defaults for these.
 		// "job_storage": {
 		// 	IsTwoWay: true,

internal/manager/config/settings_test.go

@@ -19,9 +19,9 @@ func TestDefaultSettings(t *testing.T) {
 	assert.Equal(t, defaultConfig.LocalManagerStoragePath, config.LocalManagerStoragePath)
 	assert.Equal(t, defaultConfig.DatabaseDSN, config.DatabaseDSN)
 
-	assert.Equal(t, false, config.Variables["ffmpeg"].IsTwoWay)
+	assert.Equal(t, false, config.Variables["blender"].IsTwoWay)
-	assert.Equal(t, "ffmpeg", config.Variables["ffmpeg"].Values[0].Value)
+	assert.Equal(t, "blender "+DefaultBlenderArguments, config.Variables["blender"].Values[0].Value)
-	assert.Equal(t, VariablePlatformLinux, config.Variables["ffmpeg"].Values[0].Platform)
+	assert.Equal(t, VariablePlatformLinux, config.Variables["blender"].Values[0].Platform)
 
 	assert.Greater(t, config.BlocklistThreshold, 0)
 }

internal/manager/job_compilers/job_compilers_test.go

@@ -114,7 +114,7 @@ func TestSimpleBlenderRenderHappy(t *testing.T) {
 	assert.Equal(t, 1, len(tVideo.Commands))
 	assert.Equal(t, "frames-to-video", tVideo.Commands[0].Name)
 	assert.EqualValues(t, AuthoredCommandParameters{
-		"exe":        "{ffmpeg}",
+		"exe":        "ffmpeg",
 		"inputGlob":  "/render/sprites/farm_output/promo/square_ellie/square_ellie.lighting_light_breakdown2__intermediate-2006-01-02_090405/*.png",
 		"outputFile": "/render/sprites/farm_output/promo/square_ellie/square_ellie.lighting_light_breakdown2__intermediate-2006-01-02_090405/scene123-1-10.mp4",
 		"fps":        int64(24),
@@ -198,7 +198,7 @@ func TestSimpleBlenderRenderWindowsPaths(t *testing.T) {
 	assert.Equal(t, 1, len(tVideo.Commands))
 	assert.Equal(t, "frames-to-video", tVideo.Commands[0].Name)
 	assert.EqualValues(t, AuthoredCommandParameters{
-		"exe":        "{ffmpeg}",
+		"exe":        "ffmpeg",
 		"inputGlob":  "R:/sprites/farm_output/promo/square_ellie/square_ellie.lighting_light_breakdown2__intermediate-2006-01-02_090405/*.png",
 		"outputFile": "R:/sprites/farm_output/promo/square_ellie/square_ellie.lighting_light_breakdown2__intermediate-2006-01-02_090405/scene123-1-10.mp4",
 		"fps":        int64(24),
@@ -247,7 +247,7 @@ func TestSimpleBlenderRenderOutputPathFieldReplacement(t *testing.T) {
 
 	tVideo := aj.Tasks[4] // This should be a video encoding task
 	assert.EqualValues(t, AuthoredCommandParameters{
-		"exe":        "{ffmpeg}",
+		"exe":        "ffmpeg",
 		"inputGlob":  "/root/2006-01-02_090405/jobname__intermediate-2006-01-02_090405/*.png",
 		"outputFile": "/root/2006-01-02_090405/jobname__intermediate-2006-01-02_090405/scene123-1-10.mp4",
 		"fps":        int64(24),

internal/manager/job_compilers/scripts-for-unittest/simple_blender_render.js

@@ -154,7 +154,7 @@ function authorCreateVideoTask(settings, renderDir) {
 
     const task = author.Task('preview-video', 'ffmpeg');
     const command = author.Command("frames-to-video", {
-        exe: "{ffmpeg}",
+        exe: "ffmpeg",
         fps: settings.fps,
         inputGlob: path.join(renderDir, `*${outfileExt}`),
         outputFile: outfile,

internal/manager/job_compilers/scripts/simple_blender_render.js

@@ -155,7 +155,7 @@ function authorCreateVideoTask(settings, renderDir) {
 
     const task = author.Task('preview-video', 'ffmpeg');
     const command = author.Command("frames-to-video", {
-        exe: "{ffmpeg}",
+        exe: "ffmpeg",
         fps: settings.fps,
         inputGlob: path.join(renderDir, `*${outfileExt}`),
         outputFile: outfile,

internal/worker/command_ffmpeg.go

@@ -28,7 +28,7 @@ import (
 )
 
 type CreateVideoParams struct {
-	exe        string   // Expansion of `{ffmpeg}`: executable path + its CLI parameters defined by the Manager.
+	exe        string   // Executable path + its CLI parameters defined by the Manager.
 	fps        float64  // Frames per second of the video file.
 	inputGlob  string   // Glob of input files.
 	outputFile string   // File to save the video to.