| c42a96dba4beaf87875e71b8d8b77ce7154c5cdb |
|
25-Jul-2014 |
Robert Shih <robertshih@google.com> |
MediaPlayer: scanInternalSubtitleTracks in synchronous prepare
Bug: 16385674
Change-Id: I56d205ad2fe33bd64ea2251440c88fd4ecfa13ad
/frameworks/base/media/jni/android_media_MediaPlayer.cpp
|
| 8df982dfa5408afe67cd6a4b45bfbf26c94299d0 |
|
26-Jun-2014 |
Jean-Michel Trivi <jmtrivi@google.com> |
Java MediaPlayer: add support for setting audio attributes
Change-Id: Ia638107a5e67c20c46c2f5f1800db9da57d6f698
/frameworks/base/media/jni/android_media_MediaPlayer.cpp
|
| b6079005ed0631c3972ff427f56e12523ec214a7 |
|
22-May-2014 |
Ruben Brunk <rubenbrunk@google.com> |
camera2: Move DngCreator to hardware/camera2.
Bug: 15091253
Change-Id: Ibe2ee376436e5c796e33c0b782ea68278589f2e6
/frameworks/base/media/jni/android_media_MediaPlayer.cpp
|
| f967a5486a78db244624fde4c105aa5e6fa914b9 |
|
29-Apr-2014 |
Ruben Brunk <rubenbrunk@google.com> |
camera2: Plumb DngCreator to native library.
Change-Id: Ic58bf6cf5086808b503460ef8e451fc0d6f1f850
/frameworks/base/media/jni/android_media_MediaPlayer.cpp
|
| 5ba69bef8c36e78d1e08fae52fe276276668c20d |
|
08-May-2014 |
Selim Gurun <sgurun@google.com> |
Fix build
Fix the java reflection to have the devices boot again.
Change-Id: Ibd24b1e43e5c8385aa9372f8e22133b6eb85cd2b
/frameworks/base/media/jni/android_media_MediaPlayer.cpp
|
| 1af30c7ac480e5d335f267a3ac3b2e6c748ce240 |
|
10-Mar-2014 |
John Spurlock <jspurlock@google.com> |
Add stream-level suppression to vibrate/audio services.
- Add new audio restriction layer to app-ops. Restrictions add
additional constraints to audio operations at a stream-level.
Restrictions do not affect the persistable state, and are purely
additive: that is, they can only impose additional contstraints, not
enable something that has already been disabled. Restrictions
also support a whitelisted set of exempt package names.
- Add new audio stream-level checks to app-ops.
- Implement a provisional OP_PLAY_AUDIO suppression to three
java entry points MediaPlayer, AudioTrack, & SoundPool.
- Enhance vibrator api to take stream information as an optional
hint - the constants correspond to AudioManager stream types.
OP_VIBRATE now supports the stream-level restriction check.
- Simplify Vibrator subclasses by adding default implementations
for two .vibrate calls.
- Migrate NoMan's zen-mode control to use the new app-ops
stream-level restriction mechanism.
Change-Id: Ifae8952647202f728cf1c73e881452660c704678
/frameworks/base/media/jni/android_media_MediaPlayer.cpp
|
| f8a0c47e9091d7a14e05dedc65b49af09fdc8fb8 |
|
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.
Change-Id: I32b08480593a859e0368dbbcf8da8f25c9e08ca9
/frameworks/base/media/jni/android_media_MediaPlayer.cpp
|
| d2506a506303ed94fd1991cf986b825b870a67c5 |
|
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: I7f6cdcfd2a28846d36d89dd5180ef20a22b03af8
/frameworks/base/media/jni/android_media_MediaPlayer.cpp
|
| 075e9a19ce645752f8282bc19c91b25978a7dc52 |
|
06-Jan-2014 |
Ashok Bhat <ashok.bhat@arm.com> |
AArch64: Use long for pointers in media classes
For storing pointers, long is used in media classes,
as native pointers can be 64-bit.
In addition, some minor changes have been done
to conform with standard JNI practice (e.g. use
of jint instead of int in JNI function prototypes)
Change-Id: Idc4ca0124d03df7f9cef412488abafd020e5e774
Signed-off-by: Ashok Bhat <ashok.bhat@arm.com>
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
/frameworks/base/media/jni/android_media_MediaPlayer.cpp
|
| e795ec73ebcdad306129ee55c21f8251b4603317 |
|
24-Sep-2013 |
Oscar Rydhé <oscar.rydhe@sonymobile.com> |
Add NULL check in updateProxyConfig
If the exclusionList was null in updateProxyConfig the VM would
crash when converting it to a UTF8 string. Avoid this by adding a
null check.
Change-Id: I0d8106fd54385bd9ae9c652a6c67d459a119cf2b
/frameworks/base/media/jni/android_media_MediaPlayer.cpp
|
| dbccd44a638ae8705a5b14bff8b2dd74abc26045 |
|
22-Nov-2013 |
The Android Open Source Project <initial-contribution@android.com> |
Merge commit 'b873a17ce7be0a9771c24999adca6964431728f6' into HEAD
Change-Id: I938755073e70602cc8f51ce9bd420fdcf870cecd
|
| 99f752149b1a0df9ea0ba311d609d4d6e103787c |
|
14-Nov-2013 |
Elliott Hughes <enh@google.com> |
Fix a JNI local reference leak in JNIMediaPlayerListener::notify.
Bug: https://code.google.com/p/android/issues/detail?id=62137
Change-Id: I776cd83a66de37fdbbe8af367bf1b26e5e0c7247
/frameworks/base/media/jni/android_media_MediaPlayer.cpp
|
| 87eac99a21772ae56018cb81db6966557b459554 |
|
10-Sep-2013 |
Ruben Brunk <rubenbrunk@google.com> |
Remove dependency on JNIHelp header side effects.
Bug: 10680559
Change-Id: I47870d6c48906e0a420c52b7bc5945ffe29c68a2
/frameworks/base/media/jni/android_media_MediaPlayer.cpp
|
| 212e78df9eb3bfff069de01aa7820cf4201c5f82 |
|
07-Jun-2013 |
Zhijun He <zhijunhe@google.com> |
ImageReader: Implementation of ImageReader and Image APIs
Used for direct image data access from producer like camera or video decoder.
Bug: 9254294
Change-Id: I1853af03f4487ac3585d86202f6140854471fa89
/frameworks/base/media/jni/android_media_MediaPlayer.cpp
|
| 3e72eb5245a439525976dbb9a67280b9b26b9f14 |
|
14-Jun-2013 |
Marco Nelissen <marcone@google.com> |
Remove unused MediaPlayer methods
Change-Id: Id63fdde7d0e4f096d3bb9eb4da5e0f37eb9dea21
/frameworks/base/media/jni/android_media_MediaPlayer.cpp
|
| d5f9fa574da2ee210ac86154ab0aea9fee5e8278 |
|
28-May-2013 |
Andreas Huber <andih@google.com> |
Listen for HTTP proxy changes and propagate the information to the media
framework.
related-to-bug: 8873723
Change-Id: I2a34343f8006fa1b1448a1f047458fd58fe14fda
(cherry picked from commit bfe9154142428aa8abecaf943dfeffc55f411ea7)
/frameworks/base/media/jni/android_media_MediaPlayer.cpp
|
| 8a0c80fdcc46faa8cb8c9f4dda06f4b63ec2f906 |
|
08-Feb-2013 |
Jeff Tinker <jtinker@google.com> |
Implementing MediaDrm APIs
Change-Id: Ib6eeb9c04c5c5cf1d485f9004cd3e6a1047a1d19
/frameworks/base/media/jni/android_media_MediaPlayer.cpp
|
| 68ccf103a10c674f1db649bb15bb3e790bc6dad3 |
|
13-Feb-2013 |
ztenghui <ztenghui@google.com> |
Java API for MediaMuxer
Implement the Java API for MediaMuxer.
bug:7991013
Change-Id: Ibf3aa256cc1d89f1c7636b74c9fb53073d173636
/frameworks/base/media/jni/android_media_MediaPlayer.cpp
|
| b1d90c8f60f71422196c337f1d078b68867f5710 |
|
07-Mar-2013 |
Mathias Agopian <mathias@google.com> |
fix JNI use of incStrong/decStrong
Change-Id: Ia11b404dea483dc19bbc30f4d7bcff516655e180
/frameworks/base/media/jni/android_media_MediaPlayer.cpp
|
| 52800617946c456e78ed010c82d0ec4358368164 |
|
15-Feb-2013 |
Mathias Agopian <mathias@google.com> |
Refactoring: Rename SurfaceTextureClient to Surface
Change-Id: I5a218ca11abeeec05e3a4c3cfc581bcc788814ea
/frameworks/base/media/jni/android_media_MediaPlayer.cpp
|
| d47f7d8b5fe3a3861d7cbdc5f912235407823c8e |
|
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: I08e677faf2ebb418ef131d0a8008e01037db0e50
/frameworks/base/media/jni/android_media_MediaPlayer.cpp
|
| 097922b9c1e0821beb107024bcd0dc14144c0920 |
|
04-Oct-2012 |
James Dong <jdong@google.com> |
Throw an exception instead of crash when a surface does not have a binding surface texture
o related-to-bug: 7270329
Change-Id: I498d72187968e89d9498d01b10719569e12be2af
/frameworks/base/media/jni/android_media_MediaPlayer.cpp
|
| 64a55af0ac700baecb0877235eb42caac59a3560 |
|
26-Aug-2012 |
Jeff Brown <jeffbrown@google.com> |
Add plumbing for new surface flinger display API.
Cleaned up the implementation of Surface and SurfaceSession
to use more consistent naming and structure.
Added JNI for all of the new surface flinger display API calls.
Enforced the requirement that all Surfaces created by
the window manager be named.
Updated the display manager service to use the new methods.
Change-Id: I2a658f1bfd0437e1c6f9d22df8d4ffcce7284ca2
/frameworks/base/media/jni/android_media_MediaPlayer.cpp
|
| 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/jni/android_media_MediaPlayer.cpp
|
| 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/jni/android_media_MediaPlayer.cpp
|
| 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/jni/android_media_MediaPlayer.cpp
|
| 8240d9239d9aabed75c49f9d4d69fd8a5fe4c899 |
|
04-Apr-2012 |
Andreas Huber <andih@google.com> |
New Crypto JAVA class to facilitate decryption via MediaCodec.
Change-Id: Ic4e395faa84f003793c2804f2badabab9e7f1034
related-to-bug: 6275919
/frameworks/base/media/jni/android_media_MediaPlayer.cpp
|
| 5a04bf395514a9342dd26af519b88f4b3e309eb9 |
|
30-Mar-2012 |
Andreas Huber <andih@google.com> |
New API to query available codecs and their capabilities.
Change-Id: I448ba443a96d8fee2bc9179750d57362ed31d9d9
/frameworks/base/media/jni/android_media_MediaPlayer.cpp
|
| 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/jni/android_media_MediaPlayer.cpp
|
| d84e1ce0b535128f03416145554fb405f9fade3e |
|
07-Mar-2012 |
Jeff Sharkey <jsharkey@android.com> |
Split Parcel JNI details away from Binder.
This is purely a refactoring, with no change to the underlying
functionality.
Change-Id: I41b59f14e57d1cc144274a01f77658d99a1bfe02
/frameworks/base/media/jni/android_media_MediaPlayer.cpp
|
| 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/jni/android_media_MediaPlayer.cpp
|
| 8335f1ccccedb6655d96d9d5b697a7f0938235dd |
|
26-Feb-2012 |
Mathias Agopian <mathias@google.com> |
fix libgui header location
Change-Id: Iec71706cdd4f29c6904993648ce873e83ef9cafe
/frameworks/base/media/jni/android_media_MediaPlayer.cpp
|
| 88572f7a3e9d7ef85c26865a0150f3c2041561c2 |
|
21-Feb-2012 |
Andreas Huber <andih@google.com> |
Implementation of a java media codec interface and associated tools.
Change-Id: I13e54062d4de584355c5d82bb027a68aeaf2923b
/frameworks/base/media/jni/android_media_MediaPlayer.cpp
|
| bc1d77b6cbce23fbe25f7231651037ae195bc90e |
|
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/base/media/jni/android_media_MediaPlayer.cpp
|
| 3762c311729fe9f3af085c14c5c1fb471d994c03 |
|
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/base/media/jni/android_media_MediaPlayer.cpp
|
| 8564c8da817a845353d213acd8636b76f567b234 |
|
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/base/media/jni/android_media_MediaPlayer.cpp
|
| 71f2cf116aab893e224056c38ab146bd1538dd3e |
|
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/base/media/jni/android_media_MediaPlayer.cpp
|
| f76afc80d229cf0c918e849acf5d8c4f5d4ffd07 |
|
15-Oct-2011 |
Jamie Gennis <jgennis@google.com> |
MediaPlayer: properly handle released surfaces
Bug: 5396571
Change-Id: I6af87cb04f09f9ae6ea77cd7ba31108a3e93d24a
/frameworks/base/media/jni/android_media_MediaPlayer.cpp
|
| 8dc208476f1fbbf6cd0b8cc3d48487a62cb72883 |
|
28-Sep-2011 |
Marco Nelissen <marcone@google.com> |
Log a warning when a MediaPlayer is finalized without having being released.
b/5382634
Change-Id: I756d09d16a92ab8ce736c16a24e319a87be6c8de
/frameworks/base/media/jni/android_media_MediaPlayer.cpp
|
| e828beb3866e2275cd26acd2a58f9f8a3967ba30 |
|
16-Sep-2011 |
Gloria Wang <gwang@google.com> |
If media player has died already, do not dec the old surface texture reference.
Otherwise segfault will occur.
For bug 5327664.
Change-Id: I03ea7bc047aa99a106f1e010dac74f75a833ef84
/frameworks/base/media/jni/android_media_MediaPlayer.cpp
|
| d59310d08637c8531dc7949fc166b0daeede53c0 |
|
14-Sep-2011 |
Gloria Wang <gwang@google.com> |
Do not need to reset surface as NULL in MediaPlayer's _release.
Related to bug 5252296.
Change-Id: Ieab063cee70e072fcc4d861abe0f7979a7bab1ec
/frameworks/base/media/jni/android_media_MediaPlayer.cpp
|
| fc301b0bb5c635c6bb51b48c504a8db5f9010e5c |
|
30-Aug-2011 |
Dave Burke <daveburke@google.com> |
Require INTERNET permission for network-based content.
Bug #1870981
Change-Id: Ia3ad166390c4d60cea19c3783895b078a2c4c15f
/frameworks/base/media/jni/android_media_MediaPlayer.cpp
|
| 43ef913815ec84d04877a698614a31e129cd97e3 |
|
12-Aug-2011 |
James Dong <jdong@google.com> |
If release has been called before finalize, do not expect MediaPlayer still exists
o also, we should releae the surface object when release is called, not wait until finalize is called.
related-to-bug: 5157956
Change-Id: I0233ad61d8349c3e3800de68b752b9548ece1742
/frameworks/base/media/jni/android_media_MediaPlayer.cpp
|
| 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/jni/android_media_MediaPlayer.cpp
|
| 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/jni/android_media_MediaPlayer.cpp
|
| 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/jni/android_media_MediaPlayer.cpp
|
| 79f407cc6c5ae34fc6f04d52fd034b49d1f002c4 |
|
05-May-2011 |
James Dong <jdong@google.com> |
Refactor to share code between MediaPlayer and MediaMetadataRetriever JNI
Change-Id: Ib847213f566dee79126d7c14d00750a9a8dedeb9
/frameworks/base/media/jni/android_media_MediaPlayer.cpp
|
| 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/jni/android_media_MediaPlayer.cpp
|
| d01ec6eab019e46398975202e9e4a198a603ad99 |
|
26-Apr-2011 |
Gloria Wang <gwang@google.com> |
Add setParameter/getParameter to MediaPlayer API.
for bug 1982947
Change-Id: If3f40e4f18cbba155af29944af38bdc627f8cd53
/frameworks/base/media/jni/android_media_MediaPlayer.cpp
|
| 966f9e558d714d9d41189e989b21e6d5fec35047 |
|
14-Apr-2011 |
Gloria Wang <gwang@google.com> |
Merge "- 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."
|
| 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/jni/android_media_MediaPlayer.cpp
|
| a3804cf77f0edd93f6247a055cdafb856b117eec |
|
12-Apr-2011 |
Elliott Hughes <enh@google.com> |
You don't need to poke around inside FileDescriptor manually.
We can help you with that.
Note also that getParcelFileDescriptorFD did no such thing. All its callers
were passing in a regular java.io.FileDescriptor and expecting the int. No
ParcelFileDescriptors involved.
Change-Id: Idc233626f20c092e719f152562601f406cc1b64a
/frameworks/base/media/jni/android_media_MediaPlayer.cpp
|
| c371a02e7cf504e9a926ca29c33e63b658c2cef7 |
|
06-Apr-2011 |
James Dong <jdong@google.com> |
Media JNI code cleanup
o Don't throw exception again because an exception was already thrown
o Check on return values from FindClass() and GetMethodID
Change-Id: Id92bb8228f1f0d2798d1cdf7de73cbb43816060b
related-to-bug: 4139926
/frameworks/base/media/jni/android_media_MediaPlayer.cpp
|
| a93f84e067f02c319c69a114e219006507d1b4f4 |
|
01-Apr-2011 |
James Dong <jdong@google.com> |
ISurfaceTexture does not have a method getIdentity()
Change-Id: I81e6b0335747bd5c2c4b15c9f8c99100842a06c1
/frameworks/base/media/jni/android_media_MediaPlayer.cpp
|
| 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/jni/android_media_MediaPlayer.cpp
|
| 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/jni/android_media_MediaPlayer.cpp
|
| 8182e72479a8b0d832df9c392890b25bfa6f97b5 |
|
30-Dec-2010 |
Mike Lockwood <lockwood@android.com> |
New APIs for MTP and PTP host support
This replaces the previous ContentProvider based interface
Change-Id: I4cea2544854adb9fdcc04345e4d73d8ef05380f3
Signed-off-by: Mike Lockwood <lockwood@android.com>
/frameworks/base/media/jni/android_media_MediaPlayer.cpp
|
| 27480cd49470af667dc8985f45b5ba43ab9ed4cd |
|
06-Jan-2011 |
Mike Lockwood <lockwood@android.com> |
Remove support for obsolete PTP content provider
This will be replaced by a new PTP host API in an upcoming commit.
Change-Id: Ib914194e332b5c090cb8e34ed35bd691bc9f85d1
Signed-off-by: Mike Lockwood <lockwood@android.com>
/frameworks/base/media/jni/android_media_MediaPlayer.cpp
|
| 0cd0136d440cf6ad9d5fab430269116786e671ec |
|
30-Dec-2010 |
Mike Lockwood <lockwood@android.com> |
Move MTP Java classes to android.mtp.* package.
Change-Id: Ib18bcaabf314241a95e517d0b93be5845d988e2c
Signed-off-by: Mike Lockwood <lockwood@android.com>
/frameworks/base/media/jni/android_media_MediaPlayer.cpp
|
| c0b8b321d5428e4fc425713e3889ef745af3af2d |
|
20-Nov-2010 |
Mike Lockwood <lockwood@android.com> |
Rename MtpClient and MtpCursor to PtpClient and PtpCursor
Change-Id: I26fce3bf32c8e9c8d592106af7ab4c35b19e0996
Signed-off-by: Mike Lockwood <lockwood@android.com>
/frameworks/base/media/jni/android_media_MediaPlayer.cpp
|
| 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/jni/android_media_MediaPlayer.cpp
|
| 329430a54e152ad1f5e0003194728988661788bb |
|
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
|
| b3bdf3f0086f1d921720f6dc92cabc7b6f2ab63e |
|
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/base/media/jni/android_media_MediaPlayer.cpp
|
| ee9c3dbdd04a73d867a1358a8e50848c40d0153f |
|
02-Sep-2010 |
Andreas Huber <andih@google.com> |
resolved conflicts for merge of 71c908c4 to master
Change-Id: I5a462c8e8ee0acfe2cecbfd58cb9aa2b360da047
|
| 8d7d413959b1835a5c96da4a49bfda93f09d208c |
|
01-Sep-2010 |
Andreas Huber <andih@google.com> |
Now that AmrInputStream no longer relies on opencore, make sure it's registered in non-opencore builds.
Change-Id: Ia9748691ba60d3c4b5fcaf319ed0b4493d69abc6
related-to-bug: 2963846
/frameworks/base/media/jni/android_media_MediaPlayer.cpp
|
| 0119ba5bd3335fe026927eeb65de535a7bd8c838 |
|
21-Jul-2010 |
Eric Laurent <elaurent@google.com> |
am 34161132: am 7070b365: Added support for auxiliary audio effects to AudioTrack and MediaPlayer.
Merge commit '34161132030254bac7dd64c9713832e2f961a061'
* commit '34161132030254bac7dd64c9713832e2f961a061':
Added support for auxiliary audio effects to AudioTrack and MediaPlayer.
|
| 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/jni/android_media_MediaPlayer.cpp
|
| d21eac9c70940f2c73da5faaf401dbbc44b70a15 |
|
03-Jul-2010 |
Mike Lockwood <lockwood@android.com> |
MTP: Use media provider database to implement MTP device support.
Uses a new "MTP objects" table in the media provider to support basic
enumeration of the external storage file system.
Support for accessing audio, video and image metadata in the existing
media provider tables will be added in a later commit.
The C++ MtpDatabase class is now abstract, to support a proxy subclass that
calls through JNI to the Java MtpDatabase class in the media provider.
Change-Id: I90f0db5f3acc5d35ae78c27a8507edff16d14305
Signed-off-by: Mike Lockwood <lockwood@android.com>
/frameworks/base/media/jni/android_media_MediaPlayer.cpp
|
| 98449546fa33f420e2aef7d0d1c1afb538af4069 |
|
08-Jul-2010 |
Eric Laurent <elaurent@google.com> |
am b91881fd: am dacabf97: Merge "Added Visualizer effect." into gingerbread
Merge commit 'b91881fdd1608cc922f105ec552b5505da1fecb9'
* commit 'b91881fdd1608cc922f105ec552b5505da1fecb9':
Added Visualizer effect.
|
| df9b81ced437b11f8a3fcf4ba3ea6af703d121e2 |
|
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/base/media/jni/android_media_MediaPlayer.cpp
|
| 81ea83d10883886013bc95eac2fe032acf1e7aa9 |
|
30-Jun-2010 |
Mike Lockwood <lockwood@android.com> |
Move MTP JNI code from libandroid_runtime to libmedia_jni
Signed-off-by: Mike Lockwood <lockwood@android.com>
Change-Id: I0c54bbe4e6146beba7d22e782e02ded420f50dbd
/frameworks/base/media/jni/android_media_MediaPlayer.cpp
|
| 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/jni/android_media_MediaPlayer.cpp
|
| 8b138323d54e36fd66b22a634494648e20c53373 |
|
13-Apr-2010 |
Mathias Agopian <mathias@google.com> |
don't hardcode "mSurface" throughout our source code
this is used in a few places to get access to the android.view.Surface
native surface. use a macro instead. Also rename the field to mNativeSurface.
Change-Id: I1c6dea14abd6b8b1392c7f97b304115999355094
/frameworks/base/media/jni/android_media_MediaPlayer.cpp
|
| 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/jni/android_media_MediaPlayer.cpp
|
| 000479f9e325b4e426a67033abd92d47da412725 |
|
10-Feb-2010 |
Mathias Agopian <mathias@google.com> |
split libsurfaceflinger_client and libcamera_client out of libui
/frameworks/base/media/jni/android_media_MediaPlayer.cpp
|
| c371194e4e0651c328f1870a90bbfd4e217c747b |
|
20-Jan-2010 |
James Dong <jdong@google.com> |
Initial check-in for xml-based encoder capabilities retrieval
- Changed the Java API as suggested
- Treat /etc/media_profiles.xml as the default xml configurtion file
/frameworks/base/media/jni/android_media_MediaPlayer.cpp
|
| 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/jni/android_media_MediaPlayer.cpp
|
| bfb9fb143b67c2d0307af2bce9af3c08f362b29a |
|
03-Dec-2009 |
Andreas Huber <andih@google.com> |
Refactor MediaScanner. Some steps on the way towards being able to build the tree without OpenCore.
/frameworks/base/media/jni/android_media_MediaPlayer.cpp
|
| 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/jni/android_media_MediaPlayer.cpp
|
| 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/jni/android_media_MediaPlayer.cpp
|
| 0fc736f321b01995d9f5913d2490cbb479554266 |
|
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/base/media/jni/android_media_MediaPlayer.cpp
|
| 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/jni/android_media_MediaPlayer.cpp
|
| 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/jni/android_media_MediaPlayer.cpp
|
| 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/jni/android_media_MediaPlayer.cpp
|
| 32f82774884bdd709789ab9f3ccdf5b972ff7681 |
|
12-Jun-2009 |
Nicolas Catania <niko@google.com> |
Removed trailing whitespaces.
/frameworks/base/media/jni/android_media_MediaPlayer.cpp
|
| 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/jni/android_media_MediaPlayer.cpp
|
| 4df2423a947bcd3f024cc3d3a1a315a8dc428598 |
|
05-Mar-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //depot/cupcake/@136594
/frameworks/base/media/jni/android_media_MediaPlayer.cpp
|
| 9066cfe9886ac131c34d59ed0e2d287b0e3c0087 |
|
04-Mar-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //depot/cupcake/@135843
/frameworks/base/media/jni/android_media_MediaPlayer.cpp
|
| d83a98f4ce9cfa908f5c54bbd70f03eec07e7553 |
|
04-Mar-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //depot/cupcake/@135843
/frameworks/base/media/jni/android_media_MediaPlayer.cpp
|
| b798689749c64baba81f02e10cf2157c747d6b46 |
|
10-Jan-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //branches/cupcake/...@125939
/frameworks/base/media/jni/android_media_MediaPlayer.cpp
|
| f013e1afd1e68af5e3b868c26a653bbfb39538f8 |
|
18-Dec-2008 |
The Android Open Source Project <initial-contribution@android.com> |
Code drop from //branches/cupcake/...@124589
/frameworks/base/media/jni/android_media_MediaPlayer.cpp
|
| 54b6cfa9a9e5b861a9930af873580d6dc20f773c |
|
21-Oct-2008 |
The Android Open Source Project <initial-contribution@android.com> |
Initial Contribution
/frameworks/base/media/jni/android_media_MediaPlayer.cpp
|