Merge pull request #290 from vania-pooh/master

Added ability to override video frame rate (fixes #287)

docs/special-capabilities.adoc

@@ -37,7 +37,7 @@ You should manually resize window to desired width and height.
 You need to use `setSize` method instead.
 ====
 
-=== Video Recording: enableVideo, videoName, videoScreenSize
+=== Video Recording: enableVideo, videoName, videoScreenSize, videoFrameRate
 
 NOTE: This feature requires some preparation. Please refer <<Video Recording>> section for details.
 
@@ -69,6 +69,13 @@ resolution is less than actual, screen on video will be trimmed starting from to
 videoScreenSize: "1024x768"
 ----
 
+* Default video frame rate is `12` frames per second. Specifying `videoFrameRate` capability changes this value:
+
+.Type: int
+----
+videoFrameRate: 24
+----
+
 === Custom Test Name: name
 
 For debugging purposes it is often useful to give a distinct name to every test case.

service/docker.go

@@ -280,6 +280,10 @@ func startVideoContainer(ctx context.Context, cl *client.Client, requestId uint6
 	if videoScreenSize != "" {
 		env = append(env, fmt.Sprintf("VIDEO_SIZE=%s", videoScreenSize))
 	}
+	videoFrameRate := caps.VideoFrameRate
+	if videoFrameRate > 0 {
+		env = append(env, fmt.Sprintf("FRAME_RATE=%d", videoFrameRate))
+	}
 	log.Printf("[%d] [CREATING_VIDEO_CONTAINER] [%s]\n", requestId, videoContainerImage)
 	videoContainer, err := cl.ContainerCreate(ctx,
 		&ctr.Config{

service_test.go

@@ -233,6 +233,8 @@ func createDockerStarter(t *testing.T, env *service.Environment, cfg *config.Con
 		ScreenResolution:      "1024x768",
 		VNC:                   true,
 		Video:                 true,
+		VideoScreenSize:       "1024x768",
+		VideoFrameRate:        25,
 		HostsEntries:          "example.com:192.168.0.1,test.com:192.168.0.2",
 		ApplicationContainers: "one,two",
 		TimeZone:              "Europe/Moscow",

session/session.go

@@ -14,6 +14,7 @@ type Caps struct {
 	Video                 bool   `json:"enableVideo"`
 	VideoName             string `json:"videoName"`
 	VideoScreenSize       string `json:"videoScreenSize"`
+	VideoFrameRate        uint16 `json:"videoFrameRate"`
 	TestName              string `json:"name"`
 	TimeZone              string `json:"timeZone"`
 	ContainerHostname     string `json:"containerHostname"`