Add support for frame rate pull down

shaka-project · Jun 7, 2021 · 98da2f5 · 98da2f5
1 parent 4cc6859
commit 98da2f5
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 0 deletions.
diff --git a/streamer/bitrate_configuration.py b/streamer/bitrate_configuration.py
@@ -221,6 +221,7 @@ class VideoResolutionName(configuration.RuntimeMapKeyValidator):
   '144p': VideoResolution({
     'max_width': 256,
     'max_height': 144,
+    'max_frame_rate': 30,
     'bitrates': {
       'h264': '108k',
       'vp9': '96k',
@@ -231,6 +232,7 @@ class VideoResolutionName(configuration.RuntimeMapKeyValidator):
   '240p': VideoResolution({
     'max_width': 426,
     'max_height': 240,
+    'max_frame_rate': 30,
     'bitrates': {
       'h264': '242k',
       'vp9': '151k',
@@ -241,6 +243,7 @@ class VideoResolutionName(configuration.RuntimeMapKeyValidator):
   '360p': VideoResolution({
     'max_width': 640,
     'max_height': 360,
+    'max_frame_rate': 30,
     'bitrates': {
       'h264': '400k',
       'vp9': '277k',
@@ -251,6 +254,7 @@ class VideoResolutionName(configuration.RuntimeMapKeyValidator):
   '480p': VideoResolution({  # NTSC analog broadcast TV resolution
     'max_width': 854,
     'max_height': 480,
+    'max_frame_rate': 30,
     'bitrates': {
       'h264': '1M',
       'vp9': '512k',
@@ -261,6 +265,7 @@ class VideoResolutionName(configuration.RuntimeMapKeyValidator):
   '576p': VideoResolution({  # PAL analog broadcast TV resolution
     'max_width': 1024,
     'max_height': 576,
+    'max_frame_rate': 30,
     'bitrates': {
       'h264': '1.5M',
       'vp9': '768k',
@@ -282,6 +287,7 @@ class VideoResolutionName(configuration.RuntimeMapKeyValidator):
   '720p-hfr': VideoResolution({
     'max_width': 1280,
     'max_height': 720,
+    'max_frame_rate': 60,
     'bitrates': {
       'h264': '3M',
       'vp9': '2M',
@@ -303,6 +309,7 @@ class VideoResolutionName(configuration.RuntimeMapKeyValidator):
   '1080p-hfr': VideoResolution({
     'max_width': 1920,
     'max_height': 1080,
+    'max_frame_rate': 60,
     'bitrates': {
       'h264': '5M',
       'vp9': '3M',
@@ -324,6 +331,7 @@ class VideoResolutionName(configuration.RuntimeMapKeyValidator):
   '1440p-hfr': VideoResolution({
     'max_width': 2560,
     'max_height': 1440,
+    'max_frame_rate': 60,
     'bitrates': {
       'h264': '14M',
       'vp9': '9M',
@@ -345,6 +353,7 @@ class VideoResolutionName(configuration.RuntimeMapKeyValidator):
   '4k-hfr': VideoResolution({
     'max_width': 4096,
     'max_height': 2160,
+    'max_frame_rate': 60,
     'bitrates': {
       'h264': '25M',
       'vp9': '18M',
@@ -366,6 +375,7 @@ class VideoResolutionName(configuration.RuntimeMapKeyValidator):
   '8k-hfr': VideoResolution({
     'max_width': 8192,
     'max_height': 4320,
+    'max_frame_rate': 60,
     'bitrates': {
       'h264': '60M',
       'vp9': '36M',

diff --git a/streamer/transcoder_node.py b/streamer/transcoder_node.py
@@ -202,6 +202,9 @@ def _encode_video(self, stream: VideoOutputStream, input: Input) -> List[str]:
       filters.append('pp=fd')
       args.extend(['-r', str(input.frame_rate)])
 
+    if stream.resolution.max_frame_rate < input.frame_rate:
+       args.extend(['-r', str(stream.resolution.max_frame_rate)])
+
     filters.extend(input.filters)
 
     hwaccel_api = self._pipeline_config.hwaccel_api