Merge branch 'main' into daily-js-releases

daily-co · Apr 4, 2024 · 91bd84f · 91bd84f
2 parents 7a3b44b + d0583c8
commit 91bd84f
Show file tree

Hide file tree

Showing 7 changed files with 4,660 additions and 3,466 deletions.
diff --git a/index.d.ts b/index.d.ts
@@ -699,9 +699,17 @@ export interface DailyStartScreenShare {
     | DailyScreenVideoSendSettingsPreset;
 }
 
+export interface DailyStartScreenShareFromStream {
+  mediaStream: MediaStream;
+  screenVideoSendSettings?:
+    | DailyVideoSendSettings
+    | DailyScreenVideoSendSettingsPreset;
+}
+
 export type DailyStartScreenShareOptions =
   | DailyScreenCaptureOptions
-  | DailyStartScreenShare;
+  | DailyStartScreenShare
+  | DailyStartScreenShareFromStream;
 
 export interface DailyNetworkStats {
   quality: number;
@@ -764,6 +772,7 @@ export interface DailyCpuLoadStats {
         fps: number;
         frameDecodeTimeSec: number;
         interFrameDelayStandardDeviation: number;
+        cpuUsageBasedOnTargetDecode: number;
       }[];
     };
   };