| 2adac496a891ba70cc2797a36aacf642e10b8c8d |
|
26-Aug-2012 |
James Dong <jdong@google.com> |
Added some common error codes in MediaPlayer.java
o related-to-bug: 6770717
Change-Id: Iea8ba6943755a9af8df5b6e91284c7c1b32c3c6c
/frameworks/base/media/java/android/media/MediaPlayer.java
|
| b10ec1f4b1f6a3552060d44359dd64cc37b1a497 |
|
31-Jul-2012 |
James Dong <jdong@google.com> |
Fix a typo (dependant => dependent)
Change-Id: I0337bec1a26e852c32ea9f1ce54f270f79ee3ab1
/frameworks/base/media/java/android/media/MediaPlayer.java
|
| ddd88726a247e4100cb62b3dc9d0887ca2ae2ec4 |
|
26-Jul-2012 |
Jeff Smith <whydoubt@yahoo.com> |
am 71930dd7: am a45746ef: Fix several cases of broken droiddoc syntax external issue 35214
* commit '71930dd77e4dc6f6be5c648019d2ab0da5f0584c':
Fix several cases of broken droiddoc syntax external issue 35214
|
| a45746efadd11bb7dfab026fb3c81a25fae74ca4 |
|
19-Jul-2012 |
Jeff Smith <whydoubt@yahoo.com> |
Fix several cases of broken droiddoc syntax
external issue 35214
patch contributed by Jeff Smith <whydoubt@yahoo.com>
Change-Id: I70dcee88a140699bf3e1ab369bed6dcd2fdd3d83
/frameworks/base/media/java/android/media/MediaPlayer.java
|
| 15a89e6b48e9cd0112efcfd903843c5912e26567 |
|
24-Jul-2012 |
James Dong <jdong@google.com> |
Added MEDIA_INFO_VIDEO_RENDERING_START as an informational event
o MEDIA_INFO_VIDEO_RENDERING_START indicates that the player just pushed the very first video frame
of a video source for rendering.
Change-Id: I32dad93990f5d48b70fc79d841ca3ce3b1af4027
related-to-bug: 6851811
/frameworks/base/media/java/android/media/MediaPlayer.java
|
| 333c09945e7399c6a2b1f4d9fdf981508e38db52 |
|
09-Jul-2012 |
Insun Kang <insun@google.com> |
Changed to obtain a parcel in each notify() call in jni.
Change-Id: I5faf0f5d1fdf76a5b4bd1cff37aa58df79d18e85
related-to-bug: 6785452
/frameworks/base/media/java/android/media/MediaPlayer.java
|
| 099fd80f984b8493de58bdda8ea05563261b0af2 |
|
04-Jul-2012 |
Scott Main <smain@google.com> |
docs: add throws notice for isPlaying
per external issue 33610
Change-Id: Ibd778cb4ecc5f1717fa007ac069a7b3660ec4794
/frameworks/base/media/java/android/media/MediaPlayer.java
|
| c3a5cf9aab3d409445accb2a93c09e6b4140d196 |
|
27-May-2012 |
Bryan Mawhinney <bryanmawhinney@google.com> |
Actually set the video scaling mode :-)
Change-Id: Ia3e77b68a07651861e9be268ab77cac808b3be79
/frameworks/base/media/java/android/media/MediaPlayer.java
|
| 79a9cd40f5ebb2453cb982bc17d9797a1cbdf8d8 |
|
18-May-2012 |
Bryan Mawhinney <bryanmawhinney@google.com> |
Fix video scaling mode validity check.
Change-Id: Ib7adead2758d50cae67741364801e966a82ad5ba
/frameworks/base/media/java/android/media/MediaPlayer.java
|
| 8902097bb686752ff207e3bda12713be1a8c74eb |
|
01-May-2012 |
Insun Kang <insun@google.com> |
Improve notifying TimedText by reducing marshall/unmarshalling.
o Removes mParcel from TimedText class.
o Converts native parcel into java parcel object directly without
copying to an intermediate byte array.
o JNIMediaPlayerListener::notify checks for Java exceptions, logs them,
and clears the exception state.
related-to-bug: 6405934
Change-Id: I8b82d3cd5b9b3ef8cad27e805202a0e445a88a45
/frameworks/base/media/java/android/media/MediaPlayer.java
|
| be0ea968bf8b3f92f6975ccd14031aec23a2c47f |
|
04-May-2012 |
Insun Kang <insun@google.com> |
Fix: Missed parcel recycling in MediaPlayer.
Change-Id: I2c99f771b33bf627af10e8baea455181558360e6
related-to-bug: 6405934
/frameworks/base/media/java/android/media/MediaPlayer.java
|
| 454014e55fe5a0d9a4b47080f8017b5297d016a8 |
|
29-Apr-2012 |
James Dong <jdong@google.com> |
Add video scaling mode support with a new public method in MediaPlayer.java class
o related-to-bug: 5454345
Change-Id: I379b679eb6dd87f47f87a58791a5d0c7251b3a74
/frameworks/base/media/java/android/media/MediaPlayer.java
|
| 7a9734d769d97470ce6fac0594dd007804d33432 |
|
19-Apr-2012 |
James Dong <jdong@google.com> |
Unhide APIs for timed text and multiple audio track switch APIs
o made all the member variables in helper classes for TimedText to be public and final
since they are read-only
o removed Text and TextPos helper classes
o added two public methods in TimedText class: getText() and getBounds()
o cleaned up the javadoc of related methods in MediaPlayer.java and TimedText.java classes
o make the inner classes of TimedText static and final
o change invoke and let it throw RuntimeException on failure (thus a test class needs to be
modified also).
o related-to-bug: 6110705,5542712
Change-Id: Ia1dd1fd5eb8e9fd1b61c6c0d67405edb627a3002
/frameworks/base/media/java/android/media/MediaPlayer.java
|
| 831f0a90cad923ec6b00c5c598ac4356e5849431 |
|
19-Apr-2012 |
James Dong <jdong@google.com> |
Update javadoc for timed text / multiple audio track APIs
o Throw runtime exception when selectTrack, unselectTrack, getTrackInfo fails
o remove redundant code for selectTrack and unselectTrack methods
o related-to-bug: 6110705,5542712
Change-Id: I59f0ed638e93d0365eccab1e33c9d50354a9c1ba
/frameworks/base/media/java/android/media/MediaPlayer.java
|
| c4c0284e45e1b69a03309cd55f937bcc638c0bec |
|
13-Apr-2012 |
James Dong <jdong@google.com> |
AddExternalSource(String path) needs to turn the path to fd if it is a file
o related-to-bug: 5542712
Change-Id: Iea32012996ca9de4c86f144de916df64fcab3c52
/frameworks/base/media/java/android/media/MediaPlayer.java
|
| e00b6f3a57d4b480ce674468de93555269bbd71a |
|
12-Apr-2012 |
James Dong <jdong@google.com> |
Fix failure from setDataSource(String path) when path is a local file
o the failure was because the mediaserver does not have read permission to sdcard
o related-to-bug: 6325960,6322913
Change-Id: I4feec01b8165c78563eee8aab69cb24df3244d03
/frameworks/base/media/java/android/media/MediaPlayer.java
|
| 7ae82ce1fd54103bb87b8a0593a4228c94b1d6f9 |
|
29-Mar-2012 |
James Dong <jdong@google.com> |
Removed obsolete opencore related comments
Change-Id: Ia05a889ea54a8f38d126508ffdcd09fe2a263538
/frameworks/base/media/java/android/media/MediaPlayer.java
|
| 41f3f716b07265fb355ef70e89b9d7e1ad5f0a6f |
|
16-Feb-2012 |
Insun Kang <insun@google.com> |
Defines MediaPlayer APIs to support multiple audio/video/timedtext
tracks.
o Newly introduced APIs are (MediaPlayer):
getTrackInfo() / addExternalSource() / enableTrack() / disableTrack().
o Timed text tracks are supported only, for now.
o TODOs:
- Define the audio/video behavior for enableTrack and disableTrack.
- Refactoring AwesomePlayer / TimedTextDriver so that all types of
track index can be managed in the correct order and be ready for
supporting audio/video tracks.
(MediaExtractor and MediaSource for text file might be necessary.)
Change-Id: Idb85e1b3f2ed49a64f377d05472dd6663ce94e07
/frameworks/base/media/java/android/media/MediaPlayer.java
|
| 467ec7eda8ad754d6a92d32040738b797ba5e994 |
|
14-Mar-2012 |
Marco Nelissen <marcone@google.com> |
Unhide MediaPlayer.setNextMediaPlayer
The Music apps are unbundled, so this needs to be unhidden for them to use it.
Change-Id: I24330a2d6cfa2f5fb5f9c282d28f5431b6165095
/frameworks/base/media/java/android/media/MediaPlayer.java
|
| 1c1d1e7ed7ed2673b22642c6701659146ceaa602 |
|
13-Mar-2012 |
Marco Nelissen <marcone@google.com> |
Merge "Gapless playback, step 1."
|
| 84b832054552e00257bb04997143ca33d6d100be |
|
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/base/media/java/android/media/MediaPlayer.java
|
| 55d1eea69451ee246a41e12a14be42878773e3cb |
|
09-Mar-2012 |
Glenn Kasten <gkasten@google.com> |
MediaPlayer doc for setDataSource by file pathname
Change-Id: Icb5acbf75242ca2df62ccda5185f8841217653a0
/frameworks/base/media/java/android/media/MediaPlayer.java
|
| 720aa282791ef9405d39a15f419a41ab24f11e30 |
|
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/base/media/java/android/media/MediaPlayer.java
|
| ca402cdcacfdcd2978a22d59f446c93aad34c75e |
|
07-Dec-2011 |
James Dong <jdong@google.com> |
Update onVideoSizeChanged() callback method Java doc to explicitly specify the conditions under which the width/height passed
to the callback could be 0.
Change-Id: Ie921f0af8284eccfd02c4a5826ed41fe19f9676f
related-to-bug: 5613451
/frameworks/base/media/java/android/media/MediaPlayer.java
|
| 89ca6983eb2be21848f5ac884a2c118f152c83e6 |
|
15-Nov-2011 |
James Dong <jdong@google.com> |
Document that release() should be called with onPause() and onStop() for media objects
Change-Id: I12dd734b4314df4f0573ad56a1714348e50da05e
related-to-bug: 5616833
/frameworks/base/media/java/android/media/MediaPlayer.java
|
| 61fd1e8d8c3ccf2d6b7d4af1c19e8f0988d5a1ec |
|
26-Oct-2011 |
Joe Fernandez <joefernandez@google.com> |
docs: add developer guide cross references, Project ACRE, round 3
Change-Id: I6125315ecdf0f78dd947c514a9944729d723e95d
/frameworks/base/media/java/android/media/MediaPlayer.java
|
| 83fb94d188e18a44458f903ff4baa6e8402a31ce |
|
29-Aug-2011 |
Jamie Gennis <jgennis@google.com> |
MediaPlayer: remove the setTexture method
This change removes the MediaPlayer#setTexture method. It has been
replaced with MediaPlayer#setSurface.
Change-Id: Iaecbbac7629d7092883f270694c5c67391f4ed6c
/frameworks/base/media/java/android/media/MediaPlayer.java
|
| fc301b0bb5c635c6bb51b48c504a8db5f9010e5c |
|
30-Aug-2011 |
Dave Burke <daveburke@google.com> |
Require INTERNET permission for network-based content.
Bug #1870981
Change-Id: Ia3ad166390c4d60cea19c3783895b078a2c4c15f
/frameworks/base/media/java/android/media/MediaPlayer.java
|
| b283dc64bc97f53804108cebf5b904eb4fb77155 |
|
29-Aug-2011 |
Jamie Gennis <jgennis@google.com> |
MediaPlayer: unhide the setSurface method
Change-Id: I2fb695ab918d1099ad7cc51bfd436712a0b640d9
/frameworks/base/media/java/android/media/MediaPlayer.java
|
| 1ee60119c4fa51ebfa781cf5fdc33f192e8551b8 |
|
26-Jul-2011 |
Ted Bonkenburg <tedbo@google.com> |
Remove ParcelSurfaceTexture and update MediaPlayer
This removes the ParcelSurfaceTexture class since that functionality has been
folded into Surface.java. The change also updates the MediaPlayer to get rid
of setParcelSurfaceTexture() and modifies setTexture() to use the new Surface
functionality in order to simplify the code.
Change-Id: Iafa75ea3188263928128325d8a726786971b4de4
/frameworks/base/media/java/android/media/MediaPlayer.java
|
| 91784c996f95483e3041169215c0d6635e27ffcc |
|
10-Aug-2011 |
Gloria Wang <gwang@google.com> |
To support for switching from a non-null surface/ surface texture to
a null one, and vice versa.
Fix for bug 5137445.
Change-Id: Ifca2997f8ad27a843abbdaa7e89a56329bc40fde
/frameworks/base/media/java/android/media/MediaPlayer.java
|
| 6ff9b812abe388478bbaba118a580c3f4a30c863 |
|
25-Jul-2011 |
Glenn Kasten <gkasten@google.com> |
Bug 4599730 Get audio channel count on MediaPlayer
Related changes:
- Fix bug in get/setParameter* to recycle Parcels when done with them.
Change-Id: Iaff05e91bbd99a14fccb79d816dd873359b6ae65
/frameworks/base/media/java/android/media/MediaPlayer.java
|
| 0de171b0d490a5928d54d2fb67c912d140aac643 |
|
16-Jul-2011 |
Ted Bonkenburg <tedbo@google.com> |
Add support for creating a Surface from a a SurfaceTexture.
The Surface is already using SurfaceTexture internally and it is parcelable. This
is intended to replace and phase out ParcelSurfaceTexture in favor of creating a
new Surface.java object from an existing SurfaceTexture.
Change-Id: I8e2dd86614523da6abed6403e1d705a68fa19fdf
/frameworks/base/media/java/android/media/MediaPlayer.java
|
| 03f9435273df3c8d6f342adfc391844a18535adf |
|
02-Jul-2011 |
Glenn Kasten <gkasten@google.com> |
Merge "Bug 4571308 Provide correct video frame timestamps"
|
| 5c2faf3dc310b100707eb9e32e1e5ae8ceffd0c6 |
|
27-Jun-2011 |
Glenn Kasten <gkasten@google.com> |
Bug 4571308 Provide correct video frame timestamps
Change-Id: I0f726817fc02d3e2a4cf82ed801ef977994e6bcc
/frameworks/base/media/java/android/media/MediaPlayer.java
|
| eaa5d8f9c0117bdaa20fd0a57921156bb0c06345 |
|
01-Jun-2011 |
Gloria Wang <gwang@google.com> |
Timed text display format support:
1. Extract 3GPP global format descriptions
2. Extract 3GPP local format descriptions
3. Define data structure (TimedText) for applications to
retrieve the format metadata
Change-Id: I6eac2a78df29ee15beee456656331fdd83b24e8e
/frameworks/base/media/java/android/media/MediaPlayer.java
|
| 05be9531b6faf9313e7577284a547b89950d0d55 |
|
15-Jun-2011 |
James Dong <jdong@google.com> |
Second attempt to fix the broken build
o due to a link to a hidden method
Change-Id: Ia488743e9bff6854253696cc368facbd50d2d8f4
/frameworks/base/media/java/android/media/MediaPlayer.java
|
| d52ad9ca8d36afa76161c61b65a71d70977c0d3f |
|
15-Jun-2011 |
James Dong <jdong@google.com> |
Fix broken build
Change-Id: Icf7e33a3a4d9b430cd8cbc97801df24a94f9e079
/frameworks/base/media/java/android/media/MediaPlayer.java
|
| 9ddb7888b4b8c7b1f9e352347d84ae530e47a77d |
|
14-Jun-2011 |
James Dong <jdong@google.com> |
Update MediaPlayer and MediaRecorder javadoc
o Adding some description to the Looper requirement for receiving callbacks
Change-Id: I79e7014c521f2286e6c2ccea1097d7e7467eb9ee
/frameworks/base/media/java/android/media/MediaPlayer.java
|
| cc5278a3e258b30903102b718fb1cd832e79bb2b |
|
10-Jun-2011 |
tedbo <tedbo@google.com> |
Support for setting a ParcelSurfaceTexture as the MediaPlayer sink.
This adds support for setting a SurfaceTexture as the MediaPlayer video
sink by using a ParcelSurfaceTexture object. The goal is to enable a
SurfaceTexture to pass through Binder (via ParcelSurfaceTexture) and then
be set on the MediaPlayer.
Change-Id: Ife5689ce673eb4bee1c377019db761685217b71d
/frameworks/base/media/java/android/media/MediaPlayer.java
|
| 13bc8cde1c842bea1fa3000a48739a6e22f25a9c |
|
11-May-2011 |
Gloria Wang <gwang@google.com> |
For out of band timed text support (timed text in a separate file).
Change-Id: I9e024a63eb9bf6f839deee3c7766a66e63126c96
/frameworks/base/media/java/android/media/MediaPlayer.java
|
| 817c161ef27b6087c496755768d65fcb4f78f04c |
|
13-Apr-2011 |
Glenn Kasten <gkasten@google.com> |
Bug 4184736 unhide MediaPlayer.setTexture
Change-Id: I4c8456465611b717e42c0a11e3ce3b4dc0a34270
/frameworks/base/media/java/android/media/MediaPlayer.java
|
| e4e7b48e33fbdfc00f184c18c50e9f3d6335c5ac |
|
12-May-2011 |
Andreas Huber <andih@google.com> |
Fix setDataSource(Context, Uri, Map<String,String> headers)
must not throw an exception if headers == null.
Change-Id: Ic8ddac597707129693874222fb2ebc5a84b8fff6
/frameworks/base/media/java/android/media/MediaPlayer.java
|
| 17524dc0d296146c8ffb3f692dc8ab05fee5b1e0 |
|
04-May-2011 |
James Dong <jdong@google.com> |
Clean up JNI code
o Move the Set/Map/Iterator calls from JNI to Java
o The JNI function receives arrays instead of Maps
o Removed Set/Iterator calls from the Java code as suggested
Change-Id: I34068bf24b61abaf2833dad1f65abc733ed760dd
/frameworks/base/media/java/android/media/MediaPlayer.java
|
| c6091ddd3a22da98b5e83d4b5d864939b451b752 |
|
04-May-2011 |
Gloria Wang <gwang@google.com> |
Initial CL for the timed text support:
- Add support for MP4 timed text
- Add API for app to turn on/off a text track
- Add timed text metadata(language) in the MediaMetadataRetriever
Change-Id: I0055beba38ac761627dbcc6d581ae9582d68bb94
/frameworks/base/media/java/android/media/MediaPlayer.java
|
| d01ec6eab019e46398975202e9e4a198a603ad99 |
|
26-Apr-2011 |
Gloria Wang <gwang@google.com> |
Add setParameter/getParameter to MediaPlayer API.
for bug 1982947
Change-Id: If3f40e4f18cbba155af29944af38bdc627f8cd53
/frameworks/base/media/java/android/media/MediaPlayer.java
|
| 72e738a428d7bb39a371da6105f7e2084e67e39d |
|
20-Apr-2011 |
Andreas Huber <andih@google.com> |
Unhide MediaPlayer's setDataSource method that takes optional http headers to be
passed to the server.
Change-Id: I3c7ce140b2d9cd2483cf05c8aff9b374feff2f18
related-to-bug: 4315346
/frameworks/base/media/java/android/media/MediaPlayer.java
|
| 162ee49e1ce8800de80697fdd0e0e42ad7e9374e |
|
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/base/media/java/android/media/MediaPlayer.java
|
| ea763069b1dca16193d32c6cf3ceab1c23743271 |
|
06-Apr-2011 |
Jean-Michel Trivi <jmtrivi@google.com> |
Bug 4231349 fix error in javadoc for android.media.MediaPlayer
In the javadoc for MediaPlayer.OnBufferingUpdateListener,
the percent parameter for onBufferingUpdate() is described as:
the percentage (0-100) of the buffer that has been filled thus far
This is incorrect. This percentage is the ratio of (current position
+ content buffered) relative to the total duration.
Also buffering updates are only sent for progressive HTTP download.
Change-Id: I9f346a150b39fa1f7b17126119ecc0d7d27fbfbe
/frameworks/base/media/java/android/media/MediaPlayer.java
|
| c36b3c6956479f1a154fe1e08b679ff4657097e1 |
|
29-Mar-2011 |
James Dong <jdong@google.com> |
Fix missing cross-ref links in the MediaPlayer.java javadoc
Change-Id: Ie5fba234d226ff792661ec346ddf87f43b5a0dc7
/frameworks/base/media/java/android/media/MediaPlayer.java
|
| c5f94d8a4779050125145396ca83fbc862c7ed6b |
|
18-Feb-2011 |
Eino-Ville Talvala <etalvala@google.com> |
Add support for timestamps into SurfaceTexture.
API addition: The timestamps are represented as nanoseconds from some
arbitrary time point. Like the SurfaceTexture transform matrix, the
timestamp retrieved by getTimestamp is for the last frame sent to the
GL texture using updateTexImage().
Camera HAL change: Expect vendors to set these timestamps using
native_window_set_buffers_timestamp(). For now, they are
autogenerated by SurfaceTextureClient if set_buffers_timestamp() is
never called, but such timing is likely not accurate enough to pass a
CTS test.
bug:3300707
Change-Id: Ife131a0c2a826ac27342e11b8a6c42ff49e1bea7
/frameworks/base/media/java/android/media/MediaPlayer.java
|
| cc562a3576a6a8096626387472e05e8bee03352a |
|
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/base/media/java/android/media/MediaPlayer.java
|
| 87e639bc151551c9618641a6765837b44eb90b9b |
|
23-Feb-2011 |
Gloria Wang <gwang@google.com> |
Merge "- Add method in MediaPlayerService to collect and pull codec usage (duration) for the battery app - Collect MediaPlayer decoding usage data"
|
| d211f41f764fe81fe00b10a99b4b44cb84479cbe |
|
20-Feb-2011 |
Gloria Wang <gwang@google.com> |
- Add method in MediaPlayerService to collect and pull
codec usage (duration) for the battery app
- Collect MediaPlayer decoding usage data
Change-Id: I0ef4e32b6a041ba1fe73c19f9c67185c61d03965
/frameworks/base/media/java/android/media/MediaPlayer.java
|
| 14460b9564ab700a8d426855003064568bff31e3 |
|
22-Feb-2011 |
James Dong <jdong@google.com> |
Added more warnings in javadoc for failure to call MediaPlayer.release() immediately if a MediaPlayer is not needed
bug - 3040402
Change-Id: I455d2a664851c73212711e8c4b88e97b50ee5b62
/frameworks/base/media/java/android/media/MediaPlayer.java
|
| 52c7832e35b6f0c7d6197eb09346cea7dc5bea6b |
|
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/base/media/java/android/media/MediaPlayer.java
|
| 69b8d69aadbf0e795f1a1e1adc82c78cf0b9959f |
|
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/base/media/java/android/media/MediaPlayer.java
|
| 1a5149e5d7f2dddc8b324f7695e69fd89af73c52 |
|
22-Sep-2010 |
Eric Laurent <elaurent@google.com> |
Fix issue 3022800.
- Created sub-package android.media.audiofx for audio effects.
- Hid AudioEffect class contructor, methods and variables not needed by
applications
- Added more javadoc comments for AudioEffect Class
Change-Id: Ibbb40d4e714bb248aa32cf82d7763d74efae96d1
/frameworks/base/media/java/android/media/MediaPlayer.java
|
| d09af7d5518d0a5b3c8070784c13a1070f46f460 |
|
14-Sep-2010 |
Eric Laurent <elaurent@google.com> |
Added intents for audio effects control application
Added intents to launch audio effects control panel UI and
communicate playback state from media player applications
to effect control application/service.
Change-Id: Iede23ae11fa9f0802df5f36299dd80ea57eda376
/frameworks/base/media/java/android/media/MediaPlayer.java
|
| 17cb280e7f1ac3556eac90ab08263712e0348cb9 |
|
03-Aug-2010 |
Eric Laurent <elaurent@google.com> |
NEW_API: Unhide audio effect APIs.
This change unhides all public APIs for controling audio effects exposed
by the following classes:
- AudioEffect
- BassBoost
- EnvironmentalReverb
- Equalizer
- PresetReverb
- Virtualizer
- Visualizer
Also fixes several problems in javadoc.
Change-Id: I541ee4ad0232312ec720545737cbcdb8c9a82597
/frameworks/base/media/java/android/media/MediaPlayer.java
|
| 7070b36549d511d6627538c73dfbab23fbae5b43 |
|
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/base/media/java/android/media/MediaPlayer.java
|
| 619346f902241736d933657a4fe10f10c50a1ba8 |
|
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/base/media/java/android/media/MediaPlayer.java
|
| 4d61f602bf67fe61256c23f090d6119992ad5160 |
|
10-Jun-2010 |
Andreas Huber <andih@google.com> |
Switch stagefright's approach to prefetching to the new model. The java MediaPlayer is now notified about rebuffering start/end via info messages.
Change-Id: If8185ba329ce8b6663b1ad39a4efb0ad3be81df2
/frameworks/base/media/java/android/media/MediaPlayer.java
|
| c40209ac60a64a7c08b0d0028060d5308fd7a0b8 |
|
03-Jun-2010 |
James Dong <jdong@google.com> |
am 28a92b2e: Merge "Fix a Javadoc to clarify when setAudioStreamType() should be called." into froyo
Merge commit '28a92b2e76a13c18dc23e5239717b122a174182f' into froyo-plus-aosp
* commit '28a92b2e76a13c18dc23e5239717b122a174182f':
Fix a Javadoc to clarify when setAudioStreamType() should be called.
|
| 9d96354d7055cd165d7d5625990f810f46339e52 |
|
03-Jun-2010 |
James Dong <jdong@google.com> |
Fix a Javadoc to clarify when setAudioStreamType() should be called.
bug - 2737926
Change-Id: I8718c3d1a544cf5cb1b7e98b6c24fe0e6d3574ba
/frameworks/base/media/java/android/media/MediaPlayer.java
|
| c8652199d14dc42edf882a8eb9e48a5fe0b6101d |
|
29-Apr-2010 |
The Android Open Source Project <initial-contribution@android.com> |
merge from open-source master
Change-Id: I20fa79289d84a892def9e7f6d6e7026d9de48010
|
| c6f8ea4cf26aadc0da765585d37f7850596af6de |
|
28-Apr-2010 |
hugh kennedy <kennedyh@umich.edu> |
speling fix
Change-Id: Ia9db6e1c5d1cd31fd028d551cc357a76049ce137
/frameworks/base/media/java/android/media/MediaPlayer.java
|
| fbb3885024ac9c90f322b6259d7e519c8927e6ff |
|
12-Feb-2010 |
Andreas Huber <andih@google.com> |
New API on java's MediaPlayer to suspend/resume a session.
related-to-bug: 2231576
/frameworks/base/media/java/android/media/MediaPlayer.java
|
| 256430093679e1d62b54fb0c852126e54d162f6f |
|
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/base/media/java/android/media/MediaPlayer.java
|
| 15097318640591f9e582dbdd57ec0e9d97a7683e |
|
07-Oct-2009 |
gwang@google.com <gwang@google.com> |
am 521f4f3a: Merge change I3d6cf8aa into eclair
Merge commit '521f4f3af94e3a093a37af887d3e317a526b61a1' into eclair-plus-aosp
* commit '521f4f3af94e3a093a37af887d3e317a526b61a1':
Fix for bug 2158794. Hide MediaPlayer.invoke() and MediaPlayer.newRequest(), and Fix bad links in ToneGenerator documentation.
|
| 38729e69ad641f82ca3bc8b604aeb954a8935ded |
|
07-Oct-2009 |
Marco Nelissen <marcone@google.com> |
am c39d2e3c: 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.
Merge commit 'c39d2e3c012fb96999991e30659a474f9f30f789' into eclair-plus-aosp
* commit 'c39d2e3c012fb96999991e30659a474f9f30f789':
Music visualizer support hack.
|
| ed2247dc685233b82c7769a5e17f103c1c603ab9 |
|
07-Oct-2009 |
gwang@google.com <gwang@google.com> |
am 3e655688: am 521f4f3a: Merge change I3d6cf8aa into eclair
Merge commit '3e655688728e352e51dc9718490589f1bfb8622d' into eclair-mr2-plus-aosp
* commit '3e655688728e352e51dc9718490589f1bfb8622d':
Fix for bug 2158794. Hide MediaPlayer.invoke() and MediaPlayer.newRequest(), and Fix bad links in ToneGenerator documentation.
|
| 3b49e9b52558b5c45240d098410bd5afbd29e1fe |
|
03-Oct-2009 |
gwang@google.com <gwang@google.com> |
Fix for bug 2158794. Hide MediaPlayer.invoke() and MediaPlayer.newRequest(), and Fix bad links in ToneGenerator documentation.
/frameworks/base/media/java/android/media/MediaPlayer.java
|
| 2c3dc14acb7308570b9d695ba9ac904a9502b043 |
|
06-Oct-2009 |
Marco Nelissen <marcone@google.com> |
am a97402e1: am c39d2e3c: 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.
Merge commit 'a97402e1cbadbdc874afa9ffdbd23f1c62fb8177' into eclair-mr2-plus-aosp
* commit 'a97402e1cbadbdc874afa9ffdbd23f1c62fb8177':
Music visualizer support hack.
|
| c39d2e3c012fb96999991e30659a474f9f30f789 |
|
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/base/media/java/android/media/MediaPlayer.java
|
| e525eef4b8e284ac8eb023bd0df4eeed37916d4b |
|
17-Sep-2009 |
Jean-Baptiste Queru <jbq@google.com> |
merge from open-source master
|
| ea5f767246ad201a9e2bba0d657404e002cd7c70 |
|
17-Sep-2009 |
Jean-Baptiste Queru <jbq@google.com> |
Update documentation for getVideoWidth and getVideoHeight.
Ref: http://code.google.com/p/android/issues/detail?id=3024
/frameworks/base/media/java/android/media/MediaPlayer.java
|
| 85a2c7f1cad8fd55ed72a8a3dbb2b36632ebbff3 |
|
01-Sep-2009 |
Jean-Baptiste Queru <jbq@google.com> |
merge from open-source master
|
| 4a51c20ce607c74914f90fd897f04080121ac13b |
|
22-Aug-2009 |
Dianne Hackborn <hackbod@google.com> |
I am getting tired of the java doc warnings, so fix them.
Change-Id: I2205eebae419eaf4a0992c9f5b7cd807eb843fe1
/frameworks/base/media/java/android/media/MediaPlayer.java
|
| 6ab180aa65d2b4f155518af0ac7bb2777f9ce61f |
|
13-Jun-2009 |
Kenny Root <kenny@the-b.org> |
Documentation: Clarify that a FileDescriptor must be seekable
In MediaPlayer, methods with an offset specified must be passed a
FileDescriptor that is seekable. This change notes that in the
JavaDoc.
/frameworks/base/media/java/android/media/MediaPlayer.java
|
| 4935d05eaa306cef88cf0ab13eca386f270409ec |
|
03-Aug-2009 |
Marco Nelissen <marcone@google.com> |
Untangle MediaPlayer, MediaRecorder, MediaScanner and MediaMetadataRetriever JNI
code, so that creating one of those doesn't initialize all the others. Shaves
a hundred milliseconds or so off music app startup time.
/frameworks/base/media/java/android/media/MediaPlayer.java
|
| cf4550c3198d6b3d92cdc52707fe70d7cc0caa9f |
|
21-Jul-2009 |
Jean-Baptiste Queru <jbq@google.com> |
donut snapshot
/frameworks/base/media/java/android/media/MediaPlayer.java
|
| 5d55c7119820ee9bb06fc072e416fe98ba77cd28 |
|
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/base/media/java/android/media/MediaPlayer.java
|
| b2c693919be966f179080a9ec70a7a82dbf57627 |
|
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/base/media/java/android/media/MediaPlayer.java
|
| 9193e08dc1d91401fdf1846eaad4689da3911dc1 |
|
06-Jul-2009 |
Nicolas Catania <niko@google.com> |
New Metadata API for the MediaPlayer.
MediaPlayer.java
New method getMetadata to fetch metadata from the player.
New method setMetadataFilter to filter metadata notification and fetches.
Metadata.java
Added basic interface. Implementation incomplete.
/frameworks/base/media/java/android/media/MediaPlayer.java
|
| 20cb94eeb5b9672573fc86bf51e09bd66a774581 |
|
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/base/media/java/android/media/MediaPlayer.java
|
| 32f82774884bdd709789ab9f3ccdf5b972ff7681 |
|
12-Jun-2009 |
Nicolas Catania <niko@google.com> |
Removed trailing whitespaces.
/frameworks/base/media/java/android/media/MediaPlayer.java
|
| a2df60598ac0158468ce242498b7bd3cb9383e13 |
|
10-Jun-2009 |
Marco Nelissen <marcone@google.com> |
Print a message to the log when a file can't be opened on the client side.
/frameworks/base/media/java/android/media/MediaPlayer.java
|
| 8b0b174198793cabb2b3fcc015f9bfdc9d5082b5 |
|
29-May-2009 |
Dave Sparks <davidsparks@android.com> |
Update MediaPlayer to allow setVideoSurface calls after prepare. Also allow
passing a null surface. The API is now enabled to change the surface while
the video is playing. This could allow orientation changes during playback
or to allow the audio track from a video to play in the background.
NOTE: There are still changes required to pmem driver to allow remapping
shared physical memory into a process in order for this to work. This
change only enables the API to send the appropriate calls when the lower
level code supports it.
/frameworks/base/media/java/android/media/MediaPlayer.java
|
| 4a0029f95db144ba735b35e636400e8ce535383f |
|
25-Mar-2009 |
Niko Catania <> |
Automated import from //branches/donutburger/...@141213,141213
/frameworks/base/media/java/android/media/MediaPlayer.java
|
| c2ad241504fcaa12d4579d3b0b4038d1ca8d08c9 |
|
20-Mar-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //branches/cupcake_rel/...@141571
/frameworks/base/media/java/android/media/MediaPlayer.java
|
| 105925376f8d0f6b318c9938c7b83ef7fef094da |
|
19-Mar-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //branches/cupcake_rel/...@140373
/frameworks/base/media/java/android/media/MediaPlayer.java
|
| c39a6e0c51e182338deb8b63d07933b585134929 |
|
11-Mar-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //branches/cupcake/...@137873
/frameworks/base/media/java/android/media/MediaPlayer.java
|
| 9066cfe9886ac131c34d59ed0e2d287b0e3c0087 |
|
04-Mar-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //depot/cupcake/@135843
/frameworks/base/media/java/android/media/MediaPlayer.java
|
| d83a98f4ce9cfa908f5c54bbd70f03eec07e7553 |
|
04-Mar-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //depot/cupcake/@135843
/frameworks/base/media/java/android/media/MediaPlayer.java
|
| 076357b8567458d4b6dfdcf839ef751634cd2bfb |
|
03-Mar-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //depot/cupcake/@132589
/frameworks/base/media/java/android/media/MediaPlayer.java
|
| 3dec7d563a2f3e1eb967ce2054a00b6620e3558c |
|
03-Mar-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //depot/cupcake/@137055
/frameworks/base/media/java/android/media/MediaPlayer.java
|
| d24b8183b93e781080b2c16c487e60d51c12da31 |
|
11-Feb-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //branches/cupcake/...@130745
/frameworks/base/media/java/android/media/MediaPlayer.java
|
| f013e1afd1e68af5e3b868c26a653bbfb39538f8 |
|
18-Dec-2008 |
The Android Open Source Project <initial-contribution@android.com> |
Code drop from //branches/cupcake/...@124589
/frameworks/base/media/java/android/media/MediaPlayer.java
|
| 54b6cfa9a9e5b861a9930af873580d6dc20f773c |
|
21-Oct-2008 |
The Android Open Source Project <initial-contribution@android.com> |
Initial Contribution
/frameworks/base/media/java/android/media/MediaPlayer.java
|