OSDN Git Service
Jean-Baptiste Queru [Tue, 8 May 2012 20:39:19 +0000 (13:39 -0700)]
am
7a789817: (-s ours) Merge "Fixed runtime linkage problems for libOpenSLES and libOpenMAXAL"
* commit '
7a78981743646776bb96a80a45900e53d2cc6ab8':
Fixed runtime linkage problems for libOpenSLES and libOpenMAXAL
Jean-Baptiste Queru [Tue, 8 May 2012 16:23:12 +0000 (09:23 -0700)]
Merge "Fixed runtime linkage problems for libOpenSLES and libOpenMAXAL"
Andrew Hsieh [Tue, 8 May 2012 14:55:10 +0000 (22:55 +0800)]
Fixed runtime linkage problems for libOpenSLES and libOpenMAXAL
Libraries libOpenSLES and libOpenMAXAL depend on liblog but Android.mk
doesn't specify it. Native app links libOpenSLES or libOpenMAXAL
may fail with the following error message (taking
$NDK/samples/native-media as an example)
E/AndroidRuntime( 824): Caused by: java.lang.UnsatisfiedLinkError:
Cannot load library: link_image[2260]: 82 could not load needed
library 'libOpenMAXAL.so' for 'libnative-media-jni.so'
(mips_relocate_got[1804]: 82 In 'libOpenMAXAL.so',
can't locate symbol __android_log_assert)
The root cause is that both libOpenSLES.so and libOpenMAXAL.so depends on
liblog (containing the offending __android_log_assert) but Android makefile
doesn't specify it. The reason that linker doesn't complain about it
is because "--gc-sections" causes linker to "garbage-collect" which
removes unused (in this case "invisible") functions __assert/__assert2
in both shared libraries. Unfortunately, due to a bug (recently fixed
in 2.22.52 http://sourceware.org/bugzilla/show_bug.cgi?id=13811), linker
forgot to also remove references to dead function __android_log_assert
called in __assert/__assert2.
In theory this should affect all Android devices for native app linking
libOpenMAXAL.so or libOpenSLES.so, but it seems at this moment only MIPS-based
device is affected.
Fixed Android.mk to make it explicit.
bug: http://code.google.com/p/android/issues/detail?id=30179
related CL: https://android-review.googlesource.com/#/c/36302/
Change-Id: I61655a77d85f57cf103f9ac51505dc3d58f7c866
Jean-Michel Trivi [Thu, 19 Apr 2012 16:08:11 +0000 (09:08 -0700)]
Merge "Add new scaling mode parameter in Visualizer effect"
Jean-Michel Trivi [Mon, 16 Apr 2012 00:20:23 +0000 (17:20 -0700)]
Add new scaling mode parameter in Visualizer effect
Change-Id: I5c47f5a81891022ff409161aff34d7b2c4b0a2ea
Eino-Ville Talvala [Wed, 11 Apr 2012 23:15:50 +0000 (16:15 -0700)]
Make camera metadata tag definitions more robust to mismatches.
Use array assignment-by-index syntax to make sure we match the desired
index to the entry, so it's easier to keep the metadata header and the
info structures in sync.
Change-Id: I06d1ea3d52c651b447cc167cd551e907c8e001ab
Eino-Ville Talvala [Wed, 4 Apr 2012 22:30:06 +0000 (15:30 -0700)]
Improvements to the camera metadata structure
- Add vendor_tag_query_ops_t as argument to methods inside it.
- Add version and flags fields
- Add sorted flag; additions and appends are not sorted, and thus
reset the flag.
- Add sort method, which sets the sorted flag.
- Add find-by-tag method, which uses a linear search on a non-sorted
buffer, and a binary search on a sorted buffer.
- Change dump method to take in a fd, like the HAL-level dump methods
do.
- Minor revisions to tag definitions, including a few enums for
enumerated-value tags.
Change-Id: I5f37e326519bda032cb3362da4ab3bf50eb98b4e
Mike Lockwood [Tue, 3 Apr 2012 17:33:04 +0000 (10:33 -0700)]
Merge remote-tracking branch 'goog/ics-aah'
Eric Laurent [Fri, 30 Mar 2012 16:39:46 +0000 (09:39 -0700)]
Echo reference tuning and bug fixes
- Add some smoothing in the method used to detect and compensate for echo path
delay deviation: update the reference buffer only if a deviation in the same
direction is observed for more than N consecutive reads.
Also increase the threshold controlling the reference buffer update to avoid
excessive adjustments.
- Fix problem in get_next_buffer() when echo_reference_write() is called with
variable buffer sizes which happens when the echo reference is used after a
resampler in the audio HAL.
- Use the same resampler quality level in echo reference and audio HAL to help
the AEC by reducing the delay variation and filtering differences between the
capture and echo path.
- Take resampler delay into account when calculating echo reference delay.
Change-Id: I2f425154efddd9a28f1d035fde70d55104043606
Eino-Ville Talvala [Wed, 28 Mar 2012 00:21:44 +0000 (17:21 -0700)]
Cleanup: Remove filterfw.jar from devices.
The filter framework is now merged with frameworks.jar; remove it from
the output of incremental builds so it's not taking up needless space
on devices.
Change-Id: I2d24cecb3e52d246853ada558b2e3015222b6f58
Marius Renn [Tue, 27 Mar 2012 23:29:39 +0000 (16:29 -0700)]
Merge "Multi-Project Commit: Move of filterfw out of system/media (1 of 7)"
Marius Renn [Tue, 27 Mar 2012 17:33:06 +0000 (10:33 -0700)]
Multi-Project Commit: Move of filterfw out of system/media (1 of 7)
This is part of the multi-project commit to move the filter-framework
from system/media/mca to frameworks/base/media/mca.
Note that the filter-framework will soon be replaced with a refactored
version currently under API review (also to go under frameworks/base).
This move is done now to unblock the PDK efforts.
Change-Id: Ia065ab69c2431886ae3a3db96290fa5e0f1e652d
Glenn Kasten [Mon, 26 Mar 2012 23:28:48 +0000 (16:28 -0700)]
mv system/media/wilhelm to frameworks/wilhelm/
Change-Id: I2795954c04a01f68a6286ff85ac12a39a0381265
Eino-Ville Talvala [Mon, 26 Mar 2012 15:45:45 +0000 (08:45 -0700)]
Merge "Add a camera metadata structure and utility methods"
Jamie Gennis [Fri, 23 Mar 2012 19:49:24 +0000 (12:49 -0700)]
Fix a bug with the MFF use of SurfaceTexture.
This change makes the MFF use a SurfaceTexture rather than a BufferQueue
for its dummy surface. Using a dummy BufferQueue became invalid
recently, as it's now an error to connect a BQ producer before the
consumer has connected.
Bug:
6207884
Change-Id: Iffb5d623e398838c8ecffd50ee15a6fe56414810
Eino-Ville Talvala [Fri, 10 Feb 2012 22:27:08 +0000 (14:27 -0800)]
Add a camera metadata structure and utility methods
Change-Id: I320cc33f31ebd8ce183572a447df8fae691eec0d
Glenn Kasten [Mon, 19 Mar 2012 14:32:04 +0000 (07:32 -0700)]
Merge "audio_channel_in/out_mask_from_count"
Glenn Kasten [Mon, 19 Mar 2012 14:30:28 +0000 (07:30 -0700)]
Merge "Prepare to move system/media"
Glenn Kasten [Fri, 16 Mar 2012 20:00:39 +0000 (13:00 -0700)]
Merge "Add libmedia_native"
Glenn Kasten [Fri, 16 Mar 2012 17:35:28 +0000 (10:35 -0700)]
Merge "Fix indentation and redundant whitespace"
Glenn Kasten [Wed, 14 Mar 2012 22:22:38 +0000 (15:22 -0700)]
Prepare to move system/media
Change-Id: Iac6dcfb72753e53e9a42b5feeaa2d6523f2395a4
Glenn Kasten [Tue, 13 Mar 2012 22:30:11 +0000 (15:30 -0700)]
Add libmedia_native
Change-Id: I8fa7edb2872697164edb9bdd464e282ac113075b
Glenn Kasten [Wed, 14 Mar 2012 20:39:14 +0000 (13:39 -0700)]
audio_channel_in/out_mask_from_count
Change-Id: Id62e9dee55367495c1cff04ea0b9ff7f07742e58
Daniel Lam [Tue, 13 Mar 2012 19:07:18 +0000 (12:07 -0700)]
SurfaceTexture: Fully refactored from BufferQueue
gl_env uses a dummy BufferQueue instead of SurfaceTexture
Change-Id: I6f50b372a376186a8455e34dad598b5800ba86a3
James Dong [Tue, 13 Mar 2012 01:11:30 +0000 (18:11 -0700)]
Switched to use header files in /frameworks/native
o related-to-bug:
6044887
Change-Id: Iedc72c551ce4792e695dce3cf222b76598667f43
Glenn Kasten [Sat, 10 Mar 2012 00:02:17 +0000 (16:02 -0800)]
Merge "Use audio_policy_output_flags_t consistently"
Glenn Kasten [Wed, 7 Mar 2012 02:48:58 +0000 (18:48 -0800)]
Use AudioRecord::record_flags consistently
Change-Id: Ibb185b1c461df2c17061a8a0d62cba0611a89e1e
Glenn Kasten [Wed, 7 Mar 2012 02:50:20 +0000 (18:50 -0800)]
Use audio_policy_output_flags_t consistently
Change-Id: Ie487ac0776e9bc6f12907945ec9bea0730200ad1
Jean-Michel Trivi [Tue, 6 Mar 2012 16:52:14 +0000 (08:52 -0800)]
Add downmix effect header
Downmix effect header defines the only parameter currently defined,
the type of downmix to apply, and the valid values for this parameter.
Change-Id: I0beeefa7a35af0a2c6640eeb10efd2bab5992b9c
Mathias Agopian [Sun, 26 Feb 2012 05:16:26 +0000 (21:16 -0800)]
cleanup includes
Change-Id: Ia98b76b2e0c49ee257e1f31c61c2d6f72a9fe894
Eric Laurent [Fri, 17 Feb 2012 21:40:29 +0000 (13:40 -0800)]
echo reference: fix buffer overflow
commit
33e8f78b introduced a regression causing the input buffer
size to be underestimated when downsampling and doing stereo to mono
conversion.
Also a test in create_echo_reference() was not removed and prevented
write sampling rates lower than read sampling rates.
Change-Id: I2ce2e32748eb9d00f4d5b32e5db5149f177c8804
Glenn Kasten [Tue, 14 Feb 2012 21:56:42 +0000 (13:56 -0800)]
Fix memory leak
Change-Id: I6937d23aa5c8f1f85368f8a6909272cd9b0994dc
Eric Laurent [Mon, 13 Feb 2012 20:27:10 +0000 (12:27 -0800)]
Merge "audio utils: modify echo reference resampler"
James Dong [Wed, 8 Feb 2012 22:00:13 +0000 (14:00 -0800)]
Move away from MediaDebug and use ADebug instead
Change-Id: Ic448bdd6462708779f0e5c78a25e0a359b129654
Marius Renn [Tue, 7 Feb 2012 18:24:32 +0000 (10:24 -0800)]
Fix for bug
5584451: Match Java standard with code organization in filterpacks
Filterpacks have been restructured:
- mca/filterpacks/$PACK/java -> mca/filterpacks/java/android/filterpacks/$PACK
- mca/filterpacks/$PACK/native -> mca/filterpacks/native/$PACK
Change-Id: Ic2607d368d67a363a48908ac97c6be99f2d61804
Eric Laurent [Mon, 6 Feb 2012 21:57:31 +0000 (13:57 -0800)]
audio utils: modify echo reference resampler
Modify echo reference resampler to accept upsampling.
This allows higher sampling rates in the capture path than
in the playback path.
Change-Id: Id7b5a11a53e8e09511dcb060bff8355bca3c1420
The Android Open Source Project [Wed, 1 Feb 2012 18:06:16 +0000 (10:06 -0800)]
The Android Open Source Project [Wed, 1 Feb 2012 18:01:14 +0000 (10:01 -0800)]
am
e453cdbf: Reconcile with ics-mr1-release
* commit '
e453cdbf3cdfc9940b471156cad8ccd5442678d0':
The Android Open Source Project [Wed, 1 Feb 2012 16:50:53 +0000 (08:50 -0800)]
Reconcile with ics-mr1-release
Change-Id: I950f3e06350ffce1ccd9f468e8a895972e22b3fa
Glenn Kasten [Tue, 24 Jan 2012 00:18:28 +0000 (16:18 -0800)]
Use audio_source_t consistently
Use audio_source_t instead of int.
Change-Id: I88256ee508b8f5b50635985361efa7c458f11296
Glenn Kasten [Mon, 16 Jan 2012 21:21:31 +0000 (13:21 -0800)]
Move memcpy_to_i16_from_u8 from libmedia
Change-Id: I178b953767f11abcca721efcd7f255d0cb2f3bd0
Glenn Kasten [Mon, 16 Jan 2012 21:12:57 +0000 (13:12 -0800)]
Move fixed FFT from frameworks/base/media/libmedia
Change-Id: I55a3706c329de471ac867f196f777c71c1306bcb
Glenn Kasten [Tue, 17 Jan 2012 15:25:53 +0000 (07:25 -0800)]
Merge "Use audio_stream_type_t consistently"
Glenn Kasten [Thu, 12 Jan 2012 18:30:19 +0000 (10:30 -0800)]
Merge "Use audio_format_t consistently"
Steve Block [Mon, 9 Jan 2012 18:43:07 +0000 (18:43 +0000)]
Rename LOG_ASSERT to ALOG_ASSERT DO NOT MERGE
See https://android-git.corp.google.com/g/157519
Bug:
5449033
Change-Id: Id51183ff952e627fb2749fe750c93315d39f910a
Glenn Kasten [Mon, 9 Jan 2012 20:02:19 +0000 (12:02 -0800)]
Merge "Fix bug in use of getPositionUsec()"
Glenn Kasten [Mon, 9 Jan 2012 20:00:43 +0000 (12:00 -0800)]
Merge "Minor improvements to test app"
Glenn Kasten [Mon, 9 Jan 2012 18:25:12 +0000 (10:25 -0800)]
Merge "Remove virtual from methods that don't need it"
Steve Block [Sun, 8 Jan 2012 10:37:59 +0000 (10:37 +0000)]
Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE
See https://android-git.corp.google.com/g/#/c/157220
Bug:
5449033
Change-Id: I584e6f6a3c52308b7a5a5c9980ca429c831f4320
Glenn Kasten [Fri, 6 Jan 2012 20:24:08 +0000 (12:24 -0800)]
Fix bug in use of getPositionUsec()
getPositionUsec() returns int64_t, not uint32_t, so it would truncate
after 71 minutes. Also the check ANDROID_UNKNOWN_TIME always failed.
Change-Id: I3152d7715dfe4b67a5fad6985c6717c7a802b464
Glenn Kasten [Fri, 6 Jan 2012 20:23:25 +0000 (12:23 -0800)]
Use audio_stream_type_t consistently
Change-Id: I6c02c9b285a00cefefc5d90d655d92ca8690765a
Steve Block [Fri, 6 Jan 2012 10:23:51 +0000 (10:23 +0000)]
Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGE
See https://android-git.corp.google.com/g/157065
Bug:
5449033
Change-Id: I270cbf7b920d5f2fbb5f345f3c88426697c4391d
Glenn Kasten [Thu, 5 Jan 2012 15:15:07 +0000 (07:15 -0800)]
Minor improvements to test app
Continuous pitch bend.
Expand the help text for options.
Improve error recovery for invalid options.
Fix typo in error message.
Change-Id: I7724372a510cb3733d31feeaffb22fbfa13b328c
Steve Block [Wed, 4 Jan 2012 20:21:59 +0000 (20:21 +0000)]
Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGE
See https://android-git.corp.google.com/g/156801
Bug:
5449033
Change-Id: Id162f100e77d64cce4a12cd62b330e7cb847d816
Glenn Kasten [Wed, 4 Jan 2012 17:41:53 +0000 (09:41 -0800)]
Use audio_format_t consistently
Change-Id: I81bfafb1fcb374a100b156d9c52771a4b2eb2943
Rodrigo Carceroni [Fri, 30 Dec 2011 02:38:13 +0000 (18:38 -0800)]
Merge "add a "long" type to MFF structs"
Rodrigo Carceroni [Thu, 29 Dec 2011 00:37:07 +0000 (16:37 -0800)]
add a "long" type to MFF structs
Change-Id: Idd6e5abe2f2efb122ee0cb78c51e20fc21c7341a
Glenn Kasten [Tue, 20 Dec 2011 20:48:42 +0000 (12:48 -0800)]
Merge "Cleanup CreateAudioPlayer and CreateMediaPlayer"
Glenn Kasten [Mon, 19 Dec 2011 23:07:43 +0000 (15:07 -0800)]
Merge "Consistent formatting for if ("
Glenn Kasten [Mon, 19 Dec 2011 23:07:36 +0000 (15:07 -0800)]
Merge "Add curlies to if / else"
Glenn Kasten [Mon, 19 Dec 2011 23:07:29 +0000 (15:07 -0800)]
Merge "Remove redundant this->"
Glenn Kasten [Thu, 15 Sep 2011 23:39:28 +0000 (16:39 -0700)]
Remove virtual from methods that don't need it
The virtual suggested to the reader that the methods are overridden,
when actually they aren't.
Change-Id: I8283c9c7aaa73cd9bafd2d643bb40854d718489b
Glenn Kasten [Fri, 16 Dec 2011 22:56:27 +0000 (14:56 -0800)]
Merge "Extract out audio DSP primitives from AudioFlinger"
Glenn Kasten [Fri, 16 Dec 2011 18:42:58 +0000 (10:42 -0800)]
Extract out audio DSP primitives from AudioFlinger
Change-Id: If7e8d934f773981e1f63c16aa57ada37dc8d3cd6
Glenn Kasten [Fri, 12 Aug 2011 21:29:12 +0000 (14:29 -0700)]
Fix indentation and redundant whitespace
Change-Id: I8e0193ad5aa9405f64203bf7814d8a9e434c5dde
Glenn Kasten [Wed, 16 Nov 2011 19:45:03 +0000 (11:45 -0800)]
Cleanup CreateAudioPlayer and CreateMediaPlayer
Fix minor bug in MediaPlayer, it was missing an assignment if invalid locator:
mp->mAndroidObjType = INVALID_TYPE;
Cleanup:
- add placeholders for android::AudioSystem::acquireAudioSessionId and
releaseAudioSessionId
- remove duplicate initialization of some fields.
- android_audioPlayer_create can never fail, so make it return void
- add comments
- remove unused method audioPlayer_setInvalid
- simplify android_audioPlayer_create
Change-Id: I237b796f6b828cf53bf2c628e52a05a4bdf86c06
Glenn Kasten [Fri, 16 Sep 2011 00:25:24 +0000 (17:25 -0700)]
Remove redundant this->
Change-Id: I86eabf51bf79c145d3ceff68f5aa527199d14ef7
Glenn Kasten [Mon, 3 Oct 2011 18:52:13 +0000 (11:52 -0700)]
Consistent formatting for if (
Change-Id: I4213dbe94c7dbc95565a20d12d66eb16707d0caa
Glenn Kasten [Fri, 29 Jul 2011 21:56:39 +0000 (14:56 -0700)]
Add curlies to if / else
Change-Id: Id697a96cc9bafa56f8ebbb2ad542a70181ed561d
The Android Open Source Project [Fri, 9 Dec 2011 22:57:45 +0000 (14:57 -0800)]
am
9f61907c: Reconcile with ics-mr1-release
* commit '
9f61907cc1991fd56c008cb5042d8d3d2d0db51f':
The Android Open Source Project [Thu, 8 Dec 2011 18:22:23 +0000 (10:22 -0800)]
Reconcile with ics-mr1-release
Change-Id: I04db6f7d07f213a6dabec96efd393041f109e174
Eddy Talvala [Wed, 7 Dec 2011 19:02:33 +0000 (11:02 -0800)]
am
28cd3686: Merge "CTS-like Test for Face Effects recording support" into ics-mr1
* commit '
28cd368665e7e5576102edfa8fa67ec09a6d3c69':
CTS-like Test for Face Effects recording support
The Android Open Source Project [Wed, 7 Dec 2011 17:27:44 +0000 (09:27 -0800)]
am
b7b605ff: Reconcile with ics-mr0-release
* commit '
b7b605ff5b4682bc650461c2b987aa031a1071ca':
DO NOT MERGE: Fix ordering of SurfaceTexture startup in SurfaceTextureSource.
The Android Open Source Project [Wed, 7 Dec 2011 15:44:58 +0000 (07:44 -0800)]
Reconcile with ics-mr1-release
Change-Id: I2e44bc34002b9d53adf8f7df72c9980f612e6274
The Android Automerger [Wed, 7 Dec 2011 00:55:14 +0000 (16:55 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Eddy Talvala [Wed, 7 Dec 2011 00:04:46 +0000 (16:04 -0800)]
am
28cd3686: Merge "CTS-like Test for Face Effects recording support" into ics-mr1
* commit '
28cd368665e7e5576102edfa8fa67ec09a6d3c69':
CTS-like Test for Face Effects recording support
Eddy Talvala [Tue, 6 Dec 2011 21:34:24 +0000 (13:34 -0800)]
Merge "CTS-like Test for Face Effects recording support" into ics-mr1
The Android Open Source Project [Tue, 6 Dec 2011 17:00:18 +0000 (09:00 -0800)]
am
b7b605ff: Reconcile with ics-mr0-release
* commit '
b7b605ff5b4682bc650461c2b987aa031a1071ca':
DO NOT MERGE: Fix ordering of SurfaceTexture startup in SurfaceTextureSource.
The Android Open Source Project [Tue, 6 Dec 2011 16:56:05 +0000 (08:56 -0800)]
Reconcile with ics-mr0-release
Change-Id: I5f6ea1b12b77924424ff87495db2b2a262f8f3f4
Eino-Ville Talvala [Thu, 17 Nov 2011 19:34:20 +0000 (11:34 -0800)]
DO NOT MERGE: Fix ordering of SurfaceTexture startup in SurfaceTextureSource.
Minimal cherry-pick from MR1.
An asynchronous SurfaceTexture only sends out a frame available
callback the first time a new buffer comes in; if a onFrameAvailable-
listener is not registered at this point, the callback never happens
even when new frames come in.
SurfaceTextureSource was calling its onSurfaceTextureSourceReady-
listener with a newly created SurfaceTexture before hooking up the
SurfaceTexture's onFrameAvailable-listener. This opened a window of
time for the onSurfaceTextureSourceReady-listener to set up the
provider end of the SurfaceTexture, and for the provider to get
buffers into the SurfaceTexture queue before the
onFrameAvailable-listener was registered.
And as a result, no new frame callback ever fired, and
SurfaceTextureSource eventually times out, or goes into permanent
sleep.
This change simply makes sure the onFrameAvailable-listener is
registered before the onSurfaceTextureSourceReady callback is fired.
Bug:
5614661
Change-Id: I8d6a72444ffc36b5c48952d0b1edd530ecb76478
Pannag Sanketi [Mon, 28 Nov 2011 22:30:20 +0000 (14:30 -0800)]
CTS-like Test for Face Effects recording support
Vendors can run this test for checking if the device supports the
effects recording, which needs them to support a particular EGL
extension. That cannot be part of the actual cts test for now since that
part of the filterfw is not part of the public api.
Related bug:
5584686
Change-Id: Ica444e54d1e6fb79721b401b67518f182e8616a6
Eino-Ville Talvala [Wed, 30 Nov 2011 22:50:43 +0000 (14:50 -0800)]
am
6b77115d: (-s ours) am
3e843769: DO NOT MERGE: Fix ordering of SurfaceTexture startup in SurfaceTextureSource.
* commit '
6b77115da5de1e6d82a1e96e30ffdb3f1a90a54d':
DO NOT MERGE: Fix ordering of SurfaceTexture startup in SurfaceTextureSource.
Eino-Ville Talvala [Wed, 30 Nov 2011 22:49:17 +0000 (14:49 -0800)]
am
6b77115d: am
3e843769: DO NOT MERGE: Fix ordering of SurfaceTexture startup in SurfaceTextureSource.
* commit '
6b77115da5de1e6d82a1e96e30ffdb3f1a90a54d':
DO NOT MERGE: Fix ordering of SurfaceTexture startup in SurfaceTextureSource.
Eino-Ville Talvala [Wed, 30 Nov 2011 22:46:19 +0000 (14:46 -0800)]
am
3e843769: DO NOT MERGE: Fix ordering of SurfaceTexture startup in SurfaceTextureSource.
* commit '
3e843769e46d3d53aa2565bf80af1e800a3bbf1e':
DO NOT MERGE: Fix ordering of SurfaceTexture startup in SurfaceTextureSource.
Eino-Ville Talvala [Thu, 17 Nov 2011 19:34:20 +0000 (11:34 -0800)]
DO NOT MERGE: Fix ordering of SurfaceTexture startup in SurfaceTextureSource.
Minimal cherry-pick from MR1.
An asynchronous SurfaceTexture only sends out a frame available
callback the first time a new buffer comes in; if a onFrameAvailable-
listener is not registered at this point, the callback never happens
even when new frames come in.
SurfaceTextureSource was calling its onSurfaceTextureSourceReady-
listener with a newly created SurfaceTexture before hooking up the
SurfaceTexture's onFrameAvailable-listener. This opened a window of
time for the onSurfaceTextureSourceReady-listener to set up the
provider end of the SurfaceTexture, and for the provider to get
buffers into the SurfaceTexture queue before the
onFrameAvailable-listener was registered.
And as a result, no new frame callback ever fired, and
SurfaceTextureSource eventually times out, or goes into permanent
sleep.
This change simply makes sure the onFrameAvailable-listener is
registered before the onSurfaceTextureSourceReady callback is fired.
Bug:
5614661
Change-Id: I8d6a72444ffc36b5c48952d0b1edd530ecb76478
The Android Open Source Project [Wed, 30 Nov 2011 20:56:23 +0000 (12:56 -0800)]
Reconcile with ics-mr1-release
Change-Id: I028ce272d04e55877b502cfeaabe6bd7e59ca05e
Glenn Kasten [Wed, 30 Nov 2011 18:50:39 +0000 (10:50 -0800)]
am
30f49ce0: Merge "Bug
5622637 missing XA_PLAYEVENT_HEADATPOS" into ics-mr1
* commit '
30f49ce0c8f9ee464e87552a6fb4fb3d6b09959c':
Bug
5622637 missing XA_PLAYEVENT_HEADATPOS
Jean-Michel Trivi [Wed, 30 Nov 2011 18:13:36 +0000 (10:13 -0800)]
resolved conflicts for merge of
2917f475 to master
Change-Id: I63f4689fabb2aee1682d785ad9c41f06de380396
The Android Automerger [Wed, 30 Nov 2011 14:47:13 +0000 (06:47 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Glenn Kasten [Wed, 30 Nov 2011 00:45:41 +0000 (16:45 -0800)]
am
30f49ce0: Merge "Bug
5622637 missing XA_PLAYEVENT_HEADATPOS" into ics-mr1
* commit '
30f49ce0c8f9ee464e87552a6fb4fb3d6b09959c':
Bug
5622637 missing XA_PLAYEVENT_HEADATPOS
Jean-Michel Trivi [Wed, 30 Nov 2011 00:43:59 +0000 (16:43 -0800)]
am
2917f475: Fix bug
5553055 support video only format change in MP2TS
* commit '
2917f475d6f2058ed177ee2a51fdf7069645ba3e':
Fix bug
5553055 support video only format change in MP2TS
Glenn Kasten [Wed, 30 Nov 2011 00:43:28 +0000 (16:43 -0800)]
Merge "Bug
5622637 missing XA_PLAYEVENT_HEADATPOS" into ics-mr1
Andreas Huber [Wed, 30 Nov 2011 00:32:59 +0000 (16:32 -0800)]
am
7898a5c5: Reflect (internal) API changes made to the IStreamSource interface.
* commit '
7898a5c5f283c9487da48ef92f623c149d8a7a72':
Reflect (internal) API changes made to the IStreamSource interface.
Jean-Michel Trivi [Tue, 29 Nov 2011 22:20:42 +0000 (14:20 -0800)]
Fix bug
5553055 support video only format change in MP2TS
Allow command data when enqueueing a format change command.
Support format change where the application signals that the
change is for the video stream only. Consider any other change
or format change command with invalid data as a full format
change.
Change-Id: I6c684eab36a51dded7e3d7e72b8effe13dac6cc8
Andreas Huber [Tue, 29 Nov 2011 22:30:41 +0000 (14:30 -0800)]
am
7898a5c5: Reflect (internal) API changes made to the IStreamSource interface.
* commit '
7898a5c5f283c9487da48ef92f623c149d8a7a72':
Reflect (internal) API changes made to the IStreamSource interface.
Glenn Kasten [Tue, 29 Nov 2011 21:11:09 +0000 (13:11 -0800)]
Merge "Bug fixes and cleanup for video codec profiles"
Glenn Kasten [Fri, 11 Nov 2011 20:10:41 +0000 (12:10 -0800)]
Bug fixes and cleanup for video codec profiles
Bug fixes:
- removed the line VideoDecoderNbProfLevel[c] = 0;"
it could overwrite the MPEG2 entry if only one codec implementation,
or worse if there were multiple codec implementations
- android_videoCodec_getProfileLevelCombinationNb was returning success
and zero count if a decoder has zero profile/level combinations,
but OpenMAX AL 1.0.1 spec says it must fail in that case.
Minor cleanup:
- omx does not need to be global
- We only use the first codec implementation for a given
decoder ID / MIME type, so simplify the code that iterates through
the array of codec implementations
- Add some const
- Add some comments
Also includes #if 0 code to restrict reported video codec profiles,
as a placeholder -- disabled for now.
Change-Id: I81991f164efaf3606beb5789e1a79cf76ad033a0
Andreas Huber [Tue, 29 Nov 2011 19:56:24 +0000 (11:56 -0800)]
Reflect (internal) API changes made to the IStreamSource interface.
Change-Id: I5cde6bc0d4bd9c62b4851d7e6375cd9216c7c062
related-to-bug:
5553055
Glenn Kasten [Tue, 29 Nov 2011 18:05:44 +0000 (10:05 -0800)]
Merge "Remove AudioTrackProxy since AudioTrack is RefBase"
Glenn Kasten [Tue, 29 Nov 2011 18:04:12 +0000 (10:04 -0800)]
Merge "Bug
5550980 test xaVideoDecoderCapabilities"