| commit | 355eb6a4728fdb8dbe74c46af81831745848a377 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Wed Dec 06 01:12:24 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Dec 06 01:12:24 2023 +0000 |
| tree | c27c9936f9ae8c039e87f25d9060484556877d9e | |
| parent | da3f138498a296eb860eedbe22c0bf73c0a18614 [diff] | |
| parent | cc8dcb0b16018a37158e0d1fc78352496067ad5f [diff] |
Merge "AudioPort.h: Fix Compiler Warning" into main am: 27cf27f23a am: cc8dcb0b16 Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2861165 Change-Id: I80f12f6d2712e70757acbea094055863f629858e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/media/libaudiofoundation/include/media/AudioPort.h b/media/libaudiofoundation/include/media/AudioPort.h index 77e58ed..5786f7f 100644 --- a/media/libaudiofoundation/include/media/AudioPort.h +++ b/media/libaudiofoundation/include/media/AudioPort.h
@@ -48,7 +48,10 @@ audio_port_role_t getRole() const { return mRole; } virtual void setFlags(uint32_t flags); - uint32_t getFlags() const { return useInputChannelMask() ? mFlags.input : mFlags.output; } + uint32_t getFlags() const { + return useInputChannelMask() ? static_cast<uint32_t>(mFlags.input) + : static_cast<uint32_t>(mFlags.output); + } void setGains(const AudioGains &gains) { mGains = gains; } const AudioGains &getGains() const { return mGains; }