01e4a8ff63523bba5c8f919a72e0adb66daf4b98 |
|
26-Feb-2012 |
Mathias Agopian <mathias@google.com> |
cleanup includes Change-Id: Ia98b76b2e0c49ee257e1f31c61c2d6f72a9fe894
/frameworks/wilhelm/src/android/MediaPlayer_to_android.h
|
3ac5dcc05fe321e4f01918aef2e3e54e22c9a5c1 |
|
17-Sep-2011 |
Glenn Kasten <gkasten@google.com> |
Remove dead code AudioPlayback_Parameters fields trackcb and trackcbUser audioTrack_callBack_uri android_Player_androidBufferQueue_registerCallback_l GenericPlayer field mLooperPriority StreamPlayer::registerQueueCallback CAudioPlayer::mpLock AudioSfDecoder::startPrefetch_async IAndroidBufferQueue does not support AudioRecorder object android/BufferQueueSource.h #include Change-Id: I9d7cef243167e10279df452e7c62e66d8f5fe3b6
/frameworks/wilhelm/src/android/MediaPlayer_to_android.h
|
485a038f9f0f898227b8ab4218e94c5d56b6ed0b |
|
24-Aug-2011 |
Glenn Kasten <gkasten@google.com> |
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
/frameworks/wilhelm/src/android/MediaPlayer_to_android.h
|
bcfe680db1e392f3bb29382c2e15e89c3af783ed |
|
22-Aug-2011 |
Glenn Kasten <gkasten@google.com> |
Bug 5198051 MediaPlayer PLAYEVENT_HEAD* callbacks Change-Id: Ibb04fbf727997281bb77fd22c51cd90bd044e505
/frameworks/wilhelm/src/android/MediaPlayer_to_android.h
|
35ac702ee1ad91e5c8748c12450222d50b366a52 |
|
08-Aug-2011 |
Glenn Kasten <gkasten@google.com> |
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
/frameworks/wilhelm/src/android/MediaPlayer_to_android.h
|
99b927751677abfb60a388d65dfeed1fed1db12c |
|
28-Jul-2011 |
Glenn Kasten <gkasten@google.com> |
Bug 5080320 MediaPlayer volume Details: - re-factor volume-related code yet again - remove dead variables mAmplFromVolLevel, mAmplFromStereoPos, mDirectLevel - add placeholders for kEventPrefetchFillLevelUpdate and kEventPrefetchStatusChange Known issues: - MPEG-2 TS doesn't yet implement the ability to query channel count, so default to stereo Change-Id: Ic0f2297b267dc3d380755e8d314e1d5f0f659d7c
/frameworks/wilhelm/src/android/MediaPlayer_to_android.h
|
35a5a30fdad179ccf38d8d756590411326159a89 |
|
12-Jul-2011 |
Jean-Michel Trivi <jmtrivi@google.com> |
Implement XAPlayItf::GetPosition on MediaPlayer The play interface was only in place for routing calls to an AudioPlayer in OpenSL ES, not in OpenMAX AL for a MediaPlayer. Change-Id: Icf514be428396264252874faf1060c76ddee9545
/frameworks/wilhelm/src/android/MediaPlayer_to_android.h
|
36b700a829b7a02b873b4cd0cdb0a95342b20a31 |
|
11-Apr-2011 |
Jean-Michel Trivi <jmtrivi@google.com> |
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
/frameworks/wilhelm/src/android/MediaPlayer_to_android.h
|
92b245bf8828db9e469febebbe8774c00570b5b9 |
|
07-Apr-2011 |
Jean-Michel Trivi <jmtrivi@google.com> |
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
/frameworks/wilhelm/src/android/MediaPlayer_to_android.h
|
b05ea38e5131001884aa226f90fd50cf594a23f3 |
|
06-Apr-2011 |
Jean-Michel Trivi <jmtrivi@google.com> |
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
/frameworks/wilhelm/src/android/MediaPlayer_to_android.h
|
2b06e20ae32388f6e1dfd088d9773c34e6b1cb45 |
|
29-Mar-2011 |
Jean-Michel Trivi <jmtrivi@google.com> |
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
/frameworks/wilhelm/src/android/MediaPlayer_to_android.h
|
37dc2fccf3f122b79ebd554de209d0a3c94ae161 |
|
09-Mar-2011 |
Jean-Michel Trivi <jmtrivi@google.com> |
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
/frameworks/wilhelm/src/android/MediaPlayer_to_android.h
|
e7bfcdc183454ec959ff51342f0973cabba219b2 |
|
08-Mar-2011 |
Jean-Michel Trivi <jmtrivi@google.com> |
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
/frameworks/wilhelm/src/android/MediaPlayer_to_android.h
|
70c49ae2867094072a4365423417ea452bf82231 |
|
07-Mar-2011 |
Jean-Michel Trivi <jmtrivi@google.com> |
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
/frameworks/wilhelm/src/android/MediaPlayer_to_android.h
|
ad1ab1d13a9b043202b9d5cdc1d8c4ef66cbbca8 |
|
05-Mar-2011 |
Glenn Kasten <gkasten@google.com> |
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
/frameworks/wilhelm/src/android/MediaPlayer_to_android.h
|
d158d31a6bbb06426b71c3d097b7768bc3fb79a3 |
|
04-Mar-2011 |
Jean-Michel Trivi <jmtrivi@google.com> |
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
/frameworks/wilhelm/src/android/MediaPlayer_to_android.h
|
68d56b8ebaf60184a3aef988e3d2b09ed8b88c05 |
|
24-Feb-2011 |
Jean-Michel Trivi <jmtrivi@google.com> |
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
/frameworks/wilhelm/src/android/MediaPlayer_to_android.h
|
b2aeb0f1009555181dabb944fe05901cb6e6f632 |
|
12-Jan-2011 |
Jean-Michel Trivi <jmtrivi@google.com> |
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
/frameworks/wilhelm/src/android/MediaPlayer_to_android.h
|