@pexip/media 17.1.2 → 17.3.0

package/CHANGELOG.md

@@ -1,5 +1,50 @@
 # @pexip/media
 
+## 17.3.0
+
+### Minor Changes
+
+- 7abdb2332a: Allow force to applyChanges for preview controller
+- 7b29d953: Update babel/traverse related deps
+- acb51c1ee1: Resolution from the preview should not affect the main
+
+### Patch Changes
+
+- Updated dependencies [68c3ba1bb8]
+- Updated dependencies [7b29d953]
+- Updated dependencies [821d9a1ef8]
+- Updated dependencies [96f3ce8802]
+  - @pexip/media-processor@17.3.0
+  - @pexip/media-control@17.3.0
+  - @pexip/utils@16.9.0
+  - @pexip/signal@16.6.0
+
+## 17.2.0
+
+### Minor Changes
+
+- 0a58ae61: Stablize constraints after release
+- 26878b60: Add `contentHint` to constraints
+
+  - Add a new constraint: `contentHint`
+
+- 7e02391e9c: Changest to support FECC and PTZ capabilities
+- 244cb04c: Add `createGetDisplayMedia`
+
+### Patch Changes
+
+- 4ea55a5205: Prettier and linting for new prettier version.
+- Updated dependencies [244cb04c]
+- Updated dependencies [26878b60]
+- Updated dependencies [c418c778]
+- Updated dependencies [244cb04c]
+- Updated dependencies [7e02391e9c]
+- Updated dependencies [4ea55a5205]
+  - @pexip/media-control@17.2.0
+  - @pexip/media-processor@17.2.0
+  - @pexip/utils@16.8.0
+  - @pexip/signal@16.6.0
+
 ## 17.1.2
 
 ### Patch Changes

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import * as _pexip_media_control from '@pexip/media-control';
-import { MediaDeviceRequest, MediaDeviceInfoLike, InputConstraintSet } from '@pexip/media-control';
+import { MediaDeviceRequest, MediaDeviceInfoLike, InputConstraintSet, DisplayMediaOptions } from '@pexip/media-control';
 import { RenderEffects, SegmentationModel, RenderParams, Segmenter, ThrottleOptions, AudioGraphOptions, AudioNodeInit, VideoProcessor, SegmentationTransform } from '@pexip/media-processor';
 import { Signal, SignalVariant } from '@pexip/signal';
 import { AsyncQueueOptions } from '@pexip/utils';
@@ -18,6 +18,10 @@ interface ExtendedMediaTrackSettings extends MediaTrackSettings {
     foregroundThreshold?: number;
     videoSegmentation?: RenderEffects;
     videoSegmentationModel?: SegmentationModel;
+    pan?: boolean;
+    tilt?: boolean;
+    zoom?: boolean;
+    contentHint?: AudioContentHint | VideoContentHint;
 }
 type ExtendedMediaTrackSettingsKey = keyof ExtendedMediaTrackSettings;
 interface MediaSettings {
@@ -429,6 +433,9 @@ type VideoRenderParams = Omit<RenderParams, 'backgroundImage' | 'effects'> & {
      * Render Effects
      */
     videoSegmentation: RenderEffects;
+    pan?: boolean;
+    tilt?: boolean;
+    zoom?: boolean;
 };
 interface StreamTrackSignals {
     /**
@@ -472,6 +479,86 @@ declare enum DeniedDevices {
 interface Segmenters {
     mediapipeSelfie: Segmenter;
 }
+/**
+ * Audio content hints are only applicable when the MediaStreamTrack contains an
+ * audio track
+ *
+ * {@link https://www.w3.org/TR/mst-content-hint/#audio-content-hints}
+ */
+declare const AUDIO_CONTENT_HINTS: {
+    /**
+     * No hint has been provided, the implementation should make its
+     * best-informed guess on how to handle contained audio data. This may be
+     * inferred from how the track was opened or by doing content analysis
+     */
+    readonly NoHint: "";
+    /**
+     * The track should be treated as if it contains speech data. Consuming this
+     * signal it may be appropriate to apply noise suppression or boost
+     * intelligibility of the incoming signal.
+     */
+    readonly Speech: "speech";
+    /**
+     * The track should be treated as if it contains data for the purpose of
+     * speech recognition by a machine. Consuming this signal it may be
+     * appropriate to boost intelligibility of the incoming signal for
+     * transcription and turn off audio-processing components that are used for
+     * human consumption.
+     */
+    readonly SpeechRecognition: "speech-recognition";
+    /**
+     * The track should be treated as if it contains music data. Generally this
+     * might imply tuning or turning off audio-processing components that are
+     * used to process speech data to prevent the audio from being distorted.
+     */
+    readonly Music: "music";
+};
+type AudioContentHint = (typeof AUDIO_CONTENT_HINTS)[keyof typeof AUDIO_CONTENT_HINTS];
+/**
+ * Video content hints are only applicable when the MediaStreamTrack contains a
+ * video track.
+ *
+ * {@link https://www.w3.org/TR/mst-content-hint/#video-content-hints}
+ */
+declare const VIDEO_CONTENT_HINTS: {
+    /**
+     * No hint has been provided, the implementation should make its
+     * best-informed guess on how contained video content should be treated.
+     * This can for example be inferred from how the track was opened or by
+     * doing content analysis.
+     */
+    readonly NoHint: "";
+    /**
+     * The track should be treated as if it contains video where motion is
+     * important. This is normally webcam video, movies or video games.
+     * Quantization artefacts and downscaling are acceptable in order to
+     * preserve motion as well as possible while still retaining target
+     * bitrates. During low bitrates when compromises have to be made, more
+     * effort is spent on preserving frame rate than edge quality and details.
+     */
+    readonly Motion: "motion";
+    /**
+     * The track should be treated as if video details are extra important.
+     * This is generally applicable to presentations or web pages with text
+     * content, painting or line art. This setting would normally optimize for
+     * detail in the resulting individual frames rather than smooth playback.
+     * Artefacts from quantization or downscaling that make small text or line
+     * art unintelligible should be avoided.
+     */
+    readonly Detail: "detail";
+    /**
+     * The track should be treated as if video details are extra important, and
+     * that significant sharp edges and areas of consistent color can occur
+     * frequently. This is generally applicable to presentations or web pages
+     * with text content. This setting would normally optimize for detail in the
+     * resulting individual frames rather than smooth playback, and may take
+     * advantage of encoder tools that optimize for text rendering. Artefacts
+     * from quantization or downscaling that make small text or line art
+     * unintelligible should be avoided.
+     */
+    readonly Text: "text";
+};
+type VideoContentHint = (typeof VIDEO_CONTENT_HINTS)[keyof typeof VIDEO_CONTENT_HINTS];
 
 /**
  * Create an object to interact with the media scream, which is usually used for
@@ -657,7 +744,7 @@ interface PreviewStreamController {
     updatingMain: boolean;
     updateAudioInput(input: PreviewInput): void;
     updateVideoInput(input: PreviewInput): void;
-    applyChanges(): Promise<void>;
+    applyChanges(force?: boolean): Promise<void>;
     revertChanges(): Promise<void>;
     onMediaChanged(callback: EventCallback<Media>): Unsubscribe;
     onAudioInputChanged(callback: EventCallback<PreviewInput>): Unsubscribe;
@@ -731,9 +818,20 @@ declare const REQUIRED_SIGNAL_KEYS: readonly ["onMediaChanged", "onVAD", "onSile
  */
 declare const createMediaSignals: <K extends "onDevicesChanged" | "onStatusChanged" | keyof StreamTrackSignals>(more: K[], scope?: string) => Pick<Required<MediaSignals>, "onMediaChanged" | "onVAD" | "onSilentDetected" | K>;
 
+/**
+ * Apply the content hint to the track
+ *
+ * @param hint - Content hint
+ * @param track - The track to be applied
+ */
+declare const applyContentHint: <T extends "" | "speech" | "speech-recognition" | "music" | "motion" | "detail" | "text">(hint?: T | undefined) => (track: MediaStreamTrack) => void;
+
 /**
  * Create a Audio Mixing Processor and will own the stream passed-in
  */
 declare const createAudioMixingProcess: (getCurrrentMedia: () => MediaStream | undefined, scope?: string) => Process<Promise<Media>>;
 
-export { AudioDetectionSignals, AudioSignalDetectionOptions, CreatePreviewStreamController, DeniedDevices, DenoiseParams, ExtendedMediaTrackSettings, ExtendedMediaTrackSettingsKey, Media, MediaAttributes, MediaChangesSignals, MediaController, MediaOptions, MediaProcessor, MediaProps, MediaSettings, MediaSignals, MediaSignalsOptional, MediaSignalsRequired, Pipeline, PreviewControllerProps, PreviewEventHandler, PreviewInput, PreviewStreamController, PreviewStreamParams, Process, ProcessMedia, REQUIRED_SIGNAL_KEYS, Segmenters, StreamTrackSignals, Unsubscribe, UserMediaStatus, UserMediaValidator, VideoRenderParams, VideoStreamTrackProcessorAPIs, VoiceActivityDetectionOptions, areBothGranted, createAudioMixingProcess, createAudioStreamProcess, createMedia, createMediaSignal, createMediaSignals, createPreviewStreamController, createVideoStreamProcess, deriveInitialPermissionStatus, getPermissionStatus, hasNoAudioDevices, hasNoDevice, hasNoVideoDevices, isAudioDeviceInUse, isDeviceInUse, isFallback, isFallbackAudio, isFallbackVideo, isGranted, isGrantedAudio, isGrantedOnlyAudio, isGrantedOnlyAudioNoVideoDevices, isGrantedOnlyVideo, isGrantedOnlyVideoNoAudioDevices, isGrantedVideo, isInitial, isInitialPermissions, isInitialPermissionsGranted, isInitialPermissionsNotGranted, isOnlyAudioError, isOnlyVideoError, isOverConstrained, isPromptAudio, isPromptVideo, isRejected, isRejectedOnlyAudio, isRejectedOnlyVideo, isUnknownError, isVideoDeviceInUse, setLogger, toDeniedDevices };
+declare const createGetDisplayMedia: (getDefaultConstraints: () => DisplayMediaOptions, getDisplayMedia?: MediaDevices['getDisplayMedia']) => (constraints?: DisplayMediaOptions) => Promise<MediaStream | undefined>;
+type GetDisplayMedia = ReturnType<typeof createGetDisplayMedia>;
+
+export { AUDIO_CONTENT_HINTS, AudioContentHint, AudioDetectionSignals, AudioSignalDetectionOptions, CreatePreviewStreamController, DeniedDevices, DenoiseParams, ExtendedMediaTrackSettings, ExtendedMediaTrackSettingsKey, GetDisplayMedia, Media, MediaAttributes, MediaChangesSignals, MediaController, MediaOptions, MediaProcessor, MediaProps, MediaSettings, MediaSignals, MediaSignalsOptional, MediaSignalsRequired, Pipeline, PreviewControllerProps, PreviewEventHandler, PreviewInput, PreviewStreamController, PreviewStreamParams, Process, ProcessMedia, REQUIRED_SIGNAL_KEYS, Segmenters, StreamTrackSignals, Unsubscribe, UserMediaStatus, UserMediaValidator, VIDEO_CONTENT_HINTS, VideoContentHint, VideoRenderParams, VideoStreamTrackProcessorAPIs, VoiceActivityDetectionOptions, applyContentHint, areBothGranted, createAudioMixingProcess, createAudioStreamProcess, createGetDisplayMedia, createMedia, createMediaSignal, createMediaSignals, createPreviewStreamController, createVideoStreamProcess, deriveInitialPermissionStatus, getPermissionStatus, hasNoAudioDevices, hasNoDevice, hasNoVideoDevices, isAudioDeviceInUse, isDeviceInUse, isFallback, isFallbackAudio, isFallbackVideo, isGranted, isGrantedAudio, isGrantedOnlyAudio, isGrantedOnlyAudioNoVideoDevices, isGrantedOnlyVideo, isGrantedOnlyVideoNoAudioDevices, isGrantedVideo, isInitial, isInitialPermissions, isInitialPermissionsGranted, isInitialPermissionsNotGranted, isOnlyAudioError, isOnlyVideoError, isOverConstrained, isPromptAudio, isPromptVideo, isRejected, isRejectedOnlyAudio, isRejectedOnlyVideo, isUnknownError, isVideoDeviceInUse, setLogger, toDeniedDevices };

package/dist/index.mjs

@@ -69,6 +69,72 @@ var DeniedDevices = /* @__PURE__ */ ((DeniedDevices2) => {
   DeniedDevices2["Both"] = "microphone-and-camera";
   return DeniedDevices2;
 })(DeniedDevices || {});
+var AUDIO_CONTENT_HINTS = {
+  /**
+   * No hint has been provided, the implementation should make its
+   * best-informed guess on how to handle contained audio data. This may be
+   * inferred from how the track was opened or by doing content analysis
+   */
+  NoHint: "",
+  /**
+   * The track should be treated as if it contains speech data. Consuming this
+   * signal it may be appropriate to apply noise suppression or boost
+   * intelligibility of the incoming signal.
+   */
+  Speech: "speech",
+  /**
+   * The track should be treated as if it contains data for the purpose of
+   * speech recognition by a machine. Consuming this signal it may be
+   * appropriate to boost intelligibility of the incoming signal for
+   * transcription and turn off audio-processing components that are used for
+   * human consumption.
+   */
+  SpeechRecognition: "speech-recognition",
+  /**
+   * The track should be treated as if it contains music data. Generally this
+   * might imply tuning or turning off audio-processing components that are
+   * used to process speech data to prevent the audio from being distorted.
+   */
+  Music: "music"
+};
+var VIDEO_CONTENT_HINTS = {
+  /**
+   * No hint has been provided, the implementation should make its
+   * best-informed guess on how contained video content should be treated.
+   * This can for example be inferred from how the track was opened or by
+   * doing content analysis.
+   */
+  NoHint: "",
+  /**
+   * The track should be treated as if it contains video where motion is
+   * important. This is normally webcam video, movies or video games.
+   * Quantization artefacts and downscaling are acceptable in order to
+   * preserve motion as well as possible while still retaining target
+   * bitrates. During low bitrates when compromises have to be made, more
+   * effort is spent on preserving frame rate than edge quality and details.
+   */
+  Motion: "motion",
+  /**
+   * The track should be treated as if video details are extra important.
+   * This is generally applicable to presentations or web pages with text
+   * content, painting or line art. This setting would normally optimize for
+   * detail in the resulting individual frames rather than smooth playback.
+   * Artefacts from quantization or downscaling that make small text or line
+   * art unintelligible should be avoided.
+   */
+  Detail: "detail",
+  /**
+   * The track should be treated as if video details are extra important, and
+   * that significant sharp edges and areas of consistent color can occur
+   * frequently. This is generally applicable to presentations or web pages
+   * with text content. This setting would normally optimize for detail in the
+   * resulting individual frames rather than smooth playback, and may take
+   * advantage of encoder tools that optimize for text rendering. Artefacts
+   * from quantization or downscaling that make small text or line art
+   * unintelligible should be avoided.
+   */
+  Text: "text"
+};
 
 // src/status.ts
 var isFallbackVideo = (status) => [
@@ -373,6 +439,18 @@ var isMedia = (value) => {
   }
   return false;
 };
+var isAudioContentHint = (value) => {
+  if (typeof value === "string" && Object.values(AUDIO_CONTENT_HINTS).includes(value)) {
+    return true;
+  }
+  return false;
+};
+var isVideoContentHint = (value) => {
+  if (typeof value === "string" && Object.values(VIDEO_CONTENT_HINTS).includes(value)) {
+    return true;
+  }
+  return false;
+};
 
 // src/utils.ts
 var makeDeriveDeviceStatus = (constraints) => (audio, video, both) => {
@@ -599,7 +677,8 @@ var applyExtendedConstraints = (media, applyExtended) => (
 var AUDIO_SETTINGS_KEYS = [
   "denoise",
   "vad",
-  "asd"
+  "asd",
+  "contentHint"
 ];
 var VIDEO_SETTINGS_KEYS = [
   "frameRate",
@@ -611,7 +690,8 @@ var VIDEO_SETTINGS_KEYS = [
   "flipHorizontal",
   "bgImageUrl",
   "width",
-  "height"
+  "height",
+  "contentHint"
 ];
 var MIXING_SETTINGS_KEYS = [
   "mixWithAdditionalMedia"
@@ -667,6 +747,11 @@ var getBlurKernelSize = (percentage, height, max = 20) => {
   }
   return Math.min(Math.ceil(percentage * 1e-3 * height), max);
 };
+var applyContentHint = (hint) => (track) => {
+  if (hint !== void 0 && hint !== track.contentHint) {
+    track.contentHint = hint;
+  }
+};
 
 // src/userMedia.ts
 var toErrorDeviceStatus = (error, deriveDeviceStatus) => {
@@ -1067,13 +1152,25 @@ var FEATURE_KEYS = [
   "videoSegmentation",
   "videoSegmentationModel",
   "width",
-  "height"
+  "height",
+  "pan",
+  "tilt",
+  "zoom",
+  "contentHint"
 ];
 var getVideoConstraints = extractConstraintsWithKeys2(FEATURE_KEYS);
 var updateFeatureProps = (constraints, props) => {
   const extracted = getVideoConstraints(constraints);
   return FEATURE_KEYS.reduce((accm, key) => {
     switch (key) {
+      case "contentHint": {
+        const [[feature] = []] = extracted[key];
+        if (isVideoContentHint(feature) && props[key] !== feature) {
+          props[key] = feature;
+          return { ...accm, [key]: feature };
+        }
+        return accm;
+      }
       case "videoSegmentation": {
         const [[feature] = []] = extracted[key];
         if (isRenderEffects(feature) && props[key] !== feature) {
@@ -1117,7 +1214,10 @@ var updateFeatureProps = (constraints, props) => {
         }
         return accm;
       }
-      case "flipHorizontal": {
+      case "flipHorizontal":
+      case "pan":
+      case "tilt":
+      case "zoom": {
         const [feature] = extracted[key];
         if (feature !== void 0 && props[key] !== feature) {
           props[key] = feature;
@@ -1370,6 +1470,7 @@ var createVideoStreamProcess = ({
           release,
           getSettings: () => {
             const { audio, video } = prevGetSettings();
+            const contentHint = stream.getAudioTracks().at(0)?.contentHint ?? "";
             const videoSettings = {
               videoSegmentation: transformer.effects,
               foregroundThreshold: transformer.foregroundThreshold,
@@ -1378,7 +1479,11 @@ var createVideoStreamProcess = ({
               edgeBlurAmount: transformer.edgeBlurAmount,
               flipHorizontal: transformer.flipHorizontal,
               bgImageUrl: transformer.backgroundImage && props.bgImageUrl,
-              videoSegmentationModel: transformer.segmenter.model
+              videoSegmentationModel: transformer.segmenter.model,
+              pan: props.pan,
+              tilt: props.tilt,
+              zoom: props.zoom,
+              contentHint
             };
             const settings = {
               audio,
@@ -1430,17 +1535,38 @@ var fetchDenoiseWasm = async (denoiseWasm, wasmURL) => {
   }
   return await (await fetch(wasmURL)).arrayBuffer();
 };
-var FEATURE_KEYS2 = ["denoise", "vad", "asd"];
+var FEATURE_KEYS2 = [
+  "denoise",
+  "vad",
+  "asd",
+  "contentHint"
+];
 var getAudioConstraints = extractConstraintsWithKeys3(FEATURE_KEYS2);
 var updateFeatureProps2 = (constraints, props) => {
   const extracted = getAudioConstraints(constraints);
   return FEATURE_KEYS2.reduce((accm, key) => {
-    const [feature] = extracted[key];
-    if (feature !== void 0 && props[key] !== feature) {
-      props[key] = feature;
-      return { ...accm, [key]: feature };
+    switch (key) {
+      case "contentHint": {
+        const [[feature] = []] = extracted[key];
+        if (isAudioContentHint(feature) && props[key] !== feature) {
+          props[key] = feature;
+          return { ...accm, [key]: feature };
+        }
+        return accm;
+      }
+      case "denoise":
+      case "asd":
+      case "vad": {
+        const [feature] = extracted[key];
+        if (feature !== void 0 && props[key] !== feature) {
+          props[key] = feature;
+          return { ...accm, [key]: feature };
+        }
+        return accm;
+      }
+      default:
+        return accm;
     }
-    return accm;
   }, {});
 };
 var createAudioStreamProcess = ({
@@ -1710,10 +1836,12 @@ var createAudioStreamProcess = ({
             const denoise = !!props.denoiseNode && source.hasConnectedTo(props.denoiseNode);
             const asd = !!props.asd;
             const vad = !!props.vad;
+            const contentHint = stream.getAudioTracks().at(0)?.contentHint ?? "";
             const audioSettings = {
               denoise,
               asd,
-              vad
+              vad,
+              contentHint
             };
             const settings = {
               audio: audio.map((settings2) => ({
@@ -1998,7 +2126,10 @@ var createMedia = ({
   mediaProcessors,
   getDefaultConstraints = () => ({})
 }) => {
-  const initMedia = (status = "initial" /* Initial */, devices = []) => buildMedia(() => ({ status, devices }), signals.onStatusChanged?.emit);
+  const initMedia = (status = "initial" /* Initial */, devices = [], constraints) => buildMedia(
+    () => ({ status, devices, constraints }),
+    signals.onStatusChanged?.emit
+  );
   const _props = {
     devices: [],
     media: initMedia(),
@@ -2021,7 +2152,7 @@ var createMedia = ({
       props.discardMedia = true;
     }
     const status = await deriveInitialPermissionStatus(props.media.status);
-    props.media = initMedia(status, props.devices);
+    props.media = initMedia(status, props.devices, props.media.constraints);
   };
   const mediaPipeline = createMediaPipeline([
     createGetUserMediaProcess(
@@ -2065,6 +2196,19 @@ var createMedia = ({
         await media.release();
         await cleanup();
       };
+      const applyConstraints3 = async (constraints) => {
+        await media.applyConstraints(constraints);
+        const videoFeatures = updateFeatureProps(
+          constraints.video,
+          {}
+        );
+        const audioFeatures = updateFeatureProps2(
+          constraints.audio,
+          {}
+        );
+        media.stream?.getAudioTracks().forEach(applyContentHint(audioFeatures.contentHint));
+        media.stream?.getVideoTracks().forEach(applyContentHint(videoFeatures.contentHint));
+      };
       logger2.debug(
         { finalAudioMute: audio, finalVideoMute: video },
         "End of media pipeline"
@@ -2073,7 +2217,8 @@ var createMedia = ({
         shallowCopy(media, {
           release,
           muteAudio,
-          muteVideo
+          muteVideo,
+          applyConstraints: applyConstraints3
         })
       );
     })
@@ -2096,12 +2241,16 @@ var createMedia = ({
       audio: [prevAudioSettings],
       video: [prevVideoSettings]
     } = props.media.getSettings();
-    const hasRequestedResolution = !props.devices.some(
-      (device) => device.kind === "videoinput" && device.label
-    ) || isRequestedResolution2(constraints.video, props.media?.videoInput);
     const videoFeatures = updateFeatureProps(constraints.video, {});
     const audioFeatures = updateFeatureProps2(constraints.audio, {});
     const mixingFeatures = updateFeatureProps3(constraints.audio, {});
+    const hasRequestedResolution = ["blur", "overlay"].includes(
+      videoFeatures.videoSegmentation ?? ""
+    ) || // Skip when there is a render effect to modify the video
+    !props.devices.some(
+      (device) => device.kind === "videoinput" && device.label
+    ) || // Skip when no authorized video found
+    isRequestedResolution2(constraints.video, props.media?.videoInput);
     const audioFeaturesChanged = hasSettingsChanged(AUDIO_SETTINGS_KEYS)(
       prevAudioSettings,
       audioFeatures
@@ -2114,6 +2263,10 @@ var createMedia = ({
       prevAudioSettings,
       mixingFeatures
     );
+    const ptzFeaturesChanges = hasSettingsChanged(["pan", "tilt", "zoom"])(
+      prevVideoSettings,
+      videoFeatures
+    );
     logger2.debug(
       {
         constraints,
@@ -2128,7 +2281,7 @@ var createMedia = ({
       },
       "Is currently streaming requested stream"
     );
-    if (shouldRequestAudio || shouldRequestVideo || !hasRequestedResolution || !props.media.stream) {
+    if (shouldRequestAudio || shouldRequestVideo || ptzFeaturesChanges || !hasRequestedResolution || !props.media.stream) {
       if (props.media) {
         await props.media.release();
       }
@@ -2136,6 +2289,8 @@ var createMedia = ({
         props.discardMedia = false;
       }
       const media = await mediaPipeline.execute(constraints);
+      media.stream?.getAudioTracks().forEach(applyContentHint(audioFeatures.contentHint));
+      media.stream?.getVideoTracks().forEach(applyContentHint(videoFeatures.contentHint));
       if (props.discardMedia) {
         logger2.debug("Discard media");
         return await media.release();
@@ -2502,7 +2657,7 @@ var createPreviewStreamController = ({
     () => props.media
   );
   const hasChanges = () => hasChangedAudioInput() || hasChangedVideoInput() || hasAudioVideoProcessingSettingsChanged();
-  const applyChanges = async () => {
+  const applyChanges = async (force = false) => {
     const { audioInput, videoInput } = props;
     const {
       audio: [previewAudio],
@@ -2510,7 +2665,7 @@ var createPreviewStreamController = ({
     } = props.media.getSettings();
     await props.media.release();
     cleanUpMainSubscription();
-    if (hasChanges()) {
+    if (force || hasChanges()) {
       const audioSettings = extractFeaturesToConstraints(
         AUDIO_SETTINGS_KEYS,
         previewAudio
@@ -2519,6 +2674,8 @@ var createPreviewStreamController = ({
         VIDEO_SETTINGS_KEYS,
         previewVideo
       );
+      delete videoSettings.width;
+      delete videoSettings.height;
       logger2.info(
         { audioInput, videoInput, audioSettings, videoSettings },
         "Apply changes to main"
@@ -2656,13 +2813,54 @@ var createMediaSignals = (more, scope = "") => {
     {}
   );
 };
+
+// src/displayMedia.ts
+import {
+  limitSharingMonitorInterface,
+  stopMediaStream as stopMediaStream5
+} from "@pexip/media-control";
+import { cancellablePromise } from "@pexip/utils";
+var createGetDisplayMedia = (getDefaultConstraints, getDisplayMedia = (constraints) => navigator.mediaDevices.getDisplayMedia(constraints)) => {
+  const props = {
+    requesting: false
+  };
+  return async (constraints) => {
+    const [getCancelableDisplayMedia, cancel] = cancellablePromise(
+      getDisplayMedia,
+      (stream) => {
+        stopMediaStream5(stream);
+      }
+    );
+    if (props.requesting) {
+      cancel();
+    }
+    try {
+      props.requesting = true;
+      const mergedConstraints = {
+        ...getDefaultConstraints(),
+        ...constraints
+      };
+      const stream = await getCancelableDisplayMedia(mergedConstraints);
+      if (!stream) {
+        return;
+      }
+      return limitSharingMonitorInterface(mergedConstraints, stream);
+    } finally {
+      props.requesting = false;
+    }
+  };
+};
 export {
+  AUDIO_CONTENT_HINTS,
   DeniedDevices,
   REQUIRED_SIGNAL_KEYS,
   UserMediaStatus,
+  VIDEO_CONTENT_HINTS,
+  applyContentHint,
   areBothGranted,
   createAudioMixingProcess,
   createAudioStreamProcess,
+  createGetDisplayMedia,
   createMedia,
   createMediaSignal,
   createMediaSignals,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pexip/media",
-  "version": "17.1.2",
+  "version": "17.3.0",
   "description": "Home for media related stuff",
   "homepage": "https://gitlab.com/pexip/zoo",
   "bugs": "https://gitlab.com/pexip/zoo/issues",
@@ -32,16 +32,16 @@
     "typecheck": "yarn tsc --noEmit -p ."
   },
   "dependencies": {
-    "@pexip/media-control": "17.1.2",
-    "@pexip/media-processor": "17.1.2",
+    "@pexip/media-control": "17.3.0",
+    "@pexip/media-processor": "17.3.0",
     "@pexip/signal": "16.6.0",
-    "@pexip/utils": "16.7.0"
+    "@pexip/utils": "16.9.0"
   },
   "devDependencies": {
-    "@jest/globals": "^29.5.0",
-    "@pexip/bundler": "16.4.0",
-    "prettier": "^2.7.1",
-    "typescript": "~5.0.0"
+    "@jest/globals": "^29.7.0",
+    "@pexip/bundler": "16.5.0",
+    "prettier": "^3.0.3",
+    "typescript": "~5.3.0"
   },
   "publishConfig": {
     "access": "public",