From adf55790b6ecf50c4bb2b2cf7d58441303b9d946 Mon Sep 17 00:00:00 2001 From: Andreas Pehrson Date: Tue, 2 May 2023 12:00:14 +0200 Subject: [PATCH] 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: Per Kjellander Commit-Queue: Ilya Nikolaevskiy Reviewed-by: Ilya Nikolaevskiy Cr-Commit-Position: refs/heads/main@{#39983} --- modules/video_capture/windows/device_info_ds.cc | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/modules/video_capture/windows/device_info_ds.cc b/modules/video_capture/windows/device_info_ds.cc index 69d06ca41f..d0d274cb02 100644 --- a/modules/video_capture/windows/device_info_ds.cc +++ b/modules/video_capture/windows/device_info_ds.cc @@ -454,11 +454,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(10000000 / maxFPS); capability.supportFrameRateControl = true; } else // use existing method