From 5ff64831f9403357b39552702be641faaa73057f Mon Sep 17 00:00:00 2001 From: henrika Date: Wed, 11 Oct 2017 15:14:51 +0200 Subject: [PATCH] Removes usage if ID in AudioDeviceImpl. This CL is a follow-up on https://webrtc-review.googlesource.com/c/src/+/8380 TBR=solenberg Bug: webrtc:7306 Change-Id: I26cd59d51f15b81d7262b6eb5fc64cbb256c8754 Reviewed-on: https://webrtc-review.googlesource.com/8440 Reviewed-by: Henrik Andreassson Commit-Queue: Henrik Andreassson Cr-Commit-Position: refs/heads/master@{#20249} --- modules/audio_device/audio_device_buffer.h | 1 - modules/audio_device/audio_device_impl.cc | 17 ++++++++--------- modules/audio_device/audio_device_impl.h | 4 +--- modules/audio_device/dummy/audio_device_dummy.h | 2 +- modules/audio_device/dummy/file_audio_device.cc | 3 +-- modules/audio_device/dummy/file_audio_device.h | 3 +-- .../dummy/file_audio_device_factory.cc | 5 ++--- .../dummy/file_audio_device_factory.h | 2 +- 8 files changed, 15 insertions(+), 22 deletions(-) diff --git a/modules/audio_device/audio_device_buffer.h b/modules/audio_device/audio_device_buffer.h index b59779dfe2..a68bbdf091 100644 --- a/modules/audio_device/audio_device_buffer.h +++ b/modules/audio_device/audio_device_buffer.h @@ -76,7 +76,6 @@ class AudioDeviceBuffer { AudioDeviceBuffer(); virtual ~AudioDeviceBuffer(); - void SetId(uint32_t id) {}; int32_t RegisterAudioCallback(AudioTransport* audio_callback); void StartPlayout(); diff --git a/modules/audio_device/audio_device_impl.cc b/modules/audio_device/audio_device_impl.cc index c37e6184ed..2cfae0a569 100644 --- a/modules/audio_device/audio_device_impl.cc +++ b/modules/audio_device/audio_device_impl.cc @@ -65,13 +65,14 @@ namespace webrtc { // static +// TODO(henrika): remove id parameter when all clients are updated. rtc::scoped_refptr AudioDeviceModule::Create( const int32_t id, const AudioLayer audio_layer) { LOG(INFO) << __FUNCTION__; // Create the generic reference counted (platform independent) implementation. rtc::scoped_refptr audioDevice( - new rtc::RefCountedObject(id, audio_layer)); + new rtc::RefCountedObject(audio_layer)); // Ensure that the current platform is supported. if (audioDevice->CheckPlatform() == -1) { @@ -92,9 +93,8 @@ rtc::scoped_refptr AudioDeviceModule::Create( return audioDevice; } -AudioDeviceModuleImpl::AudioDeviceModuleImpl(const int32_t id, - const AudioLayer audioLayer) - : id_(id), audio_layer_(audioLayer) { +AudioDeviceModuleImpl::AudioDeviceModuleImpl(const AudioLayer audioLayer) + : audio_layer_(audioLayer) { LOG(INFO) << __FUNCTION__; } @@ -131,15 +131,15 @@ int32_t AudioDeviceModuleImpl::CreatePlatformSpecificObjects() { LOG(INFO) << __FUNCTION__; // Dummy ADM implementations if build flags are set. #if defined(WEBRTC_DUMMY_AUDIO_BUILD) - audio_device_.reset(new AudioDeviceDummy(Id())); + audio_device_.reset(new AudioDeviceDummy()); LOG(INFO) << "Dummy Audio APIs will be utilized"; #elif defined(WEBRTC_DUMMY_FILE_DEVICES) - audio_device_.reset(FileAudioDeviceFactory::CreateFileAudioDevice(Id())); + audio_device_.reset(FileAudioDeviceFactory::CreateFileAudioDevice()); if (audio_device_) { LOG(INFO) << "Will use file-playing dummy device."; } else { // Create a dummy device instead. - audio_device_.reset(new AudioDeviceDummy(Id())); + audio_device_.reset(new AudioDeviceDummy()); LOG(INFO) << "Dummy Audio APIs will be utilized"; } @@ -252,7 +252,7 @@ int32_t AudioDeviceModuleImpl::CreatePlatformSpecificObjects() { // Dummy ADM implementation. if (audio_layer == kDummyAudio) { - audio_device_.reset(new AudioDeviceDummy(Id())); + audio_device_.reset(new AudioDeviceDummy()); LOG(INFO) << "Dummy Audio APIs will be utilized."; } #endif // if defined(WEBRTC_DUMMY_AUDIO_BUILD) @@ -267,7 +267,6 @@ int32_t AudioDeviceModuleImpl::CreatePlatformSpecificObjects() { int32_t AudioDeviceModuleImpl::AttachAudioBuffer() { LOG(INFO) << __FUNCTION__; - audio_device_buffer_.SetId(id_); audio_device_->AttachAudioBuffer(&audio_device_buffer_); return 0; } diff --git a/modules/audio_device/audio_device_impl.h b/modules/audio_device/audio_device_impl.h index b59f19b920..b78558f2d1 100644 --- a/modules/audio_device/audio_device_impl.h +++ b/modules/audio_device/audio_device_impl.h @@ -41,7 +41,7 @@ class AudioDeviceModuleImpl : public AudioDeviceModule { int32_t CreatePlatformSpecificObjects(); int32_t AttachAudioBuffer(); - AudioDeviceModuleImpl(const int32_t id, const AudioLayer audioLayer); + AudioDeviceModuleImpl(const AudioLayer audioLayer); ~AudioDeviceModuleImpl() override; // Retrieve the currently utilized audio layer @@ -160,7 +160,6 @@ class AudioDeviceModuleImpl : public AudioDeviceModule { int GetRecordAudioParameters(AudioParameters* params) const override; #endif // WEBRTC_IOS - int32_t Id() const { return id_; } #if defined(WEBRTC_ANDROID) // Only use this acccessor for test purposes on Android. AudioManager* GetAndroidAudioManagerForTest() { @@ -173,7 +172,6 @@ class AudioDeviceModuleImpl : public AudioDeviceModule { PlatformType Platform() const; AudioLayer PlatformAudioLayer() const; - const int32_t id_; AudioLayer audio_layer_; PlatformType platform_type_ = kPlatformNotSupported; bool initialized_ = false; diff --git a/modules/audio_device/dummy/audio_device_dummy.h b/modules/audio_device/dummy/audio_device_dummy.h index 5e2cecfa8f..c29ed1ee70 100644 --- a/modules/audio_device/dummy/audio_device_dummy.h +++ b/modules/audio_device/dummy/audio_device_dummy.h @@ -19,7 +19,7 @@ namespace webrtc { class AudioDeviceDummy : public AudioDeviceGeneric { public: - AudioDeviceDummy(const int32_t id) {} + AudioDeviceDummy() {} virtual ~AudioDeviceDummy() {} // Retrieve the currently utilized audio layer diff --git a/modules/audio_device/dummy/file_audio_device.cc b/modules/audio_device/dummy/file_audio_device.cc index 7b3e17ec75..9ab66d81b5 100644 --- a/modules/audio_device/dummy/file_audio_device.cc +++ b/modules/audio_device/dummy/file_audio_device.cc @@ -25,8 +25,7 @@ const size_t kPlayoutBufferSize = const size_t kRecordingBufferSize = kRecordingFixedSampleRate / 100 * kRecordingNumChannels * 2; -FileAudioDevice::FileAudioDevice(const int32_t id, - const char* inputFilename, +FileAudioDevice::FileAudioDevice(const char* inputFilename, const char* outputFilename): _ptrAudioBuffer(NULL), _recordingBuffer(NULL), diff --git a/modules/audio_device/dummy/file_audio_device.h b/modules/audio_device/dummy/file_audio_device.h index 11ed8b8d65..6bd0f99c92 100644 --- a/modules/audio_device/dummy/file_audio_device.h +++ b/modules/audio_device/dummy/file_audio_device.h @@ -38,8 +38,7 @@ class FileAudioDevice : public AudioDeviceGeneric { // 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 int32_t id, - const char* inputFilename, + FileAudioDevice(const char* inputFilename, const char* outputFilename); virtual ~FileAudioDevice(); diff --git a/modules/audio_device/dummy/file_audio_device_factory.cc b/modules/audio_device/dummy/file_audio_device_factory.cc index 9056646812..96e3eaf94b 100644 --- a/modules/audio_device/dummy/file_audio_device_factory.cc +++ b/modules/audio_device/dummy/file_audio_device_factory.cc @@ -22,8 +22,7 @@ bool FileAudioDeviceFactory::_isConfigured = false; char FileAudioDeviceFactory::_inputAudioFilename[MAX_FILENAME_LEN] = ""; char FileAudioDeviceFactory::_outputAudioFilename[MAX_FILENAME_LEN] = ""; -FileAudioDevice* FileAudioDeviceFactory::CreateFileAudioDevice( - const int32_t id) { +FileAudioDevice* FileAudioDeviceFactory::CreateFileAudioDevice() { // Bail out here if the files haven't been set explicitly. // audio_device_impl.cc should then fall back to dummy audio. if (!_isConfigured) { @@ -33,7 +32,7 @@ FileAudioDevice* FileAudioDeviceFactory::CreateFileAudioDevice( return nullptr; } - return new FileAudioDevice(id, _inputAudioFilename, _outputAudioFilename); + return new FileAudioDevice(_inputAudioFilename, _outputAudioFilename); } void FileAudioDeviceFactory::SetFilenamesToUse( diff --git a/modules/audio_device/dummy/file_audio_device_factory.h b/modules/audio_device/dummy/file_audio_device_factory.h index 2cfd8be4d5..9cd5b3d625 100644 --- a/modules/audio_device/dummy/file_audio_device_factory.h +++ b/modules/audio_device/dummy/file_audio_device_factory.h @@ -23,7 +23,7 @@ class FileAudioDevice; // intended for test tools which use the audio device module. class FileAudioDeviceFactory { public: - static FileAudioDevice* CreateFileAudioDevice(const int32_t id); + static FileAudioDevice* CreateFileAudioDevice(); // The input file must be a readable 48k stereo raw file. The output // file must be writable. The strings will be copied.