OSDN Git Service
Glenn Kasten [Mon, 14 Nov 2011 15:48:56 +0000 (07:48 -0800)]
am
e75ba3ef: Merge "Bug
5201321 recover from mediaserver crash" into ics-mr1
* commit '
e75ba3eff247622fdf36974d2216dcaff269ea5c':
Bug
5201321 recover from mediaserver crash
Glenn Kasten [Mon, 14 Nov 2011 15:23:59 +0000 (07:23 -0800)]
Merge "Bug
5201321 recover from mediaserver crash" into ics-mr1
Pannag Sanketi [Sat, 12 Nov 2011 02:46:47 +0000 (18:46 -0800)]
am
760eb949: Fixing mirrored background video in camera effects
* commit '
760eb949cf0abe299e6c6710cda5c52364945ae0':
Fixing mirrored background video in camera effects
Pannag Sanketi [Wed, 9 Nov 2011 00:00:45 +0000 (16:00 -0800)]
Fixing mirrored background video in camera effects
The MediaSource is set to rotate so that it adjusts to the
rotation of the device, and displays upright. The backdropper does not
have to do any rotation except for the mirroring in case of front
camera.
Bug:
5490654
Change-Id: I36124c7ca7cce73b24683277370227abab97d55b
Glenn Kasten [Thu, 10 Nov 2011 23:16:15 +0000 (15:16 -0800)]
Merge "MediaPlayer kEventPrepared similar to AudioPlayer"
Glenn Kasten [Thu, 10 Nov 2011 02:13:31 +0000 (18:13 -0800)]
Bug
5201321 recover from mediaserver crash
Add a media player death notifier to recover from media server crashes.
Downgrade some logs.
Destructors should be protected.
Change-Id: I7774733bcb12fc7fbfe237bdbeffca1adde46e78
Glenn Kasten [Fri, 30 Sep 2011 18:34:07 +0000 (11:34 -0700)]
MediaPlayer kEventPrepared similar to AudioPlayer
Now that AudioPlayer kEventPrepared logic for successful/unsuccessful
prepare completion has been combined, make MediaPlayer work the same
way. This will make it easier to merge similar code AudioPlayer and
MediaPlayer in an upcoming CL.
Change-Id: Iaa58dcc85b0ede82036c0a5f45d61d0e7853fe0b
The Android Open Source Project [Thu, 10 Nov 2011 22:36:39 +0000 (14:36 -0800)]
Reconcile with ics-mr1-release
Change-Id: I448b449f721790e8a952fedb8696dfffa5daccb3
Eddy Talvala [Thu, 10 Nov 2011 16:14:55 +0000 (16:14 +0000)]
am
e0746488: Merge "Bug
5353078: Reduce foreground holes in Backdropper." into ics-mr1
* commit '
e07464884a4bcb4d1548e7408015364dc037bdc1':
Bug
5353078: Reduce foreground holes in Backdropper.
The Android Automerger [Thu, 10 Nov 2011 14:47:42 +0000 (06:47 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Jean-Michel Trivi [Thu, 10 Nov 2011 05:42:37 +0000 (05:42 +0000)]
am
5696c8a7: Merge "Bug
5585323 Authorize audio decode for system" into ics-mr1
* commit '
5696c8a7a0e2fde4b051230544a58db853d3551f':
Bug
5585323 Authorize audio decode for system
Glenn Kasten [Thu, 10 Nov 2011 01:11:23 +0000 (01:11 +0000)]
am
b9217405: Merge "Bug
5578928 Fix race in stop for destroy" into ics-mr1
* commit '
b921740510e15a4e403e2819f1a8f0a9a6c03da9':
Bug
5578928 Fix race in stop for destroy
Eddy Talvala [Wed, 9 Nov 2011 22:27:31 +0000 (14:27 -0800)]
Merge "Bug
5353078: Reduce foreground holes in Backdropper." into ics-mr1
Pannag Sanketi [Wed, 9 Nov 2011 21:50:49 +0000 (21:50 +0000)]
am
e8c04ee9: Merge "Fixing the mirroring in MediaSource Filter" into ics-mr1
* commit '
e8c04ee9ea63b90667aaf5be6fbb3475ecd93520':
Fixing the mirroring in MediaSource Filter
Rodrigo Carceroni [Fri, 4 Nov 2011 02:09:29 +0000 (19:09 -0700)]
Bug
5353078: Reduce foreground holes in Backdropper.
Change-Id: I77b84e4c345bad237af13b82989f2f8119770bd3
The Android Automerger [Wed, 9 Nov 2011 18:06:37 +0000 (10:06 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Jean-Michel Trivi [Wed, 9 Nov 2011 16:58:10 +0000 (08:58 -0800)]
Merge "Bug
5585323 Authorize audio decode for system" into ics-mr1
Glenn Kasten [Wed, 9 Nov 2011 15:17:38 +0000 (07:17 -0800)]
Merge "Bug
5578928 Fix race in stop for destroy" into ics-mr1
The Android Automerger [Wed, 9 Nov 2011 14:48:05 +0000 (06:48 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Pannag Sanketi [Wed, 9 Nov 2011 00:20:14 +0000 (16:20 -0800)]
Merge "Fixing the mirroring in MediaSource Filter" into ics-mr1
Pannag Sanketi [Tue, 8 Nov 2011 23:55:13 +0000 (15:55 -0800)]
Fixing the mirroring in MediaSource Filter
MediaSource Filter was outputing mirrored video.
Bug:
5585630
Change-Id: If87ee799c0fccff783d3db7cf04080160a5a5ac4
Jean-Michel Trivi [Mon, 7 Nov 2011 23:59:51 +0000 (15:59 -0800)]
Bug
5585323 Authorize audio decode for system
Authorize the use of specific audio codecs for audio decoding
by the system, which guarantees audio is decoded for playback,
when the appropriate system permission is used.
Change-Id: I0633b04b4d0aebe89804ef48752bf05d72abc56d
Andreas Huber [Tue, 8 Nov 2011 16:52:17 +0000 (16:52 +0000)]
am
e87e28c3: Merge "Remove MediaPlayer::setVideoSurface legacy." into ics-mr1
* commit '
e87e28c32f35ed40a12b18ef51cc6af0f44ec270':
Remove MediaPlayer::setVideoSurface legacy.
Andreas Huber [Tue, 8 Nov 2011 16:48:24 +0000 (08:48 -0800)]
Merge "Remove MediaPlayer::setVideoSurface legacy." into ics-mr1
Glenn Kasten [Mon, 7 Nov 2011 20:20:31 +0000 (12:20 -0800)]
Bug
5578928 Fix race in stop for destroy
Change-Id: Ic5c84406bffa372a2fd3e92ad1aca1f6f5185026
Glenn Kasten [Mon, 7 Nov 2011 17:36:25 +0000 (09:36 -0800)]
Merge "CT and spec errata for MuteSolo::GetNumChannels"
Glenn Kasten [Mon, 7 Nov 2011 17:35:55 +0000 (09:35 -0800)]
Merge "Comments"
Glenn Kasten [Fri, 29 Jul 2011 14:53:06 +0000 (07:53 -0700)]
Comments
Change-Id: I1592d1979ce5f5811ff5a47b4b60db93e8670313
Glenn Kasten [Mon, 7 Nov 2011 17:27:12 +0000 (09:27 -0800)]
Merge "Fix line length"
Glenn Kasten [Thu, 21 Jul 2011 16:28:36 +0000 (09:28 -0700)]
Fix line length
And add explanation for -p# option of slesTest_recBuffQueue
Change-Id: I32a06caf633c6796e263a1beeec93513cd775096
Glenn Kasten [Mon, 7 Nov 2011 17:20:26 +0000 (09:20 -0800)]
Merge "xaplay test additions"
Glenn Kasten [Wed, 28 Sep 2011 19:53:22 +0000 (12:53 -0700)]
CT and spec errata for MuteSolo::GetNumChannels
The question of what to return when channel count is unknown was dicussed
by Khronos working group. They decided to return zero channel count
and success if unknown. Both the spec errata and CT have been updated for this.
Change-Id: I820291271f83bad2142046372d9b22e4d05faf07
Glenn Kasten [Mon, 7 Nov 2011 16:41:23 +0000 (08:41 -0800)]
Merge "DataSource::getSize() returns ERROR_UNSUPPORTED"
Glenn Kasten [Tue, 30 Aug 2011 21:05:14 +0000 (14:05 -0700)]
xaplay test additions
Allow playing a subset of input file.
Add format change test.
Call gComposerClient->dispose before exit.
Remove dead code related to re-initializing the engine.
Add position, seek, loop tests.
Force callback failures with -c option.
Don't enqueue EOS more than once.
Add STOPPED at end of xaplay.
Add temporary set play state to paused.
Added discontinuity test.
More stream information queries and printfs.
Shorter marker to make it easier to hit when looping.
Add explanation of command line options.
Change-Id: I5b425a52f9afc2c8f9083badb6de0773f711c6d9
The Android Open Source Project [Fri, 4 Nov 2011 15:31:47 +0000 (08:31 -0700)]
Reconcile with ics-mr1-release
Change-Id: I3217d6a7871bd15bfa77f492f01d343237ed4dff
Glenn Kasten [Thu, 3 Nov 2011 18:16:50 +0000 (11:16 -0700)]
Merge "Fix build errors and warnings on native"
Jean-Michel Trivi [Wed, 2 Nov 2011 17:29:59 +0000 (17:29 +0000)]
am
762f1065: am
c157a9c2: Bug
5544082 Filter out unsupported codecs in OpenSL ES
* commit '
762f10659c2ac6fb66afd09be5bddd7ffebbf9df':
Bug
5544082 Filter out unsupported codecs in OpenSL ES
Glenn Kasten [Fri, 7 Oct 2011 16:06:41 +0000 (09:06 -0700)]
AudioPlayback_Parameters cleanup
Use AudioPlayback_Parameters more consistently in parameter list of
constructors. Also, StreamPlayer::StreamPlayer was over-assigning to
mPlaybackParams (already assigned by its superclass's constructor).
Move initialization of AudioPlayback_Parameters from each case
to before the switch, as it is shared by each use case.
Remove old asserts.
Change-Id: I8925d36da031c80308457c7e940418d3a4e47b62
Glenn Kasten [Wed, 2 Nov 2011 14:18:09 +0000 (07:18 -0700)]
Merge "Finish out the StreamInformation interface"
The Android Automerger [Wed, 2 Nov 2011 13:47:11 +0000 (06:47 -0700)]
merge in ics-mr1-release history after reset to ics-mr1
Glenn Kasten [Tue, 1 Nov 2011 21:19:26 +0000 (14:19 -0700)]
Merge "Reverb comply with OpenSL ES 1.0.1 spec"
Jean-Michel Trivi [Tue, 1 Nov 2011 15:41:40 +0000 (15:41 +0000)]
am
c157a9c2: Bug
5544082 Filter out unsupported codecs in OpenSL ES
* commit '
c157a9c259474d4e1736c4f9ccccad10b5000734':
Bug
5544082 Filter out unsupported codecs in OpenSL ES
Jean-Michel Trivi [Mon, 31 Oct 2011 23:21:49 +0000 (16:21 -0700)]
Bug
5544082 Filter out unsupported codecs in OpenSL ES
When decoding compressed audio data, disregard tracks
encoded with unsupported codecs.
Change-Id: If0535013990923c6859829106ccf9e92e5856f90
The Android Open Source Project [Mon, 31 Oct 2011 20:19:40 +0000 (13:19 -0700)]
Reconcile with ics-mr1-release
Change-Id: I89995f978dbd3c063c1f5f6a815c609f7e962d87
Andreas Huber [Wed, 26 Oct 2011 21:44:29 +0000 (14:44 -0700)]
Remove MediaPlayer::setVideoSurface legacy.
Change-Id: I95aa181f39b375087b30ac65fea37589108c9f16
The Android Automerger [Sun, 30 Oct 2011 13:48:41 +0000 (06:48 -0700)]
merge in ics-mr1-release history after reset to ics-mr1
Glenn Kasten [Fri, 28 Oct 2011 02:18:10 +0000 (02:18 +0000)]
am
13ffc7f7: am
d0b07222: Merge "Bug
5526807 inform client of errors after prepare" into ics-mr0
* commit '
13ffc7f7c69e2fabf1ef70ebb2ea81489be9bd74':
Bug
5526807 inform client of errors after prepare
Glenn Kasten [Fri, 28 Oct 2011 02:14:09 +0000 (02:14 +0000)]
am
d0b07222: Merge "Bug
5526807 inform client of errors after prepare" into ics-mr0
* commit '
d0b0722276aea9a06a118a64abfc8b3e9498e931':
Bug
5526807 inform client of errors after prepare
Glenn Kasten [Fri, 28 Oct 2011 01:18:44 +0000 (18:18 -0700)]
Merge "Bug
5526807 inform client of errors after prepare" into ics-mr0
Glenn Kasten [Thu, 27 Oct 2011 21:54:22 +0000 (21:54 +0000)]
am
21b2f0ce: am
d7762ba2: Bug
5526272 ignore player events during destroy
* commit '
21b2f0ce677aa42c34df65995eefb30e20f2c3aa':
Bug
5526272 ignore player events during destroy
Glenn Kasten [Thu, 27 Oct 2011 21:46:58 +0000 (21:46 +0000)]
am
d7762ba2: Bug
5526272 ignore player events during destroy
* commit '
d7762ba20bc7d13e1af73539d7a2a75183e2960b':
Bug
5526272 ignore player events during destroy
Glenn Kasten [Thu, 27 Oct 2011 21:16:20 +0000 (14:16 -0700)]
Bug
5526807 inform client of errors after prepare
Change-Id: Ic5c88f8e1c8e7d6226a7a71a2a89a70f0fa876f8
Glenn Kasten [Thu, 27 Oct 2011 18:49:31 +0000 (11:49 -0700)]
Bug
5526272 ignore player events during destroy
Change-Id: I45c67660c7cbfabcf66b0ffffbaedf56c17453d7
Ed Heyl [Wed, 26 Oct 2011 14:43:25 +0000 (14:43 +0000)]
am
9a371a20: Merge remote branch \'goog/ics-mr0\' into ics-mr1
* commit '
9a371a201366ff0c0c132a31029a6c2357400b3e':
The Android Automerger [Wed, 26 Oct 2011 14:05:38 +0000 (07:05 -0700)]
merge in ics-mr1-release history after reset to ics-mr1
Steve Block [Wed, 26 Oct 2011 10:12:08 +0000 (11:12 +0100)]
Rename LOGV(_IF) to ALOGV(_IF) DO NOT MERGE
See https://android-git.corp.google.com/g/#/c/143865
Bug:
5449033
Change-Id: I4c0e3dc9da0a0cdf9aef8be4fae7b24da876dc17
Ed Heyl [Tue, 25 Oct 2011 19:50:44 +0000 (19:50 +0000)]
Merge remote branch 'goog/ics-mr0' into ics-mr1
Glenn Kasten [Mon, 24 Oct 2011 19:46:45 +0000 (12:46 -0700)]
am
ba6d04f5: Bug
5505856 remove incorrect setDataSource(NULL)
* commit '
ba6d04f523bf6c3c2d4ed6975109e72f328889b8':
Bug
5505856 remove incorrect setDataSource(NULL)
Glenn Kasten [Mon, 24 Oct 2011 19:21:50 +0000 (12:21 -0700)]
Bug
5505856 remove incorrect setDataSource(NULL)
Change-Id: Id23cbc43b56c014f5931cd1e941c12a773dba2b5
The Android Automerger [Sun, 23 Oct 2011 14:03:21 +0000 (07:03 -0700)]
merge in ics-release history after reset to master
Eino-Ville Talvala [Fri, 21 Oct 2011 01:55:52 +0000 (18:55 -0700)]
am
f52b953c: Fix NPE in AsyncRunner when runner is stopped immediately after start.
* commit '
f52b953c0acb730289c6f5a664ec5624d6ba5d36':
Fix NPE in AsyncRunner when runner is stopped immediately after start.
Eino-Ville Talvala [Thu, 20 Oct 2011 23:36:01 +0000 (16:36 -0700)]
Fix NPE in AsyncRunner when runner is stopped immediately after start.
If the AsyncTask is cancelled immediately after being started, the
background worker function may never be called, and variables it
initializes may not be set.
As used in Camera, this could lead to a crash if the right sequence
of start/stop actions is taken.
Bug:
5493458
Change-Id: Idee9c3de1cf1dc999acc57c6aefcae4797582bdb
The Android Automerger [Thu, 20 Oct 2011 14:02:30 +0000 (07:02 -0700)]
merge in ics-release history after reset to master
Pannag Sanketi [Thu, 20 Oct 2011 06:06:01 +0000 (23:06 -0700)]
am
0ea5e57c: Support for max duration recording with effects
* commit '
0ea5e57c6cc314a5d3a14aa0745c56c2a9101f0f':
Support for max duration recording with effects
Pannag Sanketi [Thu, 20 Oct 2011 03:08:39 +0000 (20:08 -0700)]
Support for max duration recording with effects
Related to Bug:
5472397
Change-Id: I949b3e1a7ac5d9f85f9538289f29cd586a0a9667
The Android Automerger [Wed, 19 Oct 2011 14:45:12 +0000 (07:45 -0700)]
merge in ics-release history after reset to master
Scott Main [Tue, 18 Oct 2011 23:07:48 +0000 (16:07 -0700)]
am
bffd2f01: Merge "docs: add package summary for media effects" into ics-mr0
* commit '
bffd2f0106fac140de9b12ee20169de86e33f4e3':
docs: add package summary for media effects
Scott Main [Tue, 18 Oct 2011 23:06:15 +0000 (16:06 -0700)]
Merge "docs: add package summary for media effects" into ics-mr0
Scott Main [Tue, 18 Oct 2011 18:02:18 +0000 (11:02 -0700)]
docs: add package summary for media effects
Change-Id: I6ce4f31bcef947f426a5a2f0c5c409bf2c004797
Pannag Sanketi [Tue, 18 Oct 2011 23:00:42 +0000 (16:00 -0700)]
am
aef7e413: Merge "Add timeLapse support in MediaEncoderFilter" into ics-mr0
* commit '
aef7e41306f276071fae1954c59d93235c47867f':
Add timeLapse support in MediaEncoderFilter
Pannag Sanketi [Tue, 18 Oct 2011 22:58:44 +0000 (15:58 -0700)]
Merge "Add timeLapse support in MediaEncoderFilter" into ics-mr0
Pannag Sanketi [Mon, 17 Oct 2011 03:52:57 +0000 (20:52 -0700)]
Add timeLapse support in MediaEncoderFilter
For recording timelapsed videos with effects.
Bug:
5452088
Change-Id: Ia99ca0af96bcd1da8a5f6dd4d2d46dde39ca9660
Jamie Gennis [Tue, 18 Oct 2011 17:59:43 +0000 (10:59 -0700)]
am
543c7826: wilhelm: fix native-media SurfaceTexture test
* commit '
543c7826963411caef0c8052bb4866874def7cd7':
wilhelm: fix native-media SurfaceTexture test
Glenn Kasten [Tue, 18 Oct 2011 17:07:11 +0000 (10:07 -0700)]
Merge "Simplify the native-media demo."
Ming Jia [Mon, 17 Oct 2011 22:55:59 +0000 (15:55 -0700)]
Simplify the native-media demo.
1. Removed the old glsurfaceview.
2. remove physics and accelerometer related codes.
2. remove touch action.
4. Rotate the card a bit to show the tilting effect.
Change-Id: Ib2a7aeeef0b643644b22c285e6a295f5c09d3951
The Android Automerger [Tue, 18 Oct 2011 14:01:43 +0000 (07:01 -0700)]
merge in ics-release history after reset to master
Glenn Kasten [Fri, 30 Sep 2011 21:03:46 +0000 (14:03 -0700)]
Fix race in getting duration
mDuration is protected by mSettingsLock because it is accessed from both
the ALooper thread and from the application thread, but only one of the
two "set"s was using the lock, and the "get" was not using the lock.
Also added some comments about the lock, and moved lock closer inside { }.
Change-Id: I7c96186f31baaad1b941d934549cb50d4f82d0c8
Jamie Gennis [Mon, 17 Oct 2011 22:53:11 +0000 (15:53 -0700)]
wilhelm: fix native-media SurfaceTexture test
This change updates the Java portion of the native-media test to use the
new MediaPlayer#setSurface method rather than the MediaPlayer#setTexture
method, which is no longer present.
Change-Id: I0b89129b65fc3765b343ba5da7672e5d72afe775
Pannag Sanketi [Mon, 17 Oct 2011 18:30:39 +0000 (11:30 -0700)]
am
6b9780ef: Fixing file sizelimit error in video capture intent with effects
* commit '
6b9780efb2b34058f24e462ae54e6a5b6df85e46':
Fixing file sizelimit error in video capture intent with effects
The Android Automerger [Sun, 16 Oct 2011 14:01:04 +0000 (07:01 -0700)]
merge in ics-release history after reset to master
Pannag Sanketi [Fri, 14 Oct 2011 18:26:59 +0000 (11:26 -0700)]
Fixing file sizelimit error in video capture intent with effects
There was an error in video capture intent with effects on
with regards to file sizelimit. This CL fixes that. Now the video gets
recorded without an error. The only remaining issue is that
the max file sizelimit is reached very quickly (~5s) since
effects get recorded at 480p.
Related to bug:
5441217
Change-Id: I045ea1e2b6bb501c0f68954fdb28d135e9a4ed75
Glenn Kasten [Fri, 14 Oct 2011 19:44:01 +0000 (12:44 -0700)]
am
fcdc9c4c: Merge "Improved deadlock detection logs." into ics-mr0
* commit '
fcdc9c4cc7da7044f92399b1b5c7a4ddd5fec3b4':
Improved deadlock detection logs.
Glenn Kasten [Fri, 14 Oct 2011 19:44:00 +0000 (12:44 -0700)]
am
70db434d: Merge "Bug
5267571 disable callbacks earlier" into ics-mr0
* commit '
70db434d0dc2a58656e792ac8cdcd9a09ee5f17a':
Bug
5267571 disable callbacks earlier
Glenn Kasten [Fri, 14 Oct 2011 19:40:31 +0000 (12:40 -0700)]
Merge "Improved deadlock detection logs." into ics-mr0
Glenn Kasten [Fri, 14 Oct 2011 19:40:28 +0000 (12:40 -0700)]
Merge "Bug
5267571 disable callbacks earlier" into ics-mr0
Rodrigo Carceroni [Fri, 14 Oct 2011 18:23:46 +0000 (11:23 -0700)]
am
4aad9a24: Bug
5383077: Add callback to finalize media when recording of video with effects is done.
* commit '
4aad9a241281b973b05c14eb48752d3afafec4ce':
Bug
5383077: Add callback to finalize media when recording of video with effects is done.
Rodrigo Carceroni [Fri, 14 Oct 2011 00:32:28 +0000 (17:32 -0700)]
Bug
5383077: Add callback to finalize media when recording of video with effects is done.
Change-Id: Ib767195e0089abd03e3b34f95f40499ee3226a48
Glenn Kasten [Fri, 14 Oct 2011 17:06:23 +0000 (10:06 -0700)]
Bug
5267571 disable callbacks earlier
Change-Id: I0da3b85dcce93a8a250b8b225a998b80d92f436b
Pannag Sanketi [Fri, 14 Oct 2011 17:06:19 +0000 (10:06 -0700)]
am
7177efa8: Merge "Fixing crash in video capture intent with effects on" into ics-mr0
* commit '
7177efa8da13a1b0d4c8939cd110897bcaee8bb9':
Fixing crash in video capture intent with effects on
Pannag Sanketi [Fri, 14 Oct 2011 17:04:19 +0000 (10:04 -0700)]
Merge "Fixing crash in video capture intent with effects on" into ics-mr0
Eino-Ville Talvala [Fri, 14 Oct 2011 16:44:00 +0000 (09:44 -0700)]
Merge "Fix color transforms in BackDropperFilter."
Pannag Sanketi [Fri, 14 Oct 2011 00:04:48 +0000 (17:04 -0700)]
Fixing crash in video capture intent with effects on
The video capture intent sends an uri and not a filename. Adding
support in the MediaencoderFilter for uri. The filter
passes that on to the MediaRecorder.
Related to bug:
5441217
Change-Id: I95a12e94e3705c00c3bbc0d375eba7844dd300b5
Pannag Sanketi [Thu, 13 Oct 2011 17:33:18 +0000 (10:33 -0700)]
am
d115b191: Merge "Fixing a bug in gl_env release surface" into ics-mr0
* commit '
d115b1919a31b086f2e60a1136ee5d4de7357cea':
Fixing a bug in gl_env release surface
Pannag Sanketi [Thu, 13 Oct 2011 17:31:51 +0000 (10:31 -0700)]
Merge "Fixing a bug in gl_env release surface" into ics-mr0
Glenn Kasten [Wed, 28 Sep 2011 19:47:10 +0000 (12:47 -0700)]
Reverb comply with OpenSL ES 1.0.1 spec
According to OpenSL ES 1.0.1 spec, SL_RESULT_CONTROL_LOST is not
a valid result code for the "Get" APIs. They are supposed to return
SL_RESULT_SUCCESS and the last known setting. This affects ability to
run Khronos CT.
Change-Id: I8ee4c0f9ef95da2ac3d59ca1cde9b4ace32e88fe
Glenn Kasten [Sun, 11 Sep 2011 17:27:23 +0000 (10:27 -0700)]
Finish out the StreamInformation interface
Return SL_RESULT_FEATURE_UNSUPPORTED instead of
XA_RESULT_CONTENT_UNSUPPORTED for unsupported APIs.
First pass at implementing QueryStreamName.
Use shared not exclusive locks for read-only access
(serves as a comment only, since really the same).
Change-Id: I54c5f3456d541f4f9afa0271721e6c958eaae1d9
Glenn Kasten [Fri, 23 Sep 2011 14:38:56 +0000 (07:38 -0700)]
Fix build errors and warnings on native
android_audioPlayer_metadata_* APIs don't exist on non-Android.
handlers.c needs a definition for NULL.
handler_AudioPlayer_gain isn't present on non-Android.
Fix typo in declaration of ThreadPool_add.
Fix warning: unused variable len.
Change-Id: Ia7d516c2cf3a51f5a657a3aad76188041dcc6620
Glenn Kasten [Thu, 13 Oct 2011 14:19:22 +0000 (07:19 -0700)]
Merge "Fix bugs in get decoder/encoder counts"
The Android Automerger [Thu, 13 Oct 2011 14:00:58 +0000 (07:00 -0700)]
merge in ics-release history after reset to master
Pannag Sanketi [Thu, 13 Oct 2011 01:06:41 +0000 (18:06 -0700)]
Fixing a bug in gl_env release surface
While recording in camera with the effects on, there was a bug in releasing
a surface. The possible memory corruption was due to erasing
the surface-window pair in the map before destroying the surface and its associated
window handle.
Also, fixed a bit of nomenclature in the related functions.
Related to bug:
5373197
Change-Id: Ie861e5ce87cde8909c5680897cdfddafeba5e507