diff options
| author | Glenn Kasten <gkasten@google.com> | 2012-01-12 12:27:51 -0800 |
|---|---|---|
| committer | Glenn Kasten <gkasten@google.com> | 2012-01-20 14:41:34 -0800 |
| commit | 58f30210ea540b6ce5aa6a46330cd3499483cb97 (patch) | |
| tree | 8c559ac8ca7892803b62e5e6d6018e9a4f4533a3 /media/libmedia/IAudioPolicyService.cpp | |
| parent | 9bf3a2f69bbfa2562664181b779941e776b7e835 (diff) | |
| download | frameworks_av-58f30210ea540b6ce5aa6a46330cd3499483cb97.zip frameworks_av-58f30210ea540b6ce5aa6a46330cd3499483cb97.tar.gz frameworks_av-58f30210ea540b6ce5aa6a46330cd3499483cb97.tar.bz2 | |
Use audio_format_t consistently, continued
Was int or uint32_t.
When AudioFlinger::format can't determine the correct format,
return INVALID rather than DEFAULT.
Init mFormat to INVALID rather than DEFAULT in the constructor.
Subclass constructors will set mFormat to the correct value.
Change-Id: I9b62640aa107d24d2d27925f5563d0d7407d1b73
Diffstat (limited to 'media/libmedia/IAudioPolicyService.cpp')
| -rw-r--r-- | media/libmedia/IAudioPolicyService.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/media/libmedia/IAudioPolicyService.cpp b/media/libmedia/IAudioPolicyService.cpp index e363101..b5c857f 100644 --- a/media/libmedia/IAudioPolicyService.cpp +++ b/media/libmedia/IAudioPolicyService.cpp @@ -122,7 +122,7 @@ public: virtual audio_io_handle_t getOutput( audio_stream_type_t stream, uint32_t samplingRate, - uint32_t format, + audio_format_t format, uint32_t channels, audio_policy_output_flags_t flags) { @@ -174,7 +174,7 @@ public: virtual audio_io_handle_t getInput( int inputSource, uint32_t samplingRate, - uint32_t format, + audio_format_t format, uint32_t channels, audio_in_acoustics_t acoustics, int audioSession) @@ -416,7 +416,7 @@ status_t BnAudioPolicyService::onTransact( audio_stream_type_t stream = static_cast <audio_stream_type_t>(data.readInt32()); uint32_t samplingRate = data.readInt32(); - uint32_t format = data.readInt32(); + audio_format_t format = (audio_format_t) data.readInt32(); uint32_t channels = data.readInt32(); audio_policy_output_flags_t flags = static_cast <audio_policy_output_flags_t>(data.readInt32()); @@ -463,7 +463,7 @@ status_t BnAudioPolicyService::onTransact( CHECK_INTERFACE(IAudioPolicyService, data, reply); int inputSource = data.readInt32(); uint32_t samplingRate = data.readInt32(); - uint32_t format = data.readInt32(); + audio_format_t format = (audio_format_t) data.readInt32(); uint32_t channels = data.readInt32(); audio_in_acoustics_t acoustics = static_cast <audio_in_acoustics_t>(data.readInt32()); |