OSDN Git Service
Glenn Kasten [Fri, 2 Sep 2011 00:24:55 +0000 (17:24 -0700)]
Merge "Bug
5244675 miscellaenous AAC decode test"
Glenn Kasten [Mon, 29 Aug 2011 21:49:48 +0000 (14:49 -0700)]
Check callback result code and warn if non-success
The result code is currently unused, but reserved for future use.
This change will help make sure that developers do the right thing now,
so that they will not be impacted when we begin to act on the result.
Change-Id: I8c712882d41d09506defa77340676079bb34de6c
Marius Renn [Thu, 1 Sep 2011 21:39:59 +0000 (14:39 -0700)]
Merge "Class name cleanup. (1/3)"
Glenn Kasten [Fri, 19 Aug 2011 18:51:21 +0000 (11:51 -0700)]
Add rewind (discontinuity) to native-media test
Change-Id: I0f32564d2a2937092436dd48fef877ed55b2d4f3
Glenn Kasten [Wed, 31 Aug 2011 17:51:14 +0000 (10:51 -0700)]
Bug
5244675 miscellaenous AAC decode test
Fix bug in counting encoded frames.
Test get play position and duration at various points.
Display all PCM metadata (in particular the channel mask).
Add example of expected output.
Change-Id: I0d0a629755a37b71a1540e79ae7a6f1ed7095a24
Eric Laurent [Thu, 1 Sep 2011 15:22:47 +0000 (08:22 -0700)]
Merge "clean up in echo reference code"
Eric Laurent [Thu, 1 Sep 2011 02:18:26 +0000 (19:18 -0700)]
clean up in echo reference code
Change-Id: Ie06ed382eee2f1d4d1289d9a49d8a93dcf103e4e
Wei Hua [Thu, 1 Sep 2011 00:38:41 +0000 (17:38 -0700)]
Merge "Added a FixedRotationFilter."
Rodrigo Carceroni [Thu, 1 Sep 2011 00:35:34 +0000 (17:35 -0700)]
Merge "Make background replacement roughly independent of input size."
Wei Hua [Thu, 1 Sep 2011 00:07:53 +0000 (17:07 -0700)]
Added a FixedRotationFilter.
bug:
5221073
RotationFilter is used for dealing the 4 orientations of the device.
Fixed ToPackedGrayFilter to correctly resize the image
if aspect ratio needs to be kept.
Change-Id: Idd3c26ae2ec12b64f7d040a301a87c619fe146e3
Ruei-sung Lin [Thu, 1 Sep 2011 00:04:57 +0000 (17:04 -0700)]
Merge "rewrite lomo and documentary filters"
Marius Renn [Wed, 31 Aug 2011 23:49:47 +0000 (16:49 -0700)]
Class name cleanup. (1/3)
Addresses bug
5214502.
Change-Id: I82321ad516b93e98047fce361a97da020b7ac09e
Ruei-sung Lin [Wed, 31 Aug 2011 22:40:34 +0000 (15:40 -0700)]
rewrite lomo and documentary filters
Change-Id: Ia88123992c4033d9d68c2e47ba22db4f6c911694
Rodrigo Carceroni [Wed, 31 Aug 2011 21:35:57 +0000 (14:35 -0700)]
Make background replacement roughly independent of input size.
Change-Id: I1257718f4ba2ae72add6501d238ec78d0465861b
Eino-Ville Talvala [Wed, 31 Aug 2011 19:15:50 +0000 (12:15 -0700)]
Fix recording resolution mismatch when using CamcorderProfile.
Did not use profile-provided resolution everywhere, resulting in
videos with tiny images in big black boxes.
Bug:
4510826
Change-Id: I845c436de091299fbd8a49eb3b8f70707aadc6f5
Eino-Ville Talvala [Wed, 31 Aug 2011 21:15:07 +0000 (14:15 -0700)]
Merge "Updates to the MediaEncoderFilter."
Glenn Kasten [Wed, 31 Aug 2011 00:26:10 +0000 (17:26 -0700)]
Merge "Bug
5217144 AndroidBufferQueue::Enqueue error chks"
Jamie Gennis [Tue, 30 Aug 2011 21:39:43 +0000 (14:39 -0700)]
Merge "MediaSource: switch to MediaPlayer#setSurface"
Wei Hua [Tue, 30 Aug 2011 20:48:36 +0000 (13:48 -0700)]
Merge "Add fillblack option"
Eino-Ville Talvala [Sun, 28 Aug 2011 18:57:51 +0000 (11:57 -0700)]
Updates to the MediaEncoderFilter.
- Support more of the MediaRecorder parameters
- Allow toggling recording on/off during filter graph execution.
- Pass timestamps on correctly
Bug:
4510826
Change-Id: I63c9c5e9554d8e8570f2051f08e81ef753069fa1
Glenn Kasten [Mon, 29 Aug 2011 23:36:43 +0000 (16:36 -0700)]
Merge "Example of AAC ADTS decoding with OpenSL ES"
Jamie Gennis [Mon, 29 Aug 2011 00:22:34 +0000 (17:22 -0700)]
MediaSource: switch to MediaPlayer#setSurface
This change updates MediaSource to use the new MediaPlayer#setSurface method, which
is replacing MediaPlayer#setTexture.
Change-Id: I4e4c5d1c5e481100db9265114bb285b766ae9877
Ruei-sung Lin [Mon, 29 Aug 2011 20:32:50 +0000 (13:32 -0700)]
Merge "Fix Grain filter and optimize other filters"
Rodrigo Carceroni [Mon, 29 Aug 2011 19:51:57 +0000 (12:51 -0700)]
Merge "Fix b/issue?id=
4882048"
Ruei-sung Lin [Mon, 29 Aug 2011 18:50:56 +0000 (11:50 -0700)]
Fix Grain filter and optimize other filters
bug:
5127871
Change-Id: I627a840906417891270aa2d93ea966c217d98b3c
Glenn Kasten [Wed, 24 Aug 2011 00:11:23 +0000 (17:11 -0700)]
Bug
5217144 AndroidBufferQueue::Enqueue error chks
Add more error checks to Enqueue:
- check for a NULL data pointer with non-zero data size
- check for a NULL item array with non-zero item array size
For the Enqueue item processing:
- examine all items if there is more than one in the array
- check for invalid combinations of items
- check that total length of item array is large enough for each
item's header and any optional data
- check for an EOS with a non-empty item data
- log if an unknown item key is found
- added the EOS item handling code for AAC ADTS
(the underlying implementation is still not yet done).
Fix copy/paste typo in initializeAndroidBufferQueueMembers.
AacBqToPcmCbRenderer::validateBufferStartEndOnFrameBoundaries:
- now returns a more specific result code rather than bool
- readAt return type ssize_t not size_t
- readAt return 0 (EOS) is a LOGV not LOGE.
Fix race in Android buffer queue callback: replaced logic in
BufferQueueSource.cpp by safer code from android_StreamPlayer.cpp
Change-Id: I423ccbd6d76a736a486b49b5dfdb7898b52cdd02
Glenn Kasten [Sun, 28 Aug 2011 16:29:43 +0000 (09:29 -0700)]
Bug
5226085 miscellaneous metadata issues
The metadata keys are now exposed for AAC decode.
The metadata keys are now exposed at Realize. The keys were previously
only available after prefetching was complete. This made it more awkward
for an application to use them.
Fixed race condition in access to metadata values.
Change-Id: I3daed2da61f5ed0add6948f1558963cfe66795fc
Jean-Michel Trivi [Thu, 25 Aug 2011 17:15:23 +0000 (10:15 -0700)]
Example of AAC ADTS decoding with OpenSL ES
Put AAC ADTS in an AndroidBufferQueue, retrieve PCM data through
a BufferQueue.
Change-Id: I9718d7a9e030a2c3568de8579f3329b76f63d891
Rodrigo Carceroni [Fri, 26 Aug 2011 22:57:02 +0000 (15:57 -0700)]
Fix b/issue?id=
4882048
Change-Id: Ib26f4c9f1c64c70e779ac5533892a91cef23d1fe
Pannag Sanketi [Mon, 22 Aug 2011 15:57:48 +0000 (08:57 -0700)]
Recording MFF Frames using MediaEncoder
Changed the GL native and jni to incorporate media encoding
This involves being able to call disconnect on the SurfaceMediaSource
and choosing the right egl config
Related to bug id:
5216763
Change-Id: I048bbbd2b308b6163fd380edd7575e52dee23ccf
Jean-Michel Trivi [Fri, 26 Aug 2011 16:49:36 +0000 (09:49 -0700)]
Merge "Metadata keys for PCM decoding"
Yifan Peng [Fri, 26 Aug 2011 00:29:59 +0000 (17:29 -0700)]
Add fillblack option
If quad box is outside of image, it will display black.
Change-Id: I4871e4bf495ec461a0923ea80cafd2566e07caeb
Marius Renn [Thu, 25 Aug 2011 21:54:24 +0000 (14:54 -0700)]
Merge "General code / documentation clean-up."
Wei Hua [Thu, 25 Aug 2011 21:36:16 +0000 (14:36 -0700)]
Merge "Change the OneShotScheduler to schedule only the source node once."
Marius Renn [Thu, 25 Aug 2011 21:35:01 +0000 (14:35 -0700)]
General code / documentation clean-up.
- Addresses API council's comments.
- Adds identity effect.
- Other clean-up.
Change-Id: Ib87ea95b8df44eef39be970971f436e46f0ade2d
Wei Hua [Thu, 25 Aug 2011 18:43:33 +0000 (11:43 -0700)]
Change the OneShotScheduler to schedule only the source node once.
Bug:
5214756
Change-Id: Ia14b57b618d875e71d0fd65909eb7aa69b867f95
Glenn Kasten [Thu, 25 Aug 2011 18:04:50 +0000 (11:04 -0700)]
Merge "xaplay command-line mediaplayer for MPEG-2 TS ABQ"
Jean-Michel Trivi [Thu, 25 Aug 2011 17:55:48 +0000 (10:55 -0700)]
Metadata keys for PCM decoding
Declare in a public header the metadata keys an application which
decodes audio data would use to figure out the output PCM format.
Make the SL ES Android header also include the configuration and
metadata headers.
Update test apps to reflect this.
Change-Id: I298db4fdb800df2d48047691441aa7489aad4822
Glenn Kasten [Mon, 22 Aug 2011 15:24:44 +0000 (08:24 -0700)]
xaplay command-line mediaplayer for MPEG-2 TS ABQ
Change-Id: Id5ea3f478f45d4fa4b86772593ae831d9eade952
Glenn Kasten [Wed, 24 Aug 2011 17:31:01 +0000 (10:31 -0700)]
Bug
5193695 Fix crash after MediaPlayer destroyed
The StreamSource callback thread was continuing to run after the
MediaPlayer object was destroyed. Fixed by adding a callback protector
and a pre-destroy hook. GenericMediaPlayer::preDestroy now also
calls MediaPlayer::stop just in case.
Change-Id: I5bd771d4d1936f433d2a8c9959593782c96daed9
Miscellaneous:
- added an explicit destructor on CMediaPlayer::mAVPlayer for consistency
(probably not a bug since there was a clear on it earlier)
- updated comments for CallbackProtector
- made some CallbackProtector fields private since no sub-classes yet
Glenn Kasten [Wed, 24 Aug 2011 19:05:44 +0000 (12:05 -0700)]
Merge "Bug
5153313 keep compatibility of local files URI"
Glenn Kasten [Wed, 24 Aug 2011 19:05:30 +0000 (12:05 -0700)]
Merge "Bug
5105712 synchronous callbacks"
Glenn Kasten [Thu, 11 Aug 2011 15:07:18 +0000 (08:07 -0700)]
Bug
5153313 keep compatibility of local files URI
Also fix a bug in decode from fd to PCM buffer queue, where
we were closing the application's fd.
Change-Id: I220cd1c242f2f5e240b4dd1b9e8d79c88878bdcd
Glenn Kasten [Tue, 2 Aug 2011 14:39:41 +0000 (07:39 -0700)]
Bug
5105712 synchronous callbacks
After GetPosition is made synchronous, it is safer to make client
callbacks synchronous also.
Change-Id: I2688f709ed672aaa62d046d5f95db1b81504c9e3
Eric Laurent [Wed, 24 Aug 2011 18:34:26 +0000 (11:34 -0700)]
Merge "Converted libaudioutils implementation to C."
Eino-Ville Talvala [Wed, 24 Aug 2011 17:19:44 +0000 (10:19 -0700)]
Merge "NEW_API: Make rest of the effect names public in EffectFactory."
Eino-Ville Talvala [Mon, 22 Aug 2011 17:37:24 +0000 (10:37 -0700)]
NEW_API: Make rest of the effect names public in EffectFactory.
Bug:
4966161
Change-Id: If194ebb5d1c45e8826a53fe9a83a94a1690cc11d
Eino-Ville Talvala [Wed, 24 Aug 2011 16:35:39 +0000 (09:35 -0700)]
Merge "Fix minor logging bug in core Filter code."
Glenn Kasten [Wed, 24 Aug 2011 16:06:36 +0000 (09:06 -0700)]
Merge "Bug
5198051 MediaPlayer prefetch status interface"
Glenn Kasten [Wed, 24 Aug 2011 15:00:34 +0000 (08:00 -0700)]
Merge "Assertion checks do LOGF not fprintf to stderr"
Eino-Ville Talvala [Wed, 24 Aug 2011 00:11:20 +0000 (17:11 -0700)]
Fix minor logging bug in core Filter code.
Change-Id: Ic03692e2456d2ca2615b75c7da4672ae3fed60d9
Glenn Kasten [Tue, 23 Aug 2011 23:50:18 +0000 (16:50 -0700)]
Merge "Bug
5198051 MediaPlayer StreamInformation various"
Wei Hua [Tue, 23 Aug 2011 23:49:27 +0000 (16:49 -0700)]
Merge "Add reset function to Native Program."
Glenn Kasten [Tue, 23 Aug 2011 23:48:57 +0000 (16:48 -0700)]
Merge "Bug
5198051 Video sink on MediaPlayer is optional"
Glenn Kasten [Tue, 23 Aug 2011 23:48:16 +0000 (16:48 -0700)]
Merge "Bug
5198051 MediaPlayer PLAYEVENT_HEAD* callbacks"
Glenn Kasten [Tue, 23 Aug 2011 22:22:55 +0000 (15:22 -0700)]
Assertion checks do LOGF not fprintf to stderr
Also add comments to Android.mk, and add SL_LOGF not yet used.
Change-Id: I1e051c040b667e2e70b6df0c03648c309efef7d6
Glenn Kasten [Mon, 22 Aug 2011 15:25:19 +0000 (08:25 -0700)]
Bug
5198051 MediaPlayer prefetch status interface
Change-Id: I426c870f803df0a7052f17be955ba797a814b4cc
Eric Laurent [Thu, 18 Aug 2011 01:36:09 +0000 (18:36 -0700)]
Converted libaudioutils implementation to C.
Converted libaudioutils implementation and interfaces from C++ to C
and removed dependencies from frameworks/base classes so that it can
be used by any audio HAL implementation.
Change-Id: I3f7ce541be8495d41864661451540971b067359b
Wei Hua [Tue, 23 Aug 2011 18:37:39 +0000 (11:37 -0700)]
Add reset function to Native Program.
Bug:
5202663
Change-Id: I6d49e7cb765f776e193e8bf1fcde26678438e12e
Eino-Ville Talvala [Tue, 23 Aug 2011 15:52:19 +0000 (08:52 -0700)]
Merge "Several improvements for interacting with Camera app."
Glenn Kasten [Sun, 21 Aug 2011 23:53:07 +0000 (16:53 -0700)]
Bug
5198051 Video sink on MediaPlayer is optional
Change-Id: I2c78508fa1efac765ff5812c22e3a4c2cfc33b73
Glenn Kasten [Mon, 22 Aug 2011 20:56:18 +0000 (13:56 -0700)]
Bug
5198051 MediaPlayer PLAYEVENT_HEAD* callbacks
Change-Id: Ibb04fbf727997281bb77fd22c51cd90bd044e505
Glenn Kasten [Tue, 23 Aug 2011 14:15:13 +0000 (07:15 -0700)]
Merge "Bug
5198051 MediaPlayer play state PAUSED at end"
Glenn Kasten [Sun, 21 Aug 2011 17:50:06 +0000 (10:50 -0700)]
Bug
5198051 MediaPlayer StreamInformation various
Fix uninitialized field frameRate.
QueryMediaContainerInformation returns XA_RESULT_PARAMETER_INVALID if
info is NULL, otherwise it copies the information via the info pointer,
and returns XA_RESULT_SUCCESS.
QueryStreamName returns XA_RESULT_FEATURE_UNSUPPORTED.
Simplify RegisterStreamChangeCallback.
Change-Id: I261ac0c053be0de7bac5fc80661b979f7f9c84b6
Glenn Kasten [Mon, 22 Aug 2011 15:59:42 +0000 (08:59 -0700)]
Bug
5198051 MediaPlayer support GetDuration
Change-Id: I09d9292685d82b88cddd243e6e7f5410ffaa2248
Glenn Kasten [Mon, 22 Aug 2011 17:33:01 +0000 (10:33 -0700)]
Bug
5198051 MediaPlayer play state PAUSED at end
Change-Id: I9160336a9e74b2f2f501cb94d1f24047b2979b76
Eino-Ville Talvala [Sun, 21 Aug 2011 20:49:45 +0000 (13:49 -0700)]
Several improvements for interacting with Camera app.
- Add support for extra library loading in FilterFactory
- Add support for listing custom libraries in graph files
- Add new SurfaceTargetFilter for output to a Surface managed by the app.
Bug:
4510826
Change-Id: Icfd350d8f83627934549c30cdfb52cd1a21d3e72
Eric Laurent [Mon, 22 Aug 2011 15:31:57 +0000 (08:31 -0700)]
Merge "Created library for common audio HAL functions."
Ruei-sung Lin [Sun, 21 Aug 2011 20:16:45 +0000 (13:16 -0700)]
Merge "Moving photo editor effects to imageproc"
Glenn Kasten [Sun, 21 Aug 2011 17:56:37 +0000 (10:56 -0700)]
Merge "8-bit now works"
Eino-Ville Talvala [Fri, 19 Aug 2011 22:46:44 +0000 (15:46 -0700)]
Merge "Tune the background replacer filter toward shipping quality."
Eino-Ville Talvala [Fri, 19 Aug 2011 16:21:31 +0000 (09:21 -0700)]
Tune the background replacer filter toward shipping quality.
Works reasonably in talk; issues with dark objects remain.
Bug:
5111139
Change-Id: I32c84d73b8d69c89e1f1d7ae9a5f7738f4025fe3
Glenn Kasten [Fri, 19 Aug 2011 19:07:12 +0000 (12:07 -0700)]
Merge "Bug
5126938 dependency for video sinks"
Glenn Kasten [Fri, 19 Aug 2011 19:06:36 +0000 (12:06 -0700)]
Merge "Test playbq: 8-bit and big-endian byte ordering"
Glenn Kasten [Fri, 12 Aug 2011 16:22:43 +0000 (09:22 -0700)]
8-bit now works
Change-Id: I70ce7e10f0b465250b9f4d7644d21f5c4b4c99fa
Glenn Kasten [Fri, 19 Aug 2011 16:01:51 +0000 (09:01 -0700)]
Merge "Use XA instead of SL in type cast"
Ruei-sung Lin [Fri, 19 Aug 2011 00:47:38 +0000 (17:47 -0700)]
Moving photo editor effects to imageproc
Change-Id: Idb11915f9e70aa40a228532ed998563227b4c5ff
Glenn Kasten [Thu, 18 Aug 2011 21:59:20 +0000 (14:59 -0700)]
Use XA instead of SL in type cast
Change-Id: Icc8d678484f454860b32d8823d4a274d3d14d991
Eino-Ville Talvala [Thu, 18 Aug 2011 21:53:13 +0000 (14:53 -0700)]
Merge "Add backdropper to list of effects, and reformat documentation."
Eino-Ville Talvala [Thu, 18 Aug 2011 20:06:30 +0000 (13:06 -0700)]
Add backdropper to list of effects, and reformat documentation.
Backdropper is still hidden, until we have the full list of effects.
Bug:
4966161
Change-Id: I95560615eb891c951da676beeb2dc3ac610dc07e
Glenn Kasten [Thu, 18 Aug 2011 14:31:11 +0000 (07:31 -0700)]
Merge "Bug
5159291 lock safety"
Glenn Kasten [Thu, 18 Aug 2011 14:30:57 +0000 (07:30 -0700)]
Merge "Bug
5161265 Recover from mediaserver process crash"
Glenn Kasten [Wed, 10 Aug 2011 23:02:48 +0000 (16:02 -0700)]
Test playbq: 8-bit and big-endian byte ordering
Change-Id: Ic34f35226fee07945925cad8cfbc10c756092fee
Eric Laurent [Wed, 17 Aug 2011 16:13:33 +0000 (09:13 -0700)]
Created library for common audio HAL functions.
libaudioutils groups functions that can be used by any audio HAL
implementation.
Current functions are:
- a resampler based on speex resampler.
- an echo reference module providing resampling, buffering and
time stamp management of PCM data between an output stream and an
input stream for use as echo reference by an AEC module.
This commit is the first step consisting of moving code previously in
crespo audio HAL. This C++ code will the be converted to C and stripped from
dependencies to frameworks/base classes for use by all audio HALs.
Change-Id: Ifa51e0c6358c23122a379d7f5d9ce13a65ff0cf0
Eino-Ville Talvala [Tue, 16 Aug 2011 23:28:07 +0000 (16:28 -0700)]
Avoid future circular dependency in framework libraries.
Explictly list which framework libraries we depend on, instead of
accepting the default list (which will include this library in the
future).
Bug:
5098987
Change-Id: I781143f535d1e84122de460125915866420e8d07
Eric Laurent [Tue, 16 Aug 2011 00:31:32 +0000 (17:31 -0700)]
Merge "Bug
5147281 prefetch status deadlocks"
Eino-Ville Talvala [Mon, 15 Aug 2011 17:06:43 +0000 (10:06 -0700)]
Merge "Remove dead code from backdropper filter shaders."
Jean-Michel Trivi [Sun, 14 Aug 2011 21:24:43 +0000 (14:24 -0700)]
Merge "AAC buffer decode to PCM buffer queue"
Eino-Ville Talvala [Sat, 13 Aug 2011 00:31:54 +0000 (17:31 -0700)]
Remove dead code from backdropper filter shaders.
The code is not approved of by all shader compilers, and is unused
in any case.
Bug:
5111139
Change-Id: I83af451b870d3c2cb1be5c8d0b780e700453e04c
Glenn Kasten [Fri, 12 Aug 2011 23:24:09 +0000 (16:24 -0700)]
Bug
5161265 Recover from mediaserver process crash
Use the utility method IMediaDeathNotifier::getMediaPlayerService()
to get a reference to media player service. It retries after errors,
and keeps a single global per-process reference to the service rather
than one per object. If we still can't contact the media player service
after retries, handle it like an unsuccessful prepare.
Miscellaneous:
- Remove unused field Parcel metadatafilter
Change-Id: I451a64bd76b4a7f157774abe967448ec081f1014
Glenn Kasten [Fri, 12 Aug 2011 14:22:27 +0000 (07:22 -0700)]
Bug
5159291 lock safety
Change-Id: I56f5fd038d63d033954d794168df4cbcdade26f3
Glenn Kasten [Wed, 10 Aug 2011 22:54:39 +0000 (15:54 -0700)]
Bug
5147281 prefetch status deadlocks
Fixed two deadlocks related to AudioTrack prefetch event callbacks:
- if PrefetchStatus interface was initialized on an AudioPlayer,
there was a deadlock at the point where it checked whether to do a callback
- prefetch status callbacks are now called with the object unlocked,
so they are permitted to do APIs on the object
Miscellaneous fixes:
- SMP-safe locks for GetPrefetchStatus, GetFillLevel,
GetCallbackEventsMask, SetFillUpdatePeriod, GetFillUpdatePeriod
- SetCallbackEventsMask error handling for invalid bitmask
- Enqueue sets prefetch fill level to 1000
Change-Id: Ic8b2c440aeb4efa3446a4a73d3422d934ceb0578
Jean-Michel Trivi [Wed, 27 Jul 2011 17:00:04 +0000 (10:00 -0700)]
AAC buffer decode to PCM buffer queue
Implement AAC ADTS decode with buffers of compressed data being
passed to the framework through an AndroidBufferQueue, and
decoded PCM buffers being passed to the application through
a BufferQueue (just like existing decode from URI/FD).
Change-Id: Id992a44a5ca7e404088b929f2b0afe9ca1f85223
Eino-Ville Talvala [Wed, 10 Aug 2011 22:41:01 +0000 (15:41 -0700)]
Add timestamp as a port to GLTextureSource.
Allows filter chains using external texture sources to propagate
timestamps provided by the external source.
Bug:
5149729
Change-Id: Ic365257306636ea1083ad23a811a48a5e872bd5b
Eino-Ville Talvala [Wed, 10 Aug 2011 20:23:37 +0000 (13:23 -0700)]
Merge "Fixes to BackDropperEffect."
Marius Renn [Wed, 10 Aug 2011 17:13:54 +0000 (10:13 -0700)]
Merge "Bugfix (
5144111): Choose FBO pixel read over texture pixel read."
Glenn Kasten [Mon, 8 Aug 2011 16:42:30 +0000 (09:42 -0700)]
Bug
5126938 dependency for video sinks
Fixing bug
5126938 will involve configuring the video sink in two places:
at the initial data locator when creating the MediaPlayer object, and
then later in the IAndroidConfiguration interface. This CL is preparation
for that.
Details:
- Abstract out common code into android_Player_setNativeWindow.
- Move the code for checking and initializing the video sink from an
#ifdef ANDROID in the CMediaPlayer_Realize portable code to into
platform-specific android_Player_realize.
- Only set one of mSurface or mSurfaceTexture to non-NULL.
- For methods which can't fail, replace the SLresult return value by void.
Change-Id: Iec8fd91e1a6de45eb64241b35e3f7d7faf63d727
Eino-Ville Talvala [Tue, 9 Aug 2011 22:27:04 +0000 (15:27 -0700)]
Fixes to BackDropperEffect.
- Enable auto-wb
- Fixes to graph, filter references
Bug:
5039738
Change-Id: I9fb17659fb706920a4637f921a6e230984aa3051
Marius Renn [Tue, 9 Aug 2011 22:35:35 +0000 (15:35 -0700)]
Bugfix (
5144111): Choose FBO pixel read over texture pixel read.
Change-Id: Ibdae635445551c302d7edb3f6fd77369e43b7293
Ruei-sung Lin [Tue, 9 Aug 2011 21:38:35 +0000 (14:38 -0700)]
Merge "add ImageSlicer and ImageStitcher filters."