summaryrefslogtreecommitdiffstats
path: root/media/jni
Commit message (Collapse)AuthorAgeFilesLines
* Refactor MediaScanner. Some steps on the way towards being able to build the ↵Andreas Huber2009-12-033-8/+30
| | | | tree without OpenCore.
* Music visualizer support hack.Marco Nelissen2009-10-061-0/+13
| | | | 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.
* Fix broken build.Dianne Hackborn2009-09-231-2/+2
| | | | | | I -did- run it... why did this later break on me?!? Change-Id: I70db0279f9a1b499496f9808525d2b112495d6c7
* When encountering a .nomedia file, notify the MediaScannerClient,Marco Nelissen2009-09-031-0/+16
| | | | | | | so that it can erase the data column for entries that are in the folder containing the .nomedia file. This prevents us from deleting (via a delete trigger) files when somebody adds a .nomedia file after the fact.
* We don't need libopencore_author and libcutils in libmedia_jniMarco Nelissen2009-08-031-2/+0
|
* Untangle MediaPlayer, MediaRecorder, MediaScanner and MediaMetadataRetriever JNIMarco Nelissen2009-08-036-134/+157
| | | | | code, so that creating one of those doesn't initialize all the others. Shaves a hundred milliseconds or so off music app startup time.
* am 17c195c8: Merge change 9340 into donutAndroid (Google) Code Review2009-07-312-11/+9
|\ | | | | | | | | | | | | Merge commit '17c195c8da3470b2e69880e206342f0c2d85f938' * commit '17c195c8da3470b2e69880e206342f0c2d85f938': Fix issue 2025872: Deadlock in SoundPool.stop
| * Fix issue 2025872: Deadlock in SoundPool.stopEric Laurent2009-07-312-11/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There were 2 problems in SoundPool: 1 If not using the shared memory buffer mode, there was a problem when a sound channel was stolen. The new channel could sometimes not be added to the restart list if the AudioTrack callback thread was stopped before the underrun callback was called. The SoundChannel::play() method is modified so that SoundPool::done() is called immediately after stopping the channel. There is a possibility that done() is called a second time by the callback; in this case it will be added 2 times to the restart list but the second start request will be ignored as the first one will have reset the next chennel ID when processed. 2 There was a deadlock on SoundPool::mLock if SoundPool::stop() was called while a channel restart was pending: SoundPool::stop() lock mLock -> SoundChannel::stop() -> SoundPool::done() -> SoundPool::addToRestartList() -> try to lock mLock == deadlock A second mutex mRestartLock is added to protect the restart list mRestart. mLock is still used to protect mChannels list but mRestart is now used to protect access to mRestart by restart thread and client thread.
* | Remove hardcoded maximum frame rate limit from the frameworkJames Dong2009-07-301-1/+1
| | | | | | | | bug 1993400
* | Fix issue 1795088 Improve audio routing codeEric Laurent2009-07-231-2/+3
| | | | | | | | | | | | | | Initial commit for review. Integrated comments after patch set 1 review. Fixed lockup in AudioFlinger::ThreadBase::exit() Fixed lockup when playing tone with AudioPlocyService startTone()
* | am 5f2b05ea: Merge change 8220 into donutAndroid (Google) Code Review2009-07-221-2/+1
|\ \ | |/ | | | | | | | | | | Merge commit '5f2b05ea3dfdaf63088ea3776af43b79c5698f09' * commit '5f2b05ea3dfdaf63088ea3776af43b79c5698f09': Fix issue 1996218: Disable use of shared memory buffer by SoundPool.
| * Fix issue 1996218: Disable use of shared memory buffer by SoundPool.Eric Laurent2009-07-221-2/+1
| | | | | | | | Disabled USE_SHARED_MEM_BUFFER compilation switch in SoundPool.cpp.
* | Don't pass references to temporary objects, and handle the case where we ↵Marco Nelissen2009-07-101-5/+4
| | | | | | | | dont have a Surface.
* | Merge change 6797Android (Google) Code Review2009-07-101-1/+1
|\ \ | | | | | | | | | | | | * changes: rename libsgl/libcorecg to libskia
| * | rename libsgl/libcorecg to libskiaMike Reed2009-07-101-1/+1
| | |
* | | Basic plumbing to retrieve metadata from the native player.Nicolas Catania2009-07-101-0/+31
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | Implemented the metadata changed notification filters.Nicolas Catania2009-07-091-2/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | am 3d7b8d1a: Merge change 5158 into donutAndroid (Google) Code Review2009-06-241-1/+1
|\ \ | |/ | | | | | | | | | | Merge commit '3d7b8d1aa6a362292f56defbe8fb2d5653f79282' * commit '3d7b8d1aa6a362292f56defbe8fb2d5653f79282': Use a ref-counted callback interface for Camera.
| * Use a ref-counted callback interface for Camera.Dave Sparks2009-06-241-1/+1
| | | | | | | | | | | | | | | | | | This allows the camera service to hang onto the callback interface until all callbacks have been processed. This prevents problems where pending callbacks in binder worker threads are processed after the Java camera object and its associated native resources have been released. Bug 1884362
* | Direct api to the native media player.Nicolas Catania2009-06-242-0/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | am d670b8c6: Merge change 3981 into donutAndroid (Google) Code Review2009-06-121-5/+5
|\ \ | |/ | | | | | | | | | | Merge commit 'd670b8c61ebd13324ac21bdbc08d8a02fc0a765a' * commit 'd670b8c61ebd13324ac21bdbc08d8a02fc0a765a': Removed trailing whitespaces.
| * Removed trailing whitespaces.Nicolas Catania2009-06-111-5/+5
| |
* | am b2df1699: Merge change 1548 into donutAndroid (Google) Code Review2009-06-081-4/+29
|\ \ | |/ | | | | | | | | | | Merge commit 'b2df1699c996e62baa78877978cd2c5607ea4194' * commit 'b2df1699c996e62baa78877978cd2c5607ea4194': NJ-1409: (frameworks/base) Support new audio encoding types(AMR and AAC).
| * NJ-1409: (frameworks/base) Support new audio encoding types(AMR and AAC).Jianhong Jiang2009-06-081-4/+29
| |
* | am 450ad31b: Merge change 2774 into donutAndroid (Google) Code Review2009-06-011-6/+10
|\ \ | |/ | | | | | | | | | | Merge commit '450ad31b62af468aa0fb308a5c983b8f8334ae4e' * commit '450ad31b62af468aa0fb308a5c983b8f8334ae4e': Limit check on maxChannels for SoundPool.
| * Merge change 2774 into donutAndroid (Google) Code Review2009-06-011-6/+10
| |\ | | | | | | | | | | | | * changes: Limit check on maxChannels for SoundPool. Bug 1838724
| | * Limit check on maxChannels for SoundPool.Dave Sparks2009-06-011-6/+10
| | | | | | | | | | | | Bug 1838724
* | | am 0f5179c7: Merge change 2716 into donutAndroid (Google) Code Review2009-05-291-7/+23
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit '0f5179c7d333ddab729b5943766637c21d1b74db' * commit '0f5179c7d333ddab729b5943766637c21d1b74db': Update MediaPlayer to allow setVideoSurface calls after prepare. Also allow
| * | Update MediaPlayer to allow setVideoSurface calls after prepare. Also allowDave Sparks2009-05-291-7/+23
| |/ | | | | | | | | | | | | | | | | | | 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.
* | am de8268d6: Merge change 2331 into donutAndroid (Google) Code Review2009-05-261-1/+1
|\ \ | |/ | | | | | | | | | | Merge commit 'de8268d6d1cd168510c490b17e93154d2eab767c' * commit 'de8268d6d1cd168510c490b17e93154d2eab767c': Fix issue 1846343 - part 1
| * Fix issue 1846343 - part 1Eric Laurent2009-05-261-1/+1
| | | | | | | | | | | | | | | | This change is the first part of a fix for issue 1846343, : - Added new enum values for input sources in AudioRecord and MediaRecorder for voice uplink, downlink and uplink+downlink sources. - renamed streamType to inputSource in all native functions handling audio record. A second change is required in opencore author driver and android audio input to completely fix the issue.
* | checkpoint: split libutils into libutils + libbinderMathias Agopian2009-05-202-0/+2
|/
* Fix a JNI layer crash due to null camera object passed to get_native_camera()James Dong2009-05-111-0/+5
| | | | | | The fix will check on the camera object and if it is a null object, we throw a NullPointerException; application layer should also avoid passing a null java object to MediaRecorder.setCamera().
* fix issue 1641535: SoundPool should use AudioTrack with shared memory bufferEric Laurent2009-05-071-1/+4
| | | | Enabled USE_SHARED_MEM_BUFFER switch in SoundPool.cpp
* Change 79 in git master branchJames Dong2009-04-302-20/+21
|
* Automated import from //branches/donutburger/...@140818,140818Dianne Hackborn2009-03-241-0/+190
|
* auto import from //branches/cupcake_rel/...@140373The Android Open Source Project2009-03-181-0/+14
|
* auto import from //branches/cupcake_rel/...@138607The Android Open Source Project2009-03-131-0/+13
|
* auto import from //depot/cupcake/@136594The Android Open Source Project2009-03-052-12/+35
|
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-0315-0/+3638
|
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-0315-3549/+0
|
* auto import from //depot/cupcake/@132589The Android Open Source Project2009-03-031-121/+32
|
* auto import from //depot/cupcake/@137055The Android Open Source Project2009-03-021-32/+121
|
* auto import from //branches/cupcake/...@131421The Android Open Source Project2009-02-132-36/+29
|
* auto import from //branches/cupcake/...@130745The Android Open Source Project2009-02-103-20/+42
|
* auto import from //branches/cupcake/...@125939The Android Open Source Project2009-01-094-2/+152
|
* Code drop from //branches/cupcake/...@124589The Android Open Source Project2008-12-178-382/+847
|
* Initial ContributionThe Android Open Source Project2008-10-2113-0/+2919