OSDN Git Service
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
Glenn Kasten [Sat, 29 Jan 2011 15:08:41 +0000 (07:08 -0800)]
am
062b7b45: Merge "Bug
3326605: AudioRecorder uses wrong channel mask" into gingerbread
* commit '
062b7b45b27c6bfffc494af21382d7fa7a8d2d82':
Bug
3326605: AudioRecorder uses wrong channel mask
Jean-Baptiste Queru [Sat, 29 Jan 2011 15:04:01 +0000 (07:04 -0800)]
Merge/ignore
28d27b96 from gingerbread
Change-Id: I25fd80f057b9a5b901f5353c296238a0f1ddf4d8
Glenn Kasten [Fri, 28 Jan 2011 22:46:52 +0000 (14:46 -0800)]
Merge "Add more test cases to reverb test"
Glenn Kasten [Tue, 25 Jan 2011 19:06:48 +0000 (11:06 -0800)]
Add more test cases to reverb test
Change-Id: Ia0970ebd8e182a45157a6edbef762f2350605a9b
Glenn Kasten [Thu, 27 Jan 2011 03:08:30 +0000 (19:08 -0800)]
am
06344973: am
04f8400d: am
4c2bc0fd: Bug
3388299 Fix stack buffer overrun
* commit '
06344973a341379cb08d6f49a6cdae1ac5dd110d':
Bug
3388299 Fix stack buffer overrun
Glenn Kasten [Thu, 27 Jan 2011 00:57:42 +0000 (16:57 -0800)]
am
04f8400d: am
4c2bc0fd: Bug
3388299 Fix stack buffer overrun
* commit '
04f8400dae4e9c26e8e6bdf707513304cd5bc5df':
Bug
3388299 Fix stack buffer overrun
Glenn Kasten [Wed, 26 Jan 2011 23:11:43 +0000 (15:11 -0800)]
am
4c2bc0fd: Bug
3388299 Fix stack buffer overrun
* commit '
4c2bc0fd150b0164f9f387214c29143346a92e14':
Bug
3388299 Fix stack buffer overrun
Glenn Kasten [Wed, 26 Jan 2011 22:01:43 +0000 (14:01 -0800)]
am
47f6611b: am
e619a697: Bug
3388299 Fix stack buffer overrun
* commit '
47f6611b7356f0a70ba73d440991a7c94742d43d':
Bug
3388299 Fix stack buffer overrun
Glenn Kasten [Wed, 26 Jan 2011 21:58:47 +0000 (13:58 -0800)]
am
e619a697: Bug
3388299 Fix stack buffer overrun
* commit '
e619a697ededd37b3645c3970a4f71af7d663524':
Bug
3388299 Fix stack buffer overrun
Glenn Kasten [Tue, 25 Jan 2011 17:26:11 +0000 (09:26 -0800)]
Bug
3388299 Fix stack buffer overrun
Change-Id: Ie8c525ddee862b32f2055cb89c10a680f0c14f97
Glenn Kasten [Tue, 25 Jan 2011 17:26:11 +0000 (09:26 -0800)]
Bug
3388299 Fix stack buffer overrun
Change-Id: I715affa4f6599afabc0bc9b56981edce2edcc95b
Glenn Kasten [Tue, 25 Jan 2011 23:03:40 +0000 (15:03 -0800)]
Merge "Bug
3388299 Fix stack buffer overrun"
Glenn Kasten [Tue, 25 Jan 2011 17:26:11 +0000 (09:26 -0800)]
Bug
3388299 Fix stack buffer overrun
Change-Id: I22bf369b42faf04ef5bdc7ca8ebca3d31add2ad6
Glenn Kasten [Tue, 25 Jan 2011 18:05:42 +0000 (10:05 -0800)]
am
a5aa1d64: am
bfa9fb97: am
062b7b45: Merge "Bug
3326605: AudioRecorder uses wrong channel mask" into gingerbread
* commit '
a5aa1d64c7469f22305fc429854a585c3c85d4df':
Bug
3326605: AudioRecorder uses wrong channel mask
Glenn Kasten [Tue, 25 Jan 2011 18:02:35 +0000 (10:02 -0800)]
am
bfa9fb97: am
062b7b45: Merge "Bug
3326605: AudioRecorder uses wrong channel mask" into gingerbread
* commit '
bfa9fb977e1e9a89f198571ab84f2fb198f72556':
Bug
3326605: AudioRecorder uses wrong channel mask
Glenn Kasten [Tue, 25 Jan 2011 18:01:18 +0000 (10:01 -0800)]
am
fa2a25a6: resolved conflicts for merge of
4ecd13c7 to honeycomb-plus-aosp
* commit '
fa2a25a630e026796c095bbfbf0ee148a1df91c8':
Bug
3360707
Glenn Kasten [Tue, 25 Jan 2011 17:57:51 +0000 (09:57 -0800)]
resolved conflicts for merge of
4ecd13c7 to honeycomb-plus-aosp
Change-Id: I536a8136afd7f92606a93b7d423499445eb89ae8
Glenn Kasten [Sun, 23 Jan 2011 19:39:56 +0000 (11:39 -0800)]
am
062b7b45: Merge "Bug
3326605: AudioRecorder uses wrong channel mask" into gingerbread
* commit '
062b7b45b27c6bfffc494af21382d7fa7a8d2d82':
Bug
3326605: AudioRecorder uses wrong channel mask
Glenn Kasten [Sun, 23 Jan 2011 19:39:53 +0000 (11:39 -0800)]
Glenn Kasten [Sun, 23 Jan 2011 19:23:05 +0000 (11:23 -0800)]
Merge "Bug
3326605: AudioRecorder uses wrong channel mask" into gingerbread
Glenn Kasten [Thu, 6 Jan 2011 01:16:13 +0000 (17:16 -0800)]
Bug
3326605: AudioRecorder uses wrong channel mask
Change-Id: I2121211b0202bc39100d74232d63be94c7e8a8de
Glenn Kasten [Sun, 16 Jan 2011 18:08:05 +0000 (10:08 -0800)]
Bug
3360707
Change-Id: Ib40d8813ac713d09ed7b298521fada1a35ecb1d4
Glenn Kasten [Wed, 19 Jan 2011 18:46:35 +0000 (10:46 -0800)]
am
50bccde0: Rename class__ to clazz, this to thiz
* commit '
50bccde01980ae803b8656e8b08ecacb65540f50':
Rename class__ to clazz, this to thiz
Glenn Kasten [Tue, 18 Jan 2011 19:44:36 +0000 (11:44 -0800)]
Rename class__ to clazz, this to thiz
The JNI naming conventions avoid conflict with C++ reserved words.
Change-Id: I93ad6920bf78c0a02ac4b2650a29c9e11252f731
Glenn Kasten [Wed, 19 Jan 2011 05:52:57 +0000 (21:52 -0800)]
am
7110872a: Merge "Replace obsolete comment" into honeycomb
* commit '
7110872a4d1fa5b7be18b3529523a7fd91f3cc58':
Replace obsolete comment
Glenn Kasten [Wed, 19 Jan 2011 05:52:51 +0000 (21:52 -0800)]
am
ce2466b3: Merge "JNI is obsolete" into honeycomb
* commit '
ce2466b32a38c3a4cd54e5f05b69c650cb719525':
JNI is obsolete
Bryan Mawhinney [Wed, 19 Jan 2011 04:43:28 +0000 (20:43 -0800)]
am
7672988d: Minor API change in NuCachedSource2
* commit '
7672988d52b27a5c6579543efd48a564e0c459d8':
Minor API change in NuCachedSource2
Glenn Kasten [Tue, 18 Jan 2011 21:59:55 +0000 (13:59 -0800)]
Merge "Replace obsolete comment" into honeycomb
Glenn Kasten [Tue, 18 Jan 2011 21:59:47 +0000 (13:59 -0800)]
Merge "JNI is obsolete" into honeycomb
Glenn Kasten [Tue, 18 Jan 2011 19:26:24 +0000 (11:26 -0800)]
JNI is obsolete
Change-Id: Ic89b9b8875af6ce13cd96d8c0c944e8878805093
Glenn Kasten [Tue, 18 Jan 2011 19:23:09 +0000 (11:23 -0800)]
Replace obsolete comment
Change-Id: I9eb825ece4562d1af742f0851da77c5c9811fe17
Bryan Mawhinney [Tue, 18 Jan 2011 19:21:32 +0000 (19:21 +0000)]
Minor API change in NuCachedSource2
approxDataRemaining now returns more info about the stream status.
Change-Id: I5549edb3765eb07fcfa5340b8755263e0e0ee196
Glenn Kasten [Mon, 17 Jan 2011 07:01:18 +0000 (23:01 -0800)]
am
cd087fad: This bug caught in code review (not used yet)
* commit '
cd087fadb8876b06f160f77938c30dbf58c8b21b':
This bug caught in code review (not used yet)
Glenn Kasten [Mon, 17 Jan 2011 06:59:22 +0000 (22:59 -0800)]
am
2eccd4f7: Merge "SMP safety: can\'t peek/poke without a barrier" into honeycomb
* commit '
2eccd4f74f1cdaa1eb9bdaef849bfbbf9f1fe810':
SMP safety: can't peek/poke without a barrier
Glenn Kasten [Mon, 17 Jan 2011 06:59:20 +0000 (22:59 -0800)]
am
7252d851: Merge "Re-build the autogen files" into honeycomb
* commit '
7252d851cf25973dea25e7c4695ffdb2b76ba508':
Re-build the autogen files
Glenn Kasten [Mon, 17 Jan 2011 06:57:20 +0000 (22:57 -0800)]
Glenn Kasten [Sun, 16 Jan 2011 21:07:55 +0000 (13:07 -0800)]
This bug caught in code review (not used yet)
Change-Id: I544447d7a91909258a7d43da1e42e1c98b638c19
Glenn Kasten [Sun, 16 Jan 2011 20:39:38 +0000 (12:39 -0800)]
Merge "SMP safety: can't peek/poke without a barrier" into honeycomb
Glenn Kasten [Sun, 16 Jan 2011 20:39:28 +0000 (12:39 -0800)]
Merge "Re-build the autogen files" into honeycomb
Glenn Kasten [Sun, 16 Jan 2011 18:33:10 +0000 (10:33 -0800)]
Re-build the autogen files
Change-Id: Ifd6f97a61168833ae34e8df8f6a6a79df9a9bcd5
Glenn Kasten [Sun, 16 Jan 2011 18:00:21 +0000 (10:00 -0800)]
SMP safety: can't peek/poke without a barrier
Change-Id: I97a78322b7b93440ad989b7a6aef4ba3c48a2b7f
Glenn Kasten [Sun, 16 Jan 2011 18:08:05 +0000 (10:08 -0800)]
Bug
3360707
Change-Id: I4a021ba7fa1f3807a658ee1336bf32b9d6728f3e
Glenn Kasten [Thu, 13 Jan 2011 00:41:01 +0000 (16:41 -0800)]
Update SDK level on master branch only
Change-Id: I15f5976ba656673112f2d1ab006fe417a4fccd22
Glenn Kasten [Thu, 13 Jan 2011 00:37:43 +0000 (16:37 -0800)]
am
a855cb96: Merge "Make symlink for libOpenMAXAL.so" into honeycomb
* commit '
a855cb9668ddb11d1cf5fca0d13861174d564ea3':
Make symlink for libOpenMAXAL.so
Glenn Kasten [Thu, 13 Jan 2011 00:33:53 +0000 (16:33 -0800)]
Merge "Make symlink for libOpenMAXAL.so" into honeycomb
Glenn Kasten [Wed, 12 Jan 2011 23:57:58 +0000 (15:57 -0800)]
Make symlink for libOpenMAXAL.so
Change-Id: I06cb66a30a1a543d2c6f7b93428d29d1b90edb2a
Jean-Michel Trivi [Wed, 12 Jan 2011 23:32:47 +0000 (15:32 -0800)]
am
551f769e: More file renames and header inclusion reorder
* commit '
551f769ee0234ca22c97dbbf84d87f2c1e19fa80':
More file renames and header inclusion reorder
Jean-Michel Trivi [Wed, 12 Jan 2011 18:01:09 +0000 (10:01 -0800)]
More file renames and header inclusion reorder
More file renames and include reordering to separate Android
classes, and the mapping of the C OpenSL ES and OpenMAX AL
function calls to the Android implementation.
Change-Id: Id6f63af80bd581ed9cab495e2c11a86589ecf6c9
Glenn Kasten [Wed, 12 Jan 2011 18:50:11 +0000 (10:50 -0800)]
am
439af19a: Directory re-organization
* commit '
439af19ad7484b0472080e8eb0cd8462a17b0286':
Directory re-organization
Glenn Kasten [Wed, 12 Jan 2011 15:29:49 +0000 (07:29 -0800)]
Directory re-organization
Change-Id: I8e3f12a22e765d36ddefd87edf204735b25474f6
Glenn Kasten [Wed, 12 Jan 2011 01:58:37 +0000 (17:58 -0800)]
am
a721aa02: Merge "AudioRecorder source format should be NULL not PCM" into honeycomb
* commit '
a721aa02e8b445daab78b1bf95c8458e9c3d0752':
AudioRecorder source format should be NULL not PCM
Glenn Kasten [Wed, 12 Jan 2011 01:58:35 +0000 (17:58 -0800)]
am
9d9456e5: Merge "Ignore the pFormat in some cases per spec" into honeycomb
* commit '
9d9456e5a395298cd24f85430a8566c1b075dc46':
Ignore the pFormat in some cases per spec
Glenn Kasten [Wed, 12 Jan 2011 01:54:00 +0000 (17:54 -0800)]
Merge "AudioRecorder source format should be NULL not PCM" into honeycomb
Glenn Kasten [Wed, 12 Jan 2011 01:53:03 +0000 (17:53 -0800)]
Merge "Ignore the pFormat in some cases per spec" into honeycomb
Jean-Michel Trivi [Wed, 12 Jan 2011 00:59:10 +0000 (16:59 -0800)]
am
331e70b5: OpenMAX AL: support URI and FD as data sources for MediaPlayer
* commit '
331e70b5c675222bbd122f7ae515dbda631040fe':
OpenMAX AL: support URI and FD as data sources for MediaPlayer
Glenn Kasten [Wed, 12 Jan 2011 00:52:01 +0000 (16:52 -0800)]
Ignore the pFormat in some cases per spec
Change-Id: Iac14c558fa7410a4b3de5c89f9e5d475404efcea
Jean-Michel Trivi [Tue, 11 Jan 2011 22:43:31 +0000 (14:43 -0800)]
OpenMAX AL: support URI and FD as data sources for MediaPlayer
Add ANDROIDFD as a data locator in OpenMAX AL
Implement playback of URI and FD in the LocAVPlayer class, that
inherits from AVPlayer
Fix bug where Android MediaPlayer resources were not destroyed
when the MediaPlayer object was destroyed.
Share URI and FD internal type definitions between SL and AL
Change-Id: I01d0d170baea4961f09b44339c99a79feba4620d
Glenn Kasten [Tue, 11 Jan 2011 22:31:03 +0000 (14:31 -0800)]
AudioRecorder source format should be NULL not PCM
Change-Id: I4bfdfa3700685f1705e0430fd4fe15b51ab9cefb
Glenn Kasten [Tue, 11 Jan 2011 22:27:20 +0000 (14:27 -0800)]
am
b11def02: Squashed commit of 9 cherry-picks from master
* commit '
b11def0293629d4d44ddbcd8a27c63504fd80ce1':
Squashed commit of 9 cherry-picks from master
Glenn Kasten [Wed, 5 Jan 2011 21:56:46 +0000 (13:56 -0800)]
Squashed commit of 9 cherry-picks from master
Android SDK level report is the highest available
Fix bug in seek torture test
This was found because we now do better checking of data locators.
Comment out and decrease log level for play state
Improve error handling and help message in test
Include data source or sink name in log messages
Bug
3326605: AudioRecorder uses wrong channel mask
Don't overwrite previous error in locator check
OpenSLESUT.h is not (yet) a supported header
so remove the symlink from the SLES/ directory
Shared engine between OpenSL ES and OpenMAX AL
Glenn Kasten [Tue, 11 Jan 2011 01:49:43 +0000 (17:49 -0800)]
Shared engine between OpenSL ES and OpenMAX AL
Change-Id: Idaee7eeb37be1c00ab8c0cf7976163831eb0fb23
Jean-Michel Trivi [Mon, 10 Jan 2011 00:25:20 +0000 (16:25 -0800)]
am
17e76190: OpenMAX AL: declare the XAAndroidSimpleBufferQueueItf interface.
* commit '
17e76190c96758588a583d1fa1769246c175b420':
OpenMAX AL: declare the XAAndroidSimpleBufferQueueItf interface.
Jean-Michel Trivi [Sun, 9 Jan 2011 22:30:10 +0000 (14:30 -0800)]
am
871ed9a3: OpenMAX AL: start implementation of XAStreamInformationItf
* commit '
871ed9a3f3fff7ea1392c5da8f475144a6e431b3':
OpenMAX AL: start implementation of XAStreamInformationItf
Jean-Michel Trivi [Sun, 9 Jan 2011 22:29:28 +0000 (14:29 -0800)]
OpenMAX AL: declare the XAAndroidSimpleBufferQueueItf interface.
Identical to the SLAndroidSimpleBufferQueueItf interface, with
OpenMAX AL types.
Change-Id: Iefc4f9ffc72f85f543f258d7906367cfedfb9e0b
Jean-Michel Trivi [Sun, 9 Jan 2011 20:22:40 +0000 (12:22 -0800)]
OpenMAX AL: start implementation of XAStreamInformationItf
XAStreamInformationItf is to be used for video size notifications.
Change-Id: I6b0d6b186772b4a66188fba7e4624092cef55c3a
Jean-Michel Trivi [Fri, 7 Jan 2011 08:11:07 +0000 (00:11 -0800)]
am
c09fe859: OpenMAX AL example: remove useless includes
* commit '
c09fe859aabccb8b18e6c857d087686b37d48c1f':
OpenMAX AL example: remove useless includes
Jean-Michel Trivi [Fri, 7 Jan 2011 08:11:04 +0000 (00:11 -0800)]
am
dd6b8e09: Initialize video surface from native window
* commit '
dd6b8e09370c75d58e51ae547c2a9d858861a26a':
Initialize video surface from native window
Jean-Michel Trivi [Thu, 6 Jan 2011 23:01:14 +0000 (15:01 -0800)]
OpenMAX AL example: remove useless includes
It's no longer necessary to include the OpenSL ES headers in
an OpenMAX AL application for the declaration of
XA_IID_ANDROIDBUFFERQUEUE.
Change-Id: I2077997087ff23db033ab69c498daf8eaaffedc9
Jean-Michel Trivi [Thu, 6 Jan 2011 22:38:35 +0000 (14:38 -0800)]
Initialize video surface from native window
When configuring the MediaPlayer object, use the ANativeWindow
pointer given as the video sink to get the display Surface pointer.
Change-Id: I0f78b7634152150ff31bfa096b8ed88ffa918f43
Glenn Kasten [Wed, 5 Jan 2011 16:03:38 +0000 (08:03 -0800)]
OpenSLESUT.h is not (yet) a supported header
so remove the symlink from the SLES/ directory
Change-Id: I95e331ac3b94457fe4c1c063069995bc48a659b4
Glenn Kasten [Wed, 5 Jan 2011 21:58:31 +0000 (13:58 -0800)]
Don't overwrite previous error in locator check
Change-Id: Ib7c2f1f34691160d881d4a2293b691e52ff01aa4
Glenn Kasten [Thu, 6 Jan 2011 17:33:33 +0000 (09:33 -0800)]
Merge "Comment out and decrease log level for play state"
Glenn Kasten [Thu, 6 Jan 2011 17:33:25 +0000 (09:33 -0800)]
Merge "Bug
3326605: AudioRecorder uses wrong channel mask"
Glenn Kasten [Thu, 6 Jan 2011 17:33:08 +0000 (09:33 -0800)]
Merge "Include data source or sink name in log messages"
Glenn Kasten [Thu, 6 Jan 2011 17:33:02 +0000 (09:33 -0800)]
Merge "Fix bug in seek torture test"
Glenn Kasten [Thu, 6 Jan 2011 17:32:52 +0000 (09:32 -0800)]
Merge "Improve error handling and help message in test"
Glenn Kasten [Thu, 6 Jan 2011 01:16:13 +0000 (17:16 -0800)]
Bug
3326605: AudioRecorder uses wrong channel mask
Change-Id: I466979669e831334b390d0ff381420cf1fe61b98