summaryrefslogtreecommitdiffstats
path: root/media/jni
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Fix failure from setDataSource(String path) when path is a local file"James Dong2012-04-121-8/+0
|\
| * Fix failure from setDataSource(String path) when path is a local fileJames Dong2012-04-121-8/+0
| | | | | | | | | | | | | | o the failure was because the mediaserver does not have read permission to sdcard o related-to-bug: 6325960,6322913 Change-Id: I4feec01b8165c78563eee8aab69cb24df3244d03
* | Fix thumbnail generation failureJames Dong2012-04-111-9/+0
|/ | | | | | | | | | o Change the impl of MediaMetadataRetriever.setDataSource(String). It opens and passes an fd to the media framework rather than pass the file path directly to the media server. The change is needed since media server does not have read permission to sdcard o Remove the unnecessary jni method Change-Id: I5a2f47dde804523d264b588f855ba2575a99c179
* New JAVA API to support submitting encrypted buffers of input data.Andreas Huber2012-04-062-0/+149
| | | | | Change-Id: Ib0df9a9427b4580946179860495b26f743558597 related-to-bug: 6275919
* New Crypto JAVA class to facilitate decryption via MediaCodec.Andreas Huber2012-04-046-3/+371
| | | | | Change-Id: Ic4e395faa84f003793c2804f2badabab9e7f1034 related-to-bug: 6275919
* More DRM/crypto support.Andreas Huber2012-04-031-2/+3
| | | | | related-to-bug: 6275919 Change-Id: I9179c03f1f91f939afcb3b1c6514a200bf586c93
* New API to query available codecs and their capabilities.Andreas Huber2012-04-023-0/+197
| | | | Change-Id: I448ba443a96d8fee2bc9179750d57362ed31d9d9
* frameworks base Android.mk file changesJames Dong2012-03-283-10/+7
| | | | Change-Id: I7459b9e959a60751b8fa6e0d893cb2c820c064ce
* Merge "Provisional support for secure decryption of media streams."Andreas Huber2012-03-263-1/+31
|\
| * Provisional support for secure decryption of media streams.Andreas Huber2012-03-263-1/+31
| | | | | | | | Change-Id: Ib3982a9c960bfdb0cb7e1b174440b141b194cfbe
* | Merge "reorganize SoundPool and JetPlayer code."Eric Laurent2012-03-266-1331/+5
|\ \ | |/ |/|
| * reorganize SoundPool and JetPlayer code.Eric Laurent2012-03-266-1331/+5
| | | | | | | | | | | | | | | | | | | | Reorganize SoundPool and JetPlayer code to be ready for the creation of libmedia_native. Split SoundPool between libsoundpool (JNI) and libmedia(sound pool implementation). Remove dependencies on nativehelper/jni.h from JetPlayer. Change-Id: I130c6014173b714329929dd82c5dfb70b757a610
* | VideoEditorMain.h is moved to /frameworks/av/libvideoeditor and thus can be ↵James Dong2012-03-241-77/+0
|/ | | | | | | | | deleted. o this is to resolve undesirable dependency of /frameworks/av/libvideoeditor on /frameworks/base/media/jni o related-to-bug: 6214141 Change-Id: I62d08a7789ecb34d35cd22d2e6f68c3510c9bd90
* Change Android.mk file to use the new location after ↵James Dong2012-03-221-6/+6
| | | | | | | | /frameworks/media/libvideoeditor source files are moved o related-to-bug: 6214141 Change-Id: Ic9f07a8558e944237ccaba4f756fcab59f84e78f
* Add libmedia_nativeGlenn Kasten2012-03-163-2/+5
| | | | Change-Id: Ib8cff8abd73723b793f08da99ad59549f219e0e7
* Remove dependency on audio_* locationGlenn Kasten2012-03-141-1/+1
| | | | Change-Id: I4bc66115fcb9ba22b057bd72db3f561dcb18a0d8
* Merge "Gapless playback, step 1."Marco Nelissen2012-03-131-0/+28
|\
| * Gapless playback, step 1.Marco Nelissen2012-03-131-0/+28
| | | | | | | | | | | | | | Currently able to play Ogg Vorbis, PCM WAV and other lossless files seamlessly by reusing the initial AudioTrack for subsequent players. Change-Id: Ie7cf6b9076bdf4f9211574456d192c02c04fecc7
* | Switched to use the header files in /frameworks/nativeJames Dong2012-03-122-3/+4
| | | | | | | | | | | | | | | | and deleted the duplicate header files in /frameworks/base o related-to-bug: 6044887 Change-Id: I17e0692d9a9b5c8796ded36677c833ca8ab36795
* | Merge "Removed the include header path since it is not needed."James Dong2012-03-121-1/+0
|\ \
| * | Removed the include header path since it is not needed.James Dong2012-03-121-1/+0
| | | | | | | | | | | | | | | | | | o related-to-bug: 6044894 Change-Id: I15aec441dc0c75804aa33fc3e7ef977f7490922d
* | | Documentation/API update for MediaCodec/MediaExtractor, fixes to MediaCodec.Andreas Huber2012-03-122-5/+32
|/ / | | | | | | | | | | and MediaExtractor.readSampleData now works with a non-direct byte buffer. Change-Id: Ifbe5c152d9550c34d3b1d493e12a223eb98e8b4e
* | Use audio_policy_output_flags_t consistentlyGlenn Kasten2012-03-091-2/+3
|/ | | | | | | | | | This affects: - IAudioFlinger::openOutput - AudioTrack::AudioTrack - AudioTrack::set - apps that call these Change-Id: I26fb281bac6cb87593d17697bc9cb37a835af205
* Split Parcel JNI details away from Binder.Jeff Sharkey2012-03-081-0/+1
| | | | | | | This is purely a refactoring, with no change to the underlying functionality. Change-Id: I41b59f14e57d1cc144274a01f77658d99a1bfe02
* Switch the way we configure for MediaPlayer retransmission.John Grossman2012-03-011-0/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* Separate the notion of "stop" from that of "release", i.e.Andreas Huber2012-02-281-1/+1
| | | | | | | | | stop - means transition back to LOADED state and keeping the component instance allocated. release - means we get rid of the component completely. Change-Id: I40ad01ce70821faaad43f57999249904f9144924
* fix libgui header locationMathias Agopian2012-02-274-5/+6
| | | | Change-Id: Iec71706cdd4f29c6904993648ce873e83ef9cafe
* Add new APIs AMessage::(set|find)Buffer to make it safer to passAndreas Huber2012-02-221-6/+3
| | | | | | ABuffer objects through messages. Change-Id: I9f8b4e4c4767d0d70a0105e0c0813b754379b49d
* Implementation of a java media codec interface and associated tools.Andreas Huber2012-02-228-0/+1381
| | | | Change-Id: I13e54062d4de584355c5d82bb027a68aeaf2923b
* Enhance Visualizer behavior in the case of mediaserver death.John Grossman2012-02-161-2/+20
| | | | | | | | | | | | | | | | | Bring the Visualizer class into line with the SDK documentation by returning ERROR_DEAD_OBJECT instead of ERROR_INVALID_OPERATION when the Visualizer loses its binder connection to the mediaserver because of a mediaserver restart. Also add a new callback interface to allow clients to be asynchronously notified in the case of server death. Right now, the interface definition and the registration method are flagged as hidden pending API council review/approval. See http://b/issue?id=5717519 for details. Change-Id: Ic15856f27ed5a950a583ac11ca81f79bd7e9b1a0 Signed-off-by: John Grossman <johngro@google.com>
* Reuse callback buffers in the Visualizer.John Grossman2012-02-161-6/+80
| | | | | | | | | | | Don't re-allocate buffers used by Visualizer callbacks as this causes an unacceptable amount of GC thrash. Instead, lazily allocate the buffers and only reallocate them when the required size changes. See http://b/issue?id=5717519 for details. Change-Id: Ibd157ed51f30687ce7c4ef0b4003258a484e0f5d Signed-off-by: John Grossman <johngro@google.com>
* Update commentsGlenn Kasten2012-02-141-1/+1
| | | | | | We no longer put the filename at start of file. Change-Id: Ic435b159a23105681e3d4a6cb1ac097bc853302e
* Follow raw pointer and sp<> conventionsGlenn Kasten2012-02-102-4/+5
| | | | | | | | Unconditional delete for raw pointers. Use "if (sp != 0)" not "if (sp.get() != 0)" or "if (sp != NULL)". Use "if (raw != NULL)" not "if (raw)". Change-Id: I531a8da7c37149261ed2f34b862ec4896a4b785b
* move away from MediaDebug and use ADebug instead for video editor engineJames Dong2012-02-091-0/+1
| | | | Change-Id: I2c0ad6c64f1bd03bd3dfe2c87792f8089dcbc101
* The software AMR NB encoder is now an OMX component.Andreas Huber2012-02-011-1/+5
| | | | Change-Id: I890eab052a7c36409b8b694c964884e28dd8d8fc
* Don't need to link to libsqlite from media JNI library.Jeff Brown2012-01-191-1/+0
| | | | | | Media JNI library doesn't actually use libsqlite. Change-Id: If8017444d259779d459ef2da83119814e31454c2
* Use audio_stream_type_t consistentlyGlenn Kasten2012-01-134-7/+7
| | | | | | | | | 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
* Merge "Use audio_format_t consistently"Glenn Kasten2012-01-122-4/+4
|\
| * Use audio_format_t consistentlyGlenn Kasten2012-01-052-4/+4
| | | | | | | | | | | | | | | | Was int, uint32_t, uint16_t, and uint8_t with 2-bit bitfield. Also replace 0 by AUDIO_FORMAT_DEFAULT and replace 1 by AUDIO_FORMAT_PCM_16_BIT. Change-Id: Ia8804f53f1725669e368857d5bb2044917e17975
* | Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGESteve Block2012-01-0813-174/+174
| | | | | | | | | | | | | | See https://android-git.corp.google.com/g/#/c/157220 Bug: 5449033 Change-Id: Ic9c19d30693bd56755f55906127cd6bd7126096c
* | Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGESteve Block2012-01-065-10/+10
| | | | | | | | | | | | | | See https://android-git.corp.google.com/g/157065 Bug: 5449033 Change-Id: I00a4b904f9449e6f93b7fd35eac28640d7929e69
* | Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGESteve Block2012-01-042-2/+2
|/ | | | | | | See https://android-git.corp.google.com/g/156801 Bug: 5449033 Change-Id: Ib08fe86d23db91ee153e9f91a99a35c42b9208ea
* Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGESteve Block2012-01-031-3/+3
| | | | | | | See https://android-git.corp.google.com/g/156016 Bug: 5449033 Change-Id: I4c4e33bb9df3e39e11cd985e193e6fbab4635298
* Extract out audio DSP code to utility libraryGlenn Kasten2011-12-161-0/+1
| | | | Change-Id: Ib8ce72028a7ea30e82baa518e381370e820ebbd0
* am 5126f1d4: am 613ed4c6: Merge "Fixd for 5490443 Native crash while ↵Hong Teng2011-12-021-2/+2
|\ | | | | | | | | | | | | exporting a video - Add new onError callback to PreviewProgressListener, which is used to indicate video editor application for the error that has occurred during priviewing. With this modification, * commit '5126f1d413b4fcb0aff5b364e1e5a41c89ca665c': Fixd for 5490443 Native crash while exporting a video - Add new onError callback to PreviewProgressListener, which is used to indicate video editor application for the error that has occurred during priviewing. With this modification, the application must implement the onError method, and then VideoEditorPreviewTest.java is changed accordingly.
| * Fixd for 5490443 Native crash while exporting a videoHong Teng2011-12-011-2/+2
| | | | | | | | | | | | | | | | | | | | - Add new onError callback to PreviewProgressListener, which is used to indicate video editor application for the error that has occurred during priviewing. With this modification, the application must implement the onError method, and then VideoEditorPreviewTest.java is changed accordingly. Change-Id: I15610b8907fcf8bd35a3c69ad7c07b5175a6e309
* | am f51f1bd9: Verify we actually have valid utf8 metadataMarco Nelissen2011-11-031-1/+63
|\ \ | |/ | | | | | | * commit 'f51f1bd9d42d0dd55c120bfb83ed113b61e5c3ca': Verify we actually have valid utf8 metadata
| * Verify we actually have valid utf8 metadataMarco Nelissen2011-11-031-1/+63
| | | | | | | | | | | | | | | | Before calling NewStringUTF, check that the metadata value is actually valid utf-8, and replace the offending characters with "?" if it is not. b/5534491 Change-Id: I43de4307e739ae0b7d4177937ed33aa1dfb90d98
* | Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF) DO NOT MERGESteve Block2011-10-2611-232/+232
|/ | | | | | | See https://android-git.corp.google.com/g/#/c/143865 Bug: 5449033 Change-Id: I0122812ed6ff6f5b59fe4a43ab8bff0577adde0a
* MediaPlayer: properly handle released surfacesJamie Gennis2011-10-141-2/+8
| | | | | Bug: 5396571 Change-Id: I6af87cb04f09f9ae6ea77cd7ba31108a3e93d24a
generated by cgit v1.1 at 2025-01-24 08:15:25 +0000