This reverts commit 793bac569fdf1be16cbf24d7871d20d00bbec81b. Reason for revert: rare compilation error fixed Original change's description: > Revert "Refactor the PlatformThread API." > > This reverts commit c89fdd716c4c8af608017c76f75bf27e4c3d602e. > > Reason for revert: Causes rare compilation error on win-libfuzzer-asan trybot. > See https://ci.chromium.org/p/chromium/builders/try/win-libfuzzer-asan-rel/713745? > > Original change's description: > > Refactor the PlatformThread API. > > > > PlatformThread's API is using old style function pointers, causes > > casting, is unintuitive and forces artificial call sequences, and > > is additionally possible to misuse in release mode. > > > > Fix this by an API face lift: > > 1. The class is turned into a handle, which can be empty. > > 2. The only way of getting a non-empty PlatformThread is by calling > > SpawnJoinable or SpawnDetached, clearly conveying the semantics to the > > code reader. > > 3. Handles can be Finalized, which works differently for joinable and > > detached threads: > > a) Handles for detached threads are simply closed where applicable. > > b) Joinable threads are joined before handles are closed. > > 4. The destructor finalizes handles. No explicit call is needed. > > > > Fixed: webrtc:12727 > > Change-Id: Id00a0464edf4fc9e552b6a1fbb5d2e1280e88811 > > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/215075 > > Commit-Queue: Markus Handell <handellm@webrtc.org> > > Reviewed-by: Harald Alvestrand <hta@webrtc.org> > > Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org> > > Reviewed-by: Tommi <tommi@webrtc.org> > > Cr-Commit-Position: refs/heads/master@{#33923} > > # Not skipping CQ checks because original CL landed > 1 day ago. > > TBR=handellm@webrtc.org > > Bug: webrtc:12727 > Change-Id: Ic0146be8866f6dd3ad9c364fb8646650b8e07419 > Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/217583 > Reviewed-by: Guido Urdaneta <guidou@webrtc.org> > Reviewed-by: Markus Handell <handellm@webrtc.org> > Commit-Queue: Guido Urdaneta <guidou@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#33936} # Not skipping CQ checks because this is a reland. Bug: webrtc:12727 Change-Id: Ifd6f44eac72fed84474277a1be03eb84d2f4376e Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/217881 Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org> Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org> Reviewed-by: Markus Handell <handellm@webrtc.org> Reviewed-by: Harald Alvestrand <hta@webrtc.org> Cr-Commit-Position: refs/heads/master@{#33950}
162 lines
5.5 KiB
C++
162 lines
5.5 KiB
C++
/*
|
|
* Copyright (c) 2014 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 AUDIO_DEVICE_FILE_AUDIO_DEVICE_H_
|
|
#define AUDIO_DEVICE_FILE_AUDIO_DEVICE_H_
|
|
|
|
#include <stdio.h>
|
|
|
|
#include <memory>
|
|
#include <string>
|
|
|
|
#include "modules/audio_device/audio_device_generic.h"
|
|
#include "rtc_base/platform_thread.h"
|
|
#include "rtc_base/synchronization/mutex.h"
|
|
#include "rtc_base/system/file_wrapper.h"
|
|
#include "rtc_base/time_utils.h"
|
|
|
|
namespace webrtc {
|
|
|
|
// This is a fake audio device which plays audio from a file as its microphone
|
|
// and plays out into a file.
|
|
class FileAudioDevice : public AudioDeviceGeneric {
|
|
public:
|
|
// Constructs a file audio device with |id|. It will read audio from
|
|
// |inputFilename| and record output audio to |outputFilename|.
|
|
//
|
|
// The input file should be a readable 48k stereo raw file, and the output
|
|
// file should point to a writable location. The output format will also be
|
|
// 48k stereo raw audio.
|
|
FileAudioDevice(const char* inputFilename, const char* outputFilename);
|
|
virtual ~FileAudioDevice();
|
|
|
|
// Retrieve the currently utilized audio layer
|
|
int32_t ActiveAudioLayer(
|
|
AudioDeviceModule::AudioLayer& audioLayer) const override;
|
|
|
|
// Main initializaton and termination
|
|
InitStatus Init() override;
|
|
int32_t Terminate() override;
|
|
bool Initialized() const override;
|
|
|
|
// Device enumeration
|
|
int16_t PlayoutDevices() override;
|
|
int16_t RecordingDevices() override;
|
|
int32_t PlayoutDeviceName(uint16_t index,
|
|
char name[kAdmMaxDeviceNameSize],
|
|
char guid[kAdmMaxGuidSize]) override;
|
|
int32_t RecordingDeviceName(uint16_t index,
|
|
char name[kAdmMaxDeviceNameSize],
|
|
char guid[kAdmMaxGuidSize]) override;
|
|
|
|
// Device selection
|
|
int32_t SetPlayoutDevice(uint16_t index) override;
|
|
int32_t SetPlayoutDevice(
|
|
AudioDeviceModule::WindowsDeviceType device) override;
|
|
int32_t SetRecordingDevice(uint16_t index) override;
|
|
int32_t SetRecordingDevice(
|
|
AudioDeviceModule::WindowsDeviceType device) override;
|
|
|
|
// Audio transport initialization
|
|
int32_t PlayoutIsAvailable(bool& available) override;
|
|
int32_t InitPlayout() override;
|
|
bool PlayoutIsInitialized() const override;
|
|
int32_t RecordingIsAvailable(bool& available) override;
|
|
int32_t InitRecording() override;
|
|
bool RecordingIsInitialized() const override;
|
|
|
|
// Audio transport control
|
|
int32_t StartPlayout() override;
|
|
int32_t StopPlayout() override;
|
|
bool Playing() const override;
|
|
int32_t StartRecording() override;
|
|
int32_t StopRecording() override;
|
|
bool Recording() const override;
|
|
|
|
// Audio mixer initialization
|
|
int32_t InitSpeaker() override;
|
|
bool SpeakerIsInitialized() const override;
|
|
int32_t InitMicrophone() override;
|
|
bool MicrophoneIsInitialized() const override;
|
|
|
|
// Speaker volume controls
|
|
int32_t SpeakerVolumeIsAvailable(bool& available) override;
|
|
int32_t SetSpeakerVolume(uint32_t volume) override;
|
|
int32_t SpeakerVolume(uint32_t& volume) const override;
|
|
int32_t MaxSpeakerVolume(uint32_t& maxVolume) const override;
|
|
int32_t MinSpeakerVolume(uint32_t& minVolume) const override;
|
|
|
|
// Microphone volume controls
|
|
int32_t MicrophoneVolumeIsAvailable(bool& available) override;
|
|
int32_t SetMicrophoneVolume(uint32_t volume) override;
|
|
int32_t MicrophoneVolume(uint32_t& volume) const override;
|
|
int32_t MaxMicrophoneVolume(uint32_t& maxVolume) const override;
|
|
int32_t MinMicrophoneVolume(uint32_t& minVolume) const override;
|
|
|
|
// Speaker mute control
|
|
int32_t SpeakerMuteIsAvailable(bool& available) override;
|
|
int32_t SetSpeakerMute(bool enable) override;
|
|
int32_t SpeakerMute(bool& enabled) const override;
|
|
|
|
// Microphone mute control
|
|
int32_t MicrophoneMuteIsAvailable(bool& available) override;
|
|
int32_t SetMicrophoneMute(bool enable) override;
|
|
int32_t MicrophoneMute(bool& enabled) const override;
|
|
|
|
// Stereo support
|
|
int32_t StereoPlayoutIsAvailable(bool& available) override;
|
|
int32_t SetStereoPlayout(bool enable) override;
|
|
int32_t StereoPlayout(bool& enabled) const override;
|
|
int32_t StereoRecordingIsAvailable(bool& available) override;
|
|
int32_t SetStereoRecording(bool enable) override;
|
|
int32_t StereoRecording(bool& enabled) const override;
|
|
|
|
// Delay information and control
|
|
int32_t PlayoutDelay(uint16_t& delayMS) const override;
|
|
|
|
void AttachAudioBuffer(AudioDeviceBuffer* audioBuffer) override;
|
|
|
|
private:
|
|
static void RecThreadFunc(void*);
|
|
static void PlayThreadFunc(void*);
|
|
bool RecThreadProcess();
|
|
bool PlayThreadProcess();
|
|
|
|
int32_t _playout_index;
|
|
int32_t _record_index;
|
|
AudioDeviceBuffer* _ptrAudioBuffer;
|
|
int8_t* _recordingBuffer; // In bytes.
|
|
int8_t* _playoutBuffer; // In bytes.
|
|
uint32_t _recordingFramesLeft;
|
|
uint32_t _playoutFramesLeft;
|
|
Mutex mutex_;
|
|
|
|
size_t _recordingBufferSizeIn10MS;
|
|
size_t _recordingFramesIn10MS;
|
|
size_t _playoutFramesIn10MS;
|
|
|
|
rtc::PlatformThread _ptrThreadRec;
|
|
rtc::PlatformThread _ptrThreadPlay;
|
|
|
|
bool _playing;
|
|
bool _recording;
|
|
int64_t _lastCallPlayoutMillis;
|
|
int64_t _lastCallRecordMillis;
|
|
|
|
FileWrapper _outputFile;
|
|
FileWrapper _inputFile;
|
|
std::string _outputFilename;
|
|
std::string _inputFilename;
|
|
};
|
|
|
|
} // namespace webrtc
|
|
|
|
#endif // AUDIO_DEVICE_FILE_AUDIO_DEVICE_H_
|