tequilaOS/platform_hardware_interfaces
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Audio : Fix a few minor issues with stream switcher class am: 035beba203 am: f901f6a465

Browse source 
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2680756

Change-Id: Idf6d4682688311952a4a04019e971f80595f0e3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Shraddha Basantwani 2023-08-01 18:01:05 +00:00 committed by Automerger Merge Worker
commit e54466ff88
2 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
audio/aidl/default/StreamSwitcher.cpp
View file

@ -31,7 +31,9 @@ using aidl::android::media::audio::common::AudioDevice;
namespace aidl::android::hardware::audio::core { namespace aidl::android::hardware::audio::core {
StreamSwitcher::StreamSwitcher(StreamContext* context, const Metadata& metadata) StreamSwitcher::StreamSwitcher(StreamContext* context, const Metadata& metadata)
: mMetadata(metadata), mStream(new InnerStreamWrapper<StreamStub>(context, mMetadata)) {} : mContext(context),
mMetadata(metadata),
mStream(new InnerStreamWrapper<StreamStub>(context, mMetadata)) {}
ndk::ScopedAStatus StreamSwitcher::closeCurrentStream(bool validateStreamState) { ndk::ScopedAStatus StreamSwitcher::closeCurrentStream(bool validateStreamState) {
if (!mStream) return ndk::ScopedAStatus::ok(); if (!mStream) return ndk::ScopedAStatus::ok();
@ -100,6 +102,10 @@ ndk::ScopedAStatus StreamSwitcher::setVendorParameters(
} }
ndk::ScopedAStatus StreamSwitcher::addEffect(const std::shared_ptr<IEffect>& in_effect) { ndk::ScopedAStatus StreamSwitcher::addEffect(const std::shared_ptr<IEffect>& in_effect) {
if (in_effect == nullptr) {
LOG(DEBUG) << __func__ << ": null effect";
return ndk::ScopedAStatus::fromExceptionCode(EX_ILLEGAL_ARGUMENT);
}
if (mStream == nullptr) { if (mStream == nullptr) {
LOG(ERROR) << __func__ << ": stream was closed"; LOG(ERROR) << __func__ << ": stream was closed";
return ndk::ScopedAStatus::fromExceptionCode(EX_ILLEGAL_STATE); return ndk::ScopedAStatus::fromExceptionCode(EX_ILLEGAL_STATE);
@ -112,6 +118,10 @@ ndk::ScopedAStatus StreamSwitcher::addEffect(const std::shared_ptr<IEffect>& in_
} }
ndk::ScopedAStatus StreamSwitcher::removeEffect(const std::shared_ptr<IEffect>& in_effect) { ndk::ScopedAStatus StreamSwitcher::removeEffect(const std::shared_ptr<IEffect>& in_effect) {
if (in_effect == nullptr) {
LOG(DEBUG) << __func__ << ": null effect";
return ndk::ScopedAStatus::fromExceptionCode(EX_ILLEGAL_ARGUMENT);
}
if (mStream == nullptr) { if (mStream == nullptr) {
LOG(ERROR) << __func__ << ": stream was closed"; LOG(ERROR) << __func__ << ": stream was closed";
return ndk::ScopedAStatus::fromExceptionCode(EX_ILLEGAL_STATE); return ndk::ScopedAStatus::fromExceptionCode(EX_ILLEGAL_STATE);

3
audio/aidl/default/include/core-impl/StreamSwitcher.h
View file

@ -86,7 +86,8 @@ class StreamCommonInterfaceEx : virtual public StreamCommonInterface {
template <typename T> template <typename T>
class InnerStreamWrapper : public T, public StreamCommonInterfaceEx { class InnerStreamWrapper : public T, public StreamCommonInterfaceEx {
public: public:
InnerStreamWrapper(StreamContext* context, const Metadata& metadata) : T(context, metadata) {} template <typename... Args>
InnerStreamWrapper(Args&&... args) : T(std::forward<Args>(args)...) {}
StreamDescriptor::State getStatePriorToClosing() const override { return mStatePriorToClosing; } StreamDescriptor::State getStatePriorToClosing() const override { return mStatePriorToClosing; }
private: private: