OSDN Git Service
Andreas Huber [Mon, 10 Oct 2011 19:46:52 +0000 (12:46 -0700)]
am
a5da78f0: Merge "YouTube can now request custom cache/prefetch parameters and disconnect-at-highwater"
* commit '
a5da78f09df49ed379028ccaaa383c68dcb58397':
YouTube can now request custom cache/prefetch parameters and disconnect-at-highwater
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
Andreas Huber [Fri, 7 Oct 2011 17:10:20 +0000 (10:10 -0700)]
am
41c95f36: Merge "Specifying -1 for both low and highwater marks would not actually do the right thing"
* commit '
41c95f3642323ec4cfdc84a3bb70537af0da8cca':
Specifying -1 for both low and highwater marks would not actually do the right thing
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
Iliyan Malchev [Fri, 7 Oct 2011 16:58:26 +0000 (09:58 -0700)]
am
851a14eb: Merge "Add initialize method to CameraHardwareInterface"
* commit '
851a14eb9443996f29617e84dd8b66281876ae8e':
Add initialize method to CameraHardwareInterface
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 15:01:49 +0000 (08:01 -0700)]
am
59797e6b: Merge "Allow a system property "media.stagefright.cache-params" to override cache/prefetcher"
* commit '
59797e6bece0ac2d649d8d93d02ed81979950145':
Allow a system property "media.stagefright.cache-params" to override cache/prefetcher
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 12:46:43 +0000 (05:46 -0700)]
am
17f25410: Merge "Allow shutter/recording sound to be adjusted unless it\'s forced."
* commit '
17f254105b399c7a4216da2d477e7f9cbdbd7319':
Allow shutter/recording sound to be adjusted unless it's forced.
Wu-cheng Li [Fri, 7 Oct 2011 12:46:42 +0000 (05:46 -0700)]
am
3c02c12c: Merge "Allow Camera.setDisplayOrientation to be called when preview is active."
* commit '
3c02c12c73fa8719e49a5da6534750196efe3eba':
Allow Camera.setDisplayOrientation to be called when preview is active.
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
Chih-Chung Chang [Fri, 7 Oct 2011 05:37:42 +0000 (13:37 +0800)]
Allow shutter/recording sound to be adjusted unless it's forced.
Change-Id: I7080d5f50a87f92c8e9395d4cf8f927a6760fa70
James Dong [Fri, 7 Oct 2011 03:40:14 +0000 (20:40 -0700)]
am
f3c00568: Merge "Fix an issue where we should allow negative values but did not"
* commit '
f3c00568163b186202cab8d79b2f11eeacb88646':
Fix an issue where we should allow negative values but did not
James Dong [Fri, 7 Oct 2011 03:38:29 +0000 (20:38 -0700)]
Merge "Fix an issue where we should allow negative values but did not"
Andreas Huber [Wed, 5 Oct 2011 21:32:17 +0000 (14:32 -0700)]
Allow a system property "media.stagefright.cache-params" to override cache/prefetcher
default parameters. To override specify a property
adb shell setprop media.stagefright.cache-params "4096/20480/15" to
set the low water threshold to 4096 KB, the high water threshold to 20 MB
and the keepalive interval to 15 secs.
if high and/or lowwater mark are negative, the default values are used for
the respective value.
if keep-alive interval is 0, keep-alives are disabled.
Change-Id: I89a4a06836e4a2f473d7a92b567ab07818c2f87d
Andreas Huber [Thu, 6 Oct 2011 16:18:07 +0000 (09:18 -0700)]
am
beedd862: Merge "Return a runtime error instead of assertion if seeking beyond EOS in mpeg4 files."
* commit '
beedd8627a82007de61480c9e794dd967b708ded':
Return a runtime error instead of assertion if seeking beyond EOS in mpeg4 files.
Andreas Huber [Thu, 6 Oct 2011 16:17:14 +0000 (09:17 -0700)]
Merge "Return a runtime error instead of assertion if seeking beyond EOS in mpeg4 files."
Andreas Huber [Thu, 6 Oct 2011 16:07:12 +0000 (09:07 -0700)]
Return a runtime error instead of assertion if seeking beyond EOS in mpeg4 files.
Change-Id: If6531b4a1ff45460cfcdcc04764c5c63a2f5a749
related-to-bug:
5418914
James Dong [Thu, 6 Oct 2011 03:02:05 +0000 (20:02 -0700)]
Fix an issue where we should allow negative values but did not
Change-Id: Ia8d718b4e6aec4c17db86e30134132f767fd72c5
related-to-bug:
5419527
Eric Laurent [Thu, 6 Oct 2011 01:04:52 +0000 (18:04 -0700)]
am
3c892288: Merge "Fix issue
5381089: problem with A2DP music volume"
* commit '
3c892288837d165e0273ff1a0f1194c2347d24ac':
Fix issue
5381089: problem with A2DP music volume
Eric Laurent [Thu, 6 Oct 2011 00:42:25 +0000 (17:42 -0700)]
Fix issue
5381089: problem with A2DP music volume
This problem only occurs when audio effects are present and
the music volume is applied by one effect engine.
When connecting or disconnecting A2DP, audio effects are moved from
one mixer thread to another. When removed from the source thread,
the effect is stopped but it is not restarted when added to the
destination thread.
This regression was introduced by commit
21b5c47e.
Change-Id: I4cc578d8d760ec65b185032b6fda98c739d331bc
Andreas Huber [Wed, 5 Oct 2011 17:37:55 +0000 (10:37 -0700)]
am
50dabc5f: Merge "Set crop params to ANative Window during Initialization."
* commit '
50dabc5f0efbe2c4a987579cb2ad94132ee587be':
Set crop params to ANative Window during Initialization.
Lakshman Gowda [Fri, 30 Sep 2011 00:47:35 +0000 (17:47 -0700)]
Set crop params to ANative Window during Initialization.
The native_window_set_crop() is called when port reconfig event callback comes from decoder's and
crop parameters are changed from default getconfig() OMX_IndexConfigCommonOutputCrop values.
Since the default crop params are same as port reconfig crop params, the native_window_set_crop()
is not called, hence resulting in displaying the whole frame(paddedWidth x paddedHeight).
By calling native_window_set_crop() during initilaization of output port of decoder ensures
in setting up ANative window to crop region.
Change-Id: I68926464a1f5c7e6053804615c8b9bd32ea85688
Signed-off-by: Lakshman Gowda <lakshman79@ti.com>
Andreas Huber [Fri, 30 Sep 2011 18:14:38 +0000 (11:14 -0700)]
am
cb52d012: Merge "Gracefuly return on detecting wrong AAC format from corrupted files"
* commit '
cb52d012e910b86d3562d4cad32d66e17986e286':
Gracefuly return on detecting wrong AAC format from corrupted files
Gilles-Arnaud Bleu-Laine [Fri, 16 Sep 2011 02:30:13 +0000 (21:30 -0500)]
Gracefuly return on detecting wrong AAC format from corrupted files
Return BAD_VALUE error upon detection of wrongly formatted files.
The client should abort the initialization upon error detection.
The current CHECK() interrupts the configurecodec() preventing a graceful
exit.
Change-Id: Ic79313fa76a63284897df5d91635de87d06f3100
Signed-off-by: Gilles-Arnaud Bleu-Laine <gilles@ti.com>
Andreas Huber [Wed, 28 Sep 2011 23:11:32 +0000 (16:11 -0700)]
am
0044a15e: Merge "Support multiple NAL fragments per .mkv payload"
* commit '
0044a15eb92588372e21fa56a02fbed396cb5e02':
Support multiple NAL fragments per .mkv payload
Andreas Huber [Wed, 28 Sep 2011 23:08:59 +0000 (16:08 -0700)]
Merge "Support multiple NAL fragments per .mkv payload"
Andreas Huber [Wed, 28 Sep 2011 22:06:46 +0000 (15:06 -0700)]
Support multiple NAL fragments per .mkv payload
Apparently the payload for an h.264 track in an .mkv file can contain multiple
NAL fragments, we used to discard everything after the first one before, now
we preserve them all.
Change-Id: Ic7187365309f3880a3256982879a45df50db697d
related-to-bug:
5337218
James Dong [Wed, 28 Sep 2011 20:48:00 +0000 (13:48 -0700)]
am
5e28463d: Merge "Flush resets the count of played audio frames"
* commit '
5e28463dc4d12802d173018c572f73e13ba50722':
Flush resets the count of played audio frames
James Dong [Wed, 28 Sep 2011 20:46:49 +0000 (13:46 -0700)]
Merge "Flush resets the count of played audio frames"
Andreas Huber [Wed, 28 Sep 2011 20:15:20 +0000 (13:15 -0700)]
am
781ae92f: Merge "Support AMR, G.711 and vorbis audio in ACodec and friends."
* commit '
781ae92f11ff136b99acb56cc361ad662d9cb6b9':
Support AMR, G.711 and vorbis audio in ACodec and friends.
Andreas Huber [Wed, 28 Sep 2011 19:37:36 +0000 (12:37 -0700)]
Support AMR, G.711 and vorbis audio in ACodec and friends.
Change-Id: I08c03219bf2d60fc5c6e89957bd4b4c615570983
James Dong [Wed, 28 Sep 2011 05:47:25 +0000 (22:47 -0700)]
Flush resets the count of played audio frames
Change-Id: I0cda94646a71757fa113a199d29235e13efd7ac3
related-to-bug:
5331470
Andreas Huber [Wed, 28 Sep 2011 02:20:19 +0000 (19:20 -0700)]
am
d4fb497c: Merge "Cut down on AwesomePlayer and OMXCodec\'s verbosity."
* commit '
d4fb497cf4606abf61ec690ed971523ff9d05eac':
Cut down on AwesomePlayer and OMXCodec's verbosity.
Andreas Huber [Tue, 27 Sep 2011 22:26:43 +0000 (15:26 -0700)]
Merge "Cut down on AwesomePlayer and OMXCodec's verbosity."
Andreas Huber [Tue, 27 Sep 2011 22:05:40 +0000 (15:05 -0700)]
Cut down on AwesomePlayer and OMXCodec's verbosity.
Change-Id: Ifd95717e8ea0fb0327099b16d72a6ed58c7c9924
related-to-bug:
5382014
Eric Laurent [Tue, 27 Sep 2011 21:09:37 +0000 (14:09 -0700)]
am
ab7ed38d: Merge "Fix issue
5373658: memory leak in AudioFlinger."
* commit '
ab7ed38d5fea82db64eb90bad9d4c646d61d15df':
Fix issue
5373658: memory leak in AudioFlinger.
Eric Laurent [Tue, 27 Sep 2011 21:07:45 +0000 (14:07 -0700)]
Merge "Fix issue
5373658: memory leak in AudioFlinger."
Andreas Huber [Tue, 27 Sep 2011 20:38:05 +0000 (13:38 -0700)]
am
d33b3881: Merge "Signal an appropriate error even if there are no active streams yet."
* commit '
d33b3881f7647e721181c46f9166ee139cec7e38':
Signal an appropriate error even if there are no active streams yet.
Andreas Huber [Tue, 27 Sep 2011 20:36:22 +0000 (13:36 -0700)]
Merge "Signal an appropriate error even if there are no active streams yet."
Andreas Huber [Tue, 27 Sep 2011 19:12:25 +0000 (12:12 -0700)]
Signal an appropriate error even if there are no active streams yet.
Change-Id: I3ac1053ad288558b62ee18056dfd0a9ce0da8f49
related-to-bug:
5372901
Eric Laurent [Tue, 27 Sep 2011 19:07:15 +0000 (12:07 -0700)]
Fix issue
5373658: memory leak in AudioFlinger.
Unlink PowerManagerService binder interface death recipient
in ThreadBase destructor.
Change-Id: Iab06ae9a8a6737bb002b6416a157b0fb50c11ad5
Eric Laurent [Tue, 27 Sep 2011 17:40:33 +0000 (10:40 -0700)]
am
53719fc4: Merge "Fix issue
5373048: AudioCache decode errors"
* commit '
53719fc4c5c441e8696f26bbfb9166b0bd19ef29':
Fix issue
5373048: AudioCache decode errors
Eric Laurent [Tue, 27 Sep 2011 17:32:17 +0000 (10:32 -0700)]
Merge "Fix issue
5373048: AudioCache decode errors"
Eric Laurent [Tue, 27 Sep 2011 16:48:56 +0000 (09:48 -0700)]
Fix issue
5373048: AudioCache decode errors
When decoding a file for the SoundPool, do not
reject the entire file in case of error but
return what was decoded so far instead.
Change-Id: Iff199a1b6a4c8e064e42a0dfe0704e0ae36a27fd
The Android Open Source Project [Mon, 26 Sep 2011 19:13:33 +0000 (12:13 -0700)]
am
4da465a0: Reconcile with ics-factoryrom-release
* commit '
4da465a056f7a7322a5a4a0f235fe20e525a6eae':
Don't crash during full backup when CheckJNI is enabled
The Android Open Source Project [Mon, 26 Sep 2011 19:11:29 +0000 (12:11 -0700)]
Reconcile with ics-factoryrom-release
Change-Id: I4096cbbfd0bae1f7c08c9731f522529d3895d2d8
Andreas Huber [Mon, 26 Sep 2011 18:28:19 +0000 (11:28 -0700)]
am
d359b575: Merge "Properly connect to surface flinger in our shell tools"
* commit '
d359b575f7cc0ac36caacf7bbdcaef3394830a25':
Properly connect to surface flinger in our shell tools
Andreas Huber [Mon, 26 Sep 2011 18:26:59 +0000 (11:26 -0700)]
Merge "Properly connect to surface flinger in our shell tools"
Andreas Huber [Mon, 26 Sep 2011 18:04:49 +0000 (11:04 -0700)]
am
48719dc6: Merge "Propagate error signalled by the source all the way to the output EOS notification."
* commit '
48719dc6221fdfbc3cc49a21166b136577fe37b9':
Propagate error signalled by the source all the way to the output EOS notification.
Andreas Huber [Mon, 26 Sep 2011 17:53:29 +0000 (10:53 -0700)]
Propagate error signalled by the source all the way to the output EOS notification.
Change-Id: I30e959a6d669f09745c59fbdebee08f869511cf7
related-to-bug:
5372901
Andreas Huber [Mon, 26 Sep 2011 15:10:51 +0000 (08:10 -0700)]
am
3bade950: Merge "Support even more .avi files with .mp3 content not aligned to chunk boundaries"
* commit '
3bade9504a648ce7606b876dc7d71b4684e279c9':
Support even more .avi files with .mp3 content not aligned to chunk boundaries
Andreas Huber [Mon, 26 Sep 2011 15:09:11 +0000 (08:09 -0700)]
Merge "Support even more .avi files with .mp3 content not aligned to chunk boundaries"
Andreas Huber [Fri, 23 Sep 2011 21:05:49 +0000 (14:05 -0700)]
Support even more .avi files with .mp3 content not aligned to chunk boundaries
Change-Id: I3ace4118e2e519648c23c51d0b699ba0d7511a5d
related-to-bug:
5349382
Eric Laurent [Fri, 23 Sep 2011 21:44:38 +0000 (14:44 -0700)]
am
65837ced: Merge "Fix issue
5355047: Automated effect tests fail."
* commit '
65837cede462b551742f900f2e2f5a1d5dd576a2':
Fix issue
5355047: Automated effect tests fail.
Eric Laurent [Fri, 23 Sep 2011 21:43:12 +0000 (14:43 -0700)]
Merge "Fix issue
5355047: Automated effect tests fail."
Andreas Huber [Fri, 23 Sep 2011 18:36:49 +0000 (11:36 -0700)]
am
7fa3b435: Merge "Add an option to dump the raw stream to a file in the stagefright cmdline tool."
* commit '
7fa3b435d67e3ba2c879431f44e262c40716ebd8':
Add an option to dump the raw stream to a file in the stagefright cmdline tool.
The Android Automerger [Fri, 23 Sep 2011 18:35:01 +0000 (11:35 -0700)]
merge in ics-factoryrom-release history after reset to ics-factoryrom
Andreas Huber [Fri, 23 Sep 2011 18:27:51 +0000 (11:27 -0700)]
Merge "Add an option to dump the raw stream to a file in the stagefright cmdline tool."
Andreas Huber [Fri, 23 Sep 2011 17:25:32 +0000 (10:25 -0700)]
Add an option to dump the raw stream to a file in the stagefright cmdline tool.
Change-Id: Ie19eca2cdf162d6973037ec554ef5916243ea7d7
Eric Laurent [Fri, 23 Sep 2011 15:40:41 +0000 (08:40 -0700)]
Fix issue
5355047: Automated effect tests fail.
Fixed several regressions in automated audio effect tests due
to changes in effect framework and visualizer FFT output range.
- Do not suspend Volume effect on session 0 when effects are
enabled on specific sessions.
- Adapt energy detection thresholds to new visualizer FFT range.
- Leave more time for BassBoost and Virtualizer effects to ramp up
before measuring the effect.
- Removed second insert reverb left by mistake on the player session
in preset reverb test.
Change-Id: I7a1ad1372d783fa7900eb9dd1d3b47f54d8d766f
Wei Huang [Fri, 23 Sep 2011 17:07:33 +0000 (10:07 -0700)]
am
e448f557: am
3d9a9e55: Merge "Update camera javadoc about AE and AWB lock." into ics-factoryrom
* commit '
e448f557f620ae30dcead7a4423059dfb7d70add':
Update camera javadoc about AE and AWB lock.
Wei Huang [Fri, 23 Sep 2011 17:05:22 +0000 (10:05 -0700)]
am
3d9a9e55: Merge "Update camera javadoc about AE and AWB lock." into ics-factoryrom
* commit '
3d9a9e55df85c720573e69ec3062efc331ea69bb':
Update camera javadoc about AE and AWB lock.
Wei Huang [Fri, 23 Sep 2011 17:04:02 +0000 (10:04 -0700)]
Merge "Update camera javadoc about AE and AWB lock." into ics-factoryrom
Pannag Sanketi [Fri, 23 Sep 2011 16:10:41 +0000 (09:10 -0700)]
am
91d34137: am
1d71c7b4: Merge "Returning EOS in SurfaceMediaSource:read" into ics-factoryrom
* commit '
91d34137903c278e5e077fa1edef9bbbcdd140f7':
Returning EOS in SurfaceMediaSource:read
Pannag Sanketi [Fri, 23 Sep 2011 16:08:11 +0000 (09:08 -0700)]
am
1d71c7b4: Merge "Returning EOS in SurfaceMediaSource:read" into ics-factoryrom
* commit '
1d71c7b40a7f38487e602e78f45279b6a8364fc9':
Returning EOS in SurfaceMediaSource:read
Pannag Sanketi [Fri, 23 Sep 2011 00:03:48 +0000 (17:03 -0700)]
Returning EOS in SurfaceMediaSource:read
In SurfaceMediaSource::read, if disconnect has already been called, then
ERROR_END_OF_STREAM should be returned rather that NO_INIT. Else, it
sometimes leads to a crash in mediarecorder stop() call.
Related to FactoryROM bug:
5332812
Change-Id: I22132538ab2501d084e0283876817b1ec3f64a1d
Wu-cheng Li [Thu, 22 Sep 2011 03:43:28 +0000 (11:43 +0800)]
Update camera javadoc about AE and AWB lock.
- Autofocus does not lock AE and AWB.
- stopPreview and takePicture do not clear AE and AWB locks.
bug:
5356404
Change-Id: I55d9b35f4ff746ecd2bff112c2674f1aa2543aca
Edwin Wong [Thu, 22 Sep 2011 06:08:10 +0000 (23:08 -0700)]
am
013ccb70: Merge "Modified loadPlugIns to load from /vendor and /system; skip libraries that are already loaded. BUG:
5284436"
* commit '
013ccb7010ac9a231eb737ed268acb4b9653b268':
Modified loadPlugIns to load from /vendor and /system; skip libraries that are already loaded. BUG:
5284436
Edwin Wong [Thu, 22 Sep 2011 06:05:57 +0000 (23:05 -0700)]
Merge "Modified loadPlugIns to load from /vendor and /system; skip libraries that are already loaded. BUG:
5284436"
Edwin Wong [Thu, 22 Sep 2011 02:18:30 +0000 (19:18 -0700)]
Modified loadPlugIns to load from /vendor and /system; skip libraries that are already loaded.
BUG:
5284436
Change-Id: I99267c81a488860c3c7edb747100d44f3083bfc2
Andreas Huber [Wed, 21 Sep 2011 20:57:54 +0000 (13:57 -0700)]
am
bfd1c9d9: Merge "Support some .avi files containing H.264 video, log warnings if audio/video unsupported"
* commit '
bfd1c9d93f47040bc52a1fbdc8ae81502a6f4b23':
Support some .avi files containing H.264 video, log warnings if audio/video unsupported
Andreas Huber [Wed, 21 Sep 2011 20:56:09 +0000 (13:56 -0700)]
Merge "Support some .avi files containing H.264 video, log warnings if audio/video unsupported"
Andreas Huber [Wed, 21 Sep 2011 20:19:54 +0000 (13:19 -0700)]
Support some .avi files containing H.264 video, log warnings if audio/video unsupported
Change-Id: Ie7280f25f2bd19f32234c08673e64ceb65833677
related-to-bug:
5349382
Glenn Kasten [Wed, 21 Sep 2011 17:54:07 +0000 (10:54 -0700)]
am
faa75f61: Merge "Bug
5234242 audio continues after discontinuity"
* commit '
faa75f6146165016685291084ca79ddd377411b4':
Bug
5234242 audio continues after discontinuity
Glenn Kasten [Wed, 21 Sep 2011 17:40:01 +0000 (10:40 -0700)]
Bug
5234242 audio continues after discontinuity
Reduce to 8 buffers of 10 packets from 16 buffers of 20 packets.
Change-Id: Ifdb5e15535989fbb6e5e1b70d5f9f71dc66a5c83
The Android Open Source Project [Tue, 20 Sep 2011 21:14:41 +0000 (14:14 -0700)]
am
3617cb65: Reconcile with ics-factoryrom-release
* commit '
3617cb652158c136b4b79f0e69d905794fc12843':
Add QVGA resolution to CamcorderProfile
Add PROPERTY_IMS_REG_REQUIRED.
James Dong [Tue, 20 Sep 2011 21:13:50 +0000 (14:13 -0700)]
am
3907c79a: am
92d0a64b: Merge "Add QVGA resolution to CamcorderProfile" into ics-factoryrom
* commit '
3907c79aebf8621a5a4880c9e66db3c49a44f359':
Add QVGA resolution to CamcorderProfile
Andreas Huber [Thu, 15 Sep 2011 19:42:32 +0000 (12:42 -0700)]
Properly connect to surface flinger in our shell tools
Also raise the layer to INT_MAX to float in front of the toolbar.
Change-Id: I045a1c83924e6655f1734d15f2504b90312eec64
The Android Open Source Project [Tue, 20 Sep 2011 14:43:10 +0000 (07:43 -0700)]
Reconcile with ics-factoryrom-release
Change-Id: I8bb64c1b31c7158d931fd9f7be8a9e5b317c5252
The Android Automerger [Tue, 20 Sep 2011 13:28:15 +0000 (06:28 -0700)]
merge in ics-factoryrom-release history after reset to ics-factoryrom
James Dong [Mon, 19 Sep 2011 23:27:31 +0000 (16:27 -0700)]
Add QVGA resolution to CamcorderProfile
Change-Id: Icebbafb68d8164370f98a2c36699845d10ef081b
related-to-bug:
5145483
James Dong [Tue, 20 Sep 2011 03:09:00 +0000 (20:09 -0700)]
am
92d0a64b: Merge "Add QVGA resolution to CamcorderProfile" into ics-factoryrom
* commit '
92d0a64b909cd95e8f4ce587438b0cc6d2daeaa0':
Add QVGA resolution to CamcorderProfile
James Dong [Mon, 19 Sep 2011 23:27:31 +0000 (16:27 -0700)]
Add QVGA resolution to CamcorderProfile
Change-Id: Icebbafb68d8164370f98a2c36699845d10ef081b
related-to-bug:
5145483
Andreas Huber [Mon, 19 Sep 2011 20:30:05 +0000 (13:30 -0700)]
am
e2bb9960: Merge "Remove an O(n^2) algorithm in MPEG4Extractor.cpp to speed up seeks in long streams"
* commit '
e2bb99600e3a6eed97d2739f62c84998180a705d':
Remove an O(n^2) algorithm in MPEG4Extractor.cpp to speed up seeks in long streams
Andreas Huber [Mon, 19 Sep 2011 19:18:47 +0000 (12:18 -0700)]
Remove an O(n^2) algorithm in MPEG4Extractor.cpp to speed up seeks in long streams
containing B-frames.
Change-Id: Ie4dc734d2c2d5a5ce84674bb883f4b27e2278642
related-to-bug:
5336497
Andreas Huber [Mon, 19 Sep 2011 16:44:48 +0000 (09:44 -0700)]
am
c7342fbf: Merge "In order to recover from video lagging behind audio, drop avc frames"
* commit '
c7342fbf992091cd37bb34b8fac2e6b6ca47fdf5':
In order to recover from video lagging behind audio, drop avc frames
Andreas Huber [Mon, 19 Sep 2011 15:54:59 +0000 (08:54 -0700)]
Merge "In order to recover from video lagging behind audio, drop avc frames"
Jason Simmons [Fri, 16 Sep 2011 23:11:42 +0000 (16:11 -0700)]
Merge "Configure the A@H TX media player with one string" into ics-aah
Jason Simmons [Fri, 16 Sep 2011 20:46:40 +0000 (13:46 -0700)]
Configure the A@H TX media player with one string
Music2 would prefer a configuration interface that takes a single
blob of data passed in from the RPC client and then passes it
opaquely to the media player. This eliminates the need for Music2
to rev their application if we add more configuration options to
the TX player.
Change-Id: I9008dab6ab94316a6ca4c1ac605bd026545bc28e
Andreas Huber [Fri, 16 Sep 2011 22:09:22 +0000 (15:09 -0700)]
In order to recover from video lagging behind audio, drop avc frames
that are not referenced by other frames before feeding them into the decoder.
Change-Id: I822190af8f8329567bff8da1ea23136d0a765481
Nick Kralevich [Fri, 16 Sep 2011 20:57:35 +0000 (13:57 -0700)]
am
9404e1fb: Merge "AudioResampler: use relative instead of absolute labels"
* commit '
9404e1fbd983c16667b9ec31941038c7af2df803':
AudioResampler: use relative instead of absolute labels
Nick Kralevich [Fri, 16 Sep 2011 20:56:16 +0000 (13:56 -0700)]
Merge "AudioResampler: use relative instead of absolute labels"
Nick Kralevich [Fri, 16 Sep 2011 20:14:16 +0000 (13:14 -0700)]
AudioResampler: use relative instead of absolute labels
This change is needed to allow Android to compile with -fPIE
Bug:
5328392
Change-Id: I84d947975776800a7b79c6ac75a881af461a631c
Andreas Huber [Fri, 16 Sep 2011 17:52:30 +0000 (10:52 -0700)]
am
9e7a6fc1: Merge "Various improvements to nuplayer playback"
* commit '
9e7a6fc149c83fcb73a73730e59df985e0286227':
Various improvements to nuplayer playback
Andreas Huber [Thu, 15 Sep 2011 19:25:04 +0000 (12:25 -0700)]
Various improvements to nuplayer playback
- Drastically cut down the number of times we supply the AudioSink with data
by estimating the time until the sink would run out of data and then scheduling
a refill in advance of that.
- Use a dedicated looper for video decoders since they are currently taking
too long to return from OMX_FillThisBuffer (bug
5325201)
- Revise thread priorities for the OMX dispatcher and software codecs, instead
of running them at ANDROID_PRIORITY_AUDIO, they now only run at
ANDROID_PRIORITY_FOREGROUND
- Since threads created by pthread_create inherit all of the parent threads
attributes including thread priority, briefly reset thread priority to
ANDROID_PRIORITY_FOREGROUND before instantiating OMX components and then
restore it.
Change-Id: If9332a3a20dad5485333d68c11de0d2d5d3fffc3
Jason Simmons [Thu, 15 Sep 2011 22:01:17 +0000 (15:01 -0700)]
Merge "Ensure that the TRTP retry buffer has contiguous sequence numbers" into ics-aah