OSDN Git Service
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 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: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
Glenn Kasten [Wed, 30 Nov 2011 00:43:28 +0000 (16:43 -0800)]
Merge "Bug
5622637 missing XA_PLAYEVENT_HEADATPOS" into ics-mr1
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 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 16:52:13 +0000 (08:52 -0800)]
Bug
5622637 missing XA_PLAYEVENT_HEADATPOS
Fix problem with a missing XA_PLAYEVENT_HEADATPOS after seek backwards,
due to a race condition between getPosition and onSeekComplete.
Change-Id: I408c8675df8a9b3cbd2874435fbeccdca355bc46
Eino-Ville Talvala [Thu, 17 Nov 2011 19:34:20 +0000 (11:34 -0800)]
Fix ordering of SurfaceTexture startup in SurfaceTextureSource.
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
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 [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 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
Eddy Talvala [Wed, 9 Nov 2011 22:27:31 +0000 (14:27 -0800)]
Merge "Bug
5353078: Reduce foreground holes in Backdropper." into ics-mr1
Rodrigo Carceroni [Fri, 4 Nov 2011 02:09:29 +0000 (19:09 -0700)]
Bug
5353078: Reduce foreground holes in Backdropper.
Change-Id: I77b84e4c345bad237af13b82989f2f8119770bd3
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
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: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
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
Andreas Huber [Wed, 26 Oct 2011 21:44:29 +0000 (14:44 -0700)]
Remove MediaPlayer::setVideoSurface legacy.
Change-Id: I95aa181f39b375087b30ac65fea37589108c9f16
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: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 [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:21:50 +0000 (12:21 -0700)]
Bug
5505856 remove incorrect setDataSource(NULL)
Change-Id: Id23cbc43b56c014f5931cd1e941c12a773dba2b5
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
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
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
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
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 [Thu, 13 Oct 2011 14:19:22 +0000 (07:19 -0700)]
Merge "Fix bugs in get decoder/encoder counts"
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
Glenn Kasten [Fri, 29 Jul 2011 19:57:39 +0000 (12:57 -0700)]
Improved deadlock detection logs.
This should make it easier to debug the "object was locked by" logs.
Display tid and pthread_t of both the lock owner and the caller in the
"object was locked by" warning log about potential deadlocks.
This makes it easier to figure out what's going on with ps -t
which only shows the tid not the pthread_t.
Reduce false positives by using a generation counter to look for forward
progress, at the risk of increasing the chance of more false negatives.
Use lock with timeout to reduce chance of missing an "unlocked" window.
Change-Id: I15e158a20d7076624188110842a01c1bf2c5c8ae
Pannag Sanketi [Wed, 12 Oct 2011 21:43:57 +0000 (14:43 -0700)]
am
d3832235: Support for MediaRecorder stop exception in Camera
* commit '
d383223561fe30ed667a347f87c442d4f21bff64':
Support for MediaRecorder stop exception in Camera
Pannag Sanketi [Tue, 11 Oct 2011 01:38:53 +0000 (18:38 -0700)]
Support for MediaRecorder stop exception in Camera
When the user of camera app presses "start" and "stop" very quickly with
the effects on, the MediaRecorder stop throws an exception since no
frames could be recorded before the user pressed stop. The
filterframework needs to take care of this issue separately as compared
to other RunTimeExceptions.
Related to bugs
5443546 and
5373197
Change-Id: I227fd1a81cbf9e48032e100111a896ffb691bf0c
Glenn Kasten [Wed, 12 Oct 2011 14:16:03 +0000 (07:16 -0700)]
Merge "Final revisions for NDK API level 14"
Glenn Kasten [Wed, 12 Oct 2011 00:10:25 +0000 (17:10 -0700)]
Merge "Error logging in AAC"
Eino-Ville Talvala [Tue, 11 Oct 2011 01:34:09 +0000 (18:34 -0700)]
Fix color transforms in BackDropperFilter.
The color transforms in BackDropperFilter were assuming alpha = 1,
which is not guaranteed. Now properly disregards input alpha.
Change-Id: I00a57e181bedb9e08da9ba0fe2e021a4d04a3de2
Glenn Kasten [Tue, 11 Oct 2011 00:51:19 +0000 (17:51 -0700)]
Merge "Multithread safety and code reduction"
Glenn Kasten [Fri, 30 Sep 2011 21:14:37 +0000 (14:14 -0700)]
Multithread safety and code reduction
Remove unsafe GenericPlayer::getSampleRate(). getSampleRate() was not
thread-safe as it accessed a member variable updated in the looper thread
without a lock. If getSampleRate() is ever needed again, the sample rate
is available in the mPcmFormatValues array, which does have a lock.
Replace member variables mChannelMask, mChannelCount, and mSampleRateHz
by local variables for locality and performance.
Change-Id: Ibf92ed090430153d748ded4d0b835e429df47eea
Glenn Kasten [Tue, 11 Oct 2011 00:21:47 +0000 (17:21 -0700)]
Merge "Khronos bug 8080 GetMarkerPosition"
Glenn Kasten [Sun, 18 Sep 2011 18:28:35 +0000 (11:28 -0700)]
Final revisions for NDK API level 14
Rename ANDROID_MIME_MP2TS to XA_ANDROID_MIME_MP2TS and
ANDROID_MIME_AACADTS to SL_ANDROID_MIME_AACADTS and make public.
ANDROID_MIME_AACADTS_ANDROID_FRAMEWORK remains private.
Change-Id: Ie2cda273b6adb2db453aad188b28e64147f9e6b0
Glenn Kasten [Mon, 10 Oct 2011 23:50:51 +0000 (16:50 -0700)]
Merge "Bug
5293383 ~StreamSourceAppProxy wasn't reached"
Glenn Kasten [Mon, 10 Oct 2011 19:01:56 +0000 (12:01 -0700)]
Merge "EnvironmentalReverb::SetDensity copy/paste"
Glenn Kasten [Mon, 10 Oct 2011 19:01:34 +0000 (12:01 -0700)]
Merge "AudioPlayer kEventPrepared"
Glenn Kasten [Mon, 10 Oct 2011 19:01:02 +0000 (12:01 -0700)]
Merge "Khronos CT PresetReverb::GetPreset"
Glenn Kasten [Mon, 12 Sep 2011 14:26:34 +0000 (07:26 -0700)]
Bug
5293383 ~StreamSourceAppProxy wasn't reached
Fix bug where StreamSourceAppProxy destructor wasn't reached,
which caused all sorts of other problems later on. To see this,
enable the logs StreamSourceAppProxy::~StreamSourceAppProxy and
StreamPlayer::~StreamPlayer. You'll see that StreamPlayer was destroyed,
but not StreamSourceAppProxy.
As StreamSourceAppProxy is child of StreamPlayer, make the reference
from StreamSourceAppProxy to StreamPlayer a weak reference in case
StreamSourceAppProxy's lifetime exceeds StreamPlayer. It is not supposed
to any more with this fix, but the wp<> provides extra safety.
StreamPlayer preDestroy no longer bypasses the preDestroy in
GenericMediaPlayer.
Do a full disconnect in GenericMediaPlayer::preDestroy.
Push decremented reference counts for strong pointer through binder
to workaround binder's "optimization".
Extra error-checking in setListener and setBuffers to verify
that mediaserver is calling them correctly.
Use mutex mLock consistently in StreamSourceAppProxy.
Add an explicit StreamSourceAppProxy::disconnect to break
a circular reference, and call it in StreamPlayer destructor.
Make methods private: receivedCmd_l and receivedBuffer_l.
Add explicit clear during preDestroy to give up references earlier.
Warning: setDataSource(NULL) is not supported by NuPlayer yet,
this depends on another change in frameworks/base, so it is
commented out for now.
Rename mPlayerPrepared to mPreparedPlayer to avoid confusion with the
enum mPlayerPrepared.
Change-Id: Ie5f554c206027d22204eb86edd15489c6281b512
Glenn Kasten [Mon, 10 Oct 2011 18:44:43 +0000 (11:44 -0700)]
Merge "Fix typos in usage: requires local filename"
Glenn Kasten [Mon, 10 Oct 2011 18:36:41 +0000 (11:36 -0700)]
Merge "Bug
5406664 workaround GetPosition for decode"
Glenn Kasten [Mon, 3 Oct 2011 22:48:59 +0000 (15:48 -0700)]
Bug
5406664 workaround GetPosition for decode
Change-Id: I6158108a8ca192f704558caca2006bf704c80d6e
Glenn Kasten [Fri, 30 Sep 2011 00:56:00 +0000 (17:56 -0700)]
Khronos bug 8080 GetMarkerPosition
Play::GetMarkerPosition returns SL_RESULT_PRECONDITIONS_VIOLATED
if no marker is set. Play::SetMarkerPosition returns
SL_RESULT_PARAMETER_INVALID is parameter is SL_TIME_UNKNOWN. Similar
changes for Record, and also bring in all the recent changes from Play.
Add missing curly brackets.
Change-Id: Ibcfdcab5d4342815fe8d0fb1174053e1599aaf5d
Jean-Michel Trivi [Mon, 10 Oct 2011 17:23:54 +0000 (10:23 -0700)]
Merge "Fix bug
5374629 Can't create AudioPlayer playing from MP2TS ABQ"
Glenn Kasten [Mon, 10 Oct 2011 16:44:54 +0000 (09:44 -0700)]
Merge "Don't update prepare state more than once"
Glenn Kasten [Mon, 10 Oct 2011 16:44:38 +0000 (09:44 -0700)]
Merge "Reduce log spam from callback protectors"
Glenn Kasten [Mon, 3 Oct 2011 18:52:43 +0000 (11:52 -0700)]
Error logging in AAC
Change-Id: Ie0b620871543b18e58964a42842d1bb9f193c235
Glenn Kasten [Wed, 28 Sep 2011 19:45:53 +0000 (12:45 -0700)]
Fix bugs in get decoder/encoder counts
Khronos CT found this problem for
AudioDecoderCapabilities::GetAudioDecoders and
AudioEncoderCapabilities::GetAudioEncoders. These APIs are not currently
supported, but are faked out to allow the CT to proceed to other tests.
Change-Id: I5e73324c51ea37e76f621c161393df700b6155c4
Glenn Kasten [Thu, 6 Oct 2011 18:43:45 +0000 (11:43 -0700)]
EnvironmentalReverb::SetDensity copy/paste
There was a missing assignment to the density field
Change-Id: I0dc3332da04b0d3f569625781258df560a89f3b9
Glenn Kasten [Thu, 6 Oct 2011 18:55:56 +0000 (11:55 -0700)]
Khronos CT PresetReverb::GetPreset
OpenSL ES 1.0.1 spec and conformance test do not permit result to
be SL_RESULT_CONTROL_LOST. They say that even if control is lost,
PresetReverb::GetPreset should return the last known preset value.
Change-Id: I11fa6434d35b8e32c660f13f6d96c1db5193bedf
Glenn Kasten [Fri, 30 Sep 2011 18:33:45 +0000 (11:33 -0700)]
AudioPlayer kEventPrepared
Combine execution paths for successful and unsucccessful paths of
android::GenericPlayer::kEventPrepared: for AudioPlayer to make it easier
to see the similarities and differences (and make some other changes soon).
Remove old asserts.
Change-Id: I59304d368a9b7611f2a16c1c687cf8d827526b58
Glenn Kasten [Mon, 3 Oct 2011 19:53:34 +0000 (12:53 -0700)]
Fix typos in usage: requires local filename
Change-Id: I6061757f3919718fc2b4da9392e37ed2c795f8b5
Eino-Ville Talvala [Tue, 4 Oct 2011 22:24:15 +0000 (15:24 -0700)]
Add input region support to MediaEncoderFilter.
This allows the recording to use a different crop/flip/rotate of the
input video than the rest of the pipeline. Placed directly into the
filter for efficiency.
Bug:
5408479
Change-Id: Iac7fcba79a5c0e059f0add4d9e37815d27c1c973
Glenn Kasten [Tue, 4 Oct 2011 19:11:59 +0000 (12:11 -0700)]
Merge "Bug
5385386 missing HEADATNEWPOS"
Glenn Kasten [Tue, 4 Oct 2011 19:11:37 +0000 (12:11 -0700)]
Merge "Bug
5161265 Error recovery getting video codecs"
Eino-Ville Talvala [Tue, 4 Oct 2011 18:32:32 +0000 (11:32 -0700)]
Merge "Updates to frame transform handling in several source filters."
Glenn Kasten [Tue, 4 Oct 2011 00:19:50 +0000 (17:19 -0700)]
Don't update prepare state more than once
If a MEDIA_ERROR event is received during preparation, it indicates
that prepare has completed unsuccessfully. However, MEDIA_ERROR can
also legitimately be sent after successful prepare. In that case, don't
update the prepare state.
Similarly, in the unlikely case that MEDIA_PREPARED is received after
prepare has already completed successfully or unsuccessfully, ignore it.
This probably indicates a buggy mediaserver, but we wouldn't want that
to take down the client also.
Change-Id: I2a92e98d13b70d1aa5ff6f440ad528f6896a2ead
Glenn Kasten [Mon, 3 Oct 2011 23:02:25 +0000 (16:02 -0700)]
Reduce log spam from callback protectors
Change-Id: I83f40370bf86878e6d8dcabfff3847cab2cbbd6c
Eino-Ville Talvala [Sat, 1 Oct 2011 00:53:58 +0000 (17:53 -0700)]
Updates to frame transform handling in several source filters.
- Affects Camera, Media, and SurfaceTextureSource
- Pre-transform source rectangle instead of doing a fragment shader
texture coordinate multiply for each pixel. Bug:
5318657
- Add output orientation port to MediaSource. Bug:
5355973
Change-Id: I446a1f0afd64f06638d17010d81c7fc838612feb