OSDN Git Service
Glenn Kasten [Wed, 21 Mar 2012 14:24:21 +0000 (07:24 -0700)]
Merge "Update comments"
Glenn Kasten [Wed, 21 Mar 2012 14:22:40 +0000 (07:22 -0700)]
Merge "Whitespace"
Glenn Kasten [Wed, 21 Mar 2012 14:21:21 +0000 (07:21 -0700)]
Merge "new doesn't fail on Android"
Eric Laurent [Wed, 21 Mar 2012 02:35:56 +0000 (19:35 -0700)]
am
d58b6cd1: am
cbc90453: am
14958e21: Merge "audioflinger: fix issue with camcorder and A2DP" into ics-mr1
* commit '
d58b6cd1e3fdf3deb5147daec556fe424a568732':
Eric Laurent [Wed, 21 Mar 2012 02:35:53 +0000 (19:35 -0700)]
am
a48285c4: am
165ee4c5: am
14958e21: Merge "audioflinger: fix issue with camcorder and A2DP" into ics-mr1
* commit '
a48285c4f22ffc43f1771ebd1ff35dcec48db2c7':
audioflinger: fix issue with camcorder and A2DP
Eric Laurent [Wed, 21 Mar 2012 02:35:41 +0000 (19:35 -0700)]
am
044e7503: am
eaa08d35: am
2a0d685e: Merge "MediaPlayerService: fix AudioSink latency" into ics-mr1
* commit '
044e7503ccdcd81adb69b5218b3b92ede47b005a':
Eric Laurent [Wed, 21 Mar 2012 02:24:33 +0000 (19:24 -0700)]
resolved conflicts for merge of
ec94ecad to master
Change-Id: I13bc9671cc1ef02bede7e83253aa8a005367fa0c
James Dong [Wed, 21 Mar 2012 01:53:29 +0000 (18:53 -0700)]
Merge "Handling end times of subtitles."
Insun Kang [Tue, 13 Mar 2012 23:16:35 +0000 (08:16 +0900)]
Handling end times of subtitles.
Change-Id: Ic19ec8980d0a2bf9f265d375cd56e638a2460af8
Eric Laurent [Wed, 21 Mar 2012 01:20:33 +0000 (18:20 -0700)]
am
eb99cacc: am
b388138f: resolved conflicts for merge of
3fe7ee65 to ics-mr1-plus-aosp
* commit '
eb99caccd7165385fc83b0175c6d176c990f179b':
Eric Laurent [Wed, 21 Mar 2012 01:20:31 +0000 (18:20 -0700)]
am
04353390: resolved conflicts for merge of
393dd03e to ics-scoop-plus-aosp
* commit '
04353390722b9195434cc86af4414004eff058e8':
AudioTrack: relax check on minimum buffer size
Glenn Kasten [Tue, 20 Mar 2012 21:01:39 +0000 (14:01 -0700)]
Merge "Add libmedia_native"
Marco Nelissen [Tue, 20 Mar 2012 17:08:52 +0000 (10:08 -0700)]
Merge "Move COM tag parsing to constructor"
Marco Nelissen [Tue, 20 Mar 2012 16:48:02 +0000 (09:48 -0700)]
Move COM tag parsing to constructor
Change-Id: Icfcf05655ca98ccccad4f94834770c2f4098a764
Marco Nelissen [Tue, 20 Mar 2012 16:15:05 +0000 (09:15 -0700)]
Merge "Parse mp3 encoder padding/delay"
Marco Nelissen [Mon, 19 Mar 2012 20:49:43 +0000 (13:49 -0700)]
Parse mp3 encoder padding/delay
Get the mp3 encoder padding and delay from a XING frame or iTunSMPB tag.
Change-Id: Icde598c8857d7e7c187a718f478ee9799d6a1b8a
Wu-cheng Li [Tue, 20 Mar 2012 02:25:56 +0000 (19:25 -0700)]
Merge "Do not set camera preview display if the surface is null."
Glenn Kasten [Wed, 14 Mar 2012 19:56:26 +0000 (12:56 -0700)]
Whitespace
Fix indentation, and add blank lines in key places for clarity
Change-Id: I57a0a8142394f83203161aa9b8aa9276abf3ed7c
Glenn Kasten [Tue, 20 Mar 2012 00:36:25 +0000 (17:36 -0700)]
Add libmedia_native
Change-Id: I3ac357c78fb89f108d15c6e5b9fa317de0e9fb9a
Glenn Kasten [Mon, 19 Mar 2012 23:21:04 +0000 (16:21 -0700)]
Merge "Add libmedia_native"
Glenn Kasten [Tue, 14 Feb 2012 16:52:15 +0000 (08:52 -0800)]
Update comments
Change-Id: I327663a020670d0a72ff57bd0b682e2ce0528650
Glenn Kasten [Mon, 19 Mar 2012 17:38:51 +0000 (10:38 -0700)]
new doesn't fail on Android
Change-Id: I5079a3bf31097dd0807b2d806d5f8d3cff2077ab
Eric Laurent [Mon, 19 Mar 2012 15:38:45 +0000 (08:38 -0700)]
am
cbc90453: am
14958e21: Merge "audioflinger: fix issue with camcorder and A2DP" into ics-mr1
* commit '
cbc90453248bd3f9a11fdbc07e544d4a39592934':
Eric Laurent [Mon, 19 Mar 2012 15:37:48 +0000 (08:37 -0700)]
am
165ee4c5: am
14958e21: Merge "audioflinger: fix issue with camcorder and A2DP" into ics-mr1
* commit '
165ee4c53da462b1b6d131e25456dade51c18496':
audioflinger: fix issue with camcorder and A2DP
Eric Laurent [Mon, 19 Mar 2012 15:34:56 +0000 (08:34 -0700)]
am
14958e21: Merge "audioflinger: fix issue with camcorder and A2DP" into ics-mr1
* commit '
14958e21c12f922d7501d32c3bec05109eb342d5':
audioflinger: fix issue with camcorder and A2DP
Eric Laurent [Mon, 19 Mar 2012 15:34:44 +0000 (08:34 -0700)]
am
14958e21: Merge "audioflinger: fix issue with camcorder and A2DP" into ics-mr1
* commit '
14958e21c12f922d7501d32c3bec05109eb342d5':
audioflinger: fix issue with camcorder and A2DP
Eric Laurent [Mon, 19 Mar 2012 15:32:35 +0000 (08:32 -0700)]
Merge "audioflinger: fix issue with camcorder and A2DP" into ics-mr1
Glenn Kasten [Mon, 19 Mar 2012 14:31:58 +0000 (07:31 -0700)]
Merge "audio_channel_in/out_mask_from_count"
Wu-cheng Li [Wed, 14 Mar 2012 09:25:57 +0000 (17:25 +0800)]
Do not set camera preview display if the surface is null.
MediaRecorder.setPreviewDisplay() is not required if applications
use MediaRecorder.setCamera(). Besides, this causes a problem when
apps use Camera.setPreviewTexture. Camera service thinks the
surface texture from Camera.setPreviewTexture and the surface from
MediaRecorder.setPreviewDisplay are different.
bug:
5988937
Change-Id: Ia345705b6679ef349db6e354feaa3cc0fe8bcd8c
Eric Laurent [Sat, 17 Mar 2012 03:37:59 +0000 (20:37 -0700)]
audioflinger: fix issue with camcorder and A2DP
Some audio HALs do not support well a device selection of 0 (no device)
received on an input stream.
This can happen because of a problem in the audioflinger code that handles
the forwarding of the output device selection to the record thread for use by
the pre processing modules that need it. If the output device is 0 (meaning
no op, which happens when stopping playback over A2DP) audioflinger could not
detect it was an output device selection and would forward it to the input
stream (see AudioFlinger::setParameters() and RecordThread::checkForNewParameters_l().
Issue
6179641.
Change-Id: Idae534521866538e0d12ba259a2834f402a922e2
Eric Laurent [Sat, 17 Mar 2012 00:29:43 +0000 (17:29 -0700)]
am
eaa08d35: am
2a0d685e: Merge "MediaPlayerService: fix AudioSink latency" into ics-mr1
* commit '
eaa08d35154b0b9d62098c80c75f2deeadf72b9e':
Eric Laurent [Sat, 17 Mar 2012 00:27:09 +0000 (17:27 -0700)]
am
b1853f70: am
2a0d685e: Merge "MediaPlayerService: fix AudioSink latency" into ics-mr1
* commit '
b1853f706371b5050cd8184f5c33955c2f5ae36a':
MediaPlayerService: fix AudioSink latency
Eric Laurent [Sat, 17 Mar 2012 00:26:24 +0000 (17:26 -0700)]
am
2a0d685e: Merge "MediaPlayerService: fix AudioSink latency" into ics-mr1
* commit '
2a0d685ed62ff7a5e5a40be0748860c092165984':
MediaPlayerService: fix AudioSink latency
Eric Laurent [Sat, 17 Mar 2012 00:26:15 +0000 (17:26 -0700)]
am
b388138f: resolved conflicts for merge of
3fe7ee65 to ics-mr1-plus-aosp
* commit '
b388138ff2986d6883fa9331fa91ae5e18ae81a0':
Eric Laurent [Sat, 17 Mar 2012 00:22:34 +0000 (17:22 -0700)]
resolved conflicts for merge of
393dd03e to ics-scoop-plus-aosp
Change-Id: Ib6af53957780a09e59d663206b956a39fe883d6a
Eric Laurent [Sat, 17 Mar 2012 00:19:25 +0000 (17:19 -0700)]
resolved conflicts for merge of
3fe7ee65 to ics-mr1-plus-aosp
Change-Id: Ia7e1cd869779e9f512e840b768f5b43992c8a122
Andreas Huber [Fri, 16 Mar 2012 22:19:30 +0000 (15:19 -0700)]
Merge "Report an error instead of waiting for EOS indefinitely in sf2."
Eric Laurent [Fri, 16 Mar 2012 22:01:03 +0000 (15:01 -0700)]
am
2a0d685e: Merge "MediaPlayerService: fix AudioSink latency" into ics-mr1
* commit '
2a0d685ed62ff7a5e5a40be0748860c092165984':
MediaPlayerService: fix AudioSink latency
Eric Laurent [Fri, 16 Mar 2012 22:01:01 +0000 (15:01 -0700)]
am
3fe7ee65: Merge "AudioTrack: relax check on minimum buffer size" into ics-mr1
* commit '
3fe7ee651db0aae9485ead227c89db1e24b9e245':
AudioTrack: relax check on minimum buffer size
Andreas Huber [Fri, 16 Mar 2012 20:19:20 +0000 (13:19 -0700)]
Report an error instead of waiting for EOS indefinitely in sf2.
Change-Id: Id7bcfb90a3b6a61f0df8bd8f39ea4ffa3c433d87
Andreas Huber [Fri, 16 Mar 2012 20:15:53 +0000 (13:15 -0700)]
Merge "ACodec is a little more aggressive in its error checking now."
Eric Laurent [Tue, 6 Mar 2012 01:27:11 +0000 (17:27 -0800)]
MediaPlayerService: fix AudioSink latency
The AudioSink latency is currently cached when the associated AudioTrack
is created. However, the AudioTrack latency can change if the AudioTrack is moved
from one output stream to another.
The AudioPlayer must also periodically update its view of the latency
as it is needed to compensate the real audio time used for A/V sync.
This fixes an A/V sync problem seen when switching A2DP on and off while
playing a video.
Change-Id: I28b24049ca114e1af3e24791dcc900f463536ba4
Conflicts:
media/libmediaplayerservice/MediaPlayerService.cpp
Eric Laurent [Tue, 6 Mar 2012 01:06:40 +0000 (17:06 -0800)]
AudioTrack: relax check on minimum buffer size
Current AudioTrack implementation enforces that the requested audio
buffer size is at least corresponding the audio latency.
This requirement is too strong and leads to problems with current
stagefright and AudioSink implementations when playing over output
streams with long latency.
Ultimately, the AudioSink design should be changed to specify a minimum
buffer size in time or frames units but not in buffer count units.
Change-Id: I8ba603956f92ac49143a8249572665aa548f2f0f
Conflicts:
media/libmedia/AudioTrack.cpp
Andreas Huber [Fri, 16 Mar 2012 19:00:18 +0000 (12:00 -0700)]
ACodec is a little more aggressive in its error checking now.
Update components to do the right thing.
Change-Id: Ibfbad3f53effc16368cca4a0e978d01d54d08a1d
Glenn Kasten [Fri, 16 Mar 2012 18:42:24 +0000 (11:42 -0700)]
Add libmedia_native
Change-Id: Ib8cff8abd73723b793f08da99ad59549f219e0e7
Andreas Huber [Fri, 16 Mar 2012 18:38:38 +0000 (11:38 -0700)]
Merge "Remove obsolete software codec header files and amr encoders."
Andreas Huber [Fri, 16 Mar 2012 17:53:50 +0000 (10:53 -0700)]
Remove obsolete software codec header files and amr encoders.
Change-Id: Ifbdf252ee312c9cb5ab29498f1e06dae8f23faf7
Marco Nelissen [Fri, 16 Mar 2012 17:11:13 +0000 (10:11 -0700)]
Merge "Skip XING/VBRI frame when decoding"
Glenn Kasten [Fri, 16 Mar 2012 17:06:49 +0000 (10:06 -0700)]
am
97824b70: am
aa1bd6de: am
d8cc1421: am
42c6d163: Merge "Add empty libmedia_native in old location"
* commit '
97824b706d8865b50faf2f09d0cf969bec0874e3':
Add empty libmedia_native in old location
Glenn Kasten [Fri, 16 Mar 2012 17:03:54 +0000 (10:03 -0700)]
am
aa1bd6de: am
d8cc1421: am
42c6d163: Merge "Add empty libmedia_native in old location"
* commit '
aa1bd6dec676ab81e14ca428427d2b8c627c83fa':
Add empty libmedia_native in old location
Glenn Kasten [Fri, 16 Mar 2012 17:01:28 +0000 (10:01 -0700)]
am
d8cc1421: am
42c6d163: Merge "Add empty libmedia_native in old location"
* commit '
d8cc14211a3d5597d6b5807d6c79a4631e36ba2d':
Add empty libmedia_native in old location
Andreas Huber [Fri, 16 Mar 2012 16:57:23 +0000 (09:57 -0700)]
Merge "Remove obsolete OMXComponentBase class"
Andreas Huber [Fri, 16 Mar 2012 15:23:32 +0000 (08:23 -0700)]
Remove obsolete OMXComponentBase class
Change-Id: I701ff5a57b0ab49cc772c4f82d03b5005e54ec6f
Marco Nelissen [Fri, 16 Mar 2012 14:56:42 +0000 (07:56 -0700)]
Skip XING/VBRI frame when decoding
Don't send the XING/VBRI frame to the decoder, as it will result in
extra data being output. Also clean up the XING seeker code a bit.
Change-Id: I714a94180edae9bedc1bc0c96bf382fe6f928ac6
Insun Kang [Thu, 15 Mar 2012 14:04:43 +0000 (23:04 +0900)]
Fix a bug in MediaPlayer's addExternalSource().
Change-Id: I035cbfb7acccc7ff88d659861ece7d0f61314fda
Glenn Kasten [Fri, 16 Mar 2012 05:09:38 +0000 (22:09 -0700)]
am
42c6d163: Merge "Add empty libmedia_native in old location"
* commit '
42c6d163aaf5170ac23a4d1e5baadddd0fb71406':
Add empty libmedia_native in old location
Wu-cheng Li [Fri, 16 Mar 2012 04:23:24 +0000 (21:23 -0700)]
Merge "Add a new camera open API that allows taking the ownership."
Glenn Kasten [Thu, 15 Mar 2012 19:53:43 +0000 (12:53 -0700)]
Add empty libmedia_native in old location
Submitting this first, in the old location, will allow early testing of
the build for all the dependent projects. Then those projects will not
need to be updated atomically when libmedia_native is moved.
Change-Id: I31ab315e53970986d18a4e3b1673e31460f6a3f1
Glenn Kasten [Wed, 14 Mar 2012 19:56:06 +0000 (12:56 -0700)]
audio_channel_in/out_mask_from_count
and avoid ambiguous term "channels" where it might be confusing
as to whether it is a channel mask or channel count
Change-Id: I744fa08ccb6001a98c97bd638d2c9d56836c4234
Eino-Ville Talvala [Thu, 15 Mar 2012 17:34:00 +0000 (10:34 -0700)]
Merge "Move CameraParameters.h to frameworks/native."
Glenn Kasten [Thu, 15 Mar 2012 14:53:54 +0000 (07:53 -0700)]
Merge "Remove dependency on audio_* location"
Wu-cheng Li [Fri, 24 Feb 2012 03:01:00 +0000 (19:01 -0800)]
Add a new camera open API that allows taking the ownership.
The purpose is to let face unlock always get the camera
successfully. What happened was the camera applications may
have opened the camera in onResume under the lock screen.
This API lets face unlock take the camera from the camera
application. A new permission will be added, so other
applicatoins won't be able to take the camera from the face
unlock.
bug:
5584464
Change-Id: Ib3d9dcbc2161815b68db42327dc01148453704c6
James Dong [Thu, 15 Mar 2012 00:45:18 +0000 (17:45 -0700)]
Merge "Defines MediaPlayer APIs to support multiple audio/video/timedtext tracks."
Eino-Ville Talvala [Thu, 15 Mar 2012 00:14:19 +0000 (17:14 -0700)]
Move CameraParameters.h to frameworks/native.
CameraParameters.h is indirectly required to implement the Camera
HAL. Move it to frameworks/native.
Bug:
6171735
Change-Id: I1bf4db228333be16fc7caa3c51280a9495293011
Marco Nelissen [Wed, 14 Mar 2012 23:58:13 +0000 (16:58 -0700)]
Merge "Fix Xing seeking when TOC[0] == 0"
Glenn Kasten [Tue, 13 Mar 2012 22:59:35 +0000 (15:59 -0700)]
Remove dependency on audio_* location
Change-Id: I4bc66115fcb9ba22b057bd72db3f561dcb18a0d8
Marco Nelissen [Wed, 14 Mar 2012 23:40:11 +0000 (16:40 -0700)]
Fix Xing seeking when TOC[0] == 0
A file purchased from the Amazon mp3 store had two 0 entries at the
start of the TOC (presumably because there was a lot of silence at
the beginning, which compresses well), which made TOC based seeking
think the TOC was not valid.
b/
6170518
Change-Id: Ie7135b4af06ebb925f63a374be780cf3a9404347
Insun Kang [Thu, 16 Feb 2012 11:28:27 +0000 (20:28 +0900)]
Defines MediaPlayer APIs to support multiple audio/video/timedtext
tracks.
o Newly introduced APIs are (MediaPlayer):
getTrackInfo() / addExternalSource() / enableTrack() / disableTrack().
o Timed text tracks are supported only, for now.
o TODOs:
- Define the audio/video behavior for enableTrack and disableTrack.
- Refactoring AwesomePlayer / TimedTextDriver so that all types of
track index can be managed in the correct order and be ready for
supporting audio/video tracks.
(MediaExtractor and MediaSource for text file might be necessary.)
Change-Id: Idb85e1b3f2ed49a64f377d05472dd6663ce94e07
Glenn Kasten [Wed, 14 Mar 2012 23:28:38 +0000 (16:28 -0700)]
Merge "AudioFlinger playback thread CPU measurement in Hz"
Glenn Kasten [Tue, 6 Mar 2012 19:27:10 +0000 (11:27 -0800)]
AudioFlinger playback thread CPU measurement in Hz
Log statistics on CPU usage in Hz in addition to wall clock time
Use CPU statistics for all playback threads, not just MIXER
(but they are disabled by default by a compile-time debug macro).
ThreadCpuUsage library:
- Move statistics out of the library and leave that up to the caller
- Add API to determine a CPU's frequency
Change-Id: Ia1011123146e641fcf210ef26e78ae2b4d3b64ad
Eric Laurent [Wed, 14 Mar 2012 22:30:05 +0000 (15:30 -0700)]
Merge "audioflinger: more info in dumpsys"
Eric Laurent [Wed, 14 Mar 2012 22:03:26 +0000 (15:03 -0700)]
audioflinger: more info in dumpsys
Added TID and io handle to AudioFlinger threads dump.
Change-Id: Ib1a856f3bad55c73e4c395b5e59d57435f4b9a4c
Glenn Kasten [Wed, 14 Mar 2012 20:57:03 +0000 (13:57 -0700)]
Merge "Break circular dependency on media player service"
Glenn Kasten [Wed, 14 Mar 2012 20:56:25 +0000 (13:56 -0700)]
Merge "Prepare frameworks/native/services/audioflinger"
Glenn Kasten [Wed, 14 Mar 2012 20:54:21 +0000 (13:54 -0700)]
Merge "Use correct syntax for #include <> """
James Dong [Wed, 14 Mar 2012 17:43:22 +0000 (10:43 -0700)]
Merge "make sure that lower-case mime and file suffix is used to check against the supported ones"
James Dong [Wed, 14 Mar 2012 17:43:18 +0000 (10:43 -0700)]
Merge "Fixed a buffer overflow bug in DrmPassthruPlugin"
James Dong [Wed, 14 Mar 2012 17:43:12 +0000 (10:43 -0700)]
Merge "Turned off log spamming from DrmPassthruPlugin"
James Dong [Wed, 14 Mar 2012 02:20:55 +0000 (19:20 -0700)]
Fixed a buffer overflow bug in DrmPassthruPlugin
Change-Id: I8df2a90409c9266a094a1a0904a5ff76ec483d16
James Dong [Wed, 14 Mar 2012 01:54:16 +0000 (18:54 -0700)]
Turned off log spamming from DrmPassthruPlugin
Change-Id: I2cecdba49cf044d2aafd8aa404d27df311cad401
Glenn Kasten [Wed, 14 Mar 2012 00:55:35 +0000 (17:55 -0700)]
Break circular dependency on media player service
Bug:
6165157
Change-Id: I3c85bbcaf31f3cb9a009e273f7b6284015eb3bd8
Glenn Kasten [Tue, 13 Mar 2012 21:46:23 +0000 (14:46 -0700)]
Use correct syntax for #include <> ""
Change-Id: I943137108668ae66f8eba18dafe069a7951bcd8f
Glenn Kasten [Tue, 13 Mar 2012 23:09:39 +0000 (16:09 -0700)]
Prepare frameworks/native/services/audioflinger
Part of this change will be reverted after the move is complete.
Change-Id: Ie7f6355368258f2b1344f4ef754da9151a06e41d
James Dong [Tue, 13 Mar 2012 06:20:29 +0000 (23:20 -0700)]
make sure that lower-case mime and file suffix is used to check against the supported ones
Change-Id: I6a20832f6a2dfb8554dbddef0dee87cc21c05c80
Daniel Lam [Thu, 23 Feb 2012 22:35:13 +0000 (14:35 -0800)]
SurfaceTexture: Fully refactored from BufferQueue
Cleaning up camera and media interactions as part of SurfaceTexture refactoring
Change-Id: Iea2b10ff80b5f01f83ed0902c725df1d3b4c541a
Marco Nelissen [Tue, 13 Mar 2012 20:23:07 +0000 (13:23 -0700)]
Merge "Gapless playback, step 1."
Marco Nelissen [Wed, 29 Feb 2012 00:07:44 +0000 (16:07 -0800)]
Gapless playback, step 1.
Currently able to play Ogg Vorbis, PCM WAV and other lossless files seamlessly
by reusing the initial AudioTrack for subsequent players.
Change-Id: Ie7cf6b9076bdf4f9211574456d192c02c04fecc7
James Dong [Tue, 13 Mar 2012 19:44:54 +0000 (12:44 -0700)]
Merge "Switched to use the header files in /frameworks/native and deleted the duplicate header files in /frameworks/base"
Glenn Kasten [Mon, 12 Mar 2012 23:29:55 +0000 (16:29 -0700)]
Whitespace and indentation
Fix indentation to be multiple of 4.
Make it easier to search:
sp< not sp < to
"switch (...)" instead of "switch(...)" (also "if" and "while")
Remove redundant blank line at start or EOF.
Remove whitespace at end of line.
Remove extra blank lines where they don't add value.
Use git diff -b or -w to verify.
Change-Id: I966b7ba852faa5474be6907fb212f5e267c2874e
James Dong [Tue, 13 Mar 2012 16:21:37 +0000 (09:21 -0700)]
Merge "Fixing coding style : Indentation"
Glenn Kasten [Tue, 13 Mar 2012 14:16:44 +0000 (07:16 -0700)]
Merge "Clean up assertion checks"
Insun Kang [Tue, 13 Mar 2012 08:17:41 +0000 (17:17 +0900)]
Fixing coding style : Indentation
Change-Id: Ia66f92aa74c55719bbc32211c75ea1ebdf828373
James Dong [Mon, 12 Mar 2012 21:37:53 +0000 (14:37 -0700)]
Switched to use the header files in /frameworks/native
and deleted the duplicate header files in /frameworks/base
o related-to-bug:
6044887
Change-Id: I17e0692d9a9b5c8796ded36677c833ca8ab36795
Glenn Kasten [Tue, 13 Mar 2012 01:13:59 +0000 (18:13 -0700)]
Fix bug where mMixerStatus was set to IDLE
Change-Id: I55df1738fb7ba17ba6caeea6a17557526eac17a7
Glenn Kasten [Thu, 8 Mar 2012 20:18:35 +0000 (12:18 -0800)]
Clean up assertion checks
Use ALOG_ASSERT instead of assert.
Use compile-time asserts where appropriate.
Fix typo in an ALOGV.
Change-Id: I58f1c1ffc14319a022c88b5a88b8d0368660da8b
Glenn Kasten [Fri, 9 Mar 2012 20:08:48 +0000 (12:08 -0800)]
Inline applyVolume() into threadLoop_mix()
Also the declaration of applyVolume in PlaybackThread was dead.
Change-Id: I4b1a9848d07d3d7f340baea05b17f667c78df868
Glenn Kasten [Mon, 12 Mar 2012 22:05:51 +0000 (15:05 -0700)]
Merge "Remove unnecessary friend declarations"
Glenn Kasten [Mon, 12 Mar 2012 22:05:21 +0000 (15:05 -0700)]
Merge "Remove virtual from methods that don't need it"
Glenn Kasten [Mon, 12 Mar 2012 18:26:39 +0000 (11:26 -0700)]
Merge "Merge dup code at thread entry and param change"
Jean-Michel Trivi [Mon, 12 Mar 2012 18:21:35 +0000 (11:21 -0700)]
Merge "Extend WAV extractor for multichannel"