Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(plugin-meetings): streamline is active speaker mqa #3597

Merged
merged 9 commits into from
Jul 5, 2024
Merged

fix(plugin-meetings): streamline is active speaker mqa #3597

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
bac21a1
fix: streamline is active speaker mqa
May 13, 2024
2bd3e36
fix(plugin-meetings): fix test cases for is-active-speaker mqa
May 14, 2024
f432565
feat(plugin-meetings): add tests for active speaker
May 22, 2024
fbc64fd
test(plugin-meetings): add additional tests for active speaker
May 23, 2024
67ca6db
test(plugin-meetings): remove only
May 23, 2024
37f171d
Merge branch 'next' into is-active-speaker-mqa
edvujic Jul 3, 2024
3cbc4b4
test(plugin-meetings): fix tests
Jul 4, 2024
c0a8e02
Merge branch 'next' into is-active-speaker-mqa
Jul 4, 2024
2ddd6f1
test(plugin-meetings): fix tests
Jul 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/@webex/plugin-meetings/src/mediaQualityMetrics/config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ export const emptyVideoReceiveStream = {
ssci: 0, // Not avaliable
},
h264CodecProfile: 'BP',
isActiveSpeaker: true,
isActiveSpeaker: false,
optimalFrameSize: 0, // Not avaliable
receivedFrameSize: 0,
receivedHeight: 0,
Expand Down
6 changes: 6 additions & 0 deletions packages/@webex/plugin-meetings/src/statsAnalyzer/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1107,6 +1107,12 @@ export class StatsAnalyzer extends EventsScope {
}
}

if (mediaType.startsWith('video-recv')) {
this.statsResults[mediaType][sendrecvType].isActiveSpeaker = result.isActiveSpeaker;
this.statsResults[mediaType][sendrecvType].lastActiveSpeakerTimestamp =
result.lastActiveSpeakerUpdateTimestamp;
}

// Check the over all packet Lost ratio
this.statsResults[mediaType][sendrecvType].currentPacketLossRatio =
currentPacketsLost > 0
Expand Down
8 changes: 8 additions & 0 deletions packages/@webex/plugin-meetings/src/statsAnalyzer/mqaUtil.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,6 +347,14 @@ export const getVideoReceiverStreamMqa = ({
statsResults[mediaType][sendrecvType].keyFramesDecoded - lastKeyFramesDecoded || 0;
videoReceiverStream.requestedKeyFrames =
statsResults[mediaType][sendrecvType].totalPliCount - lastPliCount || 0;

videoReceiverStream.isActiveSpeaker =
statsResults[mediaType][sendrecvType].isActiveSpeaker ||
((statsResults[mediaType][sendrecvType].lastActiveSpeakerTimestamp ?? 0) > 0 &&
performance.now() +
performance.timeOrigin -
edvujic marked this conversation as resolved.
Show resolved Hide resolved
(statsResults[mediaType][sendrecvType].lastActiveSpeakerTimestamp ?? 0) <
MQA_INTERVAL);
};

export const getVideoSenderMqa = ({videoSender, statsResults, lastMqaDataSent, baseMediaType}) => {
Expand Down
49 changes: 42 additions & 7 deletions packages/@webex/plugin-meetings/test/unit/spec/stats-analyzer/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -512,6 +512,8 @@ describe('plugin-meetings', () => {
packetsReceived: 0,
isRequested: true,
lastRequestedUpdateTimestamp: 0,
isActiveSpeaker: false,
lastActiveSpeakerUpdateTimestamp: 0,
},
{
type: 'remote-outbound-rtp',
Expand Down Expand Up @@ -1467,7 +1469,7 @@ describe('plugin-meetings', () => {
framesDropped: 0,
},
h264CodecProfile: 'BP',
isActiveSpeaker: true,
isActiveSpeaker: false,
optimalFrameSize: 0,
receivedFrameSize: 3600,
receivedHeight: 720,
Expand Down Expand Up @@ -1501,7 +1503,7 @@ describe('plugin-meetings', () => {
framesDropped: 0,
},
h264CodecProfile: 'BP',
isActiveSpeaker: true,
isActiveSpeaker: false,
optimalFrameSize: 0,
receivedFrameSize: 3600,
receivedHeight: 720,
Expand Down Expand Up @@ -1565,7 +1567,7 @@ describe('plugin-meetings', () => {
framesDropped: 0,
},
h264CodecProfile: 'BP',
isActiveSpeaker: true,
isActiveSpeaker: false,
optimalFrameSize: 0,
receivedFrameSize: 3600,
receivedHeight: 720,
Expand Down Expand Up @@ -1597,7 +1599,7 @@ describe('plugin-meetings', () => {
framesDropped: 0,
},
h264CodecProfile: 'BP',
isActiveSpeaker: true,
isActiveSpeaker: false,
optimalFrameSize: 0,
receivedFrameSize: 3600,
receivedHeight: 720,
Expand Down Expand Up @@ -1629,7 +1631,7 @@ describe('plugin-meetings', () => {
framesDropped: 0,
},
h264CodecProfile: 'BP',
isActiveSpeaker: true,
isActiveSpeaker: false,
optimalFrameSize: 0,
receivedFrameSize: 3600,
receivedHeight: 720,
Expand Down Expand Up @@ -1724,7 +1726,7 @@ describe('plugin-meetings', () => {
requestedFrames: 0,
rtpPackets: 0,
ssci: 0,
transmittedBitrate: 0.13333333333333333,
transmittedBitrate: 0.13333333333333333,
transmittedFrameRate: 0
},
h264CodecProfile: 'BP',
Expand Down Expand Up @@ -1828,6 +1830,39 @@ describe('plugin-meetings', () => {
}
]);
});
describe('active speaker status emission', async () => {
beforeEach(async () => {
await startStatsAnalyzer();
performance.timeOrigin = 1;
});

it('reports active speaker as true when the participant has been speaking', async () => {
fakeStats.video.receivers[0].report[0].isActiveSpeaker = true;
await progressTime(5 * MQA_INTERVAL);
assert.strictEqual(mqeData.videoReceive[0].streams[0].isActiveSpeaker, true);
});

it('reports active speaker as false when the participant has not spoken', async () => {
fakeStats.video.receivers[0].report[0].isActiveSpeaker = false;
await progressTime(5 * MQA_INTERVAL);
assert.strictEqual(mqeData.videoReceive[0].streams[0].isActiveSpeaker, false);
});

it('defaults to false when active speaker status is indeterminate', async () => {
fakeStats.video.receivers[0].report[0].isActiveSpeaker = undefined;
await progressTime(MQA_INTERVAL);
assert.strictEqual(mqeData.videoReceive[0].streams[0].isActiveSpeaker, false);
});

it('updates active speaker to true following a recent status change to speaking', async () => {
fakeStats.video.receivers[0].report[0].isActiveSpeaker = false;
fakeStats.video.receivers[0].report[0].lastActiveSpeakerUpdateTimestamp = performance.timeOrigin + performance.now() + (30 * 1000);
await progressTime(MQA_INTERVAL);
assert.strictEqual(mqeData.videoReceive[0].streams[0].isActiveSpeaker, true);
await progressTime(MQA_INTERVAL);
assert.strictEqual(mqeData.videoReceive[0].streams[0].isActiveSpeaker, false);
});
});
describe('sends streams according to their is requested flag', async () => {

beforeEach(async () => {
Expand Down Expand Up @@ -1864,4 +1899,4 @@ describe('plugin-meetings', () => {
});
})
});
})
});
Loading