summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/StagefrightMediaScanner.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Offer a type-safe album art interface.Elliott Hughes2014-06-111-8/+2
| | | | | Bug: 15514223 Change-Id: Iddfc33a00e6cd3779ca09c01a55f62b151f6ec95
* warnings be gone.Andreas Huber2014-04-111-1/+1
| | | | | | | | (cherry picked from commit 84333e0475bc911adc16417f4ca327c975cf6c36) Modified by Mark Salyzyn <salyzyn@google.com> to keep merge conflicts or errors downstream to a minimum. Change-Id: Ic3b272f9cbf3155001aabd2f79728f1bc31de613
* resolved conflicts for merge of 205d7249 to masterMarco Nelissen2012-11-161-1/+1
|\ | | | | | | Change-Id: I3df408b6e30e0c0b2a19a3336134ce49fb73a8bb
| * Add .mpga to acceptable file name extensions list.Jan Bjernler2012-11-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | The *.mpga files are playable, but are not correctly scanned. This is because they are prevented from being scanned in StagefrightMediaScanner.cpp. What this fix does is to add the extension to the list of valid file extensions so that the scanner handles the filetype properly. We have previously added the .mpga extension to the framework to make it playable, but not added it so that the scanner scans it. Change-Id: I02a44d770adb80d38e8bed77d0d76efa1b28a861
* | Scan .awb files tooMarco Nelissen2012-11-121-1/+1
|/ | | | | | b/6122599 Change-Id: Ied3e0392939231447f1fc5685ca1fade1e55ce08
* Make mediascanner use filedescriptors instead of pathsMarco Nelissen2012-04-131-1/+14
| | | | | | | | | Media scanner needs to open the files now, because media server doesn't have the required permission. b/6330061 Change-Id: I2364d93dcc0530c15676664fc4a8c306351dde08
* Send video width and height to mediascannerMarco Nelissen2012-04-041-0/+2
| | | | | | b/5820120 Change-Id: Ia5c48eb1ab15fe3bbe773131148470a06eb2b96d
* Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGESteve Block2012-01-081-1/+1
| | | | | | | See https://android-git.corp.google.com/g/#/c/157220 Bug: 5449033 Change-Id: Ic9c19d30693bd56755f55906127cd6bd7126096c
* status_t != boolMarco Nelissen2011-11-181-2/+2
| | | | | | b/5567433 Change-Id: I255ab8c3b0b5e0ea6a5cc7c05df757c667f3855e
* Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF) DO NOT MERGESteve Block2011-10-261-2/+2
| | | | | | | See https://android-git.corp.google.com/g/#/c/143865 Bug: 5449033 Change-Id: I0122812ed6ff6f5b59fe4a43ab8bff0577adde0a
* Support for an MPEG2 Program Stream extractor.Andreas Huber2011-09-301-1/+1
| | | | Change-Id: I606d87c278f72b22a5b6d7ee57bce6b02e280d41
* Untangle MediaScanner error handling.Jeff Brown2011-07-201-52/+63
| | | | | | Bug: 5056917 Change-Id: I1a7a73579e3ba4e9709459329fc1901a28b0f4b1
* - Retrieve is_drm in MediaMetadataRetriever.Gloria Wang2011-07-011-0/+1
| | | | | | | | | - Add one more column in MediaStore to indicate whether a media file is drm-protected. - Remove old DRM code from Ringtone - Use the new DRM code in RingtoneManager Change-Id: I1311fd1c04841c2cd47df6c901589966cf55a692
* Support for divx files, i.e. mpeg 4 video + mpeg audio layer III in .avi filesAndreas Huber2011-03-301-0/+1
| | | | | Change-Id: I6e1e989c43300ddb0d341e3e9183cdccd69eeae6 related-to-bug: 4192562
* Adding support for the '.mxmf' MIDI file extension.Andreas Huber2011-03-291-2/+3
| | | | | Change-Id: Ic73e2f843f8640dd794d090413cf63232f0182b9 related-to-bug: 4186454
* Bug 1804058 FLAC extractorGlenn Kasten2011-02-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Note: dependent on external/flac for libFLAC Implemented and tested: * FLAC container * mono and stereo * standard sample rates * standard bit depths * sniffer * media scanner * Vorbis comment metadata including album art * random access seeking with "torture test" * web browser integration for audio/flac (not audio/x-flac), but note that most web servers don't correctly report the MIME type Not implemented: * 24-bit to 16-bit dither or noise shaping in AudioFlinger * 96 kHz to 44.1 or 48 kHz downsampling low pass filter in AudioFlinger * replay gain is better done in AudioFlinger * multi-channel, would need AudioFlinger support * Ogg container, does not seem to be very popular yet Change-Id: I300873e8c0cfc2e95403d9adb5064d16a2923f17
* StagefrightMediaScanner: Close metadata retriever after we are done scanningMike Lockwood2011-01-251-32/+35
| | | | | | | | | | This prevents the mediaserver from leaking a file descriptor after the media scanner runs BUG: 3373546 Change-Id: I82a8bae82306de3da56a5c7da5b03ecf106a4efc Signed-off-by: Mike Lockwood <lockwood@android.com>
* Publish MediaMetadataRetriever.java as public APIJames Dong2011-01-121-6/+2
| | | | | | | | | | | | 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
* Add support for the "compilation" tag in mp3, mp4 and ogg, and also addMarco Nelissen2011-01-071-0/+1
| | | | | | | | | support for two common ways of specifying album artist in ogg files. b/3311831 (cherry-picked from GB because of weird automerger failure) Change-Id: Ibf12a3d6bc8bbc2ac5ea815de6b33414b8f53f0f
* am 716f60ce: resolved conflicts for merge of e2ec61b2 to gingerbread-plus-aospJean-Baptiste Queru2010-11-191-4/+5
|\ | | | | | | | | * commit '716f60ce605131429dc9efe8f351f0da0c8cc8c2': StagefrightMediaScanner: Call endFile() for MIDI and OGG files.
| * resolved conflicts for merge of e2ec61b2 to gingerbread-plus-aospJean-Baptiste Queru2010-11-191-4/+5
| |\ | | | | | | | | | Change-Id: I81930c62e2f78b129995cffb8b1bf3332879c7cf
| | * StagefrightMediaScanner: Call endFile() for MIDI and OGG files.Hiroshi Takekawa2010-11-191-8/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | addStringTag() caches non-ascii metadata strings for later processing, and then endFile() will be called at the end of processFile() to convert non-ascii strings from locale's charset to utf-8 if required. Stagefright's processFile() failed to call endFile() when the processing file is a MIDI file or an OGG file. This patch fixes this problem to populate metadata correctly. Reviewed by: Brad Fitzpatrick, Marco Nelissen. Change-Id: I072e79d81dce1fec63297d2b5d2b870a72e5b66e
* | | 64-bit file size/offset support for media frameworkJames Dong2010-11-181-2/+2
| | | | | | | | | | | | Change-Id: I3452bc2c0f1d990cc67285df2fce1f9f86ff8e10
* | | Media scanner support for FL(Forward Lock) DRM file typesGloria Wang2010-11-011-1/+1
|/ / | | | | | | Change-Id: Id85edbfc2851d9054a7433d24bb5cf33a457a4e5
* | Initial checkin of mpeg2 transport stream parser for stagefright.Andreas Huber2010-06-071-1/+1
| | | | | | | | Change-Id: I328ce77404daf7127933b48c9d58ed504fb8fc6f
* | Support for ogg(vorbis) metadata in stagefright including album art.Andreas Huber2010-05-251-50/+0
| | | | | | | | | | Change-Id: I0c8c0136cebe2d2d97caabb7bc0c65be86329dbb related-to-bug: 2713414
* | Support for media extraction from .mkv/.mka Matroska files in stagefright.Andreas Huber2010-05-201-1/+2
|/ | | | | Change-Id: I4c26579828ad575523ccf58b0b5cb144046c04ca related-to-bug: 2483739
* A new OggExtractor/VorbisDecoder combo to support approximate seeking.Andreas Huber2010-05-071-2/+2
| | | | | Change-Id: Id5d0c1c8b1adc62896bb5ed951f7b5cfda811e95 related-to-bug: 2654400
* Instead of instantiating StagefrightMetadataRetriever directly, instantiate ↵Andreas Huber2010-03-101-8/+12
| | | | | | | a MediaMetadataRetriever which will do-the-right-thing(tm) even for .wma/.wmv/.asf files. Change-Id: Ibda4b5268514934f14a3d49a564902bc670f4384 related-to-bug: 2074137
* Add support for "album artist" tag.Marco Nelissen2010-02-111-0/+1
|
* Add support for the TPOS/TPA (disc number) id3 tag.Marco Nelissen2010-02-081-0/+1
|
* Support for determining the mime type of media via metadata extraction.Andreas Huber2010-01-131-0/+6
|
* Squashed commit of the following:Andreas Huber2010-01-121-2/+161
| | | | | | | | | | | | | | | | | | | | | | | | | | | | commit f81bb1dac5ef107bb0d7d5d756fb1ffa532ba2cc Author: Andreas Huber <andih@google.com> Date: Mon Jan 11 14:55:56 2010 -0800 Support for duration metadata, midi and ogg-vorbis files (in mediascanner) commit 0b1385a0dc156ce27985a1ff757c4c142fd7ec39 Author: Andreas Huber <andih@google.com> Date: Mon Jan 11 14:20:45 2010 -0800 Refactor meta data logic. Container specific metadata is now also returned by the MediaExtractor. commit f9818dfac39c96e5fefe8c8295e60580692d5990 Author: Andreas Huber <andih@google.com> Date: Fri Jan 8 14:26:09 2010 -0800 A first pass at supporting metadata through ID3 tags. commit 476e9e253633336ab790f943e2d6c0cd8991d76a Author: Andreas Huber <andih@google.com> Date: Thu Jan 7 15:48:44 2010 -0800 Initial checkin of ID3 (V2.2 and V2.3) parser for use in stagefright. related-to-bug: 2295456
* Reorganize some of the stagefright implementation related to metadata.Andreas Huber2010-01-081-0/+80