541f202354
Use only one RaceChecker as intended with the original change. This gets rid of specific RaceChecker for PipeWire members. Make PipeWireSession guarded by API checker instead, since this member is accessed only in [Start/Stop]Capture and move the race checker within PipeWire thread loop lock. Also remove race check from OnStreamStateChanged where we only modify one property guarded by API mutex. Partially reverts a9d497b52dc21497fdfd0e8c03ab2f8559e02d15 reviewed on https://webrtc-review.googlesource.com/c/src/+/326781. Bug: webrtc:15181 Change-Id: I46449fce86611124688a65d5337771c75853f2ca Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/338021 Reviewed-by: Ilya Nikolaevskiy <ilnik@webrtc.org> Commit-Queue: Jan Grulich <grulja@gmail.com> Cr-Commit-Position: refs/heads/main@{#41713}
61 lines
2.3 KiB
C++
61 lines
2.3 KiB
C++
/*
|
|
* Copyright (c) 2022 The WebRTC project authors. All Rights Reserved.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license
|
|
* that can be found in the LICENSE file in the root of the source
|
|
* tree. An additional intellectual property rights grant can be found
|
|
* in the file PATENTS. All contributing project authors may
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
*/
|
|
|
|
#ifndef MODULES_VIDEO_CAPTURE_LINUX_VIDEO_CAPTURE_PIPEWIRE_H_
|
|
#define MODULES_VIDEO_CAPTURE_LINUX_VIDEO_CAPTURE_PIPEWIRE_H_
|
|
|
|
#include "modules/video_capture/linux/pipewire_session.h"
|
|
#include "modules/video_capture/video_capture_defines.h"
|
|
#include "modules/video_capture/video_capture_impl.h"
|
|
|
|
namespace webrtc {
|
|
namespace videocapturemodule {
|
|
class VideoCaptureModulePipeWire : public VideoCaptureImpl {
|
|
public:
|
|
explicit VideoCaptureModulePipeWire(VideoCaptureOptions* options);
|
|
~VideoCaptureModulePipeWire() override;
|
|
int32_t Init(const char* deviceUniqueId);
|
|
int32_t StartCapture(const VideoCaptureCapability& capability) override;
|
|
int32_t StopCapture() override;
|
|
bool CaptureStarted() override;
|
|
int32_t CaptureSettings(VideoCaptureCapability& settings) override;
|
|
|
|
static VideoType PipeWireRawFormatToVideoType(uint32_t format);
|
|
|
|
private:
|
|
static void OnStreamParamChanged(void* data,
|
|
uint32_t id,
|
|
const struct spa_pod* format);
|
|
static void OnStreamStateChanged(void* data,
|
|
pw_stream_state old_state,
|
|
pw_stream_state state,
|
|
const char* error_message);
|
|
|
|
static void OnStreamProcess(void* data);
|
|
|
|
void OnFormatChanged(const struct spa_pod* format);
|
|
void ProcessBuffers();
|
|
|
|
const rtc::scoped_refptr<PipeWireSession> session_
|
|
RTC_GUARDED_BY(api_checker_);
|
|
bool initialized_ RTC_GUARDED_BY(api_checker_);
|
|
bool started_ RTC_GUARDED_BY(api_lock_);
|
|
int node_id_ RTC_GUARDED_BY(capture_checker_);
|
|
VideoCaptureCapability configured_capability_
|
|
RTC_GUARDED_BY(capture_checker_);
|
|
|
|
struct pw_stream* stream_ RTC_GUARDED_BY(capture_checker_) = nullptr;
|
|
struct spa_hook stream_listener_ RTC_GUARDED_BY(capture_checker_);
|
|
};
|
|
} // namespace videocapturemodule
|
|
} // namespace webrtc
|
|
|
|
#endif // MODULES_VIDEO_CAPTURE_LINUX_VIDEO_CAPTURE_PIPEWIRE_H_
|