Merge pull request #109 from daily-co/only-use-fps
transport: only use fps to set maxFramerate
This commit is contained in:
@@ -21,11 +21,10 @@ class AbstractTransport:
|
|||||||
self._camera_enabled = kwargs.get("camera_enabled") or False
|
self._camera_enabled = kwargs.get("camera_enabled") or False
|
||||||
self._camera_width = kwargs.get("camera_width") or 1024
|
self._camera_width = kwargs.get("camera_width") or 1024
|
||||||
self._camera_height = kwargs.get("camera_height") or 768
|
self._camera_height = kwargs.get("camera_height") or 768
|
||||||
self._camera_max_bitrate = kwargs.get("camera_max_bitrate") or 250000
|
self._camera_bitrate = kwargs.get("camera_bitrate") or 250000
|
||||||
self._camera_max_framerate = kwargs.get("camera_max_framerate") or 30
|
self._camera_framerate = kwargs.get("camera_framerate") or 10
|
||||||
self._speaker_enabled = kwargs.get("speaker_enabled") or False
|
self._speaker_enabled = kwargs.get("speaker_enabled") or False
|
||||||
self._speaker_sample_rate = kwargs.get("speaker_sample_rate") or 16000
|
self._speaker_sample_rate = kwargs.get("speaker_sample_rate") or 16000
|
||||||
self._fps = kwargs.get("fps") or 8
|
|
||||||
|
|
||||||
self._logger: logging.Logger = logging.getLogger("dailyai.transport")
|
self._logger: logging.Logger = logging.getLogger("dailyai.transport")
|
||||||
|
|
||||||
|
|||||||
@@ -222,9 +222,9 @@ class DailyTransport(ThreadedTransport, EventHandler):
|
|||||||
"maxQuality": "low",
|
"maxQuality": "low",
|
||||||
"encodings": {
|
"encodings": {
|
||||||
"low": {
|
"low": {
|
||||||
"maxBitrate": self._camera_max_bitrate,
|
"maxBitrate": self._camera_bitrate,
|
||||||
"scaleResolutionDownBy": 1.333,
|
"scaleResolutionDownBy": 1.333,
|
||||||
"maxFramerate": self._camera_max_framerate,
|
"maxFramerate": self._camera_framerate,
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -393,7 +393,7 @@ class ThreadedTransport(AbstractTransport):
|
|||||||
this_frame = next(self._images)
|
this_frame = next(self._images)
|
||||||
self.write_frame_to_camera(this_frame)
|
self.write_frame_to_camera(this_frame)
|
||||||
|
|
||||||
time.sleep(1.0 / self._fps)
|
time.sleep(1.0 / self._camera_framerate)
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
self._logger.error(f"Exception {e} in camera thread.")
|
self._logger.error(f"Exception {e} in camera thread.")
|
||||||
raise e
|
raise e
|
||||||
|
|||||||
Reference in New Issue
Block a user