OSDN Git Service
Conley Owens [Fri, 9 Mar 2012 23:15:32 +0000 (15:15 -0800)]
am
3557654c: am
66da3fdc: am
972efafb: am
6db6ea02: Merge changes I00c852e4,Ib31bf028
* commit '
3557654c95bae7754dcd1951ec10742b895817e2':
stagefright aacenc: Avoid overflows when calculating normFactor
stagefright aacenc: Avoid a division by zero
Conley Owens [Fri, 9 Mar 2012 23:13:11 +0000 (15:13 -0800)]
am
66da3fdc: am
972efafb: am
6db6ea02: Merge changes I00c852e4,Ib31bf028
* commit '
66da3fdce4dc61f7d1c125eda9b2e065658cc0e5':
stagefright aacenc: Avoid overflows when calculating normFactor
stagefright aacenc: Avoid a division by zero
Conley Owens [Fri, 9 Mar 2012 23:09:58 +0000 (15:09 -0800)]
am
972efafb: am
6db6ea02: Merge changes I00c852e4,Ib31bf028
* commit '
972efafb90b543eea51aa5b23104d469a1bcc1fb':
stagefright aacenc: Avoid overflows when calculating normFactor
stagefright aacenc: Avoid a division by zero
Conley Owens [Fri, 9 Mar 2012 23:06:48 +0000 (15:06 -0800)]
am
6db6ea02: Merge changes I00c852e4,Ib31bf028
* commit '
6db6ea02b999e86dfbddd08780eeab0034389f93':
stagefright aacenc: Avoid overflows when calculating normFactor
stagefright aacenc: Avoid a division by zero
Andreas Huber [Fri, 9 Mar 2012 22:44:13 +0000 (14:44 -0800)]
Merge "Fix memory leak when carrying ABuffer* in AMessages."
Andreas Huber [Fri, 9 Mar 2012 22:33:01 +0000 (14:33 -0800)]
Fix memory leak when carrying ABuffer* in AMessages.
Change-Id: Icb4770ca238d316e6dd2d89159357a8fdb504ea9
Glenn Kasten [Fri, 9 Mar 2012 21:44:14 +0000 (13:44 -0800)]
Merge "Replace hard-coded 3 by FCC_2 to simplify searches"
Marco Nelissen [Fri, 9 Mar 2012 20:36:17 +0000 (12:36 -0800)]
Merge "Improve AudioPlayer position reporting"
Marco Nelissen [Fri, 9 Mar 2012 18:34:37 +0000 (10:34 -0800)]
Improve AudioPlayer position reporting
The latency was not taken into account when updating mPositionTimeRealUs
inside of the fillBuffer hook, contrary to what the getRealTimeUsLocked()
method does. This caused the realTimeOffset calculated in the
getMediaTimeUs to always be negative, causing the reported position to
always be equal to mPositionTimeMediaUs, which is updated infrequently.
With this change, the reported position is updated more frequently, allowing
apps to perform smoother UI updates.
Change-Id: I61e05c1a8b53d46b9091afb0d18a6289d13a7a5e
Andreas Huber [Fri, 9 Mar 2012 17:46:33 +0000 (09:46 -0800)]
fix EOS handling in codec test.
Change-Id: I5eb6d00aa0c1a728a951c7ffa4faebcadd7b14a6
Conley Owens [Fri, 9 Mar 2012 16:53:39 +0000 (08:53 -0800)]
Merge changes I00c852e4,Ib31bf028
* changes:
stagefright aacenc: Avoid overflows when calculating normFactor
stagefright aacenc: Avoid a division by zero
Glenn Kasten [Fri, 9 Mar 2012 15:19:43 +0000 (07:19 -0800)]
Merge "Don't ask policy manager about invalid stream type"
Glenn Kasten [Fri, 9 Mar 2012 15:19:17 +0000 (07:19 -0800)]
Merge "AudioPolicyService InputDesc minor cleanup"
Eric Laurent [Fri, 9 Mar 2012 01:45:44 +0000 (17:45 -0800)]
Merge "audio policy: use audio_devices_t when appropriate"
Jeff Tinker [Fri, 9 Mar 2012 00:40:44 +0000 (16:40 -0800)]
Merge "Fix videos app bandwidth accounting for 4G streaming"
Glenn Kasten [Thu, 8 Mar 2012 00:49:22 +0000 (16:49 -0800)]
AudioPolicyService InputDesc minor cleanup
Add a non-default constructor to set the mSessionId, and make mSessionId const.
Remove explicit clear on mEffects - it is automatically cleared by the destructor.
AudioPolicyService::setPreProcessorEnabled:
- parameter is const *
- use an alias instead of making a Vector copy
Destructor doesn't need to be virtual since there are no subclasses.
Change-Id: Ibc3c3bea8259839430b1cf5356186c7d96f1082f
Glenn Kasten [Thu, 8 Mar 2012 20:32:47 +0000 (12:32 -0800)]
Replace hard-coded 3 by FCC_2 to simplify searches
Change-Id: I92881d04e8378307f849fb343071a58d181a68b4
Eric Laurent [Thu, 8 Mar 2012 21:42:42 +0000 (13:42 -0800)]
audio policy: use audio_devices_t when appropriate
Change-Id: I1b3a5879e81c789fb53d356af3d3a1ee2dca955f
Mathias Agopian [Thu, 8 Mar 2012 22:45:51 +0000 (14:45 -0800)]
Merge changes I140d291e,Id443ec5c
* changes:
remove files that moved to frameworks/native
fixup hardcoded include paths for new project
Andreas Huber [Thu, 8 Mar 2012 17:07:10 +0000 (09:07 -0800)]
Merge "Added better codec statistics to evaluate performance."
Glenn Kasten [Thu, 8 Mar 2012 15:47:15 +0000 (07:47 -0800)]
Mixer status cleanup
Use mPrevMixerStatus for DirectOutputThread also.
Remove the MIXER_CONTINUE logic and use MIXER_IDLE instead.
Rename the field mixerStatus to mMixerStatus.
Rename local variable back to mixerStatus.
Change-Id: I0a8145fc856c6c5ff8b784b6176ef3c4d8eb7408
Glenn Kasten [Thu, 8 Mar 2012 15:14:45 +0000 (07:14 -0800)]
Merge "Cleanup DirectOutputThread::mActiveTrack"
Mathias Agopian [Thu, 8 Mar 2012 03:36:08 +0000 (19:36 -0800)]
remove files that moved to frameworks/native
Change-Id: I140d291e520097b1148930f736823650e08488f7
Glenn Kasten [Thu, 8 Mar 2012 01:05:59 +0000 (17:05 -0800)]
Cleanup DirectOutputThread::mActiveTrack
Rename activeTrack to mActiveTrack.
Release the reference earlier, at the end of threadLoop_mix().
This allows the field to be made private and to
move the declaration from PlaybackThread to DirectOutputThread.
Change-Id: I02be7a254638f7d85e92aaf0002d20ca0092a5c3
Dirk Dougherty [Thu, 8 Mar 2012 01:04:34 +0000 (17:04 -0800)]
am
391bb522: am
859717ad: am
4d7bc655: Doc change: String changes for Android Market
* commit '
391bb522013fab16b28dd8304530778114b448ce':
Dirk Dougherty [Thu, 8 Mar 2012 00:58:03 +0000 (16:58 -0800)]
resolved conflicts for merge of
532679a5 to master
Change-Id: Id60d047c0e1f288acff97526c016cca632873b6b
Glenn Kasten [Wed, 7 Mar 2012 20:26:34 +0000 (12:26 -0800)]
Don't ask policy manager about invalid stream type
Change-Id: If50fbff9d34045d1398984da48da7e6428a74491
Glenn Kasten [Thu, 8 Mar 2012 00:08:59 +0000 (16:08 -0800)]
Merge "IAudioFlingerClient::ioConfigChanged param2 const"
Andreas Huber [Wed, 7 Mar 2012 20:40:59 +0000 (12:40 -0800)]
Added better codec statistics to evaluate performance.
Change-Id: I9a1e4a803502329e0342ddde07b6df6b3761afd8
Glenn Kasten [Wed, 7 Mar 2012 20:25:28 +0000 (12:25 -0800)]
Merge "Isolate references to outputTracks/mOutputTracks"
Jean-Michel Trivi [Wed, 7 Mar 2012 19:53:21 +0000 (11:53 -0800)]
Merge "Effect for multichannel PCM downmix to stereo"
Glenn Kasten [Tue, 6 Mar 2012 19:28:04 +0000 (11:28 -0800)]
Isolate references to outputTracks/mOutputTracks
Move all references to DuplicatingThread::outputTracks and
DuplicatingThread::mOutputTracks from the common threadLoop() into
virtual methods. This allows them to be moved from PlaybackThread to
DuplicatingThread, and to be marked private.
Also use vector assignment to copy mOutputTracks to outputTracks.
Change-Id: Ieb1cf1ad36b8a65143e61e6c92a65fb43427e5e2
Glenn Kasten [Wed, 7 Mar 2012 18:44:29 +0000 (10:44 -0800)]
Merge "Make applyVolume private to DirectOutputThread"
Glenn Kasten [Tue, 6 Mar 2012 23:52:35 +0000 (15:52 -0800)]
Make applyVolume private to DirectOutputThread
Change-Id: I7ca4a59505857cbd106b6f274c66e9580dead271
Glenn Kasten [Wed, 7 Mar 2012 18:38:12 +0000 (10:38 -0800)]
Merge "Add comments about sequence for setting parameters"
Jean-Michel Trivi [Fri, 2 Mar 2012 18:59:56 +0000 (10:59 -0800)]
Effect for multichannel PCM downmix to stereo
First pass at implementing an audio effect whose role is to
downmix multichannel PCM buffers to stereo.
The effect is not handling volume changes.
The effect code here handles quad, 4.0, 5.1 and 7.1 input configurations,
to optimize the most commom configurations, and does not yet handle
generic multichanel configurations.
Change-Id: I74d04bd961348f3f0e4ae7714b70e620808a0829
Glenn Kasten [Tue, 6 Mar 2012 19:23:32 +0000 (11:23 -0800)]
Merge the calls to prepareTracks_l
Change-Id: I1dd759581333e2908d980180d44db7bf5ed6591d
Glenn Kasten [Thu, 1 Mar 2012 17:14:51 +0000 (09:14 -0800)]
IAudioFlingerClient::ioConfigChanged param2 const
The 3rd parameter (param2) to AudioFlingerClient::ioConfigChanged
is used as an input. So changed it from void * to const void *.
It is then cast to const OutputDescriptor *
or const audio_stream_type_t * depending on the event.
Change-Id: Ieec0d284f139b74b3389b5ef69c7935a8e5650ee
Glenn Kasten [Wed, 7 Mar 2012 00:22:30 +0000 (16:22 -0800)]
Merge "Rename fields of AudioSessionRef"
Glenn Kasten [Thu, 1 Mar 2012 17:21:37 +0000 (09:21 -0800)]
Add comments about sequence for setting parameters
Change-Id: Iffa59a34c3c47bdc1d3234cdcb4d8ff99c102825
Glenn Kasten [Tue, 6 Mar 2012 23:23:58 +0000 (15:23 -0800)]
Merge "Fix indentation for re-organized code"
Glenn Kasten [Tue, 6 Mar 2012 21:44:56 +0000 (13:44 -0800)]
Merge "Rename updateWaitTime since a lock is held"
Glenn Kasten [Tue, 6 Mar 2012 19:24:48 +0000 (11:24 -0800)]
Rename updateWaitTime since a lock is held
Change-Id: I9bb978cbd0debf5b21676467060f72eebafea3e6
Glenn Kasten [Tue, 6 Mar 2012 19:30:57 +0000 (11:30 -0800)]
Fix indentation for re-organized code
Change-Id: I63471cebdbd095b7ad4e481611b785f9b02c7941
Glenn Kasten [Tue, 6 Mar 2012 19:22:01 +0000 (11:22 -0800)]
Rename fields of AudioSessionRef
Change-Id: I9f2a66094135c4ac6bec2d3e9db3ac5fbf988ede
Eric Laurent [Tue, 6 Mar 2012 18:53:39 +0000 (10:53 -0800)]
Merge "MediaPlayerService: fix AudioSink latency"
Eric Laurent [Tue, 6 Mar 2012 18:52:18 +0000 (10:52 -0800)]
Merge "AudioTrack: relax check on minimum buffer size"
James Dong [Tue, 6 Mar 2012 18:23:58 +0000 (10:23 -0800)]
Merge "Remove unused code - MediaSourceSplitter"
Glenn Kasten [Tue, 6 Mar 2012 16:17:20 +0000 (08:17 -0800)]
Merge "Remove references to sched_policy.h"
Dirk Dougherty [Tue, 6 Mar 2012 07:15:38 +0000 (23:15 -0800)]
am
859717ad: am
4d7bc655: Doc change: String changes for Android Market
* commit '
859717ad627374c6e6ceae9f7cccf73084cb5fae':
Dirk Dougherty [Tue, 6 Mar 2012 06:55:49 +0000 (22:55 -0800)]
am
4d7bc655: Doc change: String changes for Android Market
* commit '
4d7bc65538c7cd9fbb1fbbcf22d1da47fcee1219':
Doc change: String changes for Android Market
Dirk Dougherty [Tue, 6 Mar 2012 06:55:34 +0000 (22:55 -0800)]
am
4d7bc655: Doc change: String changes for Android Market
* commit '
4d7bc65538c7cd9fbb1fbbcf22d1da47fcee1219':
Doc change: String changes for Android Market
Dirk Dougherty [Sat, 28 Jan 2012 01:56:49 +0000 (17:56 -0800)]
Doc change: String changes for Android Market
Change-Id: I823812a4fd24021bec906ad856479c92a8d2a759
James Dong [Tue, 6 Mar 2012 03:28:02 +0000 (19:28 -0800)]
Remove unused code - MediaSourceSplitter
Change-Id: Icf37832a1c234501ee3ff91ff13eece2242425ae
Glenn Kasten [Tue, 6 Mar 2012 01:44:04 +0000 (17:44 -0800)]
Remove references to sched_policy.h
As part of scheduling policy cleanup, remove obsolete
references to sched_policy.h and its APIs.
Change-Id: Id957d11dd645cdf9d53dd6c02e568369aef23243
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
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
Jean-Michel Trivi [Mon, 5 Mar 2012 22:51:54 +0000 (14:51 -0800)]
Merge "Add channel mask in AudioSink"
Glenn Kasten [Mon, 5 Mar 2012 20:18:14 +0000 (12:18 -0800)]
Merge "threadLoop merge"
Glenn Kasten [Fri, 2 Mar 2012 01:10:56 +0000 (17:10 -0800)]
threadLoop merge
Change-Id: Id8e6330ac6be76f9c2debba94f856de87e2d98f7
Jean-Michel Trivi [Fri, 2 Mar 2012 22:54:07 +0000 (14:54 -0800)]
Add channel mask in AudioSink
Add support for specifying a channel mask when opening an AudioSink.
This parameter does not replace the channel count parameter in order
to not have to duplicate the logic to derive a mask from the
channel count everywhere an AudioSink is used without a known mask.
A mask of 0 (CHANNEL_MASK_USE_CHANNEL_ORDER) means a mask will
be automatically derived from the number of channels.
Update existing AudioSink implementations to use the channel mask,
and users of AudioSink to specify the mask if available, and
CHANNEL_MASK_USE_CHANNEL_ORDER otherwise.
Change-Id: Ifa9bd259874816dbc25ead2b03ea52e873cff474
Glenn Kasten [Fri, 2 Mar 2012 21:48:35 +0000 (13:48 -0800)]
Merge "Fix typos and line length in AudioRecord comments"
Jean-Michel Trivi [Fri, 2 Mar 2012 17:58:05 +0000 (09:58 -0800)]
Correct GUID errors in audio effect configuration
Correct erroneous spaces that were present in some audio effect GUIDs.
Change-Id: Ide3a1552b2f8976f96ee980f1341f935555656d9
Andreas Huber [Thu, 1 Mar 2012 23:46:19 +0000 (15:46 -0800)]
Merge "Remove hacks that worked around issues in OMX components several releases back."
Jean-Baptiste Queru [Thu, 1 Mar 2012 23:35:25 +0000 (15:35 -0800)]
am
9de7793b: am
4f906362: am
97348431: am
704131cb: Merge changes I46c81dba,If1f40e9c,I652eaaa5
* commit '
9de7793b425be89889412f3a86466d7b19055c3c':
stagefright aacenc: Use QDADD/QDSUB instructions
stagefright aacenc: Remove useless inline asm for simple right shift
stagefright aacenc: Use ARMv6 SSAT instruction
Jean-Baptiste Queru [Thu, 1 Mar 2012 23:35:23 +0000 (15:35 -0800)]
am
715c78b9: am
225eec8d: am
f9d4ba77: am
69aae36e: Merge "stagefright aacenc: Safeguard against overwriting bits"
* commit '
715c78b933f8dec04882ebb73acd61fdd42c6c64':
stagefright aacenc: Safeguard against overwriting bits
Andreas Huber [Thu, 1 Mar 2012 23:17:47 +0000 (15:17 -0800)]
Remove hacks that worked around issues in OMX components several releases back.
Change-Id: I89bb3d0be4d2c1824de382aedfdd4f9bd2547dbc
John Grossman [Wed, 22 Feb 2012 23:38:35 +0000 (15:38 -0800)]
Switch the way we configure for MediaPlayer retransmission.
This is a cherry-pick of I6ab07d89b2eeb0650e634b8c3b7a0b36aba4e7dd
with merge conflicts addressed by hand and additional changes made in
response to code review feedback.
Move in the direction of a more publishable API for configuring a
media player for retransmission. It used to be that we used a custom
invoke and a modified URL (prefixed with aahTX://). There are many
issues with this technique and it was never meant to stand the test of
time.
This CL gets rid of all that. A new (but currently hidden) method was
introduced to the java level MediaPlayer API, called
setRetransmitTarget(InetSocketAddress), which allows an app writer to
set the retransmit target. For now, this method needs to be called
before a call to setDataSource (which is pretty unusual for the
MediaPlayer API) because this mid level code uses this as a cue to
instantiate an aahTX player instead of relying on the data source to
select a player. When retranmit functionality becomes part of the
existing android player implemenation, this
set-retrans-before-set-data-source behavior can go away, along with
the aahTX player itself.
Change-Id: I3b46c5227bbf69acb2f3cc4f93cfccad9777be98
Signed-off-by: John Grossman <johngro@google.com>
John Grossman [Sun, 19 Feb 2012 01:46:40 +0000 (17:46 -0800)]
LibAAH_RTP: Add support for AAC in MP4.
Cherry picked from Ie8298eb9d253fc6ede448da87660a60d23170987 and
conflicts fixed by hand.
Change-Id: I6f0a59357ba1a3d57caf67d2eb0ade7486723e7b
Signed-off-by: John Grossman <johngro@google.com>
Andreas Huber [Thu, 1 Mar 2012 20:41:10 +0000 (12:41 -0800)]
Merge "Instead of hardcoding OMX component names in our code, support"
Andreas Huber [Wed, 29 Feb 2012 23:47:17 +0000 (15:47 -0800)]
Instead of hardcoding OMX component names in our code, support
a config file instead.
Change-Id: I5835903ab9f1c4a22ccc605ca99ed966767adf57
Eric Laurent [Thu, 1 Mar 2012 18:17:21 +0000 (10:17 -0800)]
Merge "renamed audio policy output flag."
Eric Laurent [Thu, 1 Mar 2012 17:38:00 +0000 (09:38 -0800)]
renamed audio policy output flag.
Renamed AUDIO_POLICY_OUTPUT_FLAG_INDIRECT to AUDIO_POLICY_OUTPUT_FLAG_NONE
which is more appropriate.
Change-Id: Ia14d60397df0f2dcd9bea0186400a09da35bc104
James Dong [Thu, 1 Mar 2012 00:32:10 +0000 (16:32 -0800)]
Merge "Added permission check for all sensitive drm API calls"
Jean-Baptiste Queru [Wed, 29 Feb 2012 23:44:31 +0000 (15:44 -0800)]
am
704131cb: Merge changes I46c81dba,If1f40e9c,I652eaaa5
* commit '
704131cb7e4f9cc682ea57ed569375f9f289368e':
stagefright aacenc: Use QDADD/QDSUB instructions
stagefright aacenc: Remove useless inline asm for simple right shift
stagefright aacenc: Use ARMv6 SSAT instruction
Jean-Baptiste Queru [Wed, 29 Feb 2012 23:44:28 +0000 (15:44 -0800)]
am
69aae36e: Merge "stagefright aacenc: Safeguard against overwriting bits"
* commit '
69aae36e900cf7114c5895618747906951a11730':
stagefright aacenc: Safeguard against overwriting bits
Glenn Kasten [Wed, 29 Feb 2012 22:59:08 +0000 (14:59 -0800)]
Merge "Shorten thread names"
Glenn Kasten [Wed, 29 Feb 2012 22:56:30 +0000 (14:56 -0800)]
Merge "Prepare for threadLoop merge - active tracks"
Glenn Kasten [Wed, 29 Feb 2012 02:40:35 +0000 (18:40 -0800)]
Prepare for threadLoop merge - active tracks
Continued work on making the copies of threadLoop more similar:
- Remove alias for mActiveTracks in MixerThread and DuplicatingThread.
- Pull in declaration of activeTrack in DirectOutputThread.
- Remove redundant parameter of prepareTracks_l().
- Comment prepareTracks_l().
Change-Id: If1087c1902b454acec01ddfdd9f055f0ca7abf04
Glenn Kasten [Wed, 29 Feb 2012 22:45:25 +0000 (14:45 -0800)]
Merge "AudioRecord const methods"
Glenn Kasten [Wed, 29 Feb 2012 22:44:39 +0000 (14:44 -0800)]
Merge "Update AudioFlinger comments"
Glenn Kasten [Wed, 29 Feb 2012 22:43:19 +0000 (14:43 -0800)]
Merge "Pull in declaration of effectChains to inner block"
Jean-Baptiste Queru [Wed, 29 Feb 2012 22:24:52 +0000 (14:24 -0800)]
Merge changes I46c81dba,If1f40e9c,I652eaaa5
* changes:
stagefright aacenc: Use QDADD/QDSUB instructions
stagefright aacenc: Remove useless inline asm for simple right shift
stagefright aacenc: Use ARMv6 SSAT instruction
Jean-Baptiste Queru [Wed, 29 Feb 2012 22:23:38 +0000 (14:23 -0800)]
Merge "stagefright aacenc: Safeguard against overwriting bits"
Glenn Kasten [Wed, 29 Feb 2012 15:56:15 +0000 (07:56 -0800)]
Pull in declaration of effectChains to inner block
Change-Id: I09eacf72124942abd604132b9f4e774b1236fcf3
Glenn Kasten [Wed, 29 Feb 2012 15:07:30 +0000 (07:07 -0800)]
mSuspend comments and usage
Emphasize that playbackthread::mSuspend is a counter, not a bool
Change-Id: I7188e56814e1c54dbc65e560f3627f138257d644
Glenn Kasten [Wed, 29 Feb 2012 19:32:42 +0000 (11:32 -0800)]
Merge "Mark similar and different sections in threadLoop"
Glenn Kasten [Wed, 29 Feb 2012 15:57:06 +0000 (07:57 -0800)]
Mark similar and different sections in threadLoop
Most of these comments will be removed after the threadLoop merge.
Note: the trivial change in assignments to mixBufferSize, and the
comments about "tracks to remove" is to make them all identical.
Change-Id: I3b1a33a7f2cd12ad557a1986bb71f6171161974a
Andreas Huber [Wed, 29 Feb 2012 17:20:24 +0000 (09:20 -0800)]
Merge "Separate the notion of "stop" from that of "release", i.e."
Glenn Kasten [Fri, 24 Feb 2012 23:42:48 +0000 (15:42 -0800)]
Update AudioFlinger comments
Add comments to enum mixer_state
Note side-effect of lockEffectChains_l
Fix a typo
Change-Id: Ibd51678bac2193201cbcbe081ff5664046fbc494
James Dong [Tue, 28 Feb 2012 21:55:55 +0000 (13:55 -0800)]
Added permission check for all sensitive drm API calls
o all drm calls using a DecryptHandle now check the permission before proceeding
Change-Id: Ic992a991357876c6e4bfbfab4f5eec1fa0634a13
James Dong [Wed, 29 Feb 2012 02:49:34 +0000 (18:49 -0800)]
Merge "Moves TimedTextDriver.h into include/media/stagefright/timedtext."
Glenn Kasten [Tue, 28 Feb 2012 20:30:08 +0000 (12:30 -0800)]
Shorten thread names
prctl(PR_SET_NAME) limits to 15 characters. Before we had names like
"Binder Thread #" and the counter was cut off :-( Also remove redundant
"thread" at end of name; it's always a thread.
Change-Id: I1f99c2730ba0787ed9b59c15914356cddf698e2f
Andreas Huber [Tue, 28 Feb 2012 23:54:51 +0000 (15:54 -0800)]
Separate the notion of "stop" from that of "release", i.e.
stop - means transition back to LOADED state and keeping the component
instance allocated.
release - means we get rid of the component completely.
Change-Id: I40ad01ce70821faaad43f57999249904f9144924
James Dong [Tue, 28 Feb 2012 21:09:44 +0000 (13:09 -0800)]
Merge "Remove unnecessary header file includes for drmserver"
Glenn Kasten [Sat, 25 Feb 2012 00:33:14 +0000 (16:33 -0800)]
AudioRecord const methods
Change-Id: Ifae4fd7820b650aaca2b13c8658c292db1c46c0f
Glenn Kasten [Tue, 28 Feb 2012 15:23:42 +0000 (07:23 -0800)]
Merge "Unlock effect chains in the middle of two if's"
Glenn Kasten [Tue, 28 Feb 2012 15:21:51 +0000 (07:21 -0800)]
Merge "Simplify removeNotificationClient"
Glenn Kasten [Tue, 28 Feb 2012 15:21:09 +0000 (07:21 -0800)]
Merge "AudioFlinger const methods and parameters"
Jean-Baptiste Queru [Tue, 28 Feb 2012 15:19:40 +0000 (07:19 -0800)]
am
254cf597: am
7b6b81f8: am
f016dc1b: am
f881fa51: Merge "stagefright amr: Avoid C++/C99 for loops with variable declaration"
* commit '
254cf5973ebe5ebdce9ef261d826e88ed2f67f58':
stagefright amr: Avoid C++/C99 for loops with variable declaration