| d554814b49ae68a1e4a24f628bd0fed73a12ad08 |
|
11-Jun-2016 |
Wei Jia <wjia@google.com> |
Merge "MediaPlayer: fix state for setPlaybackParams." into nyc-dev
|
| 5be109faadfc08b561221bd801082873b614b93d |
|
11-Jun-2016 |
Wei Jia <wjia@google.com> |
MediaPlayer: fix state for setPlaybackParams.
Bug: 29032949
Change-Id: I7580a04cc03f96109a770f95abd3fb884c810103
/frameworks/av/media/libmedia/mediaplayer.cpp
|
| fc908d010b32bbb850a6306893ce7db166a932f6 |
|
07-Jun-2016 |
Marco Nelissen <marcone@google.com> |
Don't use sp<>&
because they may end up pointing to NULL after a NULL check was performed.
Bug: 28166152
Change-Id: Iab2ea30395b620628cc6f3d067dd4f6fcda824fe
/frameworks/av/media/libmedia/mediaplayer.cpp
|
| 1243869fb29ee580fa5c179443420c06a779dbfd |
|
28-Mar-2016 |
Wei Jia <wjia@google.com> |
MediaPlayer: use mLock to prevent racing condition.
Bug: 27823938
Change-Id: Iad156f3b35fdcccb13ad5c49921bbe3cc4fc0c47
/frameworks/av/media/libmedia/mediaplayer.cpp
|
| 848ebc644a1a7ef93a051186fb5f0aef826ad67e |
|
23-Mar-2016 |
Wei Jia <wjia@google.com> |
mediaplayer: fix logging message.
Change-Id: I99fb411632184e9f9180e7fd42eeaa614e87cf3b
/frameworks/av/media/libmedia/mediaplayer.cpp
|
| d848eb48c121c119e8ba7583efc75415fe102570 |
|
08-Mar-2016 |
Glenn Kasten <gkasten@google.com> |
Use audio_session_t consistently
Bug: 27562099
Change-Id: I328d8226191386b163f2ace41233607294c50dcd
/frameworks/av/media/libmedia/mediaplayer.cpp
|
| eeecb980ff4c202d0a3c4b0bfe040dce2f73336d |
|
26-Feb-2016 |
Glenn Kasten <gkasten@google.com> |
Add use for audio_unique_id_t
Bug: 25641253
Bug: 21019153
Change-Id: I65dc128e760c245f3d90559635a8981b186c87d7
/frameworks/av/media/libmedia/mediaplayer.cpp
|
| e096621f94f708b8634ad76333e6ac1882b46328 |
|
02-Sep-2015 |
Marco Nelissen <marcone@google.com> |
Remove unused code
Change-Id: Ib4f194a1180b832ad39d9ded0962184e6daf5e29
/frameworks/av/media/libmedia/mediaplayer.cpp
|
| 2b95bda111444f2834e64221e3a3eb1a87d43c38 |
|
22-Jul-2015 |
Robert Shih <robertshih@google.com> |
Explicitly disconnect in MediaPlayer::reset
Even without calling disconnect in MediaPlayer::reset,
MediaPlayerService::Client (which lives on the other side of a
binder with MediaPlayer) would still perform a disconnect in its
destructor. Object destruction across binder is not synchronous, but
method calls are. This commit merely makes sure that the disconnect
happens deterministically before reset returns.
Bug: 22451733
Change-Id: Id9146a63a1872d68087a252aa614248b16d2556d
/frameworks/av/media/libmedia/mediaplayer.cpp
|
| 4356269be6d2b62bbb945364e8fc4beb99e1aada |
|
16-Jul-2015 |
Eric Laurent <elaurent@google.com> |
mediaplayer: fix audio attributes override by stream type
Make sure that when audio attributes are set, the stream type
is always derived from them.
Bug: 22481669.
Change-Id: Ia10c7017eb27e7753faf97a42dd4f44e15f2c986
/frameworks/av/media/libmedia/mediaplayer.cpp
|
| 3a474aa67fc31505740526dd249d96204c08bf79 |
|
25-Apr-2015 |
Lajos Molnar <lajos@google.com> |
stagefright: support setting/getting playback/sync config in MediaSync
Bug: 18249558
Bug: 19666434
Bug: 20057497
Change-Id: I5868b17423d7c20cfaf4a399f3eb67bfba440605
/frameworks/av/media/libmedia/mediaplayer.cpp
|
| 0852843d304006e3ab333081fddda13b07193de8 |
|
08-Apr-2015 |
Robert Shih <robertshih@google.com> |
stagefright: initial timed id3 support in hls
Change-Id: I00a8a786b3f4b74742c34770edd94e937abe20a8
/frameworks/av/media/libmedia/mediaplayer.cpp
|
| 99f31604136d66ae10e20669fb6b5716f342bde0 |
|
20-Mar-2015 |
Chris Watkins <watk@google.com> |
Unhide the android.media.[Media]DataSource interface.
This allows apps to implement MediaDataSource, which is modeled on
stagefright's DataSource, to supply media data to the framework. This
was already implemented for MediaExtractor, but it was renamed from
DataSource.
MediaExtractor, MediaPlayer and MediaMetadataRetriever each have a new
overload: #setDataSource(android.media.MediaDataSource)
Only NuPlayer supports this new data source.
The change introduces:
* IDataSource: The binder interface for DataSource.
* JMediaDataSource: The native counterpart to the java interface. It
implements IDataSource.
* CallbackDataSource: A stagefright DataSource that wraps an
IDataSource.
Change-Id: Ib3c944b49cc8a792c8eb9c85e5015c07f298ebc1
/frameworks/av/media/libmedia/mediaplayer.cpp
|
| 40bc906252974d0b389ae4a147232d0c9a97193f |
|
20-Mar-2015 |
Glenn Kasten <gkasten@google.com> |
namespace does not need a closing semicolon
Change-Id: Ie8f9d42fc061f6d558f23b98414e04eb3d14b376
/frameworks/av/media/libmedia/mediaplayer.cpp
|
| 9816016afb2a13c6a866cd047d57020566a8b9a9 |
|
05-Feb-2015 |
Wei Jia <wjia@google.com> |
mediaplayer: support dynamic playback rate
Bug: 19196501
Change-Id: I856b1507d5fa2cedfb645706d2435683a7d3e050
/frameworks/av/media/libmedia/mediaplayer.cpp
|
| 980b106908cb8e105bb8849749722c5088e2f6eb |
|
28-Jan-2015 |
Marco Nelissen <marcone@google.com> |
resolved conflicts for merge of 9391844d to master
Change-Id: I348a71d1b3e3238bc3871a69454edc8247d03111
|
| b7848f1c442bc8c71020957948d1b003a62a25b7 |
|
04-Dec-2014 |
Marco Nelissen <marcone@google.com> |
Remove MediaPlayerService::decode()
and make SoundPool use MediaCodec for decoding files to PCM.
Bug: 18239054
Change-Id: Ia144fc1bbb0d2787638ee972e2224339b4965310
/frameworks/av/media/libmedia/mediaplayer.cpp
|
| b187de1ada34a9023c05d020a4592686ba761278 |
|
30-Dec-2014 |
Glenn Kasten <gkasten@google.com> |
Line length 100
Change-Id: I6c8fe626a3825fa9e139319656d682a57b887c97
/frameworks/av/media/libmedia/mediaplayer.cpp
|
| 640adb3cf89cc9b826372009fad8c9b3d120482e |
|
05-Sep-2014 |
Jean-Michel Trivi <jmtrivi@google.com> |
Cache audio attributes when player not available
Cache the audio attributes stored in a Parcel in the client-side
MediaPlayer object if they are set through setParameter()
before the server-side MediaPlayer is available. Apply them when
the player is prepared.
Bug 17280746
Change-Id: I72f1a7fc4e2b076fae8cbdede77a2f74e98b2a03
/frameworks/av/media/libmedia/mediaplayer.cpp
|
| de3f8392fbf380ba6f09d009b00d7172477389a2 |
|
28-Jul-2014 |
Eric Laurent <elaurent@google.com> |
rename AudioSystem::newAudioSessionId()
Rename AudioSystem::newAudioSessionId() to
AudioSystem::newAudioUniqueId() as it can be used
also for I/O handles.
Bug: 12378680.
Change-Id: I611ea3b5eb57a4b0774437f477ee87dc4ccc2cc2
/frameworks/av/media/libmedia/mediaplayer.cpp
|
| d88adb96ec867ed1b629c434f87514d2fabaf5e9 |
|
23-Jul-2014 |
Chong Zhang <chz@google.com> |
NuPlayer: save thread id in MediaPlayer::start
so that when MediaPlayer::notify is called from within start,
it doesn't try to lock itself again.
Bug: 15323063
Change-Id: Idd77e892cd22538bbfe3e65c64c9dd2a216a0aee
/frameworks/av/media/libmedia/mediaplayer.cpp
|
| d9d7fa0873796ac661c44a7fcd6ad5ff697ff01f |
|
24-Jun-2014 |
Jean-Michel Trivi <jmtrivi@google.com> |
Support for audio attributes on audio output of media player
Change-Id: Iae4995c98e64add1ab9e6c8ae6501515032755f5
/frameworks/av/media/libmedia/mediaplayer.cpp
|
| 34fb29696b0f3abf61b10f8d053b1f33d501de0a |
|
19-Jun-2014 |
Mark Salyzyn <salyzyn@google.com> |
libmedia: 64-bit compile warnings
Change-Id: I600f062fa7148c01851023c1240c39939e648002
/frameworks/av/media/libmedia/mediaplayer.cpp
|
| de9453fb5cbc9cd69fd1ea45d577851e3aa3b8c9 |
|
19-Mar-2014 |
John Spurlock <jspurlock@google.com> |
Add MediaPlayer::getAudioStreamType.
Change-Id: I9cd8a718d2873543609aa651fd85749478f4f89f
/frameworks/av/media/libmedia/mediaplayer.cpp
|
| d457c970c8d08519cd77280a90b61ae1e342cfe3 |
|
11-Feb-2014 |
Marco Nelissen <marcone@google.com> |
Track pid for each session
so they can be properly freed.
Change-Id: I6f389035bc29e74e7c367c1c6d0252b180f666b3
/frameworks/av/media/libmedia/mediaplayer.cpp
|
| 81e68448f3361eaf8618930471fdc3c21bdf5cbc |
|
05-Feb-2014 |
Andreas Huber <andih@google.com> |
Remove no longer needed http proxy handling code, it's obsolete now
since we started to use java's HTTPConnection instead of the native
implementation. Also remove other remnants of the previous http implementation,
such as accounting for the http user's uid.
Change-Id: I60bfd31381ea40d2220db587ec5c433093b60034
/frameworks/av/media/libmedia/mediaplayer.cpp
|
| 1b86fe063badb5f28c467ade39be0f4008688947 |
|
29-Jan-2014 |
Andreas Huber <andih@google.com> |
FINAL ATTEMPT: HTTP services are now provided from JAVA and made available to media code
Change-Id: I9f74a86e70422187c9cf0ca1318a29019700192d
/frameworks/av/media/libmedia/mediaplayer.cpp
|
| be08f6a6688f3b1ae6914fbe800953c9bfb13c45 |
|
19-Dec-2013 |
Glenn Kasten <gkasten@google.com> |
Fix compile warning / incomplete initialization
Change-Id: Ib4accf99be800988e081f96222e1ee73538221ec
/frameworks/av/media/libmedia/mediaplayer.cpp
|
| 3d00aa6de95fb46e36f2bab4e3facdf0b96acf06 |
|
24-Sep-2013 |
Eric Laurent <elaurent@google.com> |
soundpool: allocate shared memory heap by client
Current SoundPool implementation allocates the shared memory heap
containing decoded PCM samples in mediaserver process.
When mediaserver process crashes, the shared memory heaps allocated by
AudioCache cannot be mapped anymore in the new instance of mediaserver.
This causes a silent failure to end playback of new sounds because
AudioFlinger believes the new AudioTracks are opened in streaming mode
and not static mode: it sees a NULL shared memory pointer when the track
is created.
The fix consists in allocating the memory heap in the client process. Thus
the heap is not lost when mediaserver restarts. The global memory usage is
the same as this is shared memory.
Also added a way to detect that a shared memory is passed when the track is
created but cannot be mapped on mediaserver side.
Also fix a crash in SoundPool when ALOGV is enabled.
Bug: 10894793.
Change-Id: Ice6c66ec3b2a409d75dc903a508b6c6fbfb2e8a7
/frameworks/av/media/libmedia/mediaplayer.cpp
|
| dcb89b3b505522efde173c105a851c412f947178 |
|
06-Aug-2013 |
Chong Zhang <chz@google.com> |
MediaPlayer: add listener for raw track data
Bug: 10326117
Change-Id: I2c0bdf8adc67b11f8dc633423bee66897548f181
/frameworks/av/media/libmedia/mediaplayer.cpp
|
| b13820ffafcb6bcdd33b6272676535afb4dff479 |
|
05-Aug-2013 |
Marco Nelissen <marcone@google.com> |
Reject unprepared MediaPlayers
Don't allow a MediaPlayer that has been reset() or release()d to be
used as the argument to setNextMediaPlayer.
Change-Id: I47da1460ec3742f5b2bd7b79e7998b290032d5a1
/frameworks/av/media/libmedia/mediaplayer.cpp
|
| 82fc2ca6905978b4f49f2c6bf948a6872575f2cc |
|
14-Jun-2013 |
Glenn Kasten <gkasten@android.com> |
am d5018116: Merge "Fix typo."
* commit 'd5018116252a3ecb491e2eaddad12180b85d1e78':
Fix typo.
|
| f65fa170b28f97503df3c309ecdaab377a042ba6 |
|
06-Jun-2013 |
Masaki Muranaka <monaka@monami-software.com> |
Fix typo.
Change-Id: Ia72ed2bef54751dc2d6c3379a58de95a0e9ebfdd
/frameworks/av/media/libmedia/mediaplayer.cpp
|
| b7319a7eb0a06ef4fd3a0c9157ee63e637ad7aa1 |
|
29-May-2013 |
Andreas Huber <andih@google.com> |
Update HTTP proxy configuration for all media playback inside stagefright.
Change-Id: Ie0dd00045aba668d8b49da73224e7a7c9c04f69b
related-to-bug: 8873723
(cherry picked from commit 2704965b8a1ff3b7450ff58ccecf86d8ec688c40)
/frameworks/av/media/libmedia/mediaplayer.cpp
|
| 8bdb01c279828e286a6e8b22ff0c1bcb6aa6ee8f |
|
10-May-2013 |
Marco Nelissen <marcone@google.com> |
Don't purge effects we're about to start using
By acquiring the new session id before releasing the old, we prevent
purging existing effects with the new session id that aren't currently
attached but will be once the player is switched to the new session id.
b/8767565
Change-Id: I703881b69c5accd8832ac834246925a20ada4c21
/frameworks/av/media/libmedia/mediaplayer.cpp
|
| 2070254f241f52cadb69bc2323f56df72704f1ca |
|
11-Apr-2013 |
Andreas Huber <andih@google.com> |
Instead of returning an error, return an invalid duration (-1 ms)
if no duration information was available. This prevents us from
entering ERROR state, effectively rendering the player instance useless.
Change-Id: I602d2661ae8b8633360306c0ea9208fb11e2bf17
related-to-bug: 8596285
/frameworks/av/media/libmedia/mediaplayer.cpp
|
| b1e7cd156ca3e1747374e0d20cdd1ce467210453 |
|
15-Feb-2013 |
Mathias Agopian <mathias@google.com> |
Refactoring: Rename SurfaceTextureClient to Surface
Change-Id: I4e8a8b20914cb64edc37abe68233fbc9f2b5d830
/frameworks/av/media/libmedia/mediaplayer.cpp
|
| 5570227ac334479982a9dd8c1647c00f58f47c18 |
|
21-Dec-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Remove unnecessary parameter"
|
| f37971f624164c3ed185d3f976404a6f60f49b9a |
|
03-Feb-2012 |
Glenn Kasten <gkasten@google.com> |
Remove unnecessary parameter
Just get the parameter on server side
Change-Id: I433a63104dbb257e0d862be2ab61847cb36d1c15
/frameworks/av/media/libmedia/mediaplayer.cpp
|
| 484566c410afdfbc4b6bc5aa1732aef37428a5b8 |
|
18-Dec-2012 |
Andy McFadden <fadden@android.com> |
Rename ISurfaceTexture and SurfaceTexture
The C++ class names don't match what the classes do, so rename
ISurfaceTexture to IGraphicBufferProducer, and SurfaceTexture to
GLConsumer.
Bug 7736700
Change-Id: I64520a55f8c09fe6215382ea361c539a9940cba5
/frameworks/av/media/libmedia/mediaplayer.cpp
|
| b7c8e91880463ff4981e3e53e98e45d68e2fe374 |
|
28-Nov-2012 |
Andreas Huber <andih@google.com> |
Add support for HLS playlists of type 'event'.
related-to-bug: 6870049
Squashed commit of the following:
commit eee2f3ba6bb7335f4e285632726db85645669929
Author: Andreas Huber <andih@google.com>
Date: Tue Nov 27 15:02:01 2012 -0800
Make everything a lot less verbose by default.
Change-Id: I884d7a7901aa1e7d4ff590f065ca57a79d2af8b3
commit 6bbdb837ed5bd88008e45efb8faf595e4051ba26
Author: Andreas Huber <andih@google.com>
Date: Tue Nov 27 14:34:46 2012 -0800
HLS now properly signals media time changes at discontinuities including
the start of playback (which may not necessarily be at time 0 if the playlist
is of type 'event' and hasn't completed yet).
Change-Id: I5ab747d024f9b8d0df72a4e06a12ebb29f62802e
commit 1555589832b1878a144a976a643e1af4d61f877c
Author: Andreas Huber <andih@google.com>
Date: Tue Nov 27 14:32:28 2012 -0800
As part of a time discontinuity, clients of IStreamListener can now
signal the corresponding media time after the discontinuity, i.e. the first PTS
timestamp following the discontinuity will be considered equivalent to the
specified media time and media buffers timestamped accordingly.
Change-Id: Id7db7679b7faa6efd6270620ff52e34e884f3e92
commit 5c24c605c073a11c426d025b1e7478fc1ad8365a
Author: Andreas Huber <andih@google.com>
Date: Tue Nov 27 13:00:56 2012 -0800
NuPlayer sources now expose flags() and can announce
that duration may change (increase) dynamically, in which case duration
will be polled at 1 second intervals and communicated to the upper layers.
Change-Id: I45102909b7a19eed0dda576747e3814d742a0eea
commit ecb71de8e281e61971a2cd73e7161a97540bc357
Author: Andreas Huber <andih@google.com>
Date: Tue Nov 27 12:57:47 2012 -0800
Stop caching duration in MediaPlayer, duration could increase dynamically.
Change-Id: I7bb2f16c0abe49debdf45c776d2266aa069d7791
commit 544aec5823e6d7a3e97e15b6b23546616bcd343e
Author: Andreas Huber <andih@google.com>
Date: Tue Nov 27 08:46:28 2012 -0800
An attempt to add support for "event" style HLS playlists.
Change-Id: I3dfb2e801ecaff8f5d8bdb3a4fca1b18aeeb2c60
Change-Id: I48cf7f65a654d33f2f49ded74f8be22aed9e3b98
/frameworks/av/media/libmedia/mediaplayer.cpp
|
| a4c5bc0f18fe272146426ab2eccad6215279c9f3 |
|
28-Nov-2012 |
Andreas Huber <andih@google.com> |
Add support for HLS playlists of type 'event'.
related-to-bug: 6870049
Squashed commit of the following:
commit eee2f3ba6bb7335f4e285632726db85645669929
Author: Andreas Huber <andih@google.com>
Date: Tue Nov 27 15:02:01 2012 -0800
Make everything a lot less verbose by default.
Change-Id: I884d7a7901aa1e7d4ff590f065ca57a79d2af8b3
commit 6bbdb837ed5bd88008e45efb8faf595e4051ba26
Author: Andreas Huber <andih@google.com>
Date: Tue Nov 27 14:34:46 2012 -0800
HLS now properly signals media time changes at discontinuities including
the start of playback (which may not necessarily be at time 0 if the playlist
is of type 'event' and hasn't completed yet).
Change-Id: I5ab747d024f9b8d0df72a4e06a12ebb29f62802e
commit 1555589832b1878a144a976a643e1af4d61f877c
Author: Andreas Huber <andih@google.com>
Date: Tue Nov 27 14:32:28 2012 -0800
As part of a time discontinuity, clients of IStreamListener can now
signal the corresponding media time after the discontinuity, i.e. the first PTS
timestamp following the discontinuity will be considered equivalent to the
specified media time and media buffers timestamped accordingly.
Change-Id: Id7db7679b7faa6efd6270620ff52e34e884f3e92
commit 5c24c605c073a11c426d025b1e7478fc1ad8365a
Author: Andreas Huber <andih@google.com>
Date: Tue Nov 27 13:00:56 2012 -0800
NuPlayer sources now expose flags() and can announce
that duration may change (increase) dynamically, in which case duration
will be polled at 1 second intervals and communicated to the upper layers.
Change-Id: I45102909b7a19eed0dda576747e3814d742a0eea
commit ecb71de8e281e61971a2cd73e7161a97540bc357
Author: Andreas Huber <andih@google.com>
Date: Tue Nov 27 12:57:47 2012 -0800
Stop caching duration in MediaPlayer, duration could increase dynamically.
Change-Id: I7bb2f16c0abe49debdf45c776d2266aa069d7791
commit 544aec5823e6d7a3e97e15b6b23546616bcd343e
Author: Andreas Huber <andih@google.com>
Date: Tue Nov 27 08:46:28 2012 -0800
An attempt to add support for "event" style HLS playlists.
Change-Id: I3dfb2e801ecaff8f5d8bdb3a4fca1b18aeeb2c60
Change-Id: I48cf7f65a654d33f2f49ded74f8be22aed9e3b98
/frameworks/av/media/libmedia/mediaplayer.cpp
|
| 36a4d2cc7a44eb42d0d9ef5fe50b6747a7a34cab |
|
13-Mar-2012 |
Marco Nelissen <marcone@google.com> |
Merge "Gapless playback, step 1."
|
| 6b74d671a1321a6ecc4a40b6c87beedfecc1ec44 |
|
29-Feb-2012 |
Marco Nelissen <marcone@google.com> |
Gapless playback, step 1.
Currently able to play Ogg Vorbis, PCM WAV and other lossless files seamlessly
by reusing the initial AudioTrack for subsequent players.
Change-Id: Ie7cf6b9076bdf4f9211574456d192c02c04fecc7
/frameworks/av/media/libmedia/mediaplayer.cpp
|
| e53b9ead781c36e96d6b6f012ddffc93a3d80f0d |
|
13-Mar-2012 |
Glenn Kasten <gkasten@google.com> |
Whitespace and indentation
Fix indentation to be multiple of 4.
Make it easier to search:
sp< not sp < to
"switch (...)" instead of "switch(...)" (also "if" and "while")
Remove redundant blank line at start or EOF.
Remove whitespace at end of line.
Remove extra blank lines where they don't add value.
Use git diff -b or -w to verify.
Change-Id: I966b7ba852faa5474be6907fb212f5e267c2874e
/frameworks/av/media/libmedia/mediaplayer.cpp
|
| c795b64060c3af9d7961fc1371e4ccfa8ee3e450 |
|
23-Feb-2012 |
John Grossman <johngro@google.com> |
Switch the way we configure for MediaPlayer retransmission.
This is a cherry-pick of I6ab07d89b2eeb0650e634b8c3b7a0b36aba4e7dd
with merge conflicts addressed by hand and additional changes made in
response to code review feedback.
Move in the direction of a more publishable API for configuring a
media player for retransmission. It used to be that we used a custom
invoke and a modified URL (prefixed with aahTX://). There are many
issues with this technique and it was never meant to stand the test of
time.
This CL gets rid of all that. A new (but currently hidden) method was
introduced to the java level MediaPlayer API, called
setRetransmitTarget(InetSocketAddress), which allows an app writer to
set the retransmit target. For now, this method needs to be called
before a call to setDataSource (which is pretty unusual for the
MediaPlayer API) because this mid level code uses this as a cue to
instantiate an aahTX player instead of relying on the data source to
select a player. When retranmit functionality becomes part of the
existing android player implemenation, this
set-retrans-before-set-data-source behavior can go away, along with
the aahTX player itself.
Change-Id: I3b46c5227bbf69acb2f3cc4f93cfccad9777be98
Signed-off-by: John Grossman <johngro@google.com>
/frameworks/av/media/libmedia/mediaplayer.cpp
|
| df712ea86e6350f7005a02ab0e1c60c28a343ed0 |
|
26-Feb-2012 |
Mathias Agopian <mathias@google.com> |
fix libgui header location
Change-Id: Iec71706cdd4f29c6904993648ce873e83ef9cafe
/frameworks/av/media/libmedia/mediaplayer.cpp
|
| 99e53b86eebb605b70dd7591b89bf61a9414ed0e |
|
19-Jan-2012 |
Glenn Kasten <gkasten@google.com> |
Update comments
We no longer put the filename at start of file.
Change-Id: Ic435b159a23105681e3d4a6cb1ac097bc853302e
/frameworks/av/media/libmedia/mediaplayer.cpp
|
| a3f1fa308728976fc9ca1b4f37d26e633b32b9ac |
|
18-Jan-2012 |
Glenn Kasten <gkasten@google.com> |
Fix incorrect includes of AudioTrack.h
Remove unnecessary includes of AudioTrack.h.
Use forward declaration of class names in preference to #include when possible.
Change-Id: I12982811fa75c2c7695d8bbfa595a7aaec047dc0
/frameworks/av/media/libmedia/mediaplayer.cpp
|
| fff6d715a8db0daf08a50634f242c40268de3d49 |
|
13-Jan-2012 |
Glenn Kasten <gkasten@google.com> |
Use audio_stream_type_t consistently
At native level it was a mixture of audio_stream_type_t, int, uint32_t,
and uint8_t. Java is still int. Also fixed a couple of hard-coded -1
instead of AUDIO_STREAM_DEFAULT, and in startToneCommand a hard-coded 0
instead of AUDIO_STREAM_VOICE_CALL.
Change-Id: Ia33bfd70edca8c2daec9052984b369cd8eee2a83
/frameworks/av/media/libmedia/mediaplayer.cpp
|
| 4cc55d53d542c4f4ed645738cebb65b9e7eb6c44 |
|
12-Jan-2012 |
Glenn Kasten <gkasten@google.com> |
Merge "Use audio_format_t consistently"
|
| 29357bc2c0dd7c43ad3bd0c8e3efa4e6fd9bfd47 |
|
06-Jan-2012 |
Steve Block <steveblock@google.com> |
Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE
See https://android-git.corp.google.com/g/#/c/157220
Bug: 5449033
Change-Id: Ic9c19d30693bd56755f55906127cd6bd7126096c
/frameworks/av/media/libmedia/mediaplayer.cpp
|
| 5ff1dd576bb93c45b44088a51544a18fc43ebf58 |
|
06-Jan-2012 |
Steve Block <steveblock@google.com> |
Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGE
See https://android-git.corp.google.com/g/157065
Bug: 5449033
Change-Id: I00a4b904f9449e6f93b7fd35eac28640d7929e69
/frameworks/av/media/libmedia/mediaplayer.cpp
|
| e1c3962e268ffc12bfd1bd9ea84da1f135f36960 |
|
04-Jan-2012 |
Glenn Kasten <gkasten@google.com> |
Use audio_format_t consistently
Was int, uint32_t, uint16_t, and uint8_t with 2-bit bitfield.
Also replace 0 by AUDIO_FORMAT_DEFAULT and replace 1 by
AUDIO_FORMAT_PCM_16_BIT.
Change-Id: Ia8804f53f1725669e368857d5bb2044917e17975
/frameworks/av/media/libmedia/mediaplayer.cpp
|
| b8a805261bf0282e992d3608035e47d05a898710 |
|
20-Dec-2011 |
Steve Block <steveblock@google.com> |
Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGE
See https://android-git.corp.google.com/g/156016
Bug: 5449033
Change-Id: I4c4e33bb9df3e39e11cd985e193e6fbab4635298
/frameworks/av/media/libmedia/mediaplayer.cpp
|
| 471af5aaea2d2491a77dba379771f7c96b9ca3c3 |
|
08-Nov-2011 |
Andreas Huber <andih@google.com> |
resolved conflicts for merge of 26f70db9 to master
Change-Id: Ib1536b1a4c9eeff80e0726b3e61cee12057cd120
|
| 3901e5d87573447db33fb9930871a1f5266a9b2c |
|
25-Oct-2011 |
Andreas Huber <andih@google.com> |
Remove surface legacy APIs and code.
All surfaces are now supported through surface textures.
Change-Id: I95dd823e7099c0c32a48a1121624149dcc29d9c6
/frameworks/av/media/libmedia/mediaplayer.cpp
|
| 4b8bb4ee7d1d64dc1cd5478a3772f97e4a4a00d7 |
|
28-Oct-2011 |
Jamie Gennis <jgennis@google.com> |
am fc9592f8: am 08479cee: Merge "Stagefright: ANW::connect in MediaPlayerService" into ics-mr0
* commit 'fc9592f8a5f2f75207e5e532655ac294eb2b334b':
Stagefright: ANW::connect in MediaPlayerService
|
| 7dae00baa6e8957be15523c46bb948bd1dde64c3 |
|
27-Oct-2011 |
Jamie Gennis <jgennis@google.com> |
Stagefright: ANW::connect in MediaPlayerService
This change moves the ANativeWindow connect and disconnect logic from
MediaPlayer to MediaPlayerService::Client.
Bug: 5502654
Change-Id: Ifc43b98b01ad8f35d62d7ece43110724ec7fda3d
/frameworks/av/media/libmedia/mediaplayer.cpp
|
| 3856b090cd04ba5dd4a59a12430ed724d5995909 |
|
20-Oct-2011 |
Steve Block <steveblock@google.com> |
Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF) DO NOT MERGE
See https://android-git.corp.google.com/g/#/c/143865
Bug: 5449033
Change-Id: I0122812ed6ff6f5b59fe4a43ab8bff0577adde0a
/frameworks/av/media/libmedia/mediaplayer.cpp
|
| 0662067b06658a4a56a8416c676f6cce8ccddb53 |
|
06-Sep-2011 |
Dave Burke <daveburke@google.com> |
Handle setDataSource failures properly. #5261671
Change-Id: Iea0aa474d1939db23da9aabdfae2081e834f30d9
/frameworks/av/media/libmedia/mediaplayer.cpp
|
| d681bbb1767bed09415e050ba78975df214bcd68 |
|
30-Aug-2011 |
Dave Burke <daveburke@google.com> |
Require INTERNET permission for network-based content.
Bug #1870981
Change-Id: Ia3ad166390c4d60cea19c3783895b078a2c4c15f
/frameworks/av/media/libmedia/mediaplayer.cpp
|
| 3a34befc6fb04a4945a849e8bda8b84e4bf973fe |
|
02-Aug-2011 |
Marco Nelissen <marcone@google.com> |
Keep effects sessions active when the caller dies.
Don't remove effects until the session they are in goes away or all
AudioEffects have been explicitly released. This allows the control
panel process to die without stopping the effects.
Change-Id: I4496e5df080230ca1af149dec95c1309ab8ea888
/frameworks/av/media/libmedia/mediaplayer.cpp
|
| c3da3434cb57f47284ea06bb9065eaa2fe033efb |
|
30-Jul-2011 |
Mathias Agopian <mathias@google.com> |
connect/disconnect is now called from our EGL wrapper
the original connect/disconnect hooks are deprecated
and replace by api_connect/api_disconnect. the original
hooks are no no-ops.
api_connect/api_disconnect is now only called from the
android framework.
Bug: 5057915
Change-Id: I8ca64cd1acd6cabf915bf54689ec2e5f6dfa495a
/frameworks/av/media/libmedia/mediaplayer.cpp
|
| 5bc965b1ff21c64e5f30130957bfe96300e15ed3 |
|
22-Jul-2011 |
James Dong <jdong@google.com> |
Merge "Log setVideoSurface() and setVideoSurfaceTexture() failures."
|
| fada58a21be01913a8e3f25c898d26d2fc8ba630 |
|
22-Jul-2011 |
James Dong <jdong@google.com> |
Log setVideoSurface() and setVideoSurfaceTexture() failures.
Change-Id: Iaea34e74a0cf569fc85b926949253dea6baa6142
related-to-bug: 5063370
/frameworks/av/media/libmedia/mediaplayer.cpp
|
| bea47bc22b2939b324b47fd0d70e6c7e6fbc82d2 |
|
19-Jul-2011 |
Jamie Gennis <jgennis@google.com> |
MediaPlayer: add a disconnect from ANativeWindow
This change makes MediaPlayer::disconnect disconnect from the
ANativeWindow once the player has been disconnected.
Change-Id: I6744559030d1edc520cf77402d1f5ce841742340
/frameworks/av/media/libmedia/mediaplayer.cpp
|
| 61c7ef5bde2c7ed94a078396aa65da67b47e5402 |
|
13-Jul-2011 |
Jamie Gennis <jgennis@google.com> |
MediaPlayer: add ANativeWindow (dis)connect calls
This change makes MediaPlayer connect to the ANativeWindow to which it
is going to render video frames and disconnect when it is done.
Change-Id: I88ab5c2fe62493aabdc84a283ff31634f795d415
/frameworks/av/media/libmedia/mediaplayer.cpp
|
| 64760240f931714858a59c1579f07264d7182ba2 |
|
11-May-2011 |
Dima Zavin <dima@android.com> |
update for new audio.h header location
Change-Id: Ic4c62c4037800802427eb7d3c7f5eb8b25d18876
Signed-off-by: Dima Zavin <dima@android.com>
/frameworks/av/media/libmedia/mediaplayer.cpp
|
| 4f9e47f2c03ce36261c4717cd7e131d7940bb068 |
|
26-Apr-2011 |
Gloria Wang <gwang@google.com> |
Add setParameter/getParameter to MediaPlayer API.
for bug 1982947
Change-Id: If3f40e4f18cbba155af29944af38bdc627f8cd53
/frameworks/av/media/libmedia/mediaplayer.cpp
|
| fce7a473248381cc83a01855f92581077d3c9ee2 |
|
20-Apr-2011 |
Dima Zavin <dima@android.com> |
audio/media: convert to using the audio HAL and new audio defs
Change-Id: Ibc637918637329e4f2b62f4ac7781102fbc269f5
Signed-off-by: Dima Zavin <dima@android.com>
/frameworks/av/media/libmedia/mediaplayer.cpp
|
| b483c4724846c0b8d4e82afcbb7c17f671bae81c |
|
12-Apr-2011 |
Gloria Wang <gwang@google.com> |
- Add another parameter in notify() to be able to send timed text sample
through listener during video playback.
- Add OnTimedTextListener in the MediaPlayer
For feature request 800939.
Change-Id: I65072c27acb4c0037109a72be38c73e9f667420f
/frameworks/av/media/libmedia/mediaplayer.cpp
|
| 1173118eace0e9e347cb007f0da817cee87579ed |
|
09-Feb-2011 |
Glenn Kasten <gkasten@google.com> |
Bug 3438258 Add SurfaceTexture as MediaPlayer sink
This change enables the use of a SurfaceTexture in place of a Surface
as the video sink for an android.media.MediaPlayer. The new API
MediaPlayer.setTexture is currently hidden.
This includes:
- New Java and C++ interfaces
- C++ plumbing and implementation (JNI, Binder)
- Stagefright AwesomePlayer and NuPlayer use ANativeWindow
(either Surface or SurfaceTextureClient)
Change-Id: I2b568bee143d9eaf3dfc6cc4533c1bebbd5afc51
/frameworks/av/media/libmedia/mediaplayer.cpp
|
| 145e68fc778275963189b02a1adcbe27cce4d769 |
|
12-Jan-2011 |
Andreas Huber <andih@google.com> |
Increase cache size and low-watermark threshold, also
MediaPlayer now sends out MEDIA_INFO,MEDIA_INFO_VIDEO_TRACK_LAGGING messages
to the JAVA client informing it how much (if at all) the video lags behind
audio (arg2 is the media delay in ms).
Change-Id: I6933f573d8597a35112e4b5ee0fcb826a7f6ddd1
related-to-bug: 3335220
/frameworks/av/media/libmedia/mediaplayer.cpp
|
| a1680bce73ea1b051cc92e0df651a53944b104ee |
|
18-Nov-2010 |
James Dong <jdong@google.com> |
Fix an issue wherre error notification will not be sent after mediaplayer reset
bug - 3198642
Change-Id: Ieab13e12af9fdd0ad0873c522885e1350e7cd24c
/frameworks/av/media/libmedia/mediaplayer.cpp
|
| 0a5ca668c6f7d45706e9aec4a1dfec0aacc6d233 |
|
16-Nov-2010 |
Andreas Huber <andih@google.com> |
Remove all traces of legacy renderer support in stagefright.
Change-Id: I17b8e0dbf53fca37c96830c41131b4bc0c24ca6d
/frameworks/av/media/libmedia/mediaplayer.cpp
|
| 05ea6434ed399395e2dbe9f68abb44f04b274cb0 |
|
29-Oct-2010 |
Andreas Huber <andih@google.com> |
Squashed commit of the following:
commit 0d5694ba2d399dd0869532a4d6256448185a1be0
Author: Andreas Huber <andih@google.com>
Date: Fri Oct 29 11:59:23 2010 -0700
suspend() and resume() methods on VideoView are back but don't do anything.
They need to be back because they were public before.
Change-Id: Iddfd1021ffcf341f26e8d55ba761fd33701e2425
commit 16192891ed7d349ee97e47d1729d20a2d0d247b8
Author: Andreas Huber <andih@google.com>
Date: Fri Oct 29 11:47:05 2010 -0700
Revert "New API on VideoView widget to suspend/resume a session. Do not release the MediaPlayer client for video suspending/resuming."
This reverts commit 2e1818a4d16c3309660f27286c77d8d1eee95a25.
Conflicts:
api/current.xml
Change-Id: I68dd1d05871044faf3f832d0838aa40bc7f890e5
commit 8f934dc1a3ae4e60f0790fcf97671e063fa20fad
Author: Andreas Huber <andih@google.com>
Date: Fri Oct 29 11:44:16 2010 -0700
Revert "Release mediaplayer if the current state is not suspending. Fix for bug 2480093."
This reverts commit efb882cf75eef39ecaf9f8920ed302a019fa629f.
commit f2ed03550887986f39d36b5dabcd9e919949c7cf
Author: Andreas Huber <andih@google.com>
Date: Fri Oct 29 11:44:08 2010 -0700
Revert "Release MediaPlayer if suspend() returns false."
This reverts commit 047212fd4ea360675e94d3ce83c7f5544f65b268.
commit 441ecce678bd24e9660a72c8627b5bd94433ff8b
Author: Andreas Huber <andih@google.com>
Date: Fri Oct 29 11:40:46 2010 -0700
manually.
Change-Id: I4fdd43c9f7c8b3eedddb31a196da4984e1c58e87
Change-Id: I60d4b10e7a9e4ed8d9a796f1711618f557eb6e89
/frameworks/av/media/libmedia/mediaplayer.cpp
|
| 2eeadf9ded4b5770a713496e9887d668889987bc |
|
11-Oct-2010 |
Eric Laurent <elaurent@google.com> |
am 4f21e517: am b37fcbfd: Merge "Added getter for session Id to AudioSink" into gingerbread
Merge commit '4f21e517d09b9d793d20d64547df330fba705b3c'
* commit '4f21e517d09b9d793d20d64547df330fba705b3c':
Added getter for session Id to AudioSink
|
| 8c563ed9ca8a863a66965330b5d14bb4b4ab59d4 |
|
08-Oct-2010 |
Eric Laurent <elaurent@google.com> |
Added getter for session Id to AudioSink
Added a method to expose the audio session id at AudioSink interface
so that the AudioPlayer in stagefright can retrieve it.
Also:
- Fixed audio effect send level not being initialized in mediaplayer.
- Fixed compilation error when LOGV is enabled in mediaplayer JNI
Change-Id: I4bb55454fd63d646e0e677692d737c4843fb05fb
/frameworks/av/media/libmedia/mediaplayer.cpp
|
| d44b51d9fcb0b5d891d2abece83a551e71ebb73b |
|
18-Sep-2010 |
Marco Nelissen <marcone@google.com> |
am 5c9f3579: am f30fae63: Merge "Add a check to track a problem the monkey script has been triggering." into gingerbread
Merge commit '5c9f35799422d818f34f814c76c2acd8c939a40c'
* commit '5c9f35799422d818f34f814c76c2acd8c939a40c':
Add a check to track a problem the monkey script has been triggering.
|
| 1c1503cf47c0a37a30e7acac2c5d29140fc61a5f |
|
18-Sep-2010 |
Marco Nelissen <marcone@google.com> |
Add a check to track a problem the monkey script has been triggering.
Change-Id: If3896946d993cbab2442e17740f18efd7e753a3b
/frameworks/av/media/libmedia/mediaplayer.cpp
|
| 5daeb129a2c2ba3d14ccd94af283b5f561c783ea |
|
16-Aug-2010 |
Andreas Huber <andih@google.com> |
Squashed commit of the following:
commit 35cc68814a9537c31fde146e171e7b0bbdfe211e
Author: Andreas Huber <andih@google.com>
Date: Mon Aug 16 08:48:42 2010 -0700
Only enable support for yuv to yuv conversion on passion, where it's available, use the slower yuv->rgb565 path everywhere else.
commit d8ac5a8814103e60d11d2acf61997fc31a1dc58d
Author: Andreas Huber <andih@google.com>
Date: Fri Aug 13 13:56:44 2010 -0700
The software renderer takes over all rendering, converting from yuv to yuv if possible and rgb565 otherwise.
commit 684972074b74318bdcb826ed9b5b0864d2d2e273
Author: Andreas Huber <andih@google.com>
Date: Fri Aug 13 09:34:35 2010 -0700
A first shot at supporting the new rendering APIs.
Change-Id: Iea9b32856da46950501f1a700f616b5feac710fd
/frameworks/av/media/libmedia/mediaplayer.cpp
|
| 3b26844e60f8487388e7e62709faf0dada86e7e1 |
|
03-Aug-2010 |
Eric Laurent <elaurent@google.com> |
Fix issue 2876124.
Allow calls to MediaPlayer::notify() in idle state to signal errors from JNI.
Change-Id: I1515fe69766f0a926b76e15c4971317da2acd6a0
/frameworks/av/media/libmedia/mediaplayer.cpp
|
| 2beeb50b1bba9e92f6cacfeca37fe9fa9d36ead1 |
|
16-Jul-2010 |
Eric Laurent <elaurent@google.com> |
Added support for auxiliary audio effects to AudioTrack and MediaPlayer.
Added methods to AudioTrack and MediaPlayer java classes to enable use of
auxiliary audio effects. The effect can be attached and detached by specifying its
ID and the send level controlled.
Change-Id: Ie74ff54a453096a742688476f612ce355543b6f3
/frameworks/av/media/libmedia/mediaplayer.cpp
|
| da7581b7b61b84f15e8d671c86fd117c322b009e |
|
02-Jul-2010 |
Eric Laurent <elaurent@google.com> |
Added Visualizer effect.
The visualizer enables application to retrieve part of the currently playing audio for visualization purpose.
It is not an audio recording interface and only returns partial and low quality audio content as a waveform or
a frequency representation (FFT).
Removed temporary hack made in MediaPlayer for animated wall papers based on audio visualization (snoop() method.
This commit also includes a change in AudioEffect class:
- the enable()/disable() methods have been replaced bya more standard setEnabled() method.
- some fixes in javadoc
Change-Id: Id092a1340e9e38dae68646ade7be054e3a36980e
/frameworks/av/media/libmedia/mediaplayer.cpp
|
| a514bdb58b5de4986679f72b7204b4764f7a2778 |
|
21-Jun-2010 |
Eric Laurent <elaurent@google.com> |
Added support for audio sessions in MediaPlayer and AudioTrack.
Audio sessions are used to associate audio effects to particular instances (or groups) of MediaPlayers or AudioTracks.
Change-Id: Ib94eec43241cfcb416590f435ddce7ab39a07640
/frameworks/av/media/libmedia/mediaplayer.cpp
|
| 4023493a827bc9751d8e40795516d0d536a53348 |
|
10-Mar-2010 |
Nicolas Catania <niko@google.com> |
Allow invoke in all the player states except idle and error.
Previously invoke would work only after prepare but not
when the player is in play or pause state (for instance).
This new change just check that the player has been initialized
and is not in the error state.
Bug:2488931
Change-Id: I9b9f3679593a3b7697c1a84d993fdcd7e1693a90
/frameworks/av/media/libmedia/mediaplayer.cpp
|
| 64fb06f698b39759a7a2ebacd0a175949b7506a5 |
|
11-Mar-2010 |
Nicolas Catania <niko@google.com> |
Revert "Allow invoke in all the player states except idle and error."
This reverts commit 88f3b81d065d4bec6f69a25eda99158e254f55b1.
/frameworks/av/media/libmedia/mediaplayer.cpp
|
| 63bacaf543d4faee6dadda08e51556c878b078f5 |
|
10-Mar-2010 |
Nicolas Catania <niko@google.com> |
Allow invoke in all the player states except idle and error.
Previously invoke would work only after prepare but not
when the player is in play or pause state (for instance).
This new change just check that the player has been initialized
and is not in the error state.
Bug:2488931
Change-Id: I7a69d1b6e3eec1e5dbdf7378ff2085329062595a
/frameworks/av/media/libmedia/mediaplayer.cpp
|
| 83ff1438d2d1d5dbf39ca5e6f2e4fa1799e7ba80 |
|
10-Mar-2010 |
Marco Nelissen <marcone@google.com> |
MEDIA_PLAYER_STATE_ERROR is not a bitmask
(b/2502881)
Change-Id: I08e427eb2c36f5d70e40f9aeb8638fa8262de989
/frameworks/av/media/libmedia/mediaplayer.cpp
|
| 698f476590bc9e38d4d1d4155da9efdbedd357c4 |
|
26-Feb-2010 |
Marco Nelissen <marcone@google.com> |
When we're in the 'playback complete' state, don't consider pausing
an error. This makes 'playback complete' essentially equivalent to
being paused at the end, and treats it the same as being paused at
any other position.
/frameworks/av/media/libmedia/mediaplayer.cpp
|
| 4e92c7efc68b5d7635a32dbd283ab8558ad9bdd6 |
|
12-Feb-2010 |
Andreas Huber <andih@google.com> |
New API on java's MediaPlayer to suspend/resume a session.
related-to-bug: 2231576
/frameworks/av/media/libmedia/mediaplayer.cpp
|
| 3cf613507f1e2f7bd932d921a6e222e426fd3be4 |
|
10-Feb-2010 |
Mathias Agopian <mathias@google.com> |
split libsurfaceflinger_client and libcamera_client out of libui
/frameworks/av/media/libmedia/mediaplayer.cpp
|
| 2db8455d8f4468a637109d31f319ce02d9d743ec |
|
28-Jan-2010 |
Andreas Huber <andih@google.com> |
API Extension: Support for optionally specifying a map of extra request headers when specifying the uri of media data to be played.
related-to-bug: 2393577
Original change by Andrei Popescu <andreip@google.com>
/frameworks/av/media/libmedia/mediaplayer.cpp
|
| dd172fce75b2a1c3cb3a5d3b3bbb5020b1ae8675 |
|
16-Jan-2010 |
James Dong <jdong@google.com> |
Media server death nodification
/frameworks/av/media/libmedia/mediaplayer.cpp
|
| 10dbb8e97e7a81ca4867663b5517f048820b3094 |
|
20-Sep-2009 |
Marco Nelissen <marcone@google.com> |
Music visualizer support hack.
This currently assumes 44k stereo (won't crash on other formats, but won't give the correct results either), and links statically with libspeex to get FFT data, increasing the size of libmedia by about 45kb.
/frameworks/av/media/libmedia/mediaplayer.cpp
|
| aa37173500f221298fa618b5ca8b4814aff5ef31 |
|
10-Jul-2009 |
Marco Nelissen <marcone@google.com> |
Don't pass references to temporary objects, and handle the case where we dont have a Surface.
/frameworks/av/media/libmedia/mediaplayer.cpp
|
| 8e1b6cce24574b9ecd5b0300155776bd0b4ef756 |
|
09-Jul-2009 |
Nicolas Catania <niko@google.com> |
Basic plumbing to retrieve metadata from the native player.
IMediaPlayer.h
Added a getMetadata method that mirrors the on in MediaPlayer.java.
MediaPlayer.java
Added a native method to get the metadata from the native player.
Parse the parcel into a Metadata object.
Metadata.java
Added a stub to parse the Parcel returned by the native player into
a set of metadata.
android_media_MediaPlayer.cpp
JNI call to forward the getMetadata call.
MediaPlayerService.cpp
MediaPlayerService::Client implements the new getMetadata method added in IMediaPlayer.h
/frameworks/av/media/libmedia/mediaplayer.cpp
|
| a7e0e8b4c429fc68eb1bd5b5a30f5b91352288f9 |
|
08-Jul-2009 |
Nicolas Catania <niko@google.com> |
Implemented the metadata changed notification filters.
IMediaPlayer:
new setMetadataFilter method so set a filter (2 lists of allowed and blocked metadata type)
serialized in a Parcel.
MediaPlayer.java/android_media_MediaPlayer.cpp/mediaplayer.cpp
new setMetadataFilter that passes the filter down to the MediaPlayerService's binder interface.
MediaPlayerService.cpp
The Client inner class holds the allowed and blocked metadata types.
These are in 2 vectors that get populated in the setMetadataFilter.
A new shourldDropMetadata method returns true if a type of metadata should be dropped according
to the filters.
The notify method in run the metadata update notifications thru the filter and possibly drop them.
/frameworks/av/media/libmedia/mediaplayer.cpp
|
| 1d187f1a86855f5f0694d7ec30efc9833bf7c589 |
|
13-May-2009 |
Nicolas Catania <niko@google.com> |
Direct api to the native media player.
MediaPlayer.java has 3 new methods:
* newRequest creates a Parcel that can be used to send data to the
native player using invoke.
* invoke issues synchronous calls to the native player using opaque
parcels for the request and reply.
IMediaPlayer.h has 1 new abstract method:
* invoke
The Midi and Vorbis players have a stub for these. So far only PV
makes use of that new feature.
To avoid any copy overhead, the JNI interface uses Parcel as a java
object (no serialization/copy happens at the JNI layer).
The remote interface token is inserted when the Parcel is constructed
in java. That way the parcel is already routable when it reaches
IMediaPlayer.cpp (proxy). No extra copy is needed there.
/frameworks/av/media/libmedia/mediaplayer.cpp
|
| 4710a1f6c9800dae90f9e2702ba2b5b54c095eae |
|
12-Jun-2009 |
Android (Google) Code Review <android-gerrit@google.com> |
am d670b8c6: Merge change 3981 into donut
Merge commit 'd670b8c61ebd13324ac21bdbc08d8a02fc0a765a'
* commit 'd670b8c61ebd13324ac21bdbc08d8a02fc0a765a':
Removed trailing whitespaces.
|
| 660951867e959ebe98612742ef1f72d33ea7e9a3 |
|
12-Jun-2009 |
Nicolas Catania <niko@google.com> |
Removed trailing whitespaces.
/frameworks/av/media/libmedia/mediaplayer.cpp
|
| 7562408b2261d38415453378b6188f74fda99d88 |
|
20-May-2009 |
Mathias Agopian <mathias@google.com> |
move libbinder's header files under includes/binder
/frameworks/av/media/libmedia/mediaplayer.cpp
|
| 5cb07aa071b43a214e4c880b3b7852714e06451b |
|
25-Mar-2009 |
Andreas Huber <> |
Automated import from //branches/master/...@141712,141712
/frameworks/av/media/libmedia/mediaplayer.cpp
|
| 4003bf5e4cd948fe7732c16b2a683acdbfa8c44d |
|
25-Mar-2009 |
Andreas Huber <> |
Automated import from //branches/donutburger/...@141711,141711
/frameworks/av/media/libmedia/mediaplayer.cpp
|
| 1af452f333664e8b0a61d96a9b3bb682d8b9a00f |
|
25-Mar-2009 |
Jason Sams <> |
Automated import from //branches/master/...@140868,140868
/frameworks/av/media/libmedia/mediaplayer.cpp
|
| 7dc112527d77b675d5c0451502b33fe2c552a79e |
|
25-Mar-2009 |
Jason Sams <> |
Automated import from //branches/donutburger/...@140866,140866
/frameworks/av/media/libmedia/mediaplayer.cpp
|
| 65e731f393f704eedab6fbe0af7f8a580c8d4617 |
|
11-Mar-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //branches/cupcake/...@137873
/frameworks/av/media/libmedia/mediaplayer.cpp
|
| 89fa4ad53f2f4d57adbc97ae1149fc00c9b6f3c5 |
|
04-Mar-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //depot/cupcake/@135843
/frameworks/av/media/libmedia/mediaplayer.cpp
|
| 15f767b960b38059a74a42a33e16d8df2aec8bc1 |
|
04-Mar-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //depot/cupcake/@135843
/frameworks/av/media/libmedia/mediaplayer.cpp
|
| 7a2146d5807030b2629f347736be5301b61e8811 |
|
13-Feb-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //branches/cupcake/...@131421
/frameworks/av/media/libmedia/mediaplayer.cpp
|
| 5e07b5774c8b376776caa4f5b0a193767697e97e |
|
11-Feb-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //branches/cupcake/...@130745
/frameworks/av/media/libmedia/mediaplayer.cpp
|
| 7b5eb023f8d87cca6d830ae6c11c6aadbe02aca8 |
|
18-Dec-2008 |
The Android Open Source Project <initial-contribution@android.com> |
Code drop from //branches/cupcake/...@124589
/frameworks/av/media/libmedia/mediaplayer.cpp
|
| 2729ea9262ca60d93047e984739887cfc89e82eb |
|
21-Oct-2008 |
The Android Open Source Project <initial-contribution@android.com> |
Initial Contribution
/frameworks/av/media/libmedia/mediaplayer.cpp
|