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 6 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
5 changes: 5 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 @@ -1151,6 +1151,11 @@ export class StatsAnalyzer extends EventsScope {
this.statsResults[mediaType][sendrecvType].totalSamplesDecoded =
result.totalSamplesDecoded || 0;
this.statsResults[mediaType][sendrecvType].concealedSamples = result.concealedSamples || 0;
this.statsResults[mediaType][sendrecvType].isActiveSpeaker =
result.isActiveSpeaker ||
(result.lastActiveSpeakerUpdateTimestamp &&
performance.timeOrigin + performance.now() - result.lastActiveSpeakerUpdateTimestamp <
60000);
}
}

Expand Down
2 changes: 2 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,8 @@ export const getVideoReceiverStreamMqa = ({
statsResults[mediaType][sendrecvType].keyFramesDecoded - lastKeyFramesDecoded || 0;
videoReceiverStream.requestedKeyFrames =
statsResults[mediaType][sendrecvType].totalPliCount - lastPliCount || 0;
videoReceiverStream.isActiveSpeaker =
statsResults[mediaType][sendrecvType].isActiveSpeaker || false;
};

export const getVideoSenderMqa = ({videoSender, statsResults, lastMqaDataSent, baseMediaType}) => {
Expand Down
32 changes: 27 additions & 5 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 @@ -505,6 +505,8 @@ describe('plugin-meetings', () => {
framesReceived: 0,
packetsLost: 0,
packetsReceived: 0,
isActiveSpeaker: false,
lastActiveSpeakerUpdateTimestamp: 0,
},
{
type: 'remote-outbound-rtp',
Expand Down Expand Up @@ -1456,7 +1458,7 @@ describe('plugin-meetings', () => {
framesDropped: 0,
},
h264CodecProfile: 'BP',
isActiveSpeaker: true,
isActiveSpeaker: false,
optimalFrameSize: 0,
receivedFrameSize: 3600,
receivedHeight: 720,
Expand Down Expand Up @@ -1490,7 +1492,7 @@ describe('plugin-meetings', () => {
framesDropped: 0,
},
h264CodecProfile: 'BP',
isActiveSpeaker: true,
isActiveSpeaker: false,
optimalFrameSize: 0,
receivedFrameSize: 3600,
receivedHeight: 720,
Expand Down Expand Up @@ -1554,7 +1556,7 @@ describe('plugin-meetings', () => {
framesDropped: 0,
},
h264CodecProfile: 'BP',
isActiveSpeaker: true,
isActiveSpeaker: false,
optimalFrameSize: 0,
receivedFrameSize: 3600,
receivedHeight: 720,
Expand Down Expand Up @@ -1586,7 +1588,7 @@ describe('plugin-meetings', () => {
framesDropped: 0,
},
h264CodecProfile: 'BP',
isActiveSpeaker: true,
isActiveSpeaker: false,
optimalFrameSize: 0,
receivedFrameSize: 3600,
receivedHeight: 720,
Expand Down Expand Up @@ -1618,7 +1620,7 @@ describe('plugin-meetings', () => {
framesDropped: 0,
},
h264CodecProfile: 'BP',
isActiveSpeaker: true,
isActiveSpeaker: false,
optimalFrameSize: 0,
receivedFrameSize: 3600,
receivedHeight: 720,
Expand Down Expand Up @@ -1814,6 +1816,26 @@ describe('plugin-meetings', () => {
}
]);
});
it('should emit active speaker status', async () => {
it('should mark active speaker as true', async () => {
fakeStats.video.receivers[0].report[0].isActiveSpeaker = true;
await startStatsAnalyzer();
await progressTime(MQA_INTERVAL);
assert.strictEqual(mqeData.videoReceive[0].streams[0].isActiveSpeaker, true);
})
it('should mark active speaker as true if it was active speaker within the last 60 seconds', async () =>{
fakeStats.video.receivers[0].report[0].lastActiveSpeakerUpdateTimestamp = performance.timeOrigin + performance.now() - 30 * 1000;
fakeStats.video.receivers[0].report[0].isActiveSpeaker = false;
await progressTime(MQA_INTERVAL);
assert.strictEqual(mqeData.videoReceive[0].streams[0].isActiveSpeaker, true);
})
it('should not mark active speaker as true if it was not active speaker within the last 60 seconds', async () =>{
fakeStats.video.receivers[0].report[0].lastActiveSpeakerUpdateTimestamp = performance.timeOrigin + performance.now() + 30 * 1000;
fakeStats.video.receivers[0].report[0].isActiveSpeaker = false;
await progressTime(MQA_INTERVAL);
assert.strictEqual(mqeData.videoReceive[0].streams[0].isActiveSpeaker, false);
})
})
});
});
});
Loading