26583ffe69a7601ad29e00094fe66ce795356fab |
|
04-May-2016 |
Marco Nelissen <marcone@google.com> |
Merge "Clear unused pointer field when sending across binder" into klp-dev am: 71095f174e am: 4b817b51e2 am: 2d4cf313fa am: ef1fcffc98 am: 38f24823d0 am: d2c61d049b am: 7c3e69cd12 am: 5f527d44d7 am: c83479de24 am: 26ef0c4385 am: 1863e62d0f * commit '1863e62d0f49b01b7d066e2d7c47fef249fffd9d': Clear unused pointer field when sending across binder Change-Id: I6b890a1e3964ba6623344414a5a897cc19a84e88
|
5f527d44d7155103ffd3b1780008dd1441511016 |
|
04-May-2016 |
Marco Nelissen <marcone@google.com> |
Merge "Clear unused pointer field when sending across binder" into klp-dev am: 71095f174e am: 4b817b51e2 am: 2d4cf313fa am: ef1fcffc98 am: 38f24823d0 am: d2c61d049b am: 7c3e69cd12 * commit '7c3e69cd12e2e631ab97ce10b71def69b3490d9d': Clear unused pointer field when sending across binder Change-Id: If5f841e873f937669e3e23f77bbfb43f109c563d
|
7c3e69cd12e2e631ab97ce10b71def69b3490d9d |
|
04-May-2016 |
Marco Nelissen <marcone@google.com> |
Merge "Clear unused pointer field when sending across binder" into klp-dev am: 71095f174e am: 4b817b51e2 am: 2d4cf313fa am: ef1fcffc98 am: 38f24823d0 am: d2c61d049b * commit 'd2c61d049b52158c506a2c61727078fccb92b898': Clear unused pointer field when sending across binder Change-Id: I5e41f418c9fcdea8bc05c150772a0b87cef101bd
|
ef1fcffc9808df37f4031ddbf247492c8609559a |
|
04-May-2016 |
Marco Nelissen <marcone@google.com> |
Merge "Clear unused pointer field when sending across binder" into klp-dev am: 71095f174e am: 4b817b51e2 am: 2d4cf313fa * commit '2d4cf313fa141d11cfae7c31797da114598d8ed7': Clear unused pointer field when sending across binder Change-Id: I0d1569e886ff40a43423cdbf83ed5d04e35f2d07
|
e663be8d475ec6035a1a4257b208549b4375fa08 |
|
02-May-2016 |
Marco Nelissen <marcone@google.com> |
Clear unused pointer field when sending across binder Bug: 28377502 Change-Id: Iad5ebfb0a9ef89f09755bb332579dbd3534f9c98
/frameworks/av/media/libmediaplayerservice/MetadataRetrieverClient.cpp
|
833b47505c513cb5c8f22aa922a7ea20d153b319 |
|
05-Apr-2016 |
Andy Hung <hunga@google.com> |
MediaPlayerService: Remove 64 bit compilation warnings Bug: 16890215 Change-Id: I83d27d8c0c51bd868737bc2a1d6e046702d2a91c
/frameworks/av/media/libmediaplayerservice/MetadataRetrieverClient.cpp
|
83b0fd9997b558f6c2ebf5e6e4db20570cb233b8 |
|
16-Sep-2015 |
Marco Nelissen <marcone@google.com> |
Optionally print name for fd Add utility function to get the file name for a file descriptor, and use it in various places. Change-Id: I196b557a56d5ef0ef89e2020aab2699eafae61b0
/frameworks/av/media/libmediaplayerservice/MetadataRetrieverClient.cpp
|
e7616724e7054a013bc013dc62008b9d98dc2b5f |
|
13-Jun-2015 |
Marco Nelissen <marcone@google.com> |
am 2b63384b: Merge "Serialize calls to getFrameAtTime in the mediaserver" into mnc-dev * commit '2b63384b6d338f2c3320818a698c3f9d6221fe5d': Serialize calls to getFrameAtTime in the mediaserver
|
6155085b781a81af66d42d907c9f4d1063999594 |
|
13-Jun-2015 |
Marco Nelissen <marcone@google.com> |
Serialize calls to getFrameAtTime in the mediaserver to avoid running out of memory. Bug: 21277449 Change-Id: I7210806a24958f38d86aadab0310fc263e4c0edf
/frameworks/av/media/libmediaplayerservice/MetadataRetrieverClient.cpp
|
9c3e9c4ffd385abf12823cd3ffe0ee0bc688af76 |
|
28-Apr-2015 |
Marco Nelissen <marcone@google.com> |
am 31c81e9e: am b8111f83: Merge "Fix potential double close in IMediaMetadataRetriever::setDataSource" * commit '31c81e9e4a468a448b387d5c905b4ac5c6a014fc': Fix potential double close in IMediaMetadataRetriever::setDataSource
|
55203e2e29428c2c7bd830d731f5e6ed890d9a10 |
|
21-Apr-2015 |
Taiju Tsuiki <tzik@google.com> |
Fix potential double close in IMediaMetadataRetriever::setDataSource 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
/frameworks/av/media/libmediaplayerservice/MetadataRetrieverClient.cpp
|
5fde15db465775d5c607cf069752e2e075f8fc6d |
|
21-Apr-2015 |
Ying Wang <wangying@google.com> |
Fix mips build. Change-Id: I49aa83e38e90ebd20793885de9420de96062aa37
/frameworks/av/media/libmediaplayerservice/MetadataRetrieverClient.cpp
|
6d339f1f764bbd32e3381dae7bfa7c6c575bb493 |
|
18-Apr-2015 |
Lajos Molnar <lajos@google.com> |
libmediaplayerservice: fix warnings, make warnings errors, use clang Change-Id: I1b2f6b65c5abbc366068a60b8909104f31b94228
/frameworks/av/media/libmediaplayerservice/MetadataRetrieverClient.cpp
|
99f31604136d66ae10e20669fb6b5716f342bde0 |
|
20-Mar-2015 |
Chris Watkins <watk@google.com> |
Unhide the android.media.[Media]DataSource interface. 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
/frameworks/av/media/libmediaplayerservice/MetadataRetrieverClient.cpp
|
0e8928bf4f2b01b783f6da97d15e8f1abb0fd7d7 |
|
08-Jan-2015 |
Marco Nelissen <marcone@google.com> |
Replace MidiFile player with a Midi extractor 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
/frameworks/av/media/libmediaplayerservice/MetadataRetrieverClient.cpp
|
faf4efc6a41e88adf85f76f48f020a6d681f5ff1 |
|
17-Dec-2014 |
Marco Nelissen <marcone@google.com> |
Replace MidiFile player with a Midi extractor 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
/frameworks/av/media/libmediaplayerservice/MetadataRetrieverClient.cpp
|
840797f674f7c38d5215d0bcf0f4547c4e9a6957 |
|
24-Jun-2014 |
Mark Salyzyn <salyzyn@google.com> |
am 76e4e02d: am 940c688d: Merge "libmediaplayerservice: unused argument warning messages" * commit '76e4e02d6b6c1da140b8cbe48fc58035d2b7d311': libmediaplayerservice: unused argument warning messages
|
247d9ebdbe7f165644f308745eee061fcbb77771 |
|
23-Jun-2014 |
Mark Salyzyn <salyzyn@google.com> |
libmediaplayerservice: unused argument warning messages Change-Id: I7dbf62858114ac9b8de6d7b66cc00e002769a5cf
/frameworks/av/media/libmediaplayerservice/MetadataRetrieverClient.cpp
|
77342f72fdf96603938a95fcbb9888ec90e71e68 |
|
19-Jun-2014 |
Mark Salyzyn <salyzyn@google.com> |
libmediaplayerservice: 64-bit compile warnings Change-Id: I333e52dc377becc774f3fa971c230ecb55ea8d7b
/frameworks/av/media/libmediaplayerservice/MetadataRetrieverClient.cpp
|
7903bb2b3065d58cc75637900922b434f50024d9 |
|
12-Jun-2014 |
Elliott Hughes <enh@google.com> |
am 2a8270e6: am c323737d: Merge "Offer a type-safe album art interface." * commit '2a8270e6944fb3addfcba87f6885aaad196b8b88': Offer a type-safe album art interface.
|
f3e80dddd7376aa9deeb27de25e1d50030a2ad98 |
|
11-Jun-2014 |
Elliott Hughes <enh@google.com> |
Offer a type-safe album art interface. Bug: 15514223 Change-Id: Iddfc33a00e6cd3779ca09c01a55f62b151f6ec95
/frameworks/av/media/libmediaplayerservice/MetadataRetrieverClient.cpp
|
1b86fe063badb5f28c467ade39be0f4008688947 |
|
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: I9f74a86e70422187c9cf0ca1318a29019700192d
/frameworks/av/media/libmediaplayerservice/MetadataRetrieverClient.cpp
|
44a7e42f0310831e6a846d1b6bb40bf3a399bf6d |
|
22-Jun-2012 |
John Grossman <johngro@google.com> |
Add the ability to dynamicaly register MediaPlayer types. 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>
/frameworks/av/media/libmediaplayerservice/MetadataRetrieverClient.cpp
|
559bf2836f5da25b75bfb229fec0d20d540ee426 |
|
28-Mar-2012 |
James Dong <jdong@google.com> |
AV Android make files changes 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
/frameworks/av/media/libmediaplayerservice/MetadataRetrieverClient.cpp
|
afed0e1fa37473a4cd30018577b560acc79d9a3f |
|
21-Sep-2011 |
Andreas Huber <andih@google.com> |
Use NuPlayer for media playback everywhere if media.stagefright.use-nuplayer is set to true. Change-Id: Ibb217e7d7d5195b7feeea557554fe78e1585744c
/frameworks/av/media/libmediaplayerservice/MetadataRetrieverClient.cpp
|
29357bc2c0dd7c43ad3bd0c8e3efa4e6fd9bfd47 |
|
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/av/media/libmediaplayerservice/MetadataRetrieverClient.cpp
|
3856b090cd04ba5dd4a59a12430ed724d5995909 |
|
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/av/media/libmediaplayerservice/MetadataRetrieverClient.cpp
|
b8e9897b8ad5d722e424d7a7e256153307ecbd93 |
|
15-Jun-2011 |
Glenn Kasten <gkasten@google.com> |
Remove unneeded #include <sys/resource.h> Suggested in code review for previous change. Change-Id: Ic3225b240367dc6c9bf56fb4498fb8a0f9f806ec
/frameworks/av/media/libmediaplayerservice/MetadataRetrieverClient.cpp
|
0512ab559d4670c2204078470d7ef5d376811c57 |
|
05-May-2011 |
Glenn Kasten <gkasten@google.com> |
Remove dead code related to gettid The gettid system call is always available now. Change-Id: Ib78b41781eda182dc8605daf456bbea7ff7c2dc0
/frameworks/av/media/libmediaplayerservice/MetadataRetrieverClient.cpp
|
af8791e112c8072452bd14ef3c43a47511d19542 |
|
21-Mar-2011 |
Andreas Huber <andih@google.com> |
Support passing headers to MediaMetadataRetriever's setDataSource API Change-Id: Ib1a5c08fc5034cac05034db27007a35c9b660b26 related-to-bug: 3506316
/frameworks/av/media/libmediaplayerservice/MetadataRetrieverClient.cpp
|
7f7d52ac18dfc3c6d8f6267dad29306613e9bd0e |
|
06-Jan-2011 |
James Dong <jdong@google.com> |
Publish MediaMetadataRetriever.java as public API 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
/frameworks/av/media/libmediaplayerservice/MetadataRetrieverClient.cpp
|
16afe2fb439cab6125bb46a07a8078d4ce1c1ea5 |
|
03-Dec-2010 |
James Dong <jdong@google.com> |
Prepare for publishing MediaMetadataRetriever as public API step one: o replaced captureFrame with getFrameAtTime o removed getMode bug - 2433195 Change-Id: I38a8cecef29014692f0b08b8818326e3ebb40a12
/frameworks/av/media/libmediaplayerservice/MetadataRetrieverClient.cpp
|
30d713a1c18a5ff892a7f13b2524ba624b70890a |
|
11-Nov-2010 |
James Dong <jdong@google.com> |
Remove legacy PV stuff Change-Id: I60ffea7c65592df4b3a80c590c863f1f79b371fd
/frameworks/av/media/libmediaplayerservice/MetadataRetrieverClient.cpp
|
ce0febae177d1816ee7a6750ed9fba52472b9a71 |
|
09-Nov-2010 |
James Dong <jdong@google.com> |
Support extracting thumbnail from rotated video tracks Change-Id: Ife0a2536aaac5ff1efdf1035b9d2c892773ee16c
/frameworks/av/media/libmediaplayerservice/MetadataRetrieverClient.cpp
|
608d77b1cf4fb9f63dc861e4e1fa3e80a732f626 |
|
24-Jun-2010 |
Andreas Huber <andih@google.com> |
Remove most stagefright property overrides, remove VorbisPlayer and VorbisMetadataRetriever as this functionality is now provided by stagefright. Change-Id: Ieafe75a4550c273ad59b4518d7cd4c0fce0f7cce related-to-bug: 2370115
/frameworks/av/media/libmediaplayerservice/MetadataRetrieverClient.cpp
|
6b3359d4669f539c173bfc40809deb8ffde3dd0c |
|
30-Jan-2010 |
Mathias Agopian <mathias@google.com> |
Don't use MemoryDealer in MetadataRetrieverClient as it's not necessary. Use a MemoryHeapBase directly instead.
/frameworks/av/media/libmediaplayerservice/MetadataRetrieverClient.cpp
|
867d2f6ce668968e463eb86b856d21525f12fd67 |
|
26-Jan-2010 |
Mathias Agopian <mathias@google.com> |
Simplify the MemoryDealer implementation 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.
/frameworks/av/media/libmediaplayerservice/MetadataRetrieverClient.cpp
|
065c05e72091567632f927d9e5411e277480c1bf |
|
05-Jan-2010 |
Andreas Huber <andih@google.com> |
Make metadata support through stagefright property dependent until it's ready.
/frameworks/av/media/libmediaplayerservice/MetadataRetrieverClient.cpp
|
47945ea184f62def4c5a1dd15164cfa3fd286882 |
|
17-Dec-2009 |
Andreas Huber <andih@google.com> |
Disable HTTP playback and metadata support in stagefright, use PV instead.
/frameworks/av/media/libmediaplayerservice/MetadataRetrieverClient.cpp
|
827f3004421aacb6bceaf772ac825d4f2d3006e4 |
|
24-Nov-2009 |
Dave Sparks <davidsparks@android.com> |
am 8424ec32: Merge change I0f9a53d4 into eclair Merge commit '8424ec323b2bc38887370c75e2c1fcd84bcdb013' into eclair-mr2 * commit '8424ec323b2bc38887370c75e2c1fcd84bcdb013': Set metadata retriever thread group to the caller's group.
|
ec4dde75955f87e5afea3f59ef991130257f3f3a |
|
24-Nov-2009 |
Dave Sparks <davidsparks@android.com> |
Set metadata retriever thread group to the caller's group. 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.
/frameworks/av/media/libmediaplayerservice/MetadataRetrieverClient.cpp
|
5b65c7043dada0c89d3a941742666ac40ea35746 |
|
05-Nov-2009 |
Andreas Huber <andih@google.com> |
DO NOT MERGE: Squashed commit of the following: 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.
/frameworks/av/media/libmediaplayerservice/MetadataRetrieverClient.cpp
|
4ee1540a3949693693688c2004a56cb42de55160 |
|
28-Oct-2009 |
Dave Sparks <davidsparks@android.com> |
am e8543418: Merge change I7c0d20a7 into eclair Merge commit 'e8543418783f8f8f9a6bafdaa1dd6289661eac85' into eclair-mr2 * commit 'e8543418783f8f8f9a6bafdaa1dd6289661eac85': Run the metadataretriever at background priority. Bug 2187133.
|
41fbe930c0c128bcded1348e60d7d9e8f79d8a77 |
|
27-Oct-2009 |
Dave Sparks <davidsparks@android.com> |
Run the metadataretriever at background priority. Bug 2187133. 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.
/frameworks/av/media/libmediaplayerservice/MetadataRetrieverClient.cpp
|
2a4a7d5af053a17586a262a1267ba993e31790f1 |
|
07-Oct-2009 |
Andreas Huber <andih@google.com> |
Split the ColorConverter off SoftwareRenderer, metadata support in stagefright.
/frameworks/av/media/libmediaplayerservice/MetadataRetrieverClient.cpp
|
a569aebd284506058a34d9772ebb28c8dac09aa3 |
|
29-Sep-2009 |
James Dong <jdong@google.com> |
Fix some metadata retriever issues: 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
/frameworks/av/media/libmediaplayerservice/MetadataRetrieverClient.cpp
|
148c1a2a96774517407717b61e5bc9cb08be8806 |
|
06-Sep-2009 |
James Dong <jdong@google.com> |
Add basic metadata retrieval support for midi, ogg, etc. Bug 2050320
/frameworks/av/media/libmediaplayerservice/MetadataRetrieverClient.cpp
|
7562408b2261d38415453378b6188f74fda99d88 |
|
20-May-2009 |
Mathias Agopian <mathias@google.com> |
move libbinder's header files under includes/binder
/frameworks/av/media/libmediaplayerservice/MetadataRetrieverClient.cpp
|
6c5b21025f746fcb838499ae01b4d384ab1d2f66 |
|
21-Mar-2009 |
Jean-Baptiste Queru <jbq@google.com> |
Deal better with situations where OpenCORE is disabled.
/frameworks/av/media/libmediaplayerservice/MetadataRetrieverClient.cpp
|
7b5eb023f8d87cca6d830ae6c11c6aadbe02aca8 |
|
18-Dec-2008 |
The Android Open Source Project <initial-contribution@android.com> |
Code drop from //branches/cupcake/...@124589
/frameworks/av/media/libmediaplayerservice/MetadataRetrieverClient.cpp
|