Skip to content
Snippets Groups Projects
Commit 99e21a3e authored by Andreas Pehrson's avatar Andreas Pehrson
Browse files

Bug 1828065 - cherry-pick upstream libwebrtc commit adf55790b6. r=webrtc-reviewers,mjf a=RyanVM

Upstream commit: https://webrtc.googlesource.com/src/+/adf55790b6ecf50c4bb2b2cf7d58441303b9d946
    In DeviceInfoDS free the frame duration list after use

    Per the docs, the caller is responsible for freeing the memory.

    Bug: chromium:1441804
    Change-Id: I9aaae493a1a86d8ab4f03930715a643a3c9fb61b
    Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/304061


Reviewed-by: default avatarPer Kjellander <perkj@webrtc.org>
    Commit-Queue: Ilya Nikolaevskiy <ilnik@webrtc.org>
Reviewed-by: default avatarIlya Nikolaevskiy <ilnik@webrtc.org>
    Cr-Commit-Position: refs/heads/main@{#39983}

Differential Revision: https://phabricator.services.mozilla.com/D177237
parent d295b7ec
Branches
Tags
No related merge requests found
......@@ -518,11 +518,18 @@ int32_t DeviceInfoDS::CreateCapabilityMap(const char* deviceUniqueIdUTF8)
hrVC = videoControlConfig->GetFrameRateList(
outputCapturePin, tmp, size, &listSize, &frameDurationList);
if (hrVC == S_OK) {
maxFPS = GetMaxOfFrameArray(frameDurationList, listSize);
}
CoTaskMemFree(frameDurationList);
frameDurationList = NULL;
listSize = 0;
// On some odd cameras, you may get a 0 for duration. Some others may
// not update the out vars. GetMaxOfFrameArray returns the lowest
// duration (highest FPS), or 0 if there was no list with elements.
if (hrVC == S_OK &&
0 != (maxFPS = GetMaxOfFrameArray(frameDurationList, listSize))) {
if (0 != maxFPS) {
capability.maxFPS = static_cast<int>(10000000 / maxFPS);
capability.supportFrameRateControl = true;
} else // use existing method
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment