91d6edef35
We must remove dependency on Chromium, i.e. we can't use Chromium's base/logging.h. That means we need to define these macros in WebRTC also when doing Chromium builds. And this causes redefinition. Alternative solutions: * Check if we already have defined e.g. CHECK, and don't define them in that case. This makes us depend on include order in Chromium, which is not acceptable. * Don't allow using the macros in WebRTC headers. Error prone since if someone adds it there by mistake it may compile fine, but later break if a header in added or order is changed in Chromium. That will be confusing and hard to enforce. * Ensure that headers that are included by an embedder don't include our macros. This would require some heavy refactoring to be maintainable and enforcable. * Changes in Chromium for this is obviously not an option. BUG=chromium:468375 NOTRY=true Review URL: https://codereview.webrtc.org/1335923002 Cr-Commit-Position: refs/heads/master@{#9964}
55 lines
1.3 KiB
C++
55 lines
1.3 KiB
C++
/*
|
|
* Copyright (c) 2013 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 WEBRTC_MODULES_AUDIO_DEVICE_ANDROID_OPENSLES_COMMON_H_
|
|
#define WEBRTC_MODULES_AUDIO_DEVICE_ANDROID_OPENSLES_COMMON_H_
|
|
|
|
#include <SLES/OpenSLES.h>
|
|
|
|
#include "webrtc/base/checks.h"
|
|
|
|
namespace webrtc {
|
|
|
|
SLDataFormat_PCM CreatePcmConfiguration(int sample_rate);
|
|
|
|
// Helper class for using SLObjectItf interfaces.
|
|
template <typename SLType, typename SLDerefType>
|
|
class ScopedSLObject {
|
|
public:
|
|
ScopedSLObject() : obj_(nullptr) {}
|
|
|
|
~ScopedSLObject() { Reset(); }
|
|
|
|
SLType* Receive() {
|
|
RTC_DCHECK(!obj_);
|
|
return &obj_;
|
|
}
|
|
|
|
SLDerefType operator->() { return *obj_; }
|
|
|
|
SLType Get() const { return obj_; }
|
|
|
|
void Reset() {
|
|
if (obj_) {
|
|
(*obj_)->Destroy(obj_);
|
|
obj_ = nullptr;
|
|
}
|
|
}
|
|
|
|
private:
|
|
SLType obj_;
|
|
};
|
|
|
|
typedef ScopedSLObject<SLObjectItf, const SLObjectItf_*> ScopedSLObjectItf;
|
|
|
|
} // namespace webrtc_opensl
|
|
|
|
#endif // WEBRTC_MODULES_AUDIO_DEVICE_ANDROID_OPENSLES_COMMON_H_
|