Skip to content
This repository was archived by the owner on Feb 22, 2023. It is now read-only.

Commit 1dddfdd

Browse files
jokerttujokerttu
committed
[camera_plugin] capture controller test mocks
- Fix memory leaks found by tests
1 parent 930a6b2 commit 1dddfdd

12 files changed

Lines changed: 374 additions & 22 deletions

‎packages/camera/camera_windows/windows/CMakeLists.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ add_executable(${TEST_RUNNER}
7070
test/mocks.h
7171
test/camera_plugin_test.cpp
7272
test/camera_test.cpp
73+
test/capture_controller_test.cpp
7374
${PLUGIN_SOURCES}
7475
)
7576
apply_standard_settings(${TEST_RUNNER})

‎packages/camera/camera_windows/windows/camera.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,8 @@ void CameraImpl::InitCamera(
5858
messenger_ = messenger;
5959
capture_controller_ =
6060
capture_controller_factory->CreateCaptureController(this);
61-
capture_controller_->CreateCaptureDevice(texture_registrar, device_id_,
62-
enable_audio, resolution_preset);
61+
capture_controller_->InitCaptureDevice(texture_registrar, device_id_,
62+
enable_audio, resolution_preset);
6363
}
6464

6565
// Adds pending result to the pending_results map.

‎packages/camera/camera_windows/windows/capture_controller.cpp‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -352,11 +352,11 @@ HRESULT CaptureControllerImpl::CreateCaptureEngine() {
352352
hr = CreateD3DManagerWithDX11Device();
353353
}
354354

355-
if (SUCCEEDED(hr)) {
355+
if (SUCCEEDED(hr) && !video_source_) {
356356
hr = CreateVideoCaptureSourceForDevice(video_device_id_);
357357
}
358358

359-
if (enable_audio_record_) {
359+
if (enable_audio_record_ && !audio_source_) {
360360
if (SUCCEEDED(hr)) {
361361
hr = CreateDefaultAudioCaptureSource();
362362
}
@@ -366,6 +366,7 @@ HRESULT CaptureControllerImpl::CreateCaptureEngine() {
366366
capture_engine_callback_handler_ =
367367
ComPtr<CaptureEngineListener>(new CaptureEngineListener(this));
368368
}
369+
369370
if (SUCCEEDED(hr)) {
370371
hr = MFCreateAttributes(&attributes, 2);
371372
}
@@ -450,7 +451,7 @@ void CaptureControllerImpl::ResetCaptureController() {
450451
texture_ = nullptr;
451452
}
452453

453-
void CaptureControllerImpl::CreateCaptureDevice(
454+
void CaptureControllerImpl::InitCaptureDevice(
454455
flutter::TextureRegistrar *texture_registrar, const std::string &device_id,
455456
bool enable_audio, ResolutionPreset resolution_preset) {
456457
assert(capture_controller_listener_);

‎packages/camera/camera_windows/windows/capture_controller.h‎

Lines changed: 26 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -69,10 +69,10 @@ class CaptureController {
6969
CaptureController(const CaptureController&) = delete;
7070
CaptureController& operator=(const CaptureController&) = delete;
7171

72-
virtual void CreateCaptureDevice(flutter::TextureRegistrar* texture_registrar,
73-
const std::string& device_id,
74-
bool enable_audio,
75-
ResolutionPreset resolution_preset) = 0;
72+
virtual void InitCaptureDevice(flutter::TextureRegistrar* texture_registrar,
73+
const std::string& device_id,
74+
bool enable_audio,
75+
ResolutionPreset resolution_preset) = 0;
7676

7777
virtual int64_t GetTextureId() = 0;
7878
virtual uint32_t GetPreviewWidth() = 0;
@@ -98,12 +98,16 @@ class CaptureControllerImpl : public CaptureController,
9898
CaptureControllerImpl(CaptureControllerListener* listener);
9999
virtual ~CaptureControllerImpl();
100100

101+
// Disallow copy and move.
102+
CaptureControllerImpl(const CaptureControllerImpl&) = delete;
103+
CaptureControllerImpl& operator=(const CaptureControllerImpl&) = delete;
104+
101105
bool IsInitialized() { return initialized_; }
102106
bool IsPreviewing() { return previewing_; }
103107

104-
void CreateCaptureDevice(flutter::TextureRegistrar* texture_registrar,
105-
const std::string& device_id, bool enable_audio,
106-
ResolutionPreset resolution_preset) override;
108+
void InitCaptureDevice(flutter::TextureRegistrar* texture_registrar,
109+
const std::string& device_id, bool enable_audio,
110+
ResolutionPreset resolution_preset) override;
107111
int64_t GetTextureId() override { return texture_id_; }
108112
uint32_t GetPreviewWidth() override { return preview_frame_width_; }
109113
uint32_t GetPreviewHeight() override { return preview_frame_height_; }
@@ -129,6 +133,21 @@ class CaptureControllerImpl : public CaptureController,
129133
void OnBufferUpdated() override;
130134
void UpdateCaptureTime(uint64_t capture_time) override;
131135

136+
// Sets capture engine, for mocking purposes
137+
void SetCaptureEngine(IMFCaptureEngine* capture_engine) {
138+
capture_engine_ = capture_engine;
139+
};
140+
141+
// Sets video source, for mocking purposes
142+
void SetVideoSource(IMFMediaSource* video_source) {
143+
video_source_ = video_source;
144+
};
145+
146+
// Sets audio source, for mocking purposes
147+
void SetAudioSource(IMFMediaSource* audio_source) {
148+
audio_source_ = audio_source;
149+
};
150+
132151
private:
133152
CaptureControllerListener* capture_controller_listener_ = nullptr;
134153
bool initialized_ = false;

‎packages/camera/camera_windows/windows/capture_engine_listener.cpp‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,19 @@
55

66
#include "capture_engine_listener.h"
77

8+
#include <mfcaptureengine.h>
89
#include <wrl/client.h>
910

1011
namespace camera_windows {
1112

1213
using Microsoft::WRL::ComPtr;
1314

14-
// Method from IUnknown
15+
// IUnknown
1516
STDMETHODIMP_(ULONG) CaptureEngineListener::AddRef() {
1617
return InterlockedIncrement(&ref_);
1718
}
1819

19-
// Method from IUnknown
20+
// IUnknown
2021
STDMETHODIMP_(ULONG)
2122
CaptureEngineListener::Release() {
2223
LONG ref = InterlockedDecrement(&ref_);
@@ -26,23 +27,22 @@ CaptureEngineListener::Release() {
2627
return ref;
2728
}
2829

29-
// Method from IUnknown
30+
// IUnknown
3031
STDMETHODIMP_(HRESULT)
3132
CaptureEngineListener::QueryInterface(const IID &riid, void **ppv) {
32-
HRESULT hr = E_NOINTERFACE;
3333
*ppv = nullptr;
3434

3535
if (riid == IID_IMFCaptureEngineOnEventCallback) {
3636
*ppv = static_cast<IMFCaptureEngineOnEventCallback *>(this);
3737
((IUnknown *)*ppv)->AddRef();
38-
hr = S_OK;
38+
return S_OK;
3939
} else if (riid == IID_IMFCaptureEngineOnSampleCallback) {
4040
*ppv = static_cast<IMFCaptureEngineOnSampleCallback *>(this);
4141
((IUnknown *)*ppv)->AddRef();
42-
hr = S_OK;
42+
return S_OK;
4343
}
4444

45-
return hr;
45+
return E_NOINTERFACE;
4646
}
4747

4848
STDMETHODIMP CaptureEngineListener::OnEvent(IMFMediaEvent *event) {
@@ -52,7 +52,7 @@ STDMETHODIMP CaptureEngineListener::OnEvent(IMFMediaEvent *event) {
5252
return S_OK;
5353
}
5454

55-
// Method from IMFCaptureEngineOnSampleCallback
55+
// IMFCaptureEngineOnSampleCallback
5656
HRESULT CaptureEngineListener::OnSample(IMFSample *sample) {
5757
HRESULT hr = S_OK;
5858

‎packages/camera/camera_windows/windows/capture_engine_listener.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class CaptureEngineListener : public IMFCaptureEngineOnSampleCallback,
3030
public IMFCaptureEngineOnEventCallback {
3131
public:
3232
CaptureEngineListener(CaptureEngineObserver* observer)
33-
: ref_(1), observer_(observer) {}
33+
: ref_(0), observer_(observer) {}
3434

3535
~CaptureEngineListener(){};
3636

‎packages/camera/camera_windows/windows/system_api.cpp‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
// Copyright 2013 The Flutter Authors. All rights reserved.
2+
// Use of this source code is governed by a BSD-style license that can be
3+
// found in the LICENSE file.
4+
5+
#include "system_api.h"
6+
7+
namespace camera_windows {} // namespace camera_windows

‎packages/camera/camera_windows/windows/system_api.h‎

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
// Copyright 2013 The Flutter Authors. All rights reserved.
2+
// Use of this source code is governed by a BSD-style license that can be
3+
// found in the LICENSE file.
4+
5+
#ifndef PACKAGES_CAMERA_CAMERA_WINDOWS_WINDOWS_SYSTEM_API_H_
6+
#define PACKAGES_CAMERA_CAMERA_WINDOWS_WINDOWS_SYSTEM_API_H_
7+
8+
namespace camera_windows {
9+
10+
class SystemApi {
11+
public:
12+
SystemApi(){};
13+
virtual ~SystemApi() = default;
14+
15+
// Disallow copy and move.
16+
SystemApi(const SystemApi&) = delete;
17+
SystemApi& operator=(const SystemApi&) = delete;
18+
};
19+
20+
class SystemApiImpl : public SystemApi {
21+
public:
22+
SystemApiImpl(){};
23+
virtual ~SystemApiImpl() = default;
24+
25+
// Disallow copy and move.
26+
SystemApiImpl(const SystemApiImpl&) = delete;
27+
SystemApiImpl& operator=(const SystemApiImpl&) = delete;
28+
};
29+
30+
} // namespace camera_windows
31+
32+
#endif // PACKAGES_CAMERA_CAMERA_WINDOWS_WINDOWS_SYSTEM_API_H_

‎packages/camera/camera_windows/windows/test/camera_plugin_test.cpp‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5+
#include "camera_plugin.h"
6+
57
#include <flutter/method_call.h>
68
#include <flutter/method_result_functions.h>
79
#include <flutter/standard_method_codec.h>

‎packages/camera/camera_windows/windows/test/camera_test.cpp‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5+
#include "camera.h"
6+
57
#include <flutter/method_call.h>
68
#include <flutter/method_result_functions.h>
79
#include <flutter/standard_method_codec.h>

0 commit comments

Comments
 (0)