adding ability to specify encoding version

video-dev · Mar 29, 2017 · dd86b3c · dd86b3c
1 parent d4d0153
commit dd86b3c
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -67,6 +67,7 @@ export BITMOVIN_AWS_ACCESS_KEY_ID=your.access.key.id
 export BITMOVIN_AWS_SECRET_ACCESS_KEY=your.secret.access.key
 export BITMOVIN_AWS_STORAGE_REGION=your.s3.region.such.as.US_EAST_1.or.EU_WEST_1
 export BITMOVIN_ENCODING_REGION=your.provider.region.such.as.AWS_US_EAST_1.or.GOOGLE_EUROPE_WEST_1
+export BITMOVIN_ENCODING_VERSION=STABLE.or.BETA
 ```
 
 

diff --git a/config/config.go b/config/config.go
@@ -68,6 +68,7 @@ type Bitmovin struct {
 	SecretAccessKey  string `envconfig:"BITMOVIN_AWS_SECRET_ACCESS_KEY"`
 	AWSStorageRegion string `envconfig:"BITMOVIN_AWS_STORAGE_REGION" default:"US_EAST_1"`
 	EncodingRegion   string `envconfig:"BITMOVIN_ENCODING_REGION" default:"AWS_US_EAST_1"`
+	EncodingVersion  string `envconfig:"BITMOVIN_ENCODING_VERSION" default:"STABLE"`
 }
 
 // LoadConfig loads the configuration of the API using environment variables.

diff --git a/config/config_test.go b/config/config_test.go
@@ -42,6 +42,7 @@ func TestLoadConfigFromEnv(t *testing.T) {
 		"BITMOVIN_AWS_SECRET_ACCESS_KEY":           "secret-key",
 		"BITMOVIN_AWS_STORAGE_REGION":              "US_WEST_1",
 		"BITMOVIN_ENCODING_REGION":                 "GOOGLE_EUROPE_WEST_1",
+		"BITMOVIN_ENCODING_VERSION":                "notstable",
 		"SWAGGER_MANIFEST_PATH":                    "/opt/video-transcoding-api-swagger.json",
 		"HTTP_ACCESS_LOG":                          accessLog,
 		"HTTP_PORT":                                "8080",
@@ -89,6 +90,7 @@ func TestLoadConfigFromEnv(t *testing.T) {
 			SecretAccessKey:  "secret-key",
 			AWSStorageRegion: "US_WEST_1",
 			EncodingRegion:   "GOOGLE_EUROPE_WEST_1",
+			EncodingVersion:  "notstable",
 		},
 		Server: &server.Config{
 			HTTPPort:      8080,
@@ -118,7 +120,7 @@ func TestLoadConfigFromEnv(t *testing.T) {
 	}
 }
 
-func TestLoadConfigFromEnvWithDefauts(t *testing.T) {
+func TestLoadConfigFromEnvWithDefaults(t *testing.T) {
 	os.Clearenv()
 	accessLog := "/var/log/transcoding-api-access.log"
 	setEnvs(map[string]string{
@@ -193,6 +195,7 @@ func TestLoadConfigFromEnvWithDefauts(t *testing.T) {
 			SecretAccessKey:  "secret-key",
 			AWSStorageRegion: "US_EAST_1",
 			EncodingRegion:   "AWS_US_EAST_1",
+			EncodingVersion:  "STABLE",
 		},
 		Server: &server.Config{
 			HTTPPort:      8080,

diff --git a/provider/bitmovin/bitmovin.go b/provider/bitmovin/bitmovin.go
@@ -423,10 +423,12 @@ func (p *bitmovinProvider) Transcode(job *db.Job) (*provider.JobStatus, error) {
 		customData["manifest"] = manifestID
 	}
 	encodingRegion := bitmovintypes.CloudRegion(p.config.EncodingRegion)
+	encodingVersion := bitmovintypes.EncoderVersion(p.config.EncodingVersion)
 	encoding := &models.Encoding{
-		Name:        stringToPtr("encoding"),
-		CustomData:  customData,
-		CloudRegion: encodingRegion,
+		Name:           stringToPtr("encoding"),
+		CustomData:     customData,
+		CloudRegion:    encodingRegion,
+		EncoderVersion: encodingVersion,
 	}
 
 	encodingResp, err := encodingS.Create(encoding)