diff options
| author | Hyejin Kim <hyejin.kim@lge.com> | 2014-09-05 15:50:03 +0900 |
|---|---|---|
| committer | Jean-Michel Trivi <jmtrivi@google.com> | 2014-09-05 16:49:14 +0000 |
| commit | 4f418f9705d6c247b645cbcf255a3f56e665d216 (patch) | |
| tree | f4563f44841f147eae780f74e01a1af78d565179 /media/libmediaplayerservice | |
| parent | b72726bad6c9253c26c82fea76bdf99e18b8ba6d (diff) | |
| download | frameworks_av-4f418f9705d6c247b645cbcf255a3f56e665d216.zip frameworks_av-4f418f9705d6c247b645cbcf255a3f56e665d216.tar.gz frameworks_av-4f418f9705d6c247b645cbcf255a3f56e665d216.tar.bz2 | |
Fix to parse audio_source_t member of audio_attributes_t
When unmarshalling audio_attributes_t typed data,
it didn't parse the audio_source_t member between content_type and flags.
Bug: 16906307
Change-Id: Ia0d8df9b5c31441d34dc82678bceccd8ce31423d
Diffstat (limited to 'media/libmediaplayerservice')
| -rw-r--r-- | media/libmediaplayerservice/MediaPlayerService.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/media/libmediaplayerservice/MediaPlayerService.cpp b/media/libmediaplayerservice/MediaPlayerService.cpp index b5bd988..c8cb7ed 100644 --- a/media/libmediaplayerservice/MediaPlayerService.cpp +++ b/media/libmediaplayerservice/MediaPlayerService.cpp @@ -204,6 +204,8 @@ const int32_t kAudioAttributesMarshallTagFlattenTags = 1; // +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ // | content_type | // +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ +// | source | +// +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ // | flags | // +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ // | kAudioAttributesMarshallTagFlattenTags | // ignore tags if not found @@ -219,6 +221,7 @@ void unmarshallAudioAttributes(const Parcel& parcel, audio_attributes_t *attribu { attributes->usage = (audio_usage_t) parcel.readInt32(); attributes->content_type = (audio_content_type_t) parcel.readInt32(); + attributes->source = (audio_source_t) parcel.readInt32(); attributes->flags = (audio_flags_mask_t) parcel.readInt32(); const bool hasFlattenedTag = (parcel.readInt32() == kAudioAttributesMarshallTagFlattenTags); if (hasFlattenedTag) { |