OSDN Git Service
Andreas Huber [Wed, 7 Dec 2011 20:50:47 +0000 (12:50 -0800)]
Fetch at least 192KB to avoid our mp3 sniffer from blocking on data.
Change-Id: Icb10c129249bb9b69e91f6633a385840c94efa59
related-to-bug:
5666532
Andreas Huber [Tue, 6 Dec 2011 23:03:10 +0000 (15:03 -0800)]
Merge commit '
babb7200' into manualmerge
James Dong [Tue, 6 Dec 2011 20:52:52 +0000 (12:52 -0800)]
Merge "DO NOT MERGE - Consider I-Frame at zeroeth position when searching for sync frames" into ics-mr1
Andreas Huber [Tue, 6 Dec 2011 18:01:27 +0000 (10:01 -0800)]
DO NOT MERGE: Remove the AVI extractor.
Change-Id: Ifce6c0d3d87aad2f5cc7f40ad6304936cbfa795e
Andreas Huber [Tue, 6 Dec 2011 18:59:48 +0000 (10:59 -0800)]
DO NOT MERGE: Remove the AVI extractor.
Change-Id: Ib9cb4a48bd817da703ef53eb14932616d2973ee0
Eric Laurent [Tue, 6 Dec 2011 01:20:53 +0000 (17:20 -0800)]
Merge "audioflinger: fix audio skipping over A2DP" into ics-mr1
James Dong [Mon, 5 Dec 2011 20:41:06 +0000 (12:41 -0800)]
DO NOT MERGE - Consider I-Frame at zeroeth position when searching for sync frames
The current logic does not check the I-frame at zeroeth position and therefore
for the files with only 1 I-Frame at zeroeth postion does not play.
Originally authored by Braganza Sam Robertsh <sam.braganza@samsung.com>
Do not merge to master branch since we made some improvement to SampleTable.cpp in the master branch.
Change-Id: I068184dec71986f14a586f769c2af1f52b4bcf94
related-to-bug:
5711942
Andreas Huber [Mon, 5 Dec 2011 19:34:43 +0000 (11:34 -0800)]
Properly identify how much metadata we need to cache in order to instantiate
the extractor without blocking (and therefore be able to abort).
Change-Id: Id2acdde897e02baaeabadae70b7c95b66c9041b3
related-to-bug:
5666532
Eric Laurent [Mon, 5 Dec 2011 17:47:19 +0000 (09:47 -0800)]
audioflinger: fix audio skipping over A2DP
The maximum sleep time allowed in the mixer thread when audio tracks
are enabled but not ready for mixing is derived from the latency
reported by the output stream.
This does not work for A2DP where the latency also reflects encoding, decoding
and transfer time.
Modified activeSleepTimeUs() to take A2DP case into account.
Issue
5682206.
Change-Id: I3784ac01fb6f836b5a6ce6f764fb15347586de35
Mike Lockwood [Thu, 1 Dec 2011 21:58:41 +0000 (16:58 -0500)]
MTP: Add support for restricting PTP to only certain subdirectories of the storage DO NOT MERGE
Bug:
5527220
Change-Id: I81d6de590ea3002118ba46eb4b6d5fe9061c998c
Signed-off-by: Mike Lockwood <lockwood@google.com>
Mike Lockwood [Thu, 1 Dec 2011 23:36:06 +0000 (18:36 -0500)]
MTP: Don't attempt to read more than 16K at a time from the MTP driver DO NOT MERGE
This could happen sometimes if other operations increased the size of the
data packet buffer to > 16K
Change-Id: I10f85f0ce32df39f46b0a984361958c0a13f6800
Signed-off-by: Mike Lockwood <lockwood@google.com>
Andreas Huber [Thu, 1 Dec 2011 18:02:37 +0000 (10:02 -0800)]
Fixes a typo in AVIExtractor that would advertise the wrong video dimensions
Change-Id: I587a5ce259b04c973ed2d7614e874cb74c521aab
related-to-bug:
5696324
Jamie Gennis [Wed, 30 Nov 2011 01:25:09 +0000 (17:25 -0800)]
Merge "SurfaceMediaSource: use the vid enc usage bit" into ics-mr1
Andreas Huber [Tue, 29 Nov 2011 22:09:10 +0000 (14:09 -0800)]
Merge "Make sure we can properly shutdown even if" into ics-mr1
Andreas Huber [Tue, 29 Nov 2011 22:09:03 +0000 (14:09 -0800)]
Merge "If an error occurs that prevents us from reallocating buffers during a format change" into ics-mr1
Andreas Huber [Tue, 29 Nov 2011 22:08:45 +0000 (14:08 -0800)]
Merge "Updated (internal) API for IStreamSource to signal discontinuities" into ics-mr1
Andreas Huber [Tue, 29 Nov 2011 19:57:35 +0000 (11:57 -0800)]
Updated (internal) API for IStreamSource to signal discontinuities
Change-Id: Idd4b9d8e7cec16b3e3c91c70e75144d42be30f96
related-to-bug:
5553055
Andreas Huber [Mon, 28 Nov 2011 20:36:11 +0000 (12:36 -0800)]
Finer granularity discontinuity support.
No clients can signal a format change on either audio or video track (or both)
and a time discontinuity (timestamps changed) independantly.
Change-Id: I3e6cf4e7c260e85759879d61a9b517f68431c22f
related-to-bug:
5553055
Andreas Huber [Tue, 29 Nov 2011 00:27:35 +0000 (16:27 -0800)]
Make sure we can properly shutdown even if
a) one of the two decoders has a pending discontinuity
b) the renderer holds on to all output buffers for that decoder
c) the renderer is paused
if all three conditions are met the decoder won't ask for more input data
and therefore never see the discontinuity.
To avoid this we briefly resume the renderer just before shutting down.
Change-Id: I9e08af2a1eb4298d1cd00497d6aa33f4ad184e9a
related-to-bug:
5655016
Andreas Huber [Mon, 28 Nov 2011 18:54:12 +0000 (10:54 -0800)]
If an error occurs that prevents us from reallocating buffers during a format change
we need to transition to executing state anyway to be able to properly flush/shutdown
in the future.
Change-Id: Ie48bc09ea31942009ae3a5a45aabc9ffad9fb91f
related-to-bug:
5655016
Eric Laurent [Wed, 23 Nov 2011 02:50:29 +0000 (18:50 -0800)]
audioflinger: reduce sleep time to avoid underrun
Progressively reduce the sleep time applied in MixerThread::threadLoop()
in case of consecutive application underruns to avoid starving the audio HAL.
As the default sleep time is longer than the duration of an audio buffer
we ended up writing less data than needed by the audio HAL if
the condition persisted.
Issue
5553055.
Change-Id: I2b23ee79c032efa945025db228beaecd1e07a2e5
Andreas Huber [Tue, 22 Nov 2011 16:39:11 +0000 (08:39 -0800)]
Merge "Report a runtime error instead of asserting on malformed avc configuration data." into ics-mr1
Jamie Gennis [Tue, 22 Nov 2011 00:51:47 +0000 (16:51 -0800)]
SurfaceMediaSource: use the vid enc usage bit
This change makes SurfaceMediaSource add the VIDEO_ENC usage bit when
allocating its GraphicBuffers rather than the HW_TEXTURE bit.
Change-Id: Ie20e225c894fdbc31cad6bb82b3b64c7e98074eb
James Dong [Sun, 20 Nov 2011 17:45:44 +0000 (09:45 -0800)]
Fix log spamming during time lapse video recording
Change-Id: I4fc0809203684ebb02eaf217d7abad00aefc898f
related-to-bug:
5626569
Marco Nelissen [Fri, 18 Nov 2011 23:07:21 +0000 (15:07 -0800)]
am
d4b22ab4: status_t != bool
* commit '
d4b22ab4889f9b1885bfc0dc45667c846a171a98':
status_t != bool
Marco Nelissen [Fri, 18 Nov 2011 21:10:56 +0000 (13:10 -0800)]
status_t != bool
b/
5567433
Change-Id: I255ab8c3b0b5e0ea6a5cc7c05df757c667f3855e
Andreas Huber [Fri, 18 Nov 2011 20:22:59 +0000 (12:22 -0800)]
Report a runtime error instead of asserting on malformed avc configuration data.
Change-Id: Ibcd9c3fb5b6532eba843ed80ecdcdacaf50d8845
related-to-bug:
5641069
Andreas Huber [Thu, 17 Nov 2011 17:05:17 +0000 (09:05 -0800)]
Merge "Make sure not to cancel pending seek/EOS notifications on a cache underrun..." into ics-mr1
Andreas Huber [Wed, 16 Nov 2011 18:46:05 +0000 (10:46 -0800)]
Make sure not to cancel pending seek/EOS notifications on a cache underrun...
or they are lost for good.
Change-Id: I2f9f53efb05db4077961137c9dc8c27edac4ec62
related-to-bug:
5544907
The Android Open Source Project [Wed, 16 Nov 2011 17:27:57 +0000 (09:27 -0800)]
No-op merge from ics-mr0
Change-Id: I6be81522ac3e6d4d8fab545abde4d81e5bb2a2c6
The Android Open Source Project [Wed, 16 Nov 2011 16:55:42 +0000 (08:55 -0800)]
Reconcile with ics-factoryrom-2-release
Change-Id: Idf18e15df810885a373fb4057f0db064771afc8e
Hong Teng [Tue, 15 Nov 2011 17:42:37 +0000 (09:42 -0800)]
Merge "Fix for issue
5309336 -add videoeditor maximum prefetch YUV frames in media_profiles.xml to limit the total memory usage." into ics-mr1
Hong Teng [Thu, 10 Nov 2011 22:54:26 +0000 (14:54 -0800)]
Fix for issue
5309336
-add videoeditor maximum prefetch YUV frames in media_profiles.xml to limit the total memory usage.
Change-Id: I41ffbc192fcce4c7635e5b0a1f2835852e5ee509
Eric Laurent [Mon, 14 Nov 2011 16:38:05 +0000 (08:38 -0800)]
Merge "audioflinger: fix noise when skipping to next song" into ics-mr1
Eric Laurent [Fri, 11 Nov 2011 23:42:52 +0000 (15:42 -0800)]
audioflinger: fix noise when skipping to next song
When audio effects are enabled, a noise can be heard at the
beginning of the new song when skipping to next song in music app.
This is because some effects (especially virtualizer) have a tail.
This tail was not played when previous song was stopped because effects were
not processed when no tracks were present on a given session. This is to
reduce CPU load when effects are enabled but no audio is playing.
The tail was then rendered when the new song was started.
Added a delay before stopping effect process after all tracks have been removed from a session.
Issue
5584880.
Change-Id: I815e0f7441f9302e8dfe413dc269a94e4cc6fd95
Andreas Huber [Fri, 11 Nov 2011 18:46:02 +0000 (10:46 -0800)]
Merge "Didn't mean to check this in..." into ics-mr1
Andreas Huber [Fri, 11 Nov 2011 18:17:00 +0000 (10:17 -0800)]
Didn't mean to check this in...
Change-Id: Ie5a1902ff2613cd349ca5724f63a3fe3306640c7
Eric Laurent [Fri, 11 Nov 2011 16:17:22 +0000 (08:17 -0800)]
Merge "visualizer: reset buffer if playback is idle" into ics-mr1
Andreas Huber [Fri, 11 Nov 2011 15:39:25 +0000 (07:39 -0800)]
Merge "Instead of asserting, signal a runtime error if the session doesn't contain" into ics-mr1
Andreas Huber [Fri, 11 Nov 2011 15:39:18 +0000 (07:39 -0800)]
Merge "DO NOT MERGE: Instead of asserting, remove active streams if their sockets" into ics-mr1
Andreas Huber [Fri, 11 Nov 2011 15:39:11 +0000 (07:39 -0800)]
Merge "Disconnect on socket error on the RTSP control connection." into ics-mr1
Andreas Huber [Thu, 10 Nov 2011 22:48:20 +0000 (14:48 -0800)]
Disconnect on socket error on the RTSP control connection.
Change-Id: Ib52a69f9b0830b481c6f5c9b1991d1f4cb36ec7b
Andreas Huber [Wed, 9 Nov 2011 22:26:43 +0000 (14:26 -0800)]
DO NOT MERGE: Instead of asserting, remove active streams if their sockets
return failure
Change-Id: Icb47adfd2fbe0398c473ba66e068186311c9cc79
related-to-bug:
5593654
Andreas Huber [Thu, 10 Nov 2011 20:40:30 +0000 (12:40 -0800)]
Instead of asserting, signal a runtime error if the session doesn't contain
any playable tracks at all.
Change-Id: Ibbbe2fdcd53b7e020da80c84c8229856107a87e6
James Dong [Wed, 9 Nov 2011 08:48:56 +0000 (00:48 -0800)]
Add support for retrieving location information in mp4/3gpp files
Change-Id: Ib8427704ef9ee5a4fa8fe1818c8a62d77b4ea687
related-to-bug:
5560253
Eric Laurent [Thu, 10 Nov 2011 18:02:18 +0000 (10:02 -0800)]
visualizer: reset buffer if playback is idle
Visualizer capture buffer must be reset if audio framework has stopped
calling process for a given period of time to get read of residual
data from previous captures.
Issue
5571920.
Change-Id: I6e73f971bb812cdbb2979a3b5e763abab07634eb
Andreas Huber [Thu, 10 Nov 2011 16:48:44 +0000 (08:48 -0800)]
Merge "Send RTSP control connection keep-alive requests" into ics-mr1
Andreas Huber [Thu, 10 Nov 2011 16:48:34 +0000 (08:48 -0800)]
Merge "Don't believe the PV decoder's lies..." into ics-mr1
Andreas Huber [Thu, 10 Nov 2011 16:47:25 +0000 (08:47 -0800)]
Merge "There's no point in trying to continue to decode after an error was signalled." into ics-mr1
Andreas Huber [Wed, 9 Nov 2011 18:26:06 +0000 (10:26 -0800)]
There's no point in trying to continue to decode after an error was signalled.
Change-Id: I2a2410cac9444eadd85be5d104799703171f1a24
related-to-bug:
5588658
Andreas Huber [Wed, 9 Nov 2011 18:03:07 +0000 (10:03 -0800)]
Don't believe the PV decoder's lies...
Change-Id: I97391235255afb8a4890a4ff52d4e8e9ca954f27
Glenn Kasten [Wed, 9 Nov 2011 16:41:19 +0000 (16:41 +0000)]
am
19998120: Merge "Bug
5478024 drop after decode if can\'t drop before" into ics-mr0
* commit '
19998120f53caceb620f138c6eea182f1e693660':
Bug
5478024 drop after decode if can't drop before
Eric Laurent [Wed, 9 Nov 2011 02:10:16 +0000 (18:10 -0800)]
Fix regression for SoundPool playback
Commit
19ddf0eb introduced a problem with applications (like SoundPool)
relying on an underrun condition to detect end of playback instead of
stopping the track when all data is written.
AudioFlinger would keep waiting for new data in case of partial buffer
filling and never reach the underrun condition.
Added a mechanism to wait no more than once if not enough frames are present
in the track buffer.
Issue
5585490.
Change-Id: I131e605ff6070831a01ddf734e68459e3bf2354b
Andreas Huber [Tue, 8 Nov 2011 23:31:23 +0000 (15:31 -0800)]
Send RTSP control connection keep-alive requests
default to 60 secs unless overridden by server's session-id response.
Change-Id: I7c3aff5b787dbb57cc0dccf9db3c75e5cf7e778c
related-to-bug:
5562303
Andreas Huber [Tue, 8 Nov 2011 16:48:31 +0000 (08:48 -0800)]
Merge "Remove surface legacy APIs and code." into ics-mr1
Eric Laurent [Tue, 8 Nov 2011 16:32:57 +0000 (08:32 -0800)]
Merge "AudioFlinger: mix track only when really ready" into ics-mr1
James Dong [Tue, 8 Nov 2011 06:57:02 +0000 (22:57 -0800)]
Merge "Fix a hang issue where the first frame can be dropped for timelapse video recording." into ics-mr1
The Android Open Source Project [Mon, 7 Nov 2011 16:22:56 +0000 (08:22 -0800)]
Reconcile with ics-mr0-release ics-factoryrom-2-release
Change-Id: I9de1253d253c7d106862534570cad0c89d2fdaf2
Glenn Kasten [Sat, 5 Nov 2011 01:05:35 +0000 (18:05 -0700)]
Bug
5478024 drop after decode if can't drop before
Change-Id: Iaa64553be1a710da5d42be4e3a1e1d6dc873e371
Andreas Huber [Thu, 3 Nov 2011 18:00:21 +0000 (11:00 -0700)]
DO NOT MERGE Poll input data with a small timeout and don't consume a full core.
Change-Id: I3c288698920fe6ead0df24a52330483609821a41
related-to-bug:
5549263
Eric Laurent [Fri, 4 Nov 2011 15:29:30 +0000 (08:29 -0700)]
Merge "Fix device management in lvm effect bundle wrapper." into ics-mr1
Eric Laurent [Fri, 4 Nov 2011 15:27:45 +0000 (08:27 -0700)]
Merge "Fix problem in lvm effect bundle wrapper." into ics-mr1
The Android Open Source Project [Fri, 4 Nov 2011 14:56:42 +0000 (07:56 -0700)]
Reconcile with ics-mr0-release ics-factoryrom-2-release
Change-Id: I81cf3b3994cb9a1c18fca3ce0049e09402543086
Dave Burke [Fri, 4 Nov 2011 11:59:27 +0000 (11:59 +0000)]
am
32b5a7ee: (-s ours) Merge "DO NOT MERGE Poll input data with a small timeout and don\'t consume a full core." into ics-mr0
* commit '
32b5a7eeaf758fad0c24131603cdd54cd2883a58':
DO NOT MERGE Poll input data with a small timeout and don't consume a full core.
Andreas Huber [Thu, 3 Nov 2011 18:00:21 +0000 (11:00 -0700)]
DO NOT MERGE Poll input data with a small timeout and don't consume a full core.
Change-Id: I3c288698920fe6ead0df24a52330483609821a41
related-to-bug:
5549263
Eric Laurent [Thu, 3 Nov 2011 19:16:05 +0000 (12:16 -0700)]
AudioFlinger: mix track only when really ready
The addition of low power audio playback mode made that audio buffer consumption
by audio HAL can now happen in bursts. This makes that requesting audio data
from an AudioTrack for mixing can happen at much shorter intervals than before.
This revealed an existing problem where AudioFlinger would consider a track ready
for mixing although not enough frames were ready to completely fill one output buffer,
thus creating short periods of silence.
The fix consists in waiting for enough frames to be ready in AudioTrack buffer before
declaring a track ready for mixing. This minimum is not applied when the track is stopped
to allow the buffer to be emptied completely.
Change-Id: I6d04f9b65db5af85b0b53f0a5674be7ec02f9e9f
Andreas Huber [Thu, 3 Nov 2011 18:00:21 +0000 (11:00 -0700)]
Poll input data with a small timeout and don't consume a full core.
Change-Id: I3c288698920fe6ead0df24a52330483609821a41
related-to-bug:
5549263
The Android Automerger [Thu, 3 Nov 2011 03:59:04 +0000 (20:59 -0700)]
Revert "Merge "Update camera continuous autofocus javadoc." into ics-mr0"
This reverts commit
4b6353ea0265bfed52d0637abd1b17596ce25ff0, reversing
changes made to
af675222f6340a8a9edbe9e8635014a18521e5e0.
The Android Automerger [Thu, 3 Nov 2011 03:53:06 +0000 (20:53 -0700)]
merge in ics-factoryrom-2-release history after reset to ics-mr0
The Android Open Source Project [Wed, 2 Nov 2011 17:52:48 +0000 (10:52 -0700)]
Reconcile with ics-mr0-release ics-factoryrom-2-release
Change-Id: I493695d0ea182f32bbfe0e148e192ad1f60ff001
The Android Automerger [Wed, 2 Nov 2011 17:14:18 +0000 (10:14 -0700)]
Revert "Merge "Update camera continuous autofocus javadoc." into ics-mr0"
This reverts commit
4b6353ea0265bfed52d0637abd1b17596ce25ff0, reversing
changes made to
af675222f6340a8a9edbe9e8635014a18521e5e0.
Eric Laurent [Tue, 1 Nov 2011 00:36:03 +0000 (17:36 -0700)]
Fix problem in lvm effect bundle wrapper.
When an effect is disabled, the process function should either
copy or accumulate the content of the input buffer to the output buffer
depending on the behavior requested by the framework.
Current implementation is copying the input buffer unconditionally.
Related to issue
5433942.
Change-Id: Ic488ca97eadcc4c763de570d7e6c6f5b7a979415
Eric Laurent [Tue, 1 Nov 2011 01:48:15 +0000 (18:48 -0700)]
Fix device management in lvm effect bundle wrapper.
The virtualizer and bass boost effects should be disabled when
not playing throught headsets or headphones.
There is a bug in current wrapper implementation that makes that those
effects are not disabled if the effect is enabled by the user after
the headset has been removed (current logic only works if the device selection
occurs while the effect is enabled).
Change-Id: I7c66b15a0339d95fb9ed13c8320d66379725d3b6
Chih-Chung Chang [Tue, 1 Nov 2011 04:05:45 +0000 (04:05 +0000)]
am
4b6353ea: Merge "Update camera continuous autofocus javadoc." into ics-mr0
* commit '
4b6353ea0265bfed52d0637abd1b17596ce25ff0':
Update camera continuous autofocus javadoc.
Chih-Chung Chang [Tue, 1 Nov 2011 04:04:01 +0000 (21:04 -0700)]
Merge "Update camera continuous autofocus javadoc." into ics-mr0
Andreas Huber [Tue, 25 Oct 2011 20:45:00 +0000 (13:45 -0700)]
Remove surface legacy APIs and code.
All surfaces are now supported through surface textures.
Change-Id: I95dd823e7099c0c32a48a1121624149dcc29d9c6
Andreas Huber [Fri, 28 Oct 2011 16:13:54 +0000 (09:13 -0700)]
Merge "Properly report that we're no longer playing after receiving event" into ics-mr1
Jamie Gennis [Fri, 28 Oct 2011 02:14:01 +0000 (02:14 +0000)]
am
08479cee: Merge "Stagefright: ANW::connect in MediaPlayerService" into ics-mr0
* commit '
08479ceeba56c460fb52f60a24df27776f1936c3':
Stagefright: ANW::connect in MediaPlayerService
James Dong [Thu, 27 Oct 2011 22:24:28 +0000 (15:24 -0700)]
Merge "Report call status from AudioSource::start() to file writer" into ics-mr1
Wu-cheng Li [Thu, 27 Oct 2011 10:07:01 +0000 (18:07 +0800)]
Update camera continuous autofocus javadoc.
Suppose applications call autoFocus in CAF picture mode. If
CAF is in the middle of scanning, the picture is very likely to
be blurry. Change focus callback to return when the scanning
finishes.
bug:
5514415
Change-Id: Ibcb8f92a5263d7dbd7cce54df3617fb21c6255d4
Andreas Huber [Thu, 27 Oct 2011 16:07:23 +0000 (09:07 -0700)]
Merge "Fix a reference to a stale pointer in AwesomePlayer." into ics-mr1
James Dong [Thu, 27 Oct 2011 06:47:55 +0000 (23:47 -0700)]
Fix a hang issue where the first frame can be dropped for timelapse video recording.
Change-Id: I04754f1005a983953a80a659ff13f8762d0e120c
related-to-bug:
5523502
James Dong [Thu, 27 Oct 2011 06:32:13 +0000 (23:32 -0700)]
Report call status from AudioSource::start() to file writer
Change-Id: I5109dc87a92170dede4eaa58b039efe6d8b7c330
related-to-bug:
5514288
Jamie Gennis [Thu, 27 Oct 2011 01:36:31 +0000 (18:36 -0700)]
Stagefright: ANW::connect in MediaPlayerService
This change moves the ANativeWindow connect and disconnect logic from
MediaPlayer to MediaPlayerService::Client.
Bug:
5502654
Change-Id: Ifc43b98b01ad8f35d62d7ece43110724ec7fda3d
Andreas Huber [Wed, 26 Oct 2011 22:23:31 +0000 (15:23 -0700)]
Properly report that we're no longer playing after receiving event
MEDIA_PLAYBACK_COMPLETE or MEDIA_ERROR.
Change-Id: I03eeba751d3728adb33d9c66de4c7444a91696f3
Jamie Gennis [Wed, 26 Oct 2011 20:34:38 +0000 (20:34 +0000)]
am
b7b4eaaa: Merge "Stagefright: push blank buffers when tearing down" into ics-mr0
* commit '
b7b4eaaa05284634d50d581d924a250f1194f66d':
Stagefright: push blank buffers when tearing down
Andreas Huber [Wed, 26 Oct 2011 18:22:40 +0000 (11:22 -0700)]
Fix a reference to a stale pointer in AwesomePlayer.
The pointer returned by MetaData::findCString may become stale if the metadata
object is modified. Make a copy of the returned mime type in order to prevent
MediaPlayer::dump log corruption.
Change-Id: I9077aee36c4316d83b37fb909bf91e6b3f75d5d2
Jamie Gennis [Tue, 25 Oct 2011 21:50:16 +0000 (14:50 -0700)]
Stagefright: push blank buffers when tearing down
This change makes OMXCodec push RGB 565 buffers filled with black to an
ANativeWindow when tearing down after decoding to protected gralloc
buffers. This allows the OMX tear down to zero out any protected
buffers that were used without the possibility that the buffer is still
being used by SurfaceFlinger or HWComposer.
Bug:
5483222
Change-Id: I8acedd81a7bb67dfdc2fd15733e3375b6ce8d560
Dave Burke [Thu, 20 Oct 2011 05:38:45 +0000 (22:38 -0700)]
am
23d64420: Merge "Stagefright: idle OMX after ANW errors" into ics-mr0
* commit '
23d644202a44383bf008ff86f6faa3ea7e447290':
Stagefright: idle OMX after ANW errors
Dave Burke [Thu, 20 Oct 2011 05:37:18 +0000 (22:37 -0700)]
Merge "Stagefright: idle OMX after ANW errors" into ics-mr0
Jamie Gennis [Thu, 20 Oct 2011 04:14:13 +0000 (21:14 -0700)]
Stagefright: idle OMX after ANW errors
This change fixes an issue in Stagefright where the state of an OMXCodec
object can get out of sync with the state of the OMX component. In
particular, if one of the ANativeWindow functions failed and put the
OMXCodec into the ERROR state, this would cause Stagefright to skip
doing the Executing -> Idle transition. Without this transition the
freeBuffersOnPort call would never be made, and the MediaBuffers would
end up being leaked (which would also leak the Gralloc buffers they
reference).
Bug:
5333695
Change-Id: I85ea0cf92d18e7ef6d35c7d1e2a7b4e2c9745d34
Chih-Chung Chang [Thu, 20 Oct 2011 03:09:13 +0000 (20:09 -0700)]
am
f806871f: Fix
5487571: Make sure shutter sound is played when it\'s enforced
* commit '
f806871f3016a8184de4c9dcfbe0b9069dc0d72c':
Fix
5487571: Make sure shutter sound is played when it's enforced
Chih-Chung Chang [Thu, 20 Oct 2011 02:47:26 +0000 (10:47 +0800)]
Fix
5487571: Make sure shutter sound is played when it's enforced
Change-Id: I0c7adf452217b8308243836b40b1fba8f2029240
James Dong [Thu, 20 Oct 2011 00:57:58 +0000 (17:57 -0700)]
am
b3cdadb6: Merge "Check whether media recorder client exists before dumping." into ics-mr0
* commit '
b3cdadb639027f62c7c1637ca962a70d2d1f3b4d':
Check whether media recorder client exists before dumping.
James Dong [Thu, 20 Oct 2011 00:55:45 +0000 (17:55 -0700)]
Merge "Check whether media recorder client exists before dumping." into ics-mr0
Eric Laurent [Wed, 19 Oct 2011 21:02:10 +0000 (14:02 -0700)]
am
3c86134a: Merge "Fix issue 381905: BassBoostTest CTS tests fail..." into ics-mr0
* commit '
3c86134a50618605c86eb9f5f120dbf97826e3e1':
Fix issue 381905: BassBoostTest CTS tests fail...
Eric Laurent [Wed, 19 Oct 2011 18:44:54 +0000 (11:44 -0700)]
Fix issue 381905: BassBoostTest CTS tests fail...
When AudioEffectTest is executed, an Equalizer is created
and enabled on a MediaPlayer session. Effects on the output
mix are therefore suspended.
Then the MediaPlayer is released with the effect still enabled.
In this case, Audioflinger::purgeStaleEffects_l() fails to restore
the suspended effects when the effect attached to the released audio session
is removed.
When subsequent tests are executed on output mix effects, these effects cannot be
enabled as they are still suspended.
Fixed purgeStaleEffects_l() to restore suspended effects if the effect removed is enabled.
Also fixed EffectHandle::disconnect() to only restore suspended effects if the disconnected
handle actually has control over the effect.
Change-Id: I67232e7c34680b0cc01abfd57d5d510a524e5d4f
James Dong [Wed, 19 Oct 2011 05:29:20 +0000 (22:29 -0700)]
Check whether media recorder client exists before dumping.
Change-Id: I1f3a644a958975e4cf6c02099c53e30cc4d2fd82
related-to-bug:
5477177
James Dong [Wed, 19 Oct 2011 05:17:34 +0000 (22:17 -0700)]
am
5264f600: Merge "Bail out after kMaxColorFormatSupported calls to OMX_GetParameter(). Avoid infinite loop in querying omx component about the supported color format." into ics-mr0
* commit '
5264f6003bbcb8ca70df034379154914260cc322':
Bail out after kMaxColorFormatSupported calls to OMX_GetParameter(). Avoid infinite loop in querying omx component about the supported color format.
James Dong [Wed, 19 Oct 2011 05:16:08 +0000 (22:16 -0700)]
Merge "Bail out after kMaxColorFormatSupported calls to OMX_GetParameter(). Avoid infinite loop in querying omx component about the supported color format." into ics-mr0