summaryrefslogtreecommitdiffstats
path: root/media/libmediaplayerservice/MetadataRetrieverClient.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'remotes/android-6.0.1_r52' into HEADJessica Wagantall2016-07-071-0/+1
|\ | | | | | | | | | | Ticket: CYNGNOS-3020 Change-Id: I7e8d69c5f7041b66893ea643c4bc19c3b7bcdda5
| * Clear unused pointer field when sending across binderMarco Nelissen2016-05-271-0/+1
| | | | | | | | | | Bug: 28377502 Change-Id: Iad5ebfb0a9ef89f09755bb332579dbd3534f9c98
* | Fix potential double close in IMediaMetadataRetriever::setDataSourceTaiju Tsuiki2015-12-181-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | IMediaMetadataRetriever::setDataSource(fd, offset, length) takes the ownership of |fd| on the direct invocation, and doesn't take the ownership on invocation from Binder. This is inconsintent to other similar methods like IMediaPlayer::setDataSource, and causes potential double close of |fd|. This CL changes the caller and implementations to leave the ownership to make them consistent. Also, fixes a double close in IMediaPlayerService::setDataSource in an error case. Change-Id: Id551a1e725c4392b0fe6b7293871212eb101c0a5
* | stagefright: Disable AwesomePlayerMingming Yin2015-10-061-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | Permanently remove StagefrightPlayer codebase & remove its entry from MediaPlayerFactory as AwesomePlayer is completely replaced by NuPlayer. Keep the AwesomePlayer codebase to make libstagefright_timedtext available to NuPlayer via libstagefright. Conflicts: media/libmediaplayerservice/MediaPlayerFactory.cpp Change-Id: Idfecdc519919ee940817c7bb515433fc37588bd3
* | mediaplayerservice: fix 64-bit compliation errorsPraveen Chavan2015-10-061-8/+9
|/ | | | | | | | | | Use correct format specifiers to fix 64-bit compilation. Conflicts: media/libmediaplayerservice/StagefrightRecorder.cpp media/libstagefright/VideoFrameScheduler.cpp Change-Id: Ic2238db525a23710716558015ca152871b4c549f
* Serialize calls to getFrameAtTime in the mediaserverMarco Nelissen2015-06-121-0/+3
| | | | | | | to avoid running out of memory. Bug: 21277449 Change-Id: I7210806a24958f38d86aadab0310fc263e4c0edf
* Fix mips build.Ying Wang2015-04-201-1/+1
| | | | Change-Id: I49aa83e38e90ebd20793885de9420de96062aa37
* libmediaplayerservice: fix warnings, make warnings errors, use clangLajos Molnar2015-04-171-1/+1
| | | | Change-Id: I1b2f6b65c5abbc366068a60b8909104f31b94228
* Unhide the android.media.[Media]DataSource interface.Chris Watkins2015-04-151-0/+18
| | | | | | | | | | | | | | | | | | | | | This allows apps to implement MediaDataSource, which is modeled on stagefright's DataSource, to supply media data to the framework. This was already implemented for MediaExtractor, but it was renamed from DataSource. MediaExtractor, MediaPlayer and MediaMetadataRetriever each have a new overload: #setDataSource(android.media.MediaDataSource) Only NuPlayer supports this new data source. The change introduces: * IDataSource: The binder interface for DataSource. * JMediaDataSource: The native counterpart to the java interface. It implements IDataSource. * CallbackDataSource: A stagefright DataSource that wraps an IDataSource. Change-Id: Ib3c944b49cc8a792c8eb9c85e5015c07f298ebc1
* Replace MidiFile player with a Midi extractorMarco Nelissen2014-12-181-5/+0
| | | | | | | This gets rids of a bunch of special midi handling and replaces it with an extractor that works with NuPlayer and MediaMetadataRetriever. Change-Id: I8d0f5bbdde2ca24267cf4d62ab26afe9630e0217
* am 76e4e02d: am 940c688d: Merge "libmediaplayerservice: unused argument ↵Mark Salyzyn2014-06-241-1/+1
|\ | | | | | | | | | | | | warning messages" * commit '76e4e02d6b6c1da140b8cbe48fc58035d2b7d311': libmediaplayerservice: unused argument warning messages
| * libmediaplayerservice: unused argument warning messagesMark Salyzyn2014-06-241-1/+1
| | | | | | | | Change-Id: I7dbf62858114ac9b8de6d7b66cc00e002769a5cf
* | libmediaplayerservice: 64-bit compile warningsMark Salyzyn2014-06-201-2/+2
| | | | | | | | Change-Id: I333e52dc377becc774f3fa971c230ecb55ea8d7b
* | am 2a8270e6: am c323737d: Merge "Offer a type-safe album art interface."Elliott Hughes2014-06-121-6/+4
|\ \ | |/ | | | | | | * commit '2a8270e6944fb3addfcba87f6885aaad196b8b88': Offer a type-safe album art interface.
| * Offer a type-safe album art interface.Elliott Hughes2014-06-111-6/+4
| | | | | | | | | | Bug: 15514223 Change-Id: Iddfc33a00e6cd3779ca09c01a55f62b151f6ec95
* | FINAL ATTEMPT: HTTP services are now provided from JAVA and made available ↵Andreas Huber2014-02-041-2/+5
|/ | | | | | to media code Change-Id: I9f74a86e70422187c9cf0ca1318a29019700192d
* Add the ability to dynamicaly register MediaPlayer types.John Grossman2012-08-131-5/+17
| | | | | | | | | | | | Add the ability to dynamically register low level MediaPlayer factories which will be probed at setDataSource time to determine the proper MediaPlayerBase to instantiate. This change is in preparation for moving libaah_rtp out of frameworks/base and into phantasm platform directory. Change-Id: Icf8904db3ab9e3c85df6e780d5546d9988cb9076 Signed-off-by: John Grossman <johngro@google.com>
* AV Android make files changesJames Dong2012-03-281-1/+0
| | | | | | | o plus a few file relocation: ActivityManager.cpp/h, SoundPool.h, etc o remove some runtime dependencies to libandroid, libandroid_runtime, etc Change-Id: I047a47c5fb361dd5cf85cd98798c39f629a75d10
* Use NuPlayer for media playback everywhereAndreas Huber2012-03-221-0/+1
| | | | | | if media.stagefright.use-nuplayer is set to true. Change-Id: Ibb217e7d7d5195b7feeea557554fe78e1585744c
* Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGESteve Block2012-01-081-13/+13
| | | | | | | See https://android-git.corp.google.com/g/#/c/157220 Bug: 5449033 Change-Id: Ic9c19d30693bd56755f55906127cd6bd7126096c
* Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF) DO NOT MERGESteve Block2011-10-261-18/+18
| | | | | | | See https://android-git.corp.google.com/g/#/c/143865 Bug: 5449033 Change-Id: I0122812ed6ff6f5b59fe4a43ab8bff0577adde0a
* Remove unneeded #include <sys/resource.h>Glenn Kasten2011-06-151-1/+0
| | | | | | Suggested in code review for previous change. Change-Id: Ic3225b240367dc6c9bf56fb4498fb8a0f9f806ec
* Remove dead code related to gettidGlenn Kasten2011-06-031-12/+0
| | | | | | The gettid system call is always available now. Change-Id: Ib78b41781eda182dc8605daf456bbea7ff7c2dc0
* Support passing headers to MediaMetadataRetriever's setDataSource APIAndreas Huber2011-03-211-2/+3
| | | | | Change-Id: Ib1a5c08fc5034cac05034db27007a35c9b660b26 related-to-bug: 3506316
* Publish MediaMetadataRetriever.java as public APIJames Dong2011-01-121-24/+3
| | | | | | | | | | | | o Removed setMode() methods and related mode constants o Removed some of the unused the metadata keys o Updated the javadoc o part of a multi-project change. bug - 2433195 Change-Id: I5ed167f1fd6a53cb143b7dc385b149431d434438
* Prepare for publishing MediaMetadataRetriever as public APIJames Dong2010-12-031-20/+3
| | | | | | | | | | step one: o replaced captureFrame with getFrameAtTime o removed getMode bug - 2433195 Change-Id: I38a8cecef29014692f0b08b8818326e3ebb40a12
* Remove legacy PV stuffJames Dong2010-11-151-7/+0
| | | | Change-Id: I60ffea7c65592df4b3a80c590c863f1f79b371fd
* Support extracting thumbnail from rotated video tracksJames Dong2010-11-081-0/+2
| | | | Change-Id: Ife0a2536aaac5ff1efdf1035b9d2c892773ee16c
* Remove most stagefright property overrides, remove VorbisPlayer and ↵Andreas Huber2010-06-231-16/+2
| | | | | | | VorbisMetadataRetriever as this functionality is now provided by stagefright. Change-Id: Ieafe75a4550c273ad59b4518d7cd4c0fce0f7cce related-to-bug: 2370115
* Don't use MemoryDealer in MetadataRetrieverClient as it's not necessary.Mathias Agopian2010-01-291-15/+8
| | | | Use a MemoryHeapBase directly instead.
* Simplify the MemoryDealer implementationMathias Agopian2010-01-291-2/+2
| | | | | | | | | | | | | | At some point the implementation became complicated because of SurfaceFlinger's special needs, since we are now relying on gralloc we can go back to much simpler MemoryDealer. Removed HeapInterface and AllocatorInterface, since those don't need to be paramterized anymore. Merged SimpleMemory and Allocation. Made SimplisticAllocator non virtual. Removed MemoryDealer flags (READ_ONLY, PAGE_ALIGNED) Removed a lot of unneeded code.
* Make metadata support through stagefright property dependent until it's ready.Andreas Huber2010-01-041-7/+11
|
* Disable HTTP playback and metadata support in stagefright, use PV instead.Andreas Huber2009-12-171-6/+11
|
* am 8424ec32: Merge change I0f9a53d4 into eclairDave Sparks2009-11-231-14/+0
|\ | | | | | | | | | | | | Merge commit '8424ec323b2bc38887370c75e2c1fcd84bcdb013' into eclair-mr2 * commit '8424ec323b2bc38887370c75e2c1fcd84bcdb013': Set metadata retriever thread group to the caller's group.
| * Set metadata retriever thread group to the caller's group.Dave Sparks2009-11-231-14/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch modifies the native binder interface to the metadata retriever to pass the caller's thread group across the binder interface. On the server side, the thread scheduler group is set to the caller's scheduler group temporarily and restored after the request has completed. This patch also reverts a previous patch where the priority of the thread was forced to a low priority foreground thread. This should give apps more control over the priority of their metadata retrieval, particularly allow background process to run without hogging the CPU.
| * DO NOT MERGE: Squashed commit of the following:Andreas Huber2009-11-051-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit 08259dd3dc9026887f9bbfedaf45866eb56ea9bc Author: Andreas Huber <andih@google.com> Date: Thu Nov 5 12:02:31 2009 -0800 DO NOT MERGE: Use PV for metadata extraction even if stagefright is used for playback. commit 991832fe4dc012e51d3d9ed8d647c7f09991858f Author: Andreas Huber <andih@google.com> Date: Thu Nov 5 11:24:11 2009 -0800 DO NOT MERGE: Do not assert if we encounter OMX_StateInvalid. All bets are off though. commit cec45cf302d9218fe79956cbe8a462d7ca3a10bb Author: Andreas Huber <andih@google.com> Date: Mon Oct 26 16:11:54 2009 -0700 DO NOT MERGE: When freeing an OMX node, attempt to transition it from its current state all the way to "Loaded" in order to properly free any allocated buffers. commit 34a1e885ef9113d68acbc26d36fcc47fdebbed84 Author: Andreas Huber <andih@google.com> Date: Thu Nov 5 11:10:49 2009 -0800 DO NOT MERGE: Fix heap corruptin in OMXNodeInstance. commit 5a47f7439a1298b330541a7e4e647a8b44487388 Author: Andreas Huber <andih@google.com> Date: Thu Nov 5 11:08:19 2009 -0800 DO NOT MERGE: Fix seek-on-initial-read behaviour of OMXCodec. commit 45bed64722501b9f411a2940aff5aff4cc4d2e98 Author: Andreas Huber <andih@google.com> Date: Thu Nov 5 11:02:23 2009 -0800 DO NOT MERGE: Renaming string.h to stagefright_string.h to avoid conflicts. commit 6738e306a50196f31a73d4fc7b7c45faff639903 Author: Andreas Huber <andih@google.com> Date: Thu Oct 15 13:46:54 2009 -0700 DO NOT MERGE: Reimplement the OMX backend for stagefright. Besides a major cleanup and refactoring, OMX is now a singleton living in the media server, it listens for death notifications of node observers/clients that allocated OMX nodes and performs/attempts cleanup. Changed APIs to conform to the rest of the system.
* | am e8543418: Merge change I7c0d20a7 into eclairDave Sparks2009-10-281-0/+27
|\ \ | |/ | | | | | | | | | | Merge commit 'e8543418783f8f8f9a6bafdaa1dd6289661eac85' into eclair-mr2 * commit 'e8543418783f8f8f9a6bafdaa1dd6289661eac85': Run the metadataretriever at background priority. Bug 2187133.
| * Run the metadataretriever at background priority. Bug 2187133.Dave Sparks2009-10-261-0/+27
| | | | | | | | | | | | This change forces metadata retreiver threads to background priority. Uses an inner class to encapsulate the priority change so that it automatically restores priority when returning to the client.
* | Split the ColorConverter off SoftwareRenderer, metadata support in stagefright.Andreas Huber2009-10-081-1/+8
|/
* Fix some metadata retriever issues:James Dong2009-09-291-24/+26
| | | | | | 1. mRetriever was initialized twice: one in the constructor and the other in the setDataSource 2. cached the mode so that setMode can still be called before setDataSource. mRetriever won't be initialized until data source is set; thus we have to do this
* Add basic metadata retrieval support for midi, ogg, etc.James Dong2009-09-081-11/+55
| | | | Bug 2050320
* move libbinder's header files under includes/binderMathias Agopian2009-05-201-3/+3
|
* Deal better with situations where OpenCORE is disabled.Jean-Baptiste Queru2009-03-231-0/+4
|
* Code drop from //branches/cupcake/...@124589The Android Open Source Project2008-12-171-0/+250
generated by cgit v1.1 at 2024-05-08 01:17:43 +0000