OSDN Git Service
Glenn Kasten [Tue, 9 Aug 2011 17:52:01 +0000 (10:52 -0700)]
Merge "Updates to slesTestRecBuffQueue test app"
Glenn Kasten [Tue, 9 Aug 2011 17:50:48 +0000 (10:50 -0700)]
Merge "Bug
4603165 playback rate change"
Marius Renn [Tue, 9 Aug 2011 16:40:30 +0000 (09:40 -0700)]
Merge "Bug (
5106403): Serialize filter input values across threads."
Marius Renn [Tue, 9 Aug 2011 16:40:11 +0000 (09:40 -0700)]
Merge "Bugfix (
5088434): Accessing bitmap data on non-RGBA native frames."
Glenn Kasten [Mon, 8 Aug 2011 23:24:34 +0000 (16:24 -0700)]
Updates to slesTestRecBuffQueue test app
Allow the preset number to be specified on command line,
or to use default.
Change-Id: Ia4e996f8726a6bd8ca781bba5930b63bcba854bc
Eino-Ville Talvala [Mon, 8 Aug 2011 23:08:36 +0000 (16:08 -0700)]
Merge "Add background replacement Effect."
Eino-Ville Talvala [Mon, 8 Aug 2011 23:08:35 +0000 (16:08 -0700)]
Merge "Add background replacement filter to mobile filter framework."
Glenn Kasten [Mon, 8 Aug 2011 21:22:21 +0000 (14:22 -0700)]
Merge "Bug
5135150 Fix ifdef C++"
Glenn Kasten [Mon, 8 Aug 2011 21:22:10 +0000 (14:22 -0700)]
Merge "Add playback rate to buffer queue test player"
Glenn Kasten [Mon, 8 Aug 2011 17:53:48 +0000 (10:53 -0700)]
Merge "Miscellaneous loop test improvements"
Glenn Kasten [Mon, 8 Aug 2011 17:20:39 +0000 (10:20 -0700)]
Bug
5135150 Fix ifdef C++
Change-Id: Ic28452ce6b0c717722098699092f1797424a6d9b
Glenn Kasten [Tue, 2 Aug 2011 20:07:34 +0000 (13:07 -0700)]
Miscellaneous loop test improvements
Enable HEADATEND event to see whether looping causes that event.
Recover from prefetch errors using the new approach of condition signal rather than polling.
Check result returned by GetFillLevel.
Other changes:
- Make assert work.
- Pass NULL as 3rd parameter to RegisterCallback when context is not needed.
- Use CheckErr instead of assert when checking result codes.
- Add comments.
Change-Id: I972b9eca9836e62141b6a078345f091e60689321
Glenn Kasten [Wed, 3 Aug 2011 21:33:43 +0000 (14:33 -0700)]
Add playback rate to buffer queue test player
Change-Id: I831290c1d70bbd66031f609a63549801b7c7f57b
Eino-Ville Talvala [Thu, 4 Aug 2011 20:43:52 +0000 (13:43 -0700)]
Add background replacement Effect.
Bug:
5061093
Change-Id: I8db69381627c89eb9851a3383e3715ce8ee934df
Eino-Ville Talvala [Wed, 3 Aug 2011 22:00:44 +0000 (15:00 -0700)]
Add background replacement filter to mobile filter framework.
Bug:
5098987
Change-Id: I242d2a13403b3d1ace74b8b41bd23734ce0333e2
Eddy Talvala [Fri, 5 Aug 2011 17:12:19 +0000 (10:12 -0700)]
Merge "Revert "Add background replacement Effect.""
Eddy Talvala [Fri, 5 Aug 2011 17:12:18 +0000 (10:12 -0700)]
Merge "Revert "Add background replacement filter to mobile filter framework.""
Eddy Talvala [Fri, 5 Aug 2011 16:39:22 +0000 (09:39 -0700)]
Revert "Add background replacement Effect."
This reverts commit
3aeb06f571d69db6e7dcdca85f328b022c041f90
Eddy Talvala [Fri, 5 Aug 2011 16:39:19 +0000 (09:39 -0700)]
Revert "Add background replacement filter to mobile filter framework."
This reverts commit
b07371016b15886136e88f1ec62d53daa3c5053f
Eino-Ville Talvala [Fri, 5 Aug 2011 16:21:43 +0000 (09:21 -0700)]
Merge "Add background replacement Effect."
Eino-Ville Talvala [Fri, 5 Aug 2011 16:21:42 +0000 (09:21 -0700)]
Merge "Add background replacement filter to mobile filter framework."
Glenn Kasten [Fri, 5 Aug 2011 15:53:20 +0000 (08:53 -0700)]
Merge "Bug
5903270 play interface, events, markers, etc."
Eino-Ville Talvala [Thu, 4 Aug 2011 20:43:52 +0000 (13:43 -0700)]
Add background replacement Effect.
Bug:
5061093
Change-Id: Icdcf7597c9ce2ee9e6443d3b9eeaf9c99b57c809
Marius Renn [Thu, 4 Aug 2011 22:17:33 +0000 (15:17 -0700)]
Bugfix (
5088434): Accessing bitmap data on non-RGBA native frames.
Change-Id: I8db22b6d78c5350815c043acbc55e578bee1a8a0
Glenn Kasten [Thu, 4 Aug 2011 21:50:10 +0000 (14:50 -0700)]
Merge "Fix race in reverb test"
Glenn Kasten [Thu, 4 Aug 2011 21:49:56 +0000 (14:49 -0700)]
Merge "Bug
5110581 SL_PLAYEVENT_HEADATEND while looping"
Eino-Ville Talvala [Wed, 3 Aug 2011 22:00:44 +0000 (15:00 -0700)]
Add background replacement filter to mobile filter framework.
Bug:
5098987
Change-Id: Ib96da73756b736f2960b39cdc47673b52134e881
Glenn Kasten [Thu, 4 Aug 2011 17:32:46 +0000 (10:32 -0700)]
Bug
4603165 playback rate change
Non-trivial implementation is only for AudioTrack with rate range 500
to 2000 per mille and property SL_RATEPROP_NOPITCHCORAUDIO; for Android
MediaPlayer the rate range is 1000 to 1000 per mille.
Details:
- no multi-range
- fix SMP races in GetRate, SetPropertyConstraints, GetProperties
- SetRate only updates mRate if successful
- Rate_SetPropertyConstraints only updates mProperties if successful
- return SL_RESULT_FEATURE_UNSUPPORTED for non-AudioPlayers
which have this interface (currently only MidiPlayer)
- for Android, atomically set playback rate and constraints
and simplify to use hard-coded constraints rather than querying
- per the spec, SetPropertyConstraints now returns
SL_RESULT_PARAMETER_INVALID if the constraints are out of range,
or SL_RESULT_FEATURE_UNSUPPORTED if the constraints are in range but
not supported by this implementation
Change-Id: I051ff92b20f3845ffa12bccec778937d42823e5d
Glenn Kasten [Fri, 29 Jul 2011 14:39:25 +0000 (07:39 -0700)]
Bug
5903270 play interface, events, markers, etc.
As the media framework does not directly support marker and periodic
callbacks, we use a retriggerable one-shot timer at application level
to emulate this. This has the advantage of being faster, but is also
less accurate than if it were in the framework.
Details:
- Get position is now synchronous and (mostly) lock-free
- Fix regression in SL_PLAYEVENT_HEADATMARKER and SL_PLAYEVENTHEADATNEWPOS
- Fix SMP races in GetPlayState, GetCallbackEventsMask, GetMarkerPosition,
GetPositionUpdatePeriod
- AudioSfDecoder was not updating mPositionMsec when getPositionUsec failed
- Updating attributes is relatively expensive, so only do it when a significant change
in SetMarkerPosition, ClearMarkerPosition, SetPositionUpdatePeriod
- Error on unknown message type in onMessageReceived
- Delete an obsolete FIXME
- "Clearing" a marker is now equivalent to disabling the marker event,
and the default marker position is cleared.
- use Android time units and types (int32_t, ANDROID_UNKNOWN_TIME, etc.) where appropriate
instead of SLmillisecond and SL_TIME_UNKNOWN
Change-Id: Ib78bafa20d883b8d927364769663837389b6ea1d
Marius Renn [Thu, 4 Aug 2011 03:07:44 +0000 (20:07 -0700)]
Merge "Fix for
5117329: Stored frames which are externally visible check validity."
Marius Renn [Thu, 4 Aug 2011 01:59:09 +0000 (18:59 -0700)]
Merge "Fix for
5117999: Make isEffectSupported() a static method."
Marius Renn [Thu, 4 Aug 2011 00:59:44 +0000 (17:59 -0700)]
Merge "Fix for
5117285: Stream-based filters no longer close streams."
Marius Renn [Thu, 4 Aug 2011 00:40:02 +0000 (17:40 -0700)]
Fix for
5117285: Stream-based filters no longer close streams.
Stream-based filters should not close streams, as they do not open them.
Change-Id: I01688fecde4d80e6089fb4c2fd017144dfc88408
Eino-Ville Talvala [Thu, 4 Aug 2011 00:34:14 +0000 (17:34 -0700)]
Merge "Fix structgen script to build Java directory hierarchies."
Marius Renn [Thu, 4 Aug 2011 00:29:43 +0000 (17:29 -0700)]
Fix for
5117999: Make isEffectSupported() a static method.
This is required for applications such as GTalk, which need to verify that
certain effects are available before they setup an EffectContext.
Change-Id: I0f22b2ef378ebf0cb916305bc2a9f6b093b0f715
Marius Renn [Wed, 3 Aug 2011 22:35:40 +0000 (15:35 -0700)]
Bug (
5106403): Serialize filter input values across threads.
Change-Id: I973cfc681f4e9a53fcdee15acf55d1935d9a9676
Marius Renn [Wed, 3 Aug 2011 22:30:10 +0000 (15:30 -0700)]
Fix for
5117329: Stored frames which are externally visible check validity.
This patch adds callbacks to Frames to let them prepare frames for storage,
and validate them on retrieval.
Also includes some name changes to badly named functions in gl_frame.cpp.
Change-Id: Ie25ef5136a6f583cbb8f70d7c2f1c418b4bceb83
Wei Hua [Wed, 3 Aug 2011 22:29:05 +0000 (15:29 -0700)]
Merge "Added FilterGraphEffect."
Eino-Ville Talvala [Wed, 3 Aug 2011 22:01:46 +0000 (15:01 -0700)]
Fix structgen script to build Java directory hierarchies.
Bug: 509898
Change-Id: I27a1ee3dd3f3fcfa82c5f2620e5e30193327105d
Glenn Kasten [Sun, 24 Jul 2011 20:57:21 +0000 (13:57 -0700)]
Fix race in reverb test
Was setting play state to PAUSED before enabling prefetch callbacks
Change-Id: Idc3d19d87799afe7e8314199c1317cf2cea2c449
Eino-Ville Talvala [Wed, 3 Aug 2011 21:01:17 +0000 (14:01 -0700)]
Merge "Increase MediaSource's startup timeout."
Wei Hua [Wed, 3 Aug 2011 20:55:24 +0000 (13:55 -0700)]
Added FilterGraphEffect.
Make the texId in GLTextureTarget not final
Bug:
4966161
Change-Id: I0935194c957ef2c490d3661f4247ad1ea23a3512
Glenn Kasten [Tue, 2 Aug 2011 22:18:56 +0000 (15:18 -0700)]
Bug
5110581 SL_PLAYEVENT_HEADATEND while looping
Change-Id: Ia4d0433b4a6589bfda2f88addbe5b7eb3d0d9789
Marius Renn [Wed, 3 Aug 2011 01:52:03 +0000 (18:52 -0700)]
Minor API implementation fixes.
- Documentation fixes.
- Private package lookup fix.
- Exception fix.
Change-Id: Ibae80a0b9c5eacdd95ec4c699e12eaec46b552c1
Marius Renn [Wed, 3 Aug 2011 01:12:26 +0000 (18:12 -0700)]
Merge "Initial commit of the high-level public MFF effects SDK implementation."
Glenn Kasten [Tue, 2 Aug 2011 23:23:21 +0000 (16:23 -0700)]
Merge "Bug
5109153 Remove log spam"
Glenn Kasten [Tue, 2 Aug 2011 23:23:06 +0000 (16:23 -0700)]
Merge "Bug
5108531 Report the correct API level"
Marius Renn [Tue, 2 Aug 2011 20:55:34 +0000 (13:55 -0700)]
Initial commit of the high-level public MFF effects SDK implementation.
Includes fixes required for the Effects API:
- Explicit tear-down of MFF components.
- Better reuse of GL frames with external bindings.
- Fixed memory leaks.
Change-Id: I3a7397be1943361f6a8981cdf8313fd1670b26c8
Eino-Ville Talvala [Tue, 2 Aug 2011 20:43:51 +0000 (13:43 -0700)]
Increase MediaSource's startup timeout.
When streaming network URLs, the initial timeout of 5 seconds is
too short. Increasing to 10 seconds seems sufficient.
Bug:
5110877
Change-Id: I8071a7fee0bf0f5c28faef8fa69ab6790f110267
Glenn Kasten [Tue, 2 Aug 2011 19:35:13 +0000 (12:35 -0700)]
Merge "Bug
5080320 MediaPlayer volume"
Glenn Kasten [Tue, 2 Aug 2011 16:08:40 +0000 (09:08 -0700)]
Bug
5109153 Remove log spam
Change-Id: I6c0c742bfa3f0078968dc5e2ea3578ad786067c5
Glenn Kasten [Tue, 2 Aug 2011 15:22:38 +0000 (08:22 -0700)]
Bug
5108531 Report the correct API level
Use build macro PLATFORM_SDK_VERSION to automatically update the reported
value, however the test program will still need manual updates.
Change-Id: Iae044605db65021c7d1e9825aab80ab5d6b552a8
Marius Renn [Tue, 2 Aug 2011 00:05:49 +0000 (17:05 -0700)]
Merge "Bugfix (
5085850): Added function to allow easy initialization of program host variables."
Marius Renn [Tue, 2 Aug 2011 00:05:39 +0000 (17:05 -0700)]
Merge "Bugfix (
5064211): Fix uniform access and lookups to work on non-TEGRA."
Ying Wang [Mon, 1 Aug 2011 20:04:27 +0000 (13:04 -0700)]
Merge "Fix makefile function call syntax"
Marius Renn [Mon, 1 Aug 2011 19:29:33 +0000 (12:29 -0700)]
Bugfix (
5085850): Added function to allow easy initialization of program host variables.
Change-Id: If7d88a015b75937d5f49cdb51120de5f75ee6d17
Changed 2 filters to use new simplified method.
Note: This requires that other affected filters are updated to make
use of the new functionality.
Marius Renn [Mon, 1 Aug 2011 18:47:58 +0000 (11:47 -0700)]
Bugfix (
5064211): Fix uniform access and lookups to work on non-TEGRA.
Change-Id: I75f80db09d9836754c7071ed8fd3c88ab317d989
Glenn Kasten [Thu, 28 Jul 2011 15:45:22 +0000 (08:45 -0700)]
Bug
5080320 MediaPlayer volume
Details:
- re-factor volume-related code yet again
- remove dead variables mAmplFromVolLevel, mAmplFromStereoPos, mDirectLevel
- add placeholders for kEventPrefetchFillLevelUpdate and kEventPrefetchStatusChange
Known issues:
- MPEG-2 TS doesn't yet implement the ability to query channel count, so default to stereo
Change-Id: Ic0f2297b267dc3d380755e8d314e1d5f0f659d7c
Glenn Kasten [Fri, 29 Jul 2011 22:40:46 +0000 (15:40 -0700)]
Merge "Bug
5082191 fix slesTest_decodeToBuffQueue assert"
Glenn Kasten [Fri, 29 Jul 2011 14:19:36 +0000 (07:19 -0700)]
Merge "Bug
5092976 no spurious callbacks on prefetch fail"
Glenn Kasten [Fri, 29 Jul 2011 14:18:10 +0000 (07:18 -0700)]
Merge "Bug
5081346 fix whole file looping"
Pannag Sanketi [Fri, 29 Jul 2011 01:48:00 +0000 (18:48 -0700)]
Merge "Adding MediaEncoderFilter for encoding GLFrames"
Eino-Ville Talvala [Thu, 28 Jul 2011 23:01:56 +0000 (16:01 -0700)]
Fix bug in CameraSource resolution selection.
Bug:
5083927
Change-Id: I2ff78b717e8092c14f73fc51bb3802a275d08bbf
Glenn Kasten [Tue, 26 Jul 2011 21:26:47 +0000 (14:26 -0700)]
Bug
5081346 fix whole file looping
Change-Id: If4e233f9007d7e48225a342a43f06df7f66cdea7
Glenn Kasten [Thu, 28 Jul 2011 22:14:27 +0000 (15:14 -0700)]
Bug
5092976 no spurious callbacks on prefetch fail
Change-Id: I754085b4d1e43c4d10bea36e0fb683d8113844e9
Pannag Sanketi [Fri, 8 Jul 2011 18:31:00 +0000 (11:31 -0700)]
Adding MediaEncoderFilter for encoding GLFrames
Added MediaEncoderFilter inside MFF which can record GLFrames. It uses
MediaRecorder underneath. GLEnvironment gets a native window handle
using the MediaRecorder object, and creates an EGLSurface using that.
Any frames rendered to that frame are forwarded to the
StageFrightRecorder via the native window handle obtained from
MediaRecorder.
Related to bug id:
4529323
Change-Id: I0322e8dfa29ba47741222fcb8accf18eab7c050b
Glenn Kasten [Wed, 27 Jul 2011 00:36:51 +0000 (17:36 -0700)]
Bug
5082191 fix slesTest_decodeToBuffQueue assert
Change-Id: I2ec181cc7eba000847bd28e6d04733d3496d74d9
Glenn Kasten [Mon, 25 Jul 2011 16:27:01 +0000 (09:27 -0700)]
Bug
4599730 fix mute solo, channel count, volume
Change-Id: I1624c744168233c4ef79f2cd3090447b8aa7d53b
Ying Wang [Thu, 28 Jul 2011 00:05:58 +0000 (17:05 -0700)]
Fix makefile function call syntax
Before this change, the newline character will be carried to the shell
command. So no file name will be returned.
Change-Id: I54ce7da62711bf8e0bd35831e361cbf4eedbcee8
Jean-Michel Trivi [Wed, 27 Jul 2011 23:13:55 +0000 (16:13 -0700)]
Merge "Report last decoded position as AudioPlayer position for PCM decode"
Marius Renn [Wed, 27 Jul 2011 21:08:39 +0000 (14:08 -0700)]
Merge "Refactoring to fix GL related bugs (Bugs
5031729,
5062397,
5030694)"
Jean-Michel Trivi [Wed, 27 Jul 2011 00:43:14 +0000 (17:43 -0700)]
Report last decoded position as AudioPlayer position for PCM decode
Change-Id: I1ec413137d549235af4dc66cb033e1cd0bbbad62
Marius Renn [Tue, 26 Jul 2011 23:08:32 +0000 (16:08 -0700)]
Refactoring to fix GL related bugs (Bugs
5031729,
5062397,
5030694)
- GL frame must not override default texture parameters
- Detect leaking frames early.
- Do not double deallocate frames.
- Update bytes per sample when resetting format base-type.
- Split GL processing up to allow UI thread to draw.
Change-Id: I512eb0bf19e212243be2da966ed2f9219e22dc3b
Eino-Ville Talvala [Tue, 26 Jul 2011 17:05:53 +0000 (10:05 -0700)]
Concurrency fix to CameraSource.
Don't hold a lock on the whole object while waiting for new frames.
Could have potentially deadlocked the filter if the UI thread
attempted to call get/setCameraParameters while filter was waiting for
a new frame.
Bug-Id:
5075306
Change-Id: I12391ff3247c64a2c6a303bfc9f542e1e80d2c24
Glenn Kasten [Mon, 25 Jul 2011 23:47:10 +0000 (16:47 -0700)]
Merge "Bug
5045590 preset reverb on audio players"
Eino-Ville Talvala [Mon, 25 Jul 2011 23:25:33 +0000 (16:25 -0700)]
Merge "Fix concurrency bugs in MediaSource"
Jean-Michel Trivi [Mon, 25 Jul 2011 17:57:11 +0000 (10:57 -0700)]
Fix bug
5022500 MP2TS format change support in OpenMAX AL
Define new command that can be queued in AndroidBufferQueue
to signal an MP2TS format change.
This command maps directly to IStreamListener::kKeyFormatChange.
Change-Id: I67908fd9e1a7d994862ea3e41c4c0fb6e36bc804
Glenn Kasten [Fri, 22 Jul 2011 16:08:21 +0000 (09:08 -0700)]
Bug
5045590 preset reverb on audio players
Aux effects on MediaPlayer audio players (non-AudioTrack) were broken
Change-Id: I5b97bee08d809b12cb9815d6d277934123780581
Eino-Ville Talvala [Fri, 22 Jul 2011 23:21:50 +0000 (16:21 -0700)]
Fix concurrency bugs in MediaSource
Fixes several possible/occasional deadlocks between mediasource,
surfacetexture, and the UI thread.
Change-Id: I62a98f0ed86fd7a6c9d3a5141137fe960d8fa31a
Glenn Kasten [Sun, 24 Jul 2011 19:55:17 +0000 (12:55 -0700)]
Merge "Bug
5068269 Fix assertion failure after prepare"
Glenn Kasten [Sun, 24 Jul 2011 19:51:35 +0000 (12:51 -0700)]
Merge "pthread_signal instead of polling prefetch status"
Glenn Kasten [Thu, 21 Jul 2011 20:36:39 +0000 (13:36 -0700)]
pthread_signal instead of polling prefetch status
Also add looping for short files
Change-Id: Ia115ca5ff388a4824d56fad2ad34881479ab3f0d
Glenn Kasten [Fri, 22 Jul 2011 22:09:42 +0000 (15:09 -0700)]
Merge "Miscellaneous improvements to preset reverb test"
Glenn Kasten [Thu, 21 Jul 2011 20:31:50 +0000 (13:31 -0700)]
Bug
5068269 Fix assertion failure after prepare
Change-Id: I890a29eeef9021c7432da8a0ccb409846e107097
Eino-Ville Talvala [Fri, 22 Jul 2011 19:09:41 +0000 (12:09 -0700)]
Merge "Make CameraSource always pick a resolution from the supported list."
Glenn Kasten [Wed, 20 Jul 2011 15:08:10 +0000 (08:08 -0700)]
Miscellaneous improvements to preset reverb test
Add option to select URI or fd locator.
Use prefetch status callback to detect bad URI.
Fix bug where it was not playing the last few seconds of file.
Decrease reverb on/off interval from 5 to 3 seconds, for shorter files.
Add looping.
Change-Id: I34a0506742de14adcf996bfc508177b260afded8
Eino-Ville Talvala [Tue, 19 Jul 2011 23:48:45 +0000 (16:48 -0700)]
Make CameraSource always pick a resolution from the supported list.
If the requested resolution is not supported, CameraSource will now
pick the closest match that isn't bigger than requested, if possible.
Fixes crashes due to the default 320x240 not being supported
(bug
5064211)
Change-Id: I446990ed9a56a78d3676eb5d41fe9fc91431c5db
Eino-Ville Talvala [Fri, 22 Jul 2011 16:20:04 +0000 (09:20 -0700)]
Merge "Fixes to the MediaSource filter."
Glenn Kasten [Fri, 22 Jul 2011 01:28:17 +0000 (18:28 -0700)]
Merge "Bug
5047695 Handle unsuccessful prepare up to app"
Glenn Kasten [Fri, 22 Jul 2011 01:27:48 +0000 (18:27 -0700)]
Merge "Add more verbose logging"
Eino-Ville Talvala [Thu, 21 Jul 2011 22:50:41 +0000 (15:50 -0700)]
Fixes to the MediaSource filter.
- Add volume support, set default volume to 'mute' (bug:
4977691)
- Properly handle non-looping videos (bug:
5060297)
- Make error handling consistent with other filters
- Some logging improvements
Change-Id: I76c156148a18200ff43cae7816d1ffa819f86a23
Glenn Kasten [Thu, 21 Jul 2011 20:33:54 +0000 (13:33 -0700)]
Bug
5047695 Handle unsuccessful prepare up to app
Change-Id: I9f1541b37ad5cda21dc49388e42c7fb08b22fc5b
Glenn Kasten [Thu, 21 Jul 2011 20:31:12 +0000 (13:31 -0700)]
Add more verbose logging
Change-Id: I0cccee0d59fe3eefc6ef94b22bb6100d96bccdff
Wei Hua [Thu, 21 Jul 2011 18:57:33 +0000 (11:57 -0700)]
Merge "Move the format checking into process."
Wei Hua [Thu, 21 Jul 2011 17:19:20 +0000 (10:19 -0700)]
Move the format checking into process.
prepare() may not have the complete format.
Change-Id: I2245675df030564e1c652c934cbcdc16c0fc96f2
Glenn Kasten [Thu, 21 Jul 2011 15:19:17 +0000 (08:19 -0700)]
Merge "Use prefetch status to recover from URI errors"
Eric Laurent [Thu, 21 Jul 2011 00:44:26 +0000 (17:44 -0700)]
Merge "Header file for audio effects config file parser"
Glenn Kasten [Wed, 20 Jul 2011 14:46:20 +0000 (07:46 -0700)]
Use prefetch status to recover from URI errors
Change-Id: I1afa4af018c372448a456824c78e3e1ab1c13b42
Glenn Kasten [Wed, 20 Jul 2011 20:38:27 +0000 (13:38 -0700)]
Merge "Bug
5047695 missing cases"
Glenn Kasten [Wed, 20 Jul 2011 20:37:11 +0000 (13:37 -0700)]
Merge "Bug
5044578 part 2"