OSDN Git Service
James Dong [Fri, 11 Nov 2011 15:34:21 +0000 (15:34 +0000)]
am
510180f1: am
08e42967: Merge "Add support for retrieving location information in mp4/3gpp files" into ics-mr1
* commit '
510180f162dee3ae5416a98caa07f58a754f4b3f':
Add support for retrieving location information in mp4/3gpp files
James Dong [Fri, 11 Nov 2011 15:28:32 +0000 (15:28 +0000)]
am
08e42967: Merge "Add support for retrieving location information in mp4/3gpp files" into ics-mr1
* commit '
08e42967b9e459b7beb22e859f1f1eba0546741b':
Add support for retrieving location information in mp4/3gpp files
James Dong [Fri, 11 Nov 2011 00:14:56 +0000 (16:14 -0800)]
Merge "Adds handler type 'sbtl' to support subtitles in various containers."
Glenn Kasten [Thu, 10 Nov 2011 23:14:12 +0000 (15:14 -0800)]
Merge "Fix log message"
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
The Android Open Source Project [Thu, 10 Nov 2011 22:53:50 +0000 (14:53 -0800)]
Reconcile with ics-mr1-release
Change-Id: I86cac837a23dff6367af0e69d07ad3983845ff1e
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
Andreas Huber [Thu, 10 Nov 2011 19:39:38 +0000 (19:39 +0000)]
am
9e2949c6: am
2375d163: Merge "Send RTSP control connection keep-alive requests" into ics-mr1
* commit '
9e2949c6ab4e791b5c20d5e85c3eff62f206a99b':
Send RTSP control connection keep-alive requests
Andreas Huber [Thu, 10 Nov 2011 19:39:36 +0000 (19:39 +0000)]
am
2dff5cdc: am
b42aea5b: Merge "Don\'t believe the PV decoder\'s lies..." into ics-mr1
* commit '
2dff5cdc362ff6026e71d4b96faea8f2d7bd7063':
Don't believe the PV decoder's lies...
Andreas Huber [Thu, 10 Nov 2011 19:39:34 +0000 (19:39 +0000)]
am
ec04f4ac: am
7c063cf9: Merge "There\'s no point in trying to continue to decode after an error was signalled." into ics-mr1
* commit '
ec04f4ac23e5fe8f90267d09ddda8c0aa684c147':
There's no point in trying to continue to decode after an error was signalled.
Andreas Huber [Thu, 10 Nov 2011 16:51:59 +0000 (16:51 +0000)]
am
2375d163: Merge "Send RTSP control connection keep-alive requests" into ics-mr1
* commit '
2375d16378e6f8b7694c5a2cd9e0622e382e6049':
Send RTSP control connection keep-alive requests
Andreas Huber [Thu, 10 Nov 2011 16:51:58 +0000 (16:51 +0000)]
am
b42aea5b: Merge "Don\'t believe the PV decoder\'s lies..." into ics-mr1
* commit '
b42aea5b4c7cc7b2766f80f5ceda94b324d776e5':
Don't believe the PV decoder's lies...
Andreas Huber [Thu, 10 Nov 2011 16:48:53 +0000 (16:48 +0000)]
am
7c063cf9: Merge "There\'s no point in trying to continue to decode after an error was signalled." into ics-mr1
* commit '
7c063cf9679a2ecdda5e1639cfdca3e1084019f9':
There's no point in trying to continue to decode after an error was signalled.
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
Insun Kang [Thu, 10 Nov 2011 07:11:26 +0000 (16:11 +0900)]
Adds handler type 'sbtl' to support subtitles in various containers.
Change-Id: I16d2c5d9aeb087b958e28052f266ca0ef42ea7f1
Glenn Kasten [Thu, 10 Nov 2011 01:11:35 +0000 (01:11 +0000)]
am
874641f1: am
f2c2b1c4: am
19998120: Merge "Bug
5478024 drop after decode if can\'t drop before" into ics-mr0
* commit '
874641f1331f3b37e8b2d930ed942fb6ca522501':
Eric Laurent [Thu, 10 Nov 2011 01:11:28 +0000 (01:11 +0000)]
am
db7d79e6: am
2b7f91b9: Merge "Fix regression for SoundPool playback" into ics-mr1
* commit '
db7d79e6f1e1860a9bfe4756a03c753435fd0ddf':
Fix regression for SoundPool playback
Andreas Huber [Wed, 9 Nov 2011 22:47:51 +0000 (14:47 -0800)]
Merge "Instead of asserting, remove active streams if their sockets return failure"
Andreas Huber [Wed, 9 Nov 2011 22:26:43 +0000 (14:26 -0800)]
Instead of asserting, remove active streams if their sockets return failure
Change-Id: Ic5cc786f718cf921876b181927cf1b03e8373ff1
related-to-bug:
5593654
Glenn Kasten [Wed, 9 Nov 2011 21:19:00 +0000 (21:19 +0000)]
am
bb1b7d5c: am
19998120: Merge "Bug
5478024 drop after decode if can\'t drop before" into ics-mr0
* commit '
bb1b7d5cb3c5502484269bfd0cdcd0d5a6d6bfad':
Bug
5478024 drop after decode if can't drop before
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
The Android Automerger [Wed, 9 Nov 2011 18:06:07 +0000 (10:06 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
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:44:51 +0000 (16:44 +0000)]
am
f2c2b1c4: am
19998120: Merge "Bug
5478024 drop after decode if can\'t drop before" into ics-mr0
* commit '
f2c2b1c484b7b175c88c33efbbcb74d93f7eb0a2':
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 16:29:04 +0000 (16:29 +0000)]
am
2b7f91b9: Merge "Fix regression for SoundPool playback" into ics-mr1
* commit '
2b7f91b932be0aa9ce6fa3acda9ff439e94643fc':
Fix regression for SoundPool playback
The Android Automerger [Wed, 9 Nov 2011 14:47:03 +0000 (06:47 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Glenn Kasten [Wed, 9 Nov 2011 14:35:18 +0000 (14:35 +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 18:40:20 +0000 (10:40 -0800)]
resolved conflicts for merge of
26f70db9 to master
Change-Id: Ib1536b1a4c9eeff80e0726b3e61cee12057cd120
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:37:11 +0000 (16:37 +0000)]
am
f3a892ab: Merge "AudioFlinger: mix track only when really ready" into ics-mr1
* commit '
f3a892ab9347ce733b81ccb4913a91c586f8f367':
AudioFlinger: mix track only when really ready
Eric Laurent [Tue, 8 Nov 2011 16:32:57 +0000 (08:32 -0800)]
Merge "AudioFlinger: mix track only when really ready" into ics-mr1
The Android Automerger [Tue, 8 Nov 2011 14:45:56 +0000 (06:45 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
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
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 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
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: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 [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: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