From 8874e7fe0e2f96c734ab3a481a550b367d467386 Mon Sep 17 00:00:00 2001 From: David Wang <123427390+davidwj123@users.noreply.github.com> Date: Mon, 11 Sep 2023 12:17:44 -0700 Subject: [PATCH] Content constraint revert (#2751) * Revert resolution constraint for content share * Revert resolution constraint for content share * Remove unit tests for content share resolution constraint --- CHANGELOG.md | 11 ++++++++ src/task/ReceiveVideoInputTask.ts | 21 -------------- test/task/ReceiveVideoInputTask.test.ts | 37 ------------------------- 3 files changed, 11 insertions(+), 58 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index db67d10d7a..cfa235044a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,17 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [3.18.0] - 2023-09-11 + +### Added + +### Removed +- Resolution constraint for content share + +### Changed + +### Fixed + ## [3.17.0] - 2023-08-15 ### Added diff --git a/src/task/ReceiveVideoInputTask.ts b/src/task/ReceiveVideoInputTask.ts index c714945c72..51a613ff92 100644 --- a/src/task/ReceiveVideoInputTask.ts +++ b/src/task/ReceiveVideoInputTask.ts @@ -75,27 +75,6 @@ export default class ReceiveVideoInputTask extends BaseTask { ); const trackSettings = videoTracks[0].getSettings(); - // apply video track constraints for content share - if (isContentAttendee) { - const constraint = { - width: { ideal: 1920 }, - height: { ideal: 1080 }, - frameRate: { ideal: 30 }, - }; - this.context.logger.info( - `Video track (content = ${isContentAttendee}) with constraint: ${JSON.stringify( - constraint - )}, trackSettings: ${JSON.stringify(trackSettings)}` - ); - try { - await videoTracks[0].applyConstraints(constraint); - } catch (error) { - this.context.logger.info( - 'Could not apply constraint for video track (content = ${isContentAttendee})' - ); - } - } - // For video, we currently enforce 720p for simulcast. This logic should be removed in the future. if (this.context.enableSimulcast && !isContentAttendee) { const constraint = this.context.videoUplinkBandwidthPolicy.chooseMediaTrackConstraints(); diff --git a/test/task/ReceiveVideoInputTask.test.ts b/test/task/ReceiveVideoInputTask.test.ts index b715cc5865..0e0fb806a3 100644 --- a/test/task/ReceiveVideoInputTask.test.ts +++ b/test/task/ReceiveVideoInputTask.test.ts @@ -96,43 +96,6 @@ describe('ReceiveVideoInputTask', () => { assert.exists(context.activeVideoInput); }); - it('will acquire the video input and query constraint (unicast - content with video track constraint)', async () => { - context.videoStreamIndex = new SimulcastVideoStreamIndex(new NoOpLogger()); - context.enableSimulcast = false; - context.meetingSessionConfiguration.credentials.attendeeId = 'foo-attendee#content'; - context.videoUplinkBandwidthPolicy = new DefaultSimulcastUplinkPolicy( - 'attendee', - new NoOpLogger() - ); - context.videoTileController.startLocalVideoTile(); - context.mediaStreamBroker = new MockMediaStreamBroker({ - acquireVideoInputDeviceSucceeds: true, - }); - - const task = new ReceiveVideoInputTask(context); - await task.run(); - assert.exists(context.activeVideoInput); - }); - - it('will acquire the video input and query constraint (unicast - content without video track constraint)', async () => { - domMockBehavior.applyConstraintSucceeds = false; - context.videoStreamIndex = new SimulcastVideoStreamIndex(new NoOpLogger()); - context.enableSimulcast = false; - context.meetingSessionConfiguration.credentials.attendeeId = 'foo-attendee#content'; - context.videoUplinkBandwidthPolicy = new DefaultSimulcastUplinkPolicy( - 'attendee', - new NoOpLogger() - ); - context.videoTileController.startLocalVideoTile(); - context.mediaStreamBroker = new MockMediaStreamBroker({ - acquireVideoInputDeviceSucceeds: true, - }); - - const task = new ReceiveVideoInputTask(context); - await task.run(); - assert.exists(context.activeVideoInput); - }); - it('will acquire the video input and query constraint', async () => { context.videoStreamIndex = new SimulcastVideoStreamIndex(new NoOpLogger()); context.enableSimulcast = true;