summaryrefslogtreecommitdiffstats
path: root/media/jni
Commit message (Collapse)AuthorAgeFilesLines
* MTP: Remove retry loop from MTP server codeMike Lockwood2010-08-181-38/+17
| | | | | | | This should eliminate the spammy logging that my coworkers have noticed. Change-Id: Ic0e611f5277dd13651490cbe5f7ded5f6e17db4f Signed-off-by: Mike Lockwood <lockwood@android.com>
* am b408f549: am d790c648: Add lost preview surface detection in the JNI ↵James Dong2010-08-121-0/+9
|\ | | | | | | | | | | | | | | | | layer Throws an IOException if this happens rather than crashes Merge commit 'b408f5490b8591a2799d6b1db91e29e4b203d2bf' * commit 'b408f5490b8591a2799d6b1db91e29e4b203d2bf': Add lost preview surface detection in the JNI layer
| * Add lost preview surface detection in the JNI layerJames Dong2010-08-121-0/+9
| | | | | | | | | | | | Throws an IOException if this happens rather than crashes Change-Id: I32bb4c889ae596f992a0d05283c9130a99b2d0d5
* | MTP: Push queries for supported formats and properties up to Java.Mike Lockwood2010-08-101-0/+91
| | | | | | | | | | Change-Id: I4f117090340e3916afda3d194521a6092a672ddc Signed-off-by: Mike Lockwood <lockwood@android.com>
* | MTP: Fix some typosMike Lockwood2010-08-091-1/+1
| | | | | | | | | | Change-Id: Ib31708c3a925e3c0ab8eea6922ab09e02b740936 Signed-off-by: Mike Lockwood <lockwood@android.com>
* | MTP: Add support for syncing MTP playlistsMike Lockwood2010-08-031-0/+48
| | | | | | | | | | | | | | | | MTP playlists now correspond to playlists in the media provider (like those created by the Music app). Change-Id: I085cb3cff003037ad62f0e297fb0cfd3047cb3a2 Signed-off-by: Mike Lockwood <lockwood@android.com>
* | MTP: Fix some thread safety issues in MTP server start/stop sequence.Mike Lockwood2010-08-031-38/+56
| | | | | | | | | | Change-Id: Ied1cddc6220fa7394e8de99df9bc37a1208b04ff Signed-off-by: Mike Lockwood <lockwood@android.com>
* | MTP: Implement GetNumObjectsMike Lockwood2010-08-021-4/+19
| | | | | | | | | | Change-Id: Iccc3a445f9a1eab7bb76eddd567c6a3a8f155b2b Signed-off-by: Mike Lockwood <lockwood@android.com>
* | Clean up MtpDatabase API.Mike Lockwood2010-08-021-36/+11
| | | | | | | | | | | | | | | | Return MTP response codes instead of booleans for success or failure. Remove some unused code. Change-Id: I82ce80a4d7779233264e3caf139ebd0cece12f5c Signed-off-by: Mike Lockwood <lockwood@android.com>
* | am 6fa88882: am 62d83a0c: Merge "Audio effects: modified command() parameter ↵Eric Laurent2010-07-281-2/+5
|\ \ | |/ | | | | | | | | | | | | | | types." into gingerbread Merge commit '6fa8888254deb4961dc64c6ac03dc103c9cd8bcf' * commit '6fa8888254deb4961dc64c6ac03dc103c9cd8bcf': Audio effects: modified command() parameter types.
| * Audio effects: modified command() parameter types.Eric Laurent2010-07-281-2/+5
| | | | | | | | | | | | | | The type of the cmd, cmdSize and *pReplySize parameters of the effect control interface command() function have been modified from int to uint32_t. This is more consistent with their role. Change-Id: I84d289fc262d6753747910f06f485597dfee6591
* | resolved conflicts for merge of d306cc81 to masterEric Laurent2010-07-271-1/+1
|\ \ | |/ | | | | Change-Id: Ib593b7719a837de12605e8c75904634843298ba1
| * Audio Effects: added methods to effects java classes to store and load ↵Eric Laurent2010-07-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | current effect settings in a single call. Addional changes: - Fixed simulator build - Use effect interface UUIDs from OpenSL ES includes when available - Added cleanspec rules to remove now obsolete test effect libraries - Fixed bug in AudioEffect JNI setParameter function. Change-Id: Ic25ddb135e2cec5a68c181d727321f5ac7a1ab6b
* | MTP host: Add support for reading files from an MTP device via ↵Mike Lockwood2010-07-261-0/+63
| | | | | | | | | | | | | | | | | | | | ParcelFileDescriptor Also added some support for sending files to the device that hasn't been debugged yet. Add locking to MtpDevice to prevent it from attempting multiple transactions simultaneously. Change-Id: I2b995ba0af086cc6920bd6b8c869f540ad78560a Signed-off-by: Mike Lockwood <lockwood@android.com>
* | am 34161132: am 7070b365: Added support for auxiliary audio effects to ↵Eric Laurent2010-07-211-0/+24
|\ \ | |/ | | | | | | | | | | | | | | AudioTrack and MediaPlayer. Merge commit '34161132030254bac7dd64c9713832e2f961a061' * commit '34161132030254bac7dd64c9713832e2f961a061': Added support for auxiliary audio effects to AudioTrack and MediaPlayer.
| * Added support for auxiliary audio effects to AudioTrack and MediaPlayer.Eric Laurent2010-07-211-0/+24
| | | | | | | | | | | | | | | | 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
* | Exclude MTP implementation from simulator buildMike Lockwood2010-07-155-0/+51
| | | | | | | | | | Change-Id: I93364c74c26ba6e2bf6b08f1bd82802b966c8dfb Signed-off-by: Mike Lockwood <lockwood@android.com>
* | MTP: Add support for sending events to the host when objects are added and ↵Mike Lockwood2010-07-131-11/+60
| | | | | | | | | | | | | | removed Change-Id: Ia1d5232b919c644c670ff9ca651eca92b3f9ad42 Signed-off-by: Mike Lockwood <lockwood@android.com>
* | Integrate host to device file transfer with the media provider.Mike Lockwood2010-07-121-7/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MTP file transfers happen in two stages. The SendObjectInfo command sends some information about the file and reserves an ObjectHandle for the new file. The file transfer is then performed using the SendObject command. To support this in the media provider, MtpDatabase.beginSendObject receives the information from SendObjectInfo and creates an row for it in the MTP objects table for the new file. After the file transfer has completed, then MtpDatabase.endSendObject is called. In endSendObject, we run the media scanner on the new file, which will add a row to the images, audio, video or audio playlist table. To avoid the media scanner creating a second row for the file in the MTP objects table, we pass the ObjectHandle created in beginSendObject to the media scanner, which then passes it to the media provider via the content values when it performs its insert. Change-Id: I1ebcc63d6bd4404b0d3a93c703a9d3c097381d3a Signed-off-by: Mike Lockwood <lockwood@android.com>
* | am bd3f8b71: am e7b790f1: Merge "Fix swap of sessionId and output in audio ↵Jean-Michel Trivi2010-07-091-2/+2
|\ \ | |/ | | | | | | | | | | | | | | effect API." into gingerbread Merge commit 'bd3f8b711643a172703537e34a0fa7c21c5b953f' * commit 'bd3f8b711643a172703537e34a0fa7c21c5b953f': Fix swap of sessionId and output in audio effect API.
| * Fix swap of sessionId and output in audio effect API.Jean-Michel Trivi2010-07-091-2/+2
| | | | | | | | Change-Id: Idc93415efef92087507401e50cfb235a6f1f7ed7
* | Remove some scafolding and test code that is no longer worth maintaining.Mike Lockwood2010-07-092-14/+0
| | | | | | | | | | Change-Id: I9ee62d2463d8df1246a84774e8ac7e674778279a Signed-off-by: Mike Lockwood <lockwood@android.com>
* | MTP: Use media provider database to implement MTP device support.Mike Lockwood2010-07-084-12/+470
| | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | am b91881fd: am dacabf97: Merge "Added Visualizer effect." into gingerbreadEric Laurent2010-07-074-41/+523
|\ \ | |/ | | | | | | | | | | Merge commit 'b91881fdd1608cc922f105ec552b5505da1fecb9' * commit 'b91881fdd1608cc922f105ec552b5505da1fecb9': Added Visualizer effect.
| * Merge "Added Visualizer effect." into gingerbreadEric Laurent2010-07-074-41/+523
| |\
| | * Added Visualizer effect.Eric Laurent2010-07-074-41/+523
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | MTP: Fix ownership and file permissions for transferred files and foldersMike Lockwood2010-07-021-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | All new files and folders are created with group sdcard_rw Permissions for new files are 0664 and directories 0775 Change-Id: I6d508231150f687e2e529112fd47f10e30fa594f Signed-off-by: Mike Lockwood <lockwood@android.com>
* | | am bda93c4c: am 09b90057: Add multiple camera support for in MediaProfiles.Chih-Chung Chang2010-07-011-20/+20
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit 'bda93c4cb94b47c86251d22df16e46a514c191ef' * commit 'bda93c4cb94b47c86251d22df16e46a514c191ef': Add multiple camera support for in MediaProfiles.
| * | Add multiple camera support for in MediaProfiles.Chih-Chung Chang2010-07-011-20/+20
| |/ | | | | | | Change-Id: Ie89568a0f5f5fd08ede77e33f9a559215d6bed9a
* | MTP: Remove an unnecessary thread from the MtpClient class.Mike Lockwood2010-07-011-85/+35
| | | | | | | | | | | | | | Now a single thread is used for passing USB host events up to MtpClient. Change-Id: I0e3a277956cb3d1036da122ea10acb03a27844d6 Signed-off-by: Mike Lockwood <lockwood@android.com>
* | Move MTP JNI code from libandroid_runtime to libmedia_jniMike Lockwood2010-06-305-3/+577
|/ | | | | | Signed-off-by: Mike Lockwood <lockwood@android.com> Change-Id: I0c54bbe4e6146beba7d22e782e02ded420f50dbd
* Merge "Various fixes and improvements in audio effects implementation" into ↵Eric Laurent2010-06-251-1/+1
|\ | | | | | | gingerbread
| * Various fixes and improvements in audio effects implementationEric Laurent2010-06-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Effect API: - Use different definitions for audio device, channels, formats... in AudioSystem and EffectApi: Removed media/AudioCommon.h file created for initial version of EffectApi - Indicate audio session and output ID to effect library when calling EffectCreate(). Session ID can be useful to optimize the implementation of effect chains in the same audio session. Output ID can be used for effects implemented in audio hardware. - Renamed EffectQueryNext() function to EffectQueryEffect() and changed operating mode: now an index is passed for the queried effect instead of implicitly querying the next one. - Added CPU load and memory usage indication in effects descriptor - Added flags and commands to indicate changes in audio mode (ring tone, in call...) to effect engine - Added flag to indicate hardware accelerated effect implementation. - Renamed EffectFactoryApi.h to EffectsFactoryApi.h for consistency with EffectsFactory.c/h Effect libraries: - Reflected changes in Effect API - Several fixes in reverb implementation - Added build option TEST_EFFECT_LIBRARIES in makefile to prepare integration of actual effect library. - Replaced pointer by integer identifier for library handle returned by effects factory Audio effect framework: - Added support for audio session -1 in preparation of output stage effects configuration. - Reflected changes in Effect API - Removed volume ramp up/down when effect is inserted/removed: this has to be taken care of by effect engines. - Added some overflow verification on indexes used for deferred parameter updates via shared memory - Added hardcoded CPU and memory limit check when creating a new effect instance Change-Id: I43fee5182ee201384ea3479af6d0acb95092901d
* | Remove most stagefright property overrides, remove VorbisPlayer and ↵Andreas Huber2010-06-232-31/+2
|/ | | | | | | VorbisMetadataRetriever as this functionality is now provided by stagefright. Change-Id: Ieafe75a4550c273ad59b4518d7cd4c0fce0f7cce related-to-bug: 2370115
* Added support for audio sessions in MediaPlayer and AudioTrack.Eric Laurent2010-06-221-2/+25
| | | | | | Audio sessions are used to associate audio effects to particular instances (or groups) of MediaPlayers or AudioTracks. Change-Id: Ib94eec43241cfcb416590f435ddce7ab39a07640
* AmrInputStream refresh: eliminate the dependency upon OpenCore's codeJames Dong2010-06-182-76/+51
| | | | Change-Id: I0e66bc0a16fcdcf70136012ae1cd4138506cc94b
* Merge "Issue 2667802: [Audio Effect Framework] AudioEffect base class and ↵Eric Laurent2010-06-143-1/+879
|\ | | | | | | JNI." into kraken
| * Issue 2667802: [Audio Effect Framework] AudioEffect base class and JNI.Eric Laurent2010-06-113-1/+879
| | | | | | | | | | | | | | | | | | | | Added AudioEffect C++ class. AudioEffect is the base class for effect specific implementations, OpenSL ES effect interfaces and audio effect JNI. Added the AudioEffect JNI and AudioEffect JAVA class. AudioEffect is the base class to implement more specific JAVA classes to control audio effects from JAVA applications. Change-Id: If300a1b708f2e6605891261e67bfb4f8330a4624
* | Fix a potential(observed sometimes) media server crashJames Dong2010-06-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | The problem is that we are referring an temp object returned from a function call. When the function call returned, the temp object is gone; and thus the reference may be invalidated. -- rebased bug - 2734946 Change-Id: I1993c4462df95610ca478f816adc30058af5850e
* | allow re-targetting of surfacesMathias Agopian2010-06-081-1/+1
|/ | | | | | | | | Surfaces can now be parcelized and sent to remote processes. When a surface crosses a process boundary, it looses its connection with the current process and gets attached to the new one. Change-Id: I39c7b055bcd3ea1162ef2718d3d4b866bf7c81c0
* don't hardcode "mSurface" throughout our source codeMathias Agopian2010-04-122-2/+2
| | | | | | | 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
* Use local lock for most MediaMetadataRetriever methods. Bug 2560834.Dave Sparks2010-04-011-7/+0
| | | | | | | | | | MediaMetadataRetriever uses a single static lock for all operations. This effectively serializes all metadata retrieval operations in a single process. This patch uses the object level lock for all normal operations and only uses the static lock to serialize calls to release. Change-Id: I81c9f234c2f0007a26d18e1398c709b41a4dbbd7
* Add a name to the previously-unnamed thread created by SoundPoolThread.Steve Howard2010-03-112-3/+2
| | | | | | SoundPool itself also creates a thread, which was called "SoundPoolThread", unrelated to the SoundPoolThread class. The SoundPoolThread class then created an unnamed thread, which showed up as "android:unnamed_thread". That's confusing, so this change renames the SoundPool thread to "SoundPool" and then names the SoundPoolThread thread as "SoundPoolThread". Say that ten times fast :) Change-Id: I67b7e644a30c94b6eda44bf970764a52a1c2958b
* Clean up MediaRecorder for public Java SDKJames Dong2010-03-031-3/+3
| | | | | | - update comments and fix a check in setAudioChannels() bug - 2362412
* Merge "Image encoding settings java API through xml configuration file"James Dong2010-02-251-4/+38
|\
| * Image encoding settings java API through xml configuration fileJames Dong2010-02-241-4/+38
| | | | | | | | | | | | - I decided to completely remove jpeg decoding related stuff from this change I think that setting is better off if it is specified by the system properties. We don't have to include MediaProfiles.h header in skia files
* | Fix for the safty check. It checks that nFir21 + jNpoints <= BUF_SIZE,Gloria Wang2010-02-221-1/+1
|/ | | | | but when it calls GetByteArrayRegion, it multiplies it by 2 which defeats the "// safety first" check at the beginning.
* Fix logging in SoundPool.Dave Sparks2010-02-171-2/+2
|
* Merge "Add SoundPool API to pause and resume all active streams. Bug 2426531."Dave Sparks2010-02-163-1/+76
|\
| * Add SoundPool API to pause and resume all active streams. Bug 2426531.Dave Sparks2010-02-163-1/+76
| |
generated by cgit v1.1 at 2024-09-19 19:16:39 +0000