OSDN Git Service
Glenn Kasten [Thu, 10 Nov 2011 22:58:44 +0000 (14:58 -0800)]
Fix log message
Log did not have a tag, and was wrong level
Change-Id: I8d12895c80483e1e39f117a393b8be2f4bdd3e1d
James Dong [Tue, 8 Nov 2011 07:00:34 +0000 (07:00 +0000)]
am
ee7ebb32: Merge "Fix a hang issue where the first frame can be dropped for timelapse video recording." into ics-mr1
* commit '
ee7ebb3257d9337627b175835dc3d08f9b8ab339':
Fix a hang issue where the first frame can be dropped for timelapse video recording.
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
Andreas Huber [Mon, 7 Nov 2011 23:04:56 +0000 (15:04 -0800)]
Merge "Use binary search to discover closest sync sample index, replace"
Andreas Huber [Mon, 7 Nov 2011 19:38:14 +0000 (11:38 -0800)]
Use binary search to discover closest sync sample index, replace
assertions with runtime errors in case the file's table of sync sample
indices is not sorted properly.
Change-Id: Ie4446a44e613a8d329ac680c37361d4407d22520
related-to-bug:
5549855
The Android Open Source Project [Mon, 7 Nov 2011 16:30:54 +0000 (08:30 -0800)]
Reconcile with ics-mr1-release
Change-Id: Ib022135d56532756d171af770d4fae4e94402d9b
The Android Open Source Project [Mon, 7 Nov 2011 16:28:26 +0000 (16:28 +0000)]
am
064975c2: Reconcile with ics-mr0-release ics-factoryrom-2-release
* commit '
064975c27cbca412e682fa152ce00af14027ab4f':
Fix a leak in Parcel::writeBlob.
DO NOT MERGE Poll input data with a small timeout and don't consume a full core.
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
The Android Automerger [Sun, 6 Nov 2011 14:46:10 +0000 (06:46 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Eric Laurent [Sat, 5 Nov 2011 16:32:35 +0000 (09:32 -0700)]
resolved conflicts for merge of
914972be to master
Change-Id: I15adb9040eaa206c31bb5a08ed5ee5b32967ba0a
Eric Laurent [Sat, 5 Nov 2011 15:52:20 +0000 (08:52 -0700)]
resolved conflicts for merge of
79178b8b to master
Change-Id: Ia597549a6d159b86063eb3afec5ce7fe98434a65
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 15:01:30 +0000 (15:01 +0000)]
am
8242cc49: Reconcile with ics-mr0-release ics-factoryrom-2-release
* commit '
8242cc49a90aa13a4830a735438b6e3cf73ea0f0':
Revert "Merge "Avoid duplicate dialogs leading to NPE" into ics-mr0"
Revert "Merge "BatteryService(jni): properly handle read's return value" into ics-mr0"
Revert "Merge "Update camera continuous autofocus javadoc." into ics-mr0"
Revert "Merge "Fix potential segfault in RS watchdog." into ics-mr0"
Revert "Merge "Improve the slow query instrumentation." into ics-mr0"
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 12:04:08 +0000 (12:04 +0000)]
am
43e72b1f: (-s ours) 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 '
43e72b1f5692dd9e220158001317c2abc0ecafcf':
DO NOT MERGE Poll input data with a small timeout and don't consume a full core.
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
Andreas Huber [Thu, 3 Nov 2011 18:12:39 +0000 (18:12 +0000)]
am
e395f645: Poll input data with a small timeout and don\'t consume a full core.
* commit '
e395f645aa4c30a4fad8beb3da6f8fad72338617':
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)]
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 13:44:18 +0000 (06:44 -0700)]
merge in ics-mr1-release history after reset to ics-mr1
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:59:05 +0000 (17:59 +0000)]
am
11b49ba9: Reconcile with ics-mr0-release ics-factoryrom-2-release
* commit '
11b49ba933bab7ff8262139141eef0e5f3c45a18':
Revert "Merge "BatteryService(jni): properly handle read's return value" into ics-mr0"
Revert "Merge "Update camera continuous autofocus javadoc." into ics-mr0"
Revert "Merge "Fix potential segfault in RS watchdog." into ics-mr0"
Revert "Merge "Improve the slow query instrumentation." into ics-mr0"
Revert "Merge "BatteryService(jni): properly handle read's return value" into 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
Chih-Chung Chang [Wed, 2 Nov 2011 17:29:46 +0000 (17:29 +0000)]
am
11ba6da4: am
4b6353ea: Merge "Update camera continuous autofocus javadoc." into ics-mr0
* commit '
11ba6da460572b9ce9cb9dc0d5a76b710e7efdb3':
Update camera continuous autofocus javadoc.
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
Andreas Huber [Tue, 1 Nov 2011 18:01:01 +0000 (11:01 -0700)]
Properly decode ADTS files with ID3 headers.
Change-Id: I55247e79ac9cc9547e3e0f6fe048bcbdc9b639d1
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
The Android Automerger [Tue, 1 Nov 2011 13:46:02 +0000 (06:46 -0700)]
merge in ics-mr1-release history after reset to ics-mr1
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 [Mon, 8 Aug 2011 18:20:53 +0000 (11:20 -0700)]
Support new HLS byte-range extensions
Change-Id: Ic767ddea93ffcb87d83b8fbc20837486648da3d7
The Android Automerger [Sun, 30 Oct 2011 13:46:55 +0000 (06:46 -0700)]
merge in ics-mr1-release history after reset to ics-mr1
Glenn Kasten [Fri, 28 Oct 2011 18:57:56 +0000 (11:57 -0700)]
Merge "Bug
5522189 temporary workaround"
Glenn Kasten [Fri, 28 Oct 2011 17:26:17 +0000 (10:26 -0700)]
Bug
5522189 temporary workaround
Change-Id: I21d91d7a24df7bb6e7fc3d0fbc4786d55391fc0e
Andreas Huber [Fri, 28 Oct 2011 16:17:54 +0000 (16:17 +0000)]
am
27ed1249: Merge "Properly report that we\'re no longer playing after receiving event" into ics-mr1
* commit '
27ed12492dfbec6ec67b66ff3cf60febce370b01':
Properly report that we're no longer playing after receiving event
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:53:20 +0000 (02:53 +0000)]
am
fc9592f8: am
08479cee: Merge "Stagefright: ANW::connect in MediaPlayerService" into ics-mr0
* commit '
fc9592f8a5f2f75207e5e532655ac294eb2b334b':
Stagefright: ANW::connect in MediaPlayerService
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:28:08 +0000 (22:28 +0000)]
am
da57c0e8: Merge "Report call status from AudioSource::start() to file writer" into ics-mr1
* commit '
da57c0e8cf7e5022dd927b51fab3c1a40a8adf54':
Report call status from AudioSource::start() to file writer
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:11:56 +0000 (16:11 +0000)]
am
1388aced: Merge "Fix a reference to a stale pointer in AwesomePlayer." into ics-mr1
* commit '
1388aced2a5ce3aafa8b0ae922925efafb61a5e1':
Fix a reference to a stale pointer in AwesomePlayer.
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
The Android Automerger [Thu, 27 Oct 2011 13:46:35 +0000 (06:46 -0700)]
merge in ics-mr1-release history after reset to 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:39:25 +0000 (20:39 +0000)]
am
5ded5fc5: am
b7b4eaaa: Merge "Stagefright: push blank buffers when tearing down" into ics-mr0
* commit '
5ded5fc55f2da2af0a76a9ddc52d27948b227037':
Stagefright: push blank buffers when tearing down
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
Steve Block [Thu, 20 Oct 2011 10:56:00 +0000 (11:56 +0100)]
Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF) DO NOT MERGE
See https://android-git.corp.google.com/g/#/c/143865
Bug:
5449033
Change-Id: I0122812ed6ff6f5b59fe4a43ab8bff0577adde0a
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
The Android Automerger [Thu, 20 Oct 2011 14:00:47 +0000 (07:00 -0700)]
merge in ics-release history after reset to master
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
The Android Automerger [Wed, 19 Oct 2011 14:44:46 +0000 (07:44 -0700)]
merge in ics-release history after reset to master
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
Eric Laurent [Wed, 19 Oct 2011 02:31:12 +0000 (19:31 -0700)]
am
ecfdd7ff: Merge "Limit AudioFlinger log." into ics-mr0
* commit '
ecfdd7ff468bfc861e84fe18992e26b89cc63126':
Limit AudioFlinger log.
James Dong [Tue, 18 Oct 2011 23:21:52 +0000 (16:21 -0700)]
Bail out after kMaxColorFormatSupported calls to OMX_GetParameter().
Avoid infinite loop in querying omx component about the supported color format.
Change-Id: I4997efd36462c792a6d8b5e04c79a80966a559fe
related-to-bug:
5466057
Eric Laurent [Tue, 18 Oct 2011 22:42:27 +0000 (15:42 -0700)]
Limit AudioFlinger log.
AudioFlinger logs a warning when a write to the audio HAL
takes too long to return. The threshold for this warning is
a rule of thumb based on the assumption that the audio HAL will consume
buffers at a regular pace.
The introduction of low power audio mode with larger buffers and writes
occuring in bursts makes that this threshold is often exceeded resulting
in excessive and misleading warnings.
The threshold is raised to remove unwanted warnings but we should reconsider
the usefulness of this warning altogether.
Change-Id: I5ef6898ea28d879cede3e47da542a64092a3cca4
The Android Automerger [Tue, 18 Oct 2011 14:00:16 +0000 (07:00 -0700)]
merge in ics-release history after reset to master
Chih-Chung Chang [Tue, 18 Oct 2011 02:42:14 +0000 (19:42 -0700)]
am
a84e37f3: Merge "Fix
5468644: Use the proper audio stream type to play sound." into ics-mr0
* commit '
a84e37f37c7cd21fe498a923c181d3896e055d56':
Fix
5468644: Use the proper audio stream type to play sound.
Chih-Chung Chang [Tue, 18 Oct 2011 02:40:12 +0000 (19:40 -0700)]
Merge "Fix
5468644: Use the proper audio stream type to play sound." into ics-mr0
Dave Burke [Tue, 18 Oct 2011 01:36:48 +0000 (18:36 -0700)]
am
6f13adb2: Merge "Don\'t hold onto the lock while reconnecting to the server" into ics-mr0
* commit '
6f13adb22afcb47a1cd45a90eaa3c154522089d4':
Don't hold onto the lock while reconnecting to the server
Dave Burke [Tue, 18 Oct 2011 01:35:11 +0000 (18:35 -0700)]
Merge "Don't hold onto the lock while reconnecting to the server" into ics-mr0
Andreas Huber [Mon, 17 Oct 2011 22:49:01 +0000 (15:49 -0700)]
Don't hold onto the lock while reconnecting to the server
to avoid stalling the readers.
Change-Id: I73b646587c8a654a73ff7d800c0f17bd78001855
Chih-Chung Chang [Mon, 17 Oct 2011 11:03:12 +0000 (19:03 +0800)]
Fix
5468644: Use the proper audio stream type to play sound.
Change-Id: I80dd37da277b1810959a2dbdd852078b26f70cf5
The Android Automerger [Sun, 16 Oct 2011 14:00:14 +0000 (07:00 -0700)]
merge in ics-release history after reset to master
Andreas Huber [Tue, 11 Oct 2011 22:24:07 +0000 (15:24 -0700)]
NuPlayer is now taking on the task of streaming over RTSP.
Change-Id: Ie204db8810807f1e7981959e34dc0149e5d9563a
Andreas Huber [Thu, 13 Oct 2011 17:03:26 +0000 (10:03 -0700)]
Merge "Support for an MPEG2 Program Stream extractor."
Mike Lockwood [Thu, 13 Oct 2011 15:38:20 +0000 (11:38 -0400)]
MtpServer: Pass 0xFFFFFFFF for file size when receiving files >= 4GB in size
Bug:
5432487
Change-Id: Ie86e72d9d85476941eab6a9d271948b8fdde6926
Signed-off-by: Mike Lockwood <lockwood@android.com>
The Android Automerger [Thu, 13 Oct 2011 14:00:09 +0000 (07:00 -0700)]
merge in ics-release history after reset to master
Wu-cheng Li [Wed, 12 Oct 2011 11:43:51 +0000 (19:43 +0800)]
Improve camera javadoc and fix some errors.
bug:
5169599
Change-Id: Ic2205770753ff462135f884fee0a888ca8ec832d
Andreas Huber [Wed, 12 Oct 2011 20:51:05 +0000 (13:51 -0700)]
Merge "Assume a PTS of 0 if absent, don't bail on fragmented PES packets not having PTS" into ics-mr0
Andreas Huber [Wed, 12 Oct 2011 19:14:23 +0000 (12:14 -0700)]
Assume a PTS of 0 if absent, don't bail on fragmented PES packets not having PTS
Change-Id: I3b31f08428fb7195b98f145ae0675006c8756de1
related-to-bug:
5450187
Eino-Ville Talvala [Tue, 11 Oct 2011 19:41:58 +0000 (12:41 -0700)]
Add video stabilization control to Camera parameters.
Hardware video stabilization reduces camera shake in preview
and in recorded videos. It has no effect on still image capture.
Convenience accessor methods hidden for now.
Change-Id: Ie18450bff662b2ef98b85d19719beefc180975fc
The Android Automerger [Tue, 11 Oct 2011 12:33:28 +0000 (05:33 -0700)]
merge in ics-release history after reset to master
Andreas Huber [Fri, 7 Oct 2011 20:40:45 +0000 (13:40 -0700)]
YouTube can now request custom cache/prefetch parameters and disconnect-at-highwater
through the use of pseudo http headers specified in the setDataSource call.
x-cache-config: -1/-1/0
x-disconnect-at-highwatermark: 1
turns off keep-alives and disconnects every time the cache is full (will attempt
to reconnect once it run below lowwater mark)
related-to-bug:
5433309
Change-Id: Id2f942fc956e0e156834cfcd6bb08dae6a29fae1
The Android Automerger [Sun, 9 Oct 2011 14:00:35 +0000 (07:00 -0700)]
merge in ics-release history after reset to master
Andreas Huber [Fri, 7 Oct 2011 17:08:48 +0000 (10:08 -0700)]
Merge "Specifying -1 for both low and highwater marks would not actually do the right thing"
Andreas Huber [Fri, 7 Oct 2011 17:00:38 +0000 (10:00 -0700)]
Specifying -1 for both low and highwater marks would not actually do the right thing
before this change. Also make it more consistent in that specifying -1 for the
keepalive settings specifies the default.
Change-Id: I086f530fbf42abce66d1c8e61157215cb474e044
Tyler Luu [Thu, 6 Oct 2011 05:00:03 +0000 (00:00 -0500)]
Add initialize method to CameraHardwareInterface
Add intialize() method to CameraHardwareInterface so we can
return a proper error value to CameraService if open of camera
hardware module fails.
b/
5405235
Change-Id: I09c627034ddd22a5753c5163392c4fcff301e0b9
Signed-off-by: Tyler Luu <tluu@ti.com>
Signed-off-by: Iliyan Malchev <malchev@google.com>
Andreas Huber [Fri, 7 Oct 2011 14:59:35 +0000 (07:59 -0700)]
Merge "Allow a system property "media.stagefright.cache-params" to override cache/prefetcher"
Chih-Chung Chang [Fri, 7 Oct 2011 10:20:26 +0000 (03:20 -0700)]
Merge "Allow shutter/recording sound to be adjusted unless it's forced."
Wu-cheng Li [Fri, 7 Oct 2011 10:08:23 +0000 (03:08 -0700)]
Merge "Allow Camera.setDisplayOrientation to be called when preview is active."
Wu-cheng Li [Fri, 7 Oct 2011 05:13:54 +0000 (13:13 +0800)]
Allow Camera.setDisplayOrientation to be called when preview is active.
bug:
5422679
Change-Id: I4c936ab00428fc158b5947fe8f10b1028869bbdb