OSDN Git Service
Marius Renn [Sun, 12 Jun 2011 18:37:20 +0000 (11:37 -0700)]
Merge "Code clean up."
Wei Hua [Sat, 11 Jun 2011 00:37:42 +0000 (17:37 -0700)]
Code clean up.
add @Override
and remove unnecessary imports.
Change-Id: I274bd84c98e1dc657e35787ab0727b8247d70fdf
Eino-Ville Talvala [Tue, 7 Jun 2011 23:57:00 +0000 (16:57 -0700)]
Merge core filter framework libraries into one.
Combines JNI and native shared libraries into a single shared library.
Change-Id: If2cdb2b048c9c45275b1eabd06c9846c20434422
Wei Hua [Tue, 7 Jun 2011 23:45:26 +0000 (16:45 -0700)]
Merge "Throws JAVA exception when native program process fails."
Wei Hua [Tue, 7 Jun 2011 17:39:33 +0000 (10:39 -0700)]
Throws JAVA exception when native program process fails.
Change-Id: I2645bed644fd87ba483e6f0288a3255939b4dc4b
Marius Renn [Tue, 7 Jun 2011 16:49:32 +0000 (09:49 -0700)]
Refactored KeyValueMap, Parameter Binding
Also adds ability to bind directly to program parameters.
Change-Id: Ia5571bcf1f87583eb2ffab0a9b839a510a979e00
Eino-Ville Talvala [Mon, 6 Jun 2011 23:01:08 +0000 (16:01 -0700)]
Fixes to SurfaceRenderFilter, SurfaceTextureSource.
Multiple SurfaceRenderFilters can now share a single destination
FilterSurfaceView, as long as only one of them is running at a time
(ie, they're in different graphs that aren't run simultaneously)
SurfaceTextureSource now creates its SurfaceTexture on open() instead
of prepare(), to make it easier for an app to switch between multiple
processing graphs using the same ultimate source, and to keep down
memory consumption.
Change-Id: I37931b60b3de15ffa484c258e5018c15e9335371
Eino-Ville Talvala [Fri, 3 Jun 2011 23:31:15 +0000 (16:31 -0700)]
Allow CallbackFilter parameter updates
Change-Id: I9c65b09ce059a4dadeb317aae25a0a155644bae9
Eino-Ville Talvala [Fri, 3 Jun 2011 19:55:20 +0000 (12:55 -0700)]
Move runner done callback code to GraphRunner interface.
Instead of just being in AsyncRunner, implement runner done callbacks
in SyncRunner as well.
Change-Id: I9fab177493821b79c080940a69d123f1d6de35fc
Eino-Ville Talvala [Thu, 2 Jun 2011 21:10:18 +0000 (14:10 -0700)]
Adds a SurfaceTextureSource filter.
This is a filter intended for applications that want to manage the
data source for the SurfaceTexture themselves, instead of using
existing simple interfaces from CameraSource or MediaSource.
The filter provides a SurfaceTexture object that can be connected up
to any data source to provide frames.
Change-Id: Icb7d48411e95c330d0023aa9e528160b20308c6e
Jean-Michel Trivi [Fri, 3 Jun 2011 18:21:23 +0000 (11:21 -0700)]
Stop the OMX codec when destroying the OpenSL ES decoder
The AudioSfDecoder class uses a MediaSource interface from
an OMXCodec object. In the class destructor, the codec must
be stopped before the codec is anihilated.
Change-Id: Ibf0d729e055dcd8f4e05f3fb8332d650f9be0d30
Rodrigo Carceroni [Fri, 3 Jun 2011 00:28:49 +0000 (17:28 -0700)]
Merge "Add filter for efficient conversion from color in-GPU to grayscale native"
Jean-Michel Trivi [Fri, 3 Jun 2011 00:26:00 +0000 (17:26 -0700)]
Merge "Stress test for OpenSL ES: create and delete many players"
Jean-Michel Trivi [Thu, 2 Jun 2011 16:29:17 +0000 (09:29 -0700)]
Stress test for OpenSL ES: create and delete many players
Implementation of a test to deal with 40 AudioPlayers:
- creation
- realize
- configuration
- prefetching
- playback
- destruction
If a player was created, regardless of whether the other
operations were successful, it will be destroyed.
The number of players, 40, is chosen specifically because it
is larger than the number of objects Wilhelm is currently
capable of supporting, and larger than the number of tracks
supported by the platform mixer.
Change-Id: I42287039d59b77e59c60d074fbc0177d9726b359
Rodrigo Carceroni [Thu, 2 Jun 2011 21:58:35 +0000 (14:58 -0700)]
Add filter for efficient conversion from color in-GPU to grayscale native
Change-Id: I369d4d5a96d1958c70584e1a44fc9bffc99fb3ea
Eino-Ville Talvala [Thu, 2 Jun 2011 19:20:47 +0000 (12:20 -0700)]
Merge "Add pause support to MediaSource"
Eino-Ville Talvala [Thu, 2 Jun 2011 17:36:39 +0000 (10:36 -0700)]
Add pause support to MediaSource
Change-Id: Ic009c3f27a582c4b82aa4a449db409a54536f011
Glenn Kasten [Wed, 1 Jun 2011 22:20:29 +0000 (15:20 -0700)]
Revert "Use AudioTrack::event_type not int in callback"
This reverts commit
1d7ee1569f98f7f1b629a04bb0895165255c7f7b
Glenn Kasten [Wed, 4 May 2011 22:36:52 +0000 (15:36 -0700)]
Use AudioTrack::event_type not int in callback
Change-Id: Icd60d7eff86e3bdf9907c573b6900c8eca96acf1
Eino-Ville Talvala [Wed, 1 Jun 2011 19:05:33 +0000 (12:05 -0700)]
Add missing makefile to new filterpack.
Change-Id: I5a8e9020c2a0073d59ac64a6fc76f695f4fc5ea1
Eino-Ville Talvala [Wed, 1 Jun 2011 18:47:32 +0000 (11:47 -0700)]
Merge "Move Camara- and MediaSource filters to system/media."
Marius Renn [Wed, 1 Jun 2011 01:25:31 +0000 (18:25 -0700)]
Merge "Created abstract base class for frontend environments."
Marius Renn [Tue, 31 May 2011 22:58:24 +0000 (15:58 -0700)]
Created abstract base class for frontend environments.
Change-Id: Ib9c9396545e1b30aa621784f651ef6ffc0575adb
Eino-Ville Talvala [Tue, 31 May 2011 22:01:12 +0000 (15:01 -0700)]
Move Camara- and MediaSource filters to system/media.
Change-Id: Ic7abc3ccc9424d6e563fa0b385b92e7993bbbb58
Eino-Ville Talvala [Tue, 31 May 2011 19:14:42 +0000 (12:14 -0700)]
Cleanups of mobile filter framework core code.
- Eliminate basictypes.h
- Include what you use
- Consistent namespaces/header guards
- Copyright headers
Change-Id: I3658a4ce8268a58644e48544a162a910447123d1
Marius Renn [Sat, 28 May 2011 00:10:04 +0000 (17:10 -0700)]
Merge "remove unneeded dependency"
Ruei-sung Lin [Fri, 27 May 2011 23:54:06 +0000 (16:54 -0700)]
remove unneeded dependency
Change-Id: I52f1b4b57e46138fe6eb5de138d7a9acbbe82538
Eric Laurent [Fri, 27 May 2011 22:26:41 +0000 (15:26 -0700)]
Merge "New audio effect API."
Marius Renn [Fri, 27 May 2011 19:24:58 +0000 (12:24 -0700)]
Renamed ObjectFrame to JavaFrame, FilterEnvironment to FilterContext.
Also renamed Filter functions for input/output formatting.
Change-Id: I8303add0084dda718762edb635421dce7ca41313
Marius Renn [Fri, 27 May 2011 16:54:42 +0000 (09:54 -0700)]
Minor fixes.
- Filter now has a getInputFormat() method.
- Requests for illegal filter ports now throws exceptions.
- More detailed toString() implementations for Frames.
Change-Id: I03e80ae30243256d8dd45665f172a46049aa2245
Marius Renn [Fri, 27 May 2011 00:05:40 +0000 (17:05 -0700)]
Renamed filterfw2 lib to filterfw.
Change-Id: Ib21cd71f1bbe3e7d65e4378fa158cbb4e0302cd6
Eric Laurent [Wed, 18 May 2011 02:22:27 +0000 (19:22 -0700)]
New audio effect API.
media/EffectApi.h header file has been moved and renamed to
hardware/audio_effect.h
Change-Id: Ie24295fb16f3925f1cc43577605d371fd9a18528
Wei Hua [Wed, 25 May 2011 16:39:04 +0000 (09:39 -0700)]
Add filterpacks' native base library.
Change-Id: Ia83f68dee76eb9c5684f760380b48de9e146c3c5
Rodrigo Carceroni [Wed, 25 May 2011 01:17:00 +0000 (18:17 -0700)]
Initial public check-in of Mobile Filter Framework
Change-Id: I952e3b11c1742b861cc31d3f3ecf2713cfa434f8
Dima Zavin [Wed, 11 May 2011 21:16:27 +0000 (14:16 -0700)]
update for new audio.h header location
Change-Id: I2140f1def08bedd8b2bd5170c6ac5edccb80035c
Signed-off-by: Dima Zavin <dima@android.com>
Jean-Michel Trivi [Wed, 11 May 2011 18:12:13 +0000 (11:12 -0700)]
Update automated OpenSL ES test for playback from file path
Remove test where duration is queried after the player is realized
but before prefetching has started: invalid test, duration isn't
known at this time.
Changed wording of error messages to make test failures easier to
identify
Added test to compare retrieved duration, and expected duration.
Fixed expected file duration: was 75s, should be 71s
Change-Id: I6230c00f0c945c6966e1f08ecfbc67452667cf33
Dima Zavin [Tue, 5 Apr 2011 23:15:40 +0000 (16:15 -0700)]
system/media: convert to use new defines from hardware/audio.h
Change-Id: I8f0f0d26e10dbbb4dfbc3b52f1c02737a375c5e0
Signed-off-by: Dima Zavin <dima@android.com>
Gloria Wang [Wed, 13 Apr 2011 23:02:36 +0000 (16:02 -0700)]
- Add another parameter in notify() to be able to send timed text sample
through listener during video playback.
For feature request 800939.
Change-Id: I14aa18d2f803163a62c05f9e6bd990518c58cd3f
Glenn Kasten [Wed, 13 Apr 2011 21:32:52 +0000 (14:32 -0700)]
Merge "Fix build warnings caused by the 'long' change"
Glenn Kasten [Wed, 13 Apr 2011 18:58:55 +0000 (11:58 -0700)]
Fix build warnings caused by the 'long' change
Change-Id: I34e74d723ae7fd829dd140614928d7880e669f03
Jean-Michel Trivi [Wed, 13 Apr 2011 17:09:31 +0000 (10:09 -0700)]
Fix stuttering at beginning of playback
When an AudioPlayer is created, its playstate is set to STOPPED
three times. A stop command is translated into a pause + seek(0).
When a seek is underway, any new seek command was postponed. So
when playback would start after a first seek(0), the other seeks
would be executed, causing the stutterring.
This CL verifies that, when seeking to a certain time, any new
seek command to the same point in time received while seeking
is ignored.
It also correct the update of mStateFlags, which should be done
BEFORE the command is issued to the player, in case the seek
complete notification happens syncronously with the seek command.
This CL does NOT fix why a newly created player sees its playstate
updated to STOPPED three times in a test app like slesTest_playUri
before playback starts.
Change-Id: Ic7627678735f559b911ea3c5a0e1e00d7d7534d2
Glenn Kasten [Tue, 12 Apr 2011 23:55:35 +0000 (16:55 -0700)]
Fix various bugs found with unit tests
ISeek::SetLoop was returning undefined status.
Khronos Bug 7614 - sizeof(long) != 32 bits on x86_64.
Fix bug in IID hashing due to the above.
Fix bug in GenericMediaPlayer::onLoop; was using mPlayer without checking for NULL.
Fix wrong API level in tests/sandbox/object.c.
Decrease log level from I to V in MediaPlayerNotificationClient::notify
and GenericPlayer::~GenericPlayer.
Fix memory leak in tests/sandbox/engine.c.
Comment out overly verbose log in tests/sandbox/streamSource/slesTestPlayStream.cpp.
Change-Id: I322fa9e19ee95ea1e18870a20f6a3c03b8f21208
Glenn Kasten [Tue, 12 Apr 2011 17:24:17 +0000 (10:24 -0700)]
Merge "Refactor the handling of updates to attributes"
Glenn Kasten [Thu, 7 Apr 2011 19:23:38 +0000 (12:23 -0700)]
Refactor the handling of updates to attributes
Attribute handler functions are more modular and
get rid of those endless if statements.
Change-Id: I3221aeb3d26d2dcc5dc9a3f6d37d088f5ce511a1
Jean-Michel Trivi [Mon, 11 Apr 2011 18:39:05 +0000 (11:39 -0700)]
Remove compilation warnings for SLmillibel level comparisons
In OpenSL ES, the volumes are expressed in millibels, which are
stored as SLint16.
The mix and max values are defined as:
define SL_MILLIBEL_MAX ((SLmillibel) 0x7FFF)
define SL_MILLIBEL_MIN ((SLmillibel) (-SL_MILLIBEL_MAX-1))
Therefore the comparison
(SL_MILLIBEL_MIN <= level)
is always true.
This CL removes those comparisons rather than use the compilation
flag to suppress the warning (it is a useful warning!).
Change-Id: I5672f257661ac045ba5282ecb0ecd14d985d8102
Jean-Michel Trivi [Mon, 11 Apr 2011 18:01:17 +0000 (11:01 -0700)]
Use reference to sp on GenericPlayer
When an object like GenericPlayer is stored in CAudioPlayer or
CMediaPlayer by a sp, don't use a pointer to GenericPlayer when
the object is passed as a function parameter, but rather use
a reference to the sp that maintains it.
Change-Id: I49ff219618ac4b657deb43cfffb65f0e0dd6d58d
Glenn Kasten [Thu, 7 Apr 2011 18:58:42 +0000 (11:58 -0700)]
Re-generate autogen files
Change-Id: I3ff71790a981ea0f1e604bae344e4a949509405a
Jean-Michel Trivi [Thu, 7 Apr 2011 17:55:20 +0000 (10:55 -0700)]
Merge "OpenMAX AL: support the SeekItf and XA_PLAYEVENT_HEADATEND"
Jean-Michel Trivi [Thu, 7 Apr 2011 16:52:09 +0000 (09:52 -0700)]
OpenMAX AL: support the SeekItf and XA_PLAYEVENT_HEADATEND
Implemented support for:
- seeking to a position
- looping (only over full duration is supported, no loop points)
- notification of end of content reached
This is all for the playback of URIs or FDs.
Change-Id: I015c40e66feb7ac280459895f5f7915ac964df31
Glenn Kasten [Wed, 6 Apr 2011 22:59:30 +0000 (15:59 -0700)]
Merge "Fix build on non-Android platform"
Glenn Kasten [Wed, 6 Apr 2011 22:59:17 +0000 (15:59 -0700)]
Merge "Line length 100"
Glenn Kasten [Wed, 6 Apr 2011 19:49:05 +0000 (12:49 -0700)]
Line length 100
Change-Id: Ie4459eed7f94870413bc87252910c1189ecf2e06
Glenn Kasten [Wed, 6 Apr 2011 19:41:52 +0000 (12:41 -0700)]
Fix build on non-Android platform
Change-Id: I85b25467ac5bae45b12ec5b0abfb4696449c2da8
Jean-Michel Trivi [Wed, 6 Apr 2011 19:05:56 +0000 (12:05 -0700)]
OpenSL ES / OpenMAX AL code clean up
Do not use cryptic acronyms for Android object type definitions.
Harmonize object state and type naming conventions.
Change-Id: I62bed7aba2e0b9ea0c47264af8e3cf29f74746a8
Jean-Michel Trivi [Tue, 29 Mar 2011 20:48:32 +0000 (13:48 -0700)]
Move support for SL URI and FD playback under GenericPlayer class
The SfPlayer class was implementing URI and FD decode and playback
in the application process. This CL removes this class entirely
and moves its functionality under the GenericPlayer class. This
means that the playback of URIs and FDs is now implemented through
an android::MediaPlayer object running in the media service.
The SfPlayer header had many StageFright and system includes, which
are now moved to the relevant files where they are required,
instead of automagically coming from sles_allinclusive.h.
Note that this CL breaks support for the following OpenSL ES features
due to missing Android MediaPlayer features:
SLPlayItf.GetPosition
HEADATMARKER
HEADATNEWPOSITION
SLVolumeItf.EnableStereoPosition
SetStereoPosition
SLMuteSoloItf
SLPlaybackRateItf
Support for those features will be reintegrated in subsequent CLs.
Change-Id: I8d7f6ea006eb7b876ef1ca1909d74b4517335850
Glenn Kasten [Tue, 5 Apr 2011 16:25:16 +0000 (09:25 -0700)]
Fix bug in last commit
Always read the documentation:
- Add hooks for new OpenMAX AL interfaces
- Since OpenSL ES engine interface has a deinit hook, add one for OpenMAX AL also
Change-Id: I266bf2112e6f8e525e5b3c06bbb6a68a4764e978
Glenn Kasten [Mon, 4 Apr 2011 18:28:56 +0000 (11:28 -0700)]
Merge "Add basis for future OpenMAX AL 1.0.1 interfaces"
Glenn Kasten [Mon, 4 Apr 2011 15:57:22 +0000 (08:57 -0700)]
Add basis for future OpenMAX AL 1.0.1 interfaces
Bug fix:
OpenMAX AL media player was using SL instead of XA symbols for the Object
and DynamicInterfaceManagement interfaces. A Object::GetInterface using
the XA symbols would have failed. Fortunately, these are not used in
typical applications.
Minor cleanup:
- Add README.txt for mphtogen tool
- Fix clang warning
- Update comments
- Remove spurious commas
- Fix warning at declaration of SL_IID_array
- SL_IID_ANDROIDBUFFERQUEUE was added in API level 12, not 10
Change-Id: I75abced5bc3c3fdabe40face25463810de741bf2
Glenn Kasten [Mon, 4 Apr 2011 15:54:50 +0000 (08:54 -0700)]
Add OpenMAX AL 1.0.1 spec
Change-Id: Iaeb78d64d01cd776f8a7096371f20ce366a64b79
Jean-Michel Trivi [Mon, 28 Mar 2011 23:41:17 +0000 (16:41 -0700)]
Reduce include noise in SL and XA class definitions
In classes.h: we should only have to include the headers
for the objects that are actually stored as member variables of
the OpenSL ES and OpenMAX AL objects (so here AudioTrackProtector,
Effect, and GenericPlayer).
In CMediaPlayer.c: remove useless includes and change the video
surface function prototypes to use const refs to strong pointers
instead of pointers to access the GenericMediaPlayer objects.
Note that android_SfPlayer.h is still in sles_allinclusive.h because
it will be dealt with when the SfPlayer functionality is absorbed
under LocAVPlayer.
Change-Id: Ic2c9459862588399d9545a247cc15341effc0f66
Jean-Michel Trivi [Mon, 28 Mar 2011 18:16:16 +0000 (11:16 -0700)]
Clean up main header
There are many includes in sles_allinclusive.h that should be moved
to the files that rely on those headers. This is a first cleanup
to move Android audio effect related headers to where they belong.
+ one relocation for a media server related file. More to come
with AudioPlayer refactoring.
Change-Id: I181dde96db522d9cfb537dffea18ba57f855b99e
Jean-Michel Trivi [Wed, 23 Mar 2011 23:58:27 +0000 (16:58 -0700)]
am
9e0e6e5c: Fix bug
4109988 fix deadlock on destroy
* commit '
9e0e6e5c60320dac9aa2abbce2f9a843b8fc4449':
Fix bug
4109988 fix deadlock on destroy
Carl Shapiro [Tue, 22 Mar 2011 03:35:08 +0000 (20:35 -0700)]
Include strings.h for the strcasecmp prototype.
Change-Id: Ibd1689f36b3d74eb1dc1a506f97ca8d11f2b0730
Jean-Michel Trivi [Sat, 19 Mar 2011 00:02:17 +0000 (17:02 -0700)]
Fix bug
4109988 fix deadlock on destroy
Fix deadlock with an AudioPlayer playing from a PCM buffer queue.
This type of player uses an AudioTrack that pulls data through
its callback from a buffer queue.
This issue is that when you destroy the player (whick locks the
object), it tries to destroy the AudioTrack object. The
AudioTrack destructor can only finish when the AudioTrack
callback thread can exit. If a callback was underway when
trying to destroy the object, a race condition existed for
the AudioPlayer lock.
The fix consists in using the "pre-destroy" hook for the AudioPlayer
object. In it, we unlock the AudioPlayer, and block until the
AudioTrack callback has signaled it's done. The pre-destroy
hook also marks the track as "about to be destroyed" so any
callback that gets called once the pre-destroy hook has been
called can return immediately.
Change-Id: I4ca69157ff381232c1edc8fb576c6d9e90c2777f
Jean-Michel Trivi [Thu, 17 Mar 2011 04:11:29 +0000 (21:11 -0700)]
resolved conflicts for merge of
c5dcfeb2 to master
Change-Id: Iff3428cd554c5b5940da8a243c661ae70a92af8d
Jean-Michel Trivi [Thu, 17 Mar 2011 03:39:54 +0000 (20:39 -0700)]
am
30ebe675: Bug
3329759 clean logs, PTS should be unsigned
* commit '
30ebe675beff91283cc72d4ee5e94e56ab7e107f':
Bug
3329759 clean logs, PTS should be unsigned
Jean-Michel Trivi [Thu, 17 Mar 2011 03:34:23 +0000 (20:34 -0700)]
Merge "Bug
4106199 Split libOpenSLES.so & libOpenMAXAL.so" into honeycomb-mr1
Glenn Kasten [Wed, 16 Mar 2011 15:54:50 +0000 (08:54 -0700)]
Bug
4106199 Split libOpenSLES.so & libOpenMAXAL.so
Change-Id: I718cf6bcfff51a6fb153928eb160a36b4ca9fc96
Jean-Michel Trivi [Wed, 16 Mar 2011 19:22:45 +0000 (12:22 -0700)]
Bug
3329759 clean logs, PTS should be unsigned
- Don't pollute logs.
- Save MPEG-2 PTS as an unsigned 64bit value, negative values are
invalid.
Change-Id: I51d427789dd1e42219a63c68159f2e28628f0448
Glenn Kasten [Wed, 16 Mar 2011 16:32:12 +0000 (09:32 -0700)]
am
7a713baa: Merge "Bug
4099084 native window data locator" into honeycomb-mr1
* commit '
7a713baae6cac3740cc27380f1dc8099dd272470':
Bug
4099084 native window data locator
Glenn Kasten [Wed, 16 Mar 2011 16:18:48 +0000 (09:18 -0700)]
Merge "Bug
4099084 native window data locator" into honeycomb-mr1
Jean-Michel Trivi [Wed, 16 Mar 2011 06:50:27 +0000 (23:50 -0700)]
am
632d1061: Merge "Bug
3329759 callback mask for TS streaming" into honeycomb-mr1
* commit '
632d10616d5d20296d9ea32d4c94d2fc76926534':
Bug
3329759 callback mask for TS streaming
Glenn Kasten [Wed, 16 Mar 2011 04:44:12 +0000 (21:44 -0700)]
am
2e28af68: Bug
4099355 workaround gcc x86 problem
* commit '
2e28af68bc8807958ba611c082a0a61691e76a2c':
Bug
4099355 workaround gcc x86 problem
Jean-Michel Trivi [Wed, 16 Mar 2011 02:08:44 +0000 (19:08 -0700)]
Merge "Bug
3329759 callback mask for TS streaming" into honeycomb-mr1
Glenn Kasten [Tue, 15 Mar 2011 23:32:17 +0000 (16:32 -0700)]
Bug
4099084 native window data locator
Change-Id: I03cac7501c3f185a2f95395b140b52b695081c4b
Jean-Michel Trivi [Tue, 15 Mar 2011 16:24:30 +0000 (09:24 -0700)]
Bug
3329759 callback mask for TS streaming
- declare a "buffer event" item key and the event mask matching
the OpenSL ES 1.1 buffer queue event mask
- added a buffer state field in AdvancedBufferHeader to keep
track of the lifecycle of a buffer in the queue
- in StreamPlayer, store a constant to be sent as the item
each time a buffer is dequeued because it's been processed
- fix bug in playStream test app where after clearing the
queue, the data was read to the last dequeued buffer address,
rather than at the beginning of the cache.
Change-Id: I07141c8a913dfedeb9fde41d80afbce794ab7379
Glenn Kasten [Tue, 15 Mar 2011 17:01:31 +0000 (10:01 -0700)]
Bug
4099355 workaround gcc x86 problem
Change-Id: Ib9e2fc9eb58bef73772d8c617023f689b514e3a1
Jean-Michel Trivi [Tue, 15 Mar 2011 02:59:11 +0000 (19:59 -0700)]
am
2b7f4d9d: Unbreak the x86 build
* commit '
2b7f4d9d3e8f67b93b919f27082d1fd73d969c04':
Unbreak the x86 build
Jean-Michel Trivi [Tue, 15 Mar 2011 02:46:36 +0000 (19:46 -0700)]
Unbreak the x86 build
Looks like the x86 compiler does't like placement new. Commenting
out offending line until a proper fix (wrap Vector initialization
in another object) is implemented.
Change-Id: Id35cf7845e4fcb10536c2055263805dbf3cce65b
Jean-Michel Trivi [Tue, 15 Mar 2011 01:21:18 +0000 (18:21 -0700)]
am
fcc99629: Bug
3329759 Implement streamInformation and volume in OpenMAX AL
* commit '
fcc996296bdbf6c3949ad4312991fdde4ae2e157':
Bug
3329759 Implement streamInformation and volume in OpenMAX AL
Jean-Michel Trivi [Wed, 9 Mar 2011 17:33:51 +0000 (09:33 -0800)]
Bug
3329759 Implement streamInformation and volume in OpenMAX AL
- Implement StreamInformation for video size notification.
- Implement the XAVolumeItf for volume control
- Fix bug in GUID -> MPH hash.
- Fixed typo in GenericPlayer::pause() log
- Do not signal a discontinuity automatically when the ABQ is
cleared because clearing the queue doesn't imply there will
be a discontinuity in the data (e.g. the same data that was
cleared could be reenqueued)
- In "native-media" test app: add test code to exercise the
XAVolumeItf functionality.
Change-Id: I9f69f8cacbdce51b6d96d60141ec1d0f645df991
Iliyan Malchev [Mon, 14 Mar 2011 21:02:19 +0000 (14:02 -0700)]
system/media: remove LOCAL_PRELINK_MODULE
Change-Id: I55942287d5789a6297ab16f4049f529cb9f9e56c
Signed-off-by: Iliyan Malchev <malchev@google.com>
Glenn Kasten [Fri, 11 Mar 2011 00:52:30 +0000 (16:52 -0800)]
Merge "Bug
3463332 Unified test/demo of video sink & APIs" into honeycomb-mr1
Glenn Kasten [Wed, 9 Mar 2011 18:16:51 +0000 (10:16 -0800)]
Bug
3463332 Unified test/demo of video sink & APIs
Note: this only affects test code, nothing in the platform.
Can use for testing Java and native APIs
Video sinks is selectable as Surface (SurfaceView) or SurfaceTexture (GLSurfaceView)
Media source is selectable from drop-down list
Change-Id: I45fe16b672e0783ee89e0985b446b8ecc4f452e3
Jean-Michel Trivi [Tue, 8 Mar 2011 18:21:29 +0000 (10:21 -0800)]
Bug
3329759 Implement Clear() and GetState() for MPEG-2 TS
- implemented Clear() in AndroidBufferQueue
- declared and implemented GetState() in AndroidBufferQueue
- fixed typo in AudioPlayer_to_android.cpp that cause a "case"
to be compiled as a label (no unused label warning from
compiler)
- more test in sandbox/streamSource
Change-Id: If4eede16430cda943224bf950669cc105ac2f894
Jean-Michel Trivi [Mon, 7 Mar 2011 01:57:40 +0000 (17:57 -0800)]
Bug
3329759 support commands in SLAndroidBufferQueueItf
Support for EOS, DISCONTINUITY, and DISCONTINUITY with
a PTS.
- in IAndroidBufferQueue structure, added buffer type
- modified AdvancedBufferHeader structure to have a buffer
type-specific structure that contains all the items for each
buffer
- added parsing of items when enqueueing a buffer
- enforce buffer size enqueue to be a multiple of MPEG-2 TS
block size for buffer of the corresponding types
- when enqueueing a buffer on an empty queue, implemented
an asynchronous notification on StreamPlayer to consume
the newly queued buffer. Verified this kicks off playback
after having starved the framework for buffers.
- report unknown duration when using AndroidBufferQueue
Change-Id: I9bde97a6c6ffca7d376b4963313b820b35f50a26
Glenn Kasten [Sat, 5 Mar 2011 01:48:48 +0000 (17:48 -0800)]
Bug
3329759 Surface texture as video sink
XA_DATALOCATOR_NATIVEDISPLAY now allows either a Surface or SurfaceTexture
together with a JNIEnv *.
Miscellaneous fixes:
- Clarify test button labels.
- Line length 100.
- Fix typos in XA_DATALOCATOR_ANDROIDFD and XA_DATALOCATOR_ANDROIDFD_USE_FILE_SIZE.
Change-Id: I3f3c604dfda3cf66ef7d7adc8689564a83623b2f
Jean-Michel Trivi [Fri, 4 Mar 2011 00:00:58 +0000 (16:00 -0800)]
Bug
3329759 TS streaming over SLAndroidBufferQueueItf
Modify the SLAndroidBufferQueueItf interface to offer a model
where buffers of data can be queued along with commands
(messages) when used for playback, or buffers of data can be
received along with metadata (messages)
changes:
- new callback and enqueue functions in SLAndroidBufferQueueItf
and XAAndroidBufferQueueItf.
- definition of a new struct, AdvancedBufferHeader, for
the buffers in the queue.
- decoupling of the "buffer available to be filled" from SF
and the call to the ABQ callback. Implemented in new
file AndroidBufferQueueSource.cpp
- source/sink checks and memory allocation when creating an
AudioPlayer or MediaPlayer that uses SLAndroidBufferQueueItf,
and verifying the data fed to the ABQ is declared as
SL_CONTAINERTYPE_MPEG_TS
- updated tests/native-media XA demo code, and
tests/sandbox/streamSource to use the new interface.
Change-Id: I48e44f346e718041d835fde51e349923fcc1f4b1
Jean-Michel Trivi [Thu, 24 Feb 2011 16:59:55 +0000 (08:59 -0800)]
Merge "OpenMAX AL: consolidate MediaPlayer implementations under superclass"
Glenn Kasten [Thu, 24 Feb 2011 16:16:38 +0000 (08:16 -0800)]
Merge "Bug
3266825 partial fix"
Jean-Michel Trivi [Wed, 23 Feb 2011 23:45:43 +0000 (15:45 -0800)]
OpenMAX AL: consolidate MediaPlayer implementations under superclass
The OpenMAX AL MediaPlayer object has two implementations: one
for playing from URI/FD (LocAVPlayer) and one for playing from
AndroidBufferQueue (StreamPlayer). They both inherit from AVPlayer.
This CL makes LocAVPlayer and StreamPlayer inherit from
GenericMediaPlayer (new name of AVPlayer) which encapsulates the
interaction with an android::MediaPlayer instance running in
the media server process.
Also it makes GenericMediaPlayer inherit from GenericPlayer, the
player superclass also used in OpenSL ES.
After this CL, the OpenMAX AL and OpenSL ES have a common class
hierarchy for their players.
Change-Id: I5f6e279fc29b7f6f26c9ed5c83a9455cfda88ff4
Jean-Michel Trivi [Wed, 23 Feb 2011 17:04:35 +0000 (09:04 -0800)]
Fix bug in decode to memory example app
Bug in detecting write errors: count and size in fwrite were
swapped, so an error was always reported.
Change-Id: If20276a412d110c2791c50ebc41761d6e1d3386e
Glenn Kasten [Wed, 23 Feb 2011 16:41:04 +0000 (08:41 -0800)]
Bug
3266825 partial fix
This was a copy/paste bug that caused AddInterface to corrupt the v-table.
Change-Id: I93cd8d58c2a95d1dd9e9f139bc9f4a73d96351ed
Jean-Michel Trivi [Mon, 14 Feb 2011 20:40:47 +0000 (12:40 -0800)]
Report an error when the data source can't be created.
Check the value returned by DataSource::CreateFromURI(uri)
Change-Id: Ia94b18b09c68d1e8bf90d2f1a099319d5f5e565e
Jean-Michel Trivi [Fri, 11 Feb 2011 23:54:42 +0000 (15:54 -0800)]
OpenSL ES: add demo app for decode to PCM buffer queue.
Example for the decoding of a compressed file to PCM, saved in
a .raw file as the decoded buffers are received through a
buffer queue.
Change-Id: Ia44078e00569e6aa1f14ab3eaa2b2ebfb07b709d
Jean-Michel Trivi [Tue, 1 Feb 2011 02:29:17 +0000 (18:29 -0800)]
OpenSL ES: support decode to PCM buffer queue
Created a new audio player class, APlayer, from which we derive
subclasses to encapsulate OpenSL ES AudioPlayer implementations:
- ASfPlayer derives from APlayer and encapsulates StageFright
functionality for audio decoding to a buffer
- ADecoder derives from ASfPlayer and encapsulates rendering
the decoded audio data to a callback function. It interfaces
with the OpenSL ES Buffer Queue interface to pass the decoded
data back to an OpenSL ES application.
For OpenSL ES, to support decoding to a Buffer Queue, we now
allow an AudioPlayer to have its sink be a PCM buffer queue.
Change-Id: I9aefeb0375a71f7ca770c5c62b4fb8faf59c9c23
The Android Open Source Project [Sun, 30 Jan 2011 20:55:26 +0000 (12:55 -0800)]
am
b372117a: Reconcile gingerbread-plus-aosp and honeycomb
* commit '
b372117a203bb8942e2985d57b3dcec5f0ece745':
The Android Open Source Project [Sun, 30 Jan 2011 20:43:22 +0000 (12:43 -0800)]
Reconcile gingerbread-plus-aosp and honeycomb
Change-Id: Id6a4042483e3c5d9bdba600ec06f11596212d838
The Android Open Source Project [Sun, 30 Jan 2011 20:43:22 +0000 (12:43 -0800)]
Mass merge from gingerbread - do not merge
Change-Id: Ibdf926e21c60db22344c1dd8d9a6a3ab3fbc4bb9
Glenn Kasten [Sat, 29 Jan 2011 17:55:00 +0000 (09:55 -0800)]
am
4c2bc0fd: Bug
3388299 Fix stack buffer overrun
* commit '
4c2bc0fd150b0164f9f387214c29143346a92e14':
Bug
3388299 Fix stack buffer overrun