| 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/libstagefright/StagefrightMediaScanner.cpp
|
| d411b4ca2945cd8974a3a78199fce94646950128 |
|
11-Apr-2014 |
Andreas Huber <andih@google.com> |
warnings be gone.
(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
/frameworks/av/media/libstagefright/StagefrightMediaScanner.cpp
|
| 84333e0475bc911adc16417f4ca327c975cf6c36 |
|
08-Feb-2014 |
Andreas Huber <andih@google.com> |
warnings be gone.
Change-Id: Ie3bae3f037730e316d7fca12e7a3527973f752ef
/frameworks/av/media/libstagefright/StagefrightMediaScanner.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/libstagefright/StagefrightMediaScanner.cpp
|
| db182fc307c3fd50ea287f0cdc1b2032d6c056c1 |
|
16-Nov-2012 |
Marco Nelissen <marcone@google.com> |
resolved conflicts for merge of 205d7249 to master
Change-Id: I3df408b6e30e0c0b2a19a3336134ce49fb73a8bb
|
| b7047796795083484c0bc9003f346b4022c3be9a |
|
16-Nov-2012 |
Marco Nelissen <marcone@google.com> |
resolved conflicts for merge of 205d7249 to master
Change-Id: I3df408b6e30e0c0b2a19a3336134ce49fb73a8bb
|
| 19af4c7966bda963f5d9143bd60f58a9e171cf0a |
|
16-Nov-2012 |
Jan Bjernler <jan2.bjernler@sonymobile.com> |
Add .mpga to acceptable file name extensions list.
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
/frameworks/av/media/libstagefright/StagefrightMediaScanner.cpp
|
| 03163f4ed4e130c5df454e3ab2a5bb3690c26be1 |
|
16-Nov-2012 |
Jan Bjernler <jan2.bjernler@sonymobile.com> |
Add .mpga to acceptable file name extensions list.
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
/frameworks/av/media/libstagefright/StagefrightMediaScanner.cpp
|
| 0332a0cfecd3f7a26dafd3c973a8bf4185fb85c8 |
|
08-Nov-2012 |
Marco Nelissen <marcone@google.com> |
Scan .awb files too
b/6122599
Change-Id: Ied3e0392939231447f1fc5685ca1fade1e55ce08
/frameworks/av/media/libstagefright/StagefrightMediaScanner.cpp
|
| f4fca226d2cb08862d0faa4918e181b3e73f6a0c |
|
08-Nov-2012 |
Marco Nelissen <marcone@google.com> |
Scan .awb files too
b/6122599
Change-Id: Ied3e0392939231447f1fc5685ca1fade1e55ce08
/frameworks/av/media/libstagefright/StagefrightMediaScanner.cpp
|
| a28976b04c70cef3c8e79137478b6a7bc05608ac |
|
13-Apr-2012 |
Marco Nelissen <marcone@google.com> |
Make mediascanner use filedescriptors instead of paths
Media scanner needs to open the files now, because media server doesn't
have the required permission.
b/6330061
Change-Id: I2364d93dcc0530c15676664fc4a8c306351dde08
/frameworks/av/media/libstagefright/StagefrightMediaScanner.cpp
|
| 4762a5164a986bd6a7ca0e7aba43881b64f146dd |
|
04-Apr-2012 |
Marco Nelissen <marcone@google.com> |
Send video width and height to mediascanner
b/5820120
Change-Id: Ia5c48eb1ab15fe3bbe773131148470a06eb2b96d
/frameworks/av/media/libstagefright/StagefrightMediaScanner.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/libstagefright/StagefrightMediaScanner.cpp
|
| 153cefdf4acab25355f590d7760ebf73ef6096a9 |
|
18-Nov-2011 |
Marco Nelissen <marcone@google.com> |
status_t != bool
b/5567433
Change-Id: I255ab8c3b0b5e0ea6a5cc7c05df757c667f3855e
/frameworks/av/media/libstagefright/StagefrightMediaScanner.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/libstagefright/StagefrightMediaScanner.cpp
|
| 2944eca607304a095ea43ba2b8f0b9de61249f9f |
|
08-Sep-2011 |
Andreas Huber <andih@google.com> |
Support for an MPEG2 Program Stream extractor.
Change-Id: I606d87c278f72b22a5b6d7ee57bce6b02e280d41
/frameworks/av/media/libstagefright/StagefrightMediaScanner.cpp
|
| 7188e55f54a43c55fd6b96454720c447f1dc454e |
|
21-Jul-2011 |
Jeff Brown <jeffbrown@google.com> |
Untangle MediaScanner error handling.
Bug: 5056917
Change-Id: I1a7a73579e3ba4e9709459329fc1901a28b0f4b1
/frameworks/av/media/libstagefright/StagefrightMediaScanner.cpp
|
| 0d0edfb024f65f7e1097bf1814ae229ce9cb367d |
|
27-Jun-2011 |
Gloria Wang <gwang@google.com> |
- Retrieve is_drm in MediaMetadataRetriever.
- 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
/frameworks/av/media/libstagefright/StagefrightMediaScanner.cpp
|
| f8374dec590223ebdd6959b26d9ba90749dd8328 |
|
24-Mar-2011 |
Andreas Huber <andih@google.com> |
Support for divx files, i.e. mpeg 4 video + mpeg audio layer III in .avi files
Change-Id: I6e1e989c43300ddb0d341e3e9183cdccd69eeae6
related-to-bug: 4192562
/frameworks/av/media/libstagefright/StagefrightMediaScanner.cpp
|
| 8d30cc86d36c5e2d7d8defab8f58faed4139ed7f |
|
29-Mar-2011 |
Andreas Huber <andih@google.com> |
Adding support for the '.mxmf' MIDI file extension.
Change-Id: Ic73e2f843f8640dd794d090413cf63232f0182b9
related-to-bug: 4186454
/frameworks/av/media/libstagefright/StagefrightMediaScanner.cpp
|
| 856990b491d84b7ed4fefe337485c8997ba9dd02 |
|
13-Jan-2011 |
Glenn Kasten <gkasten@google.com> |
Bug 1804058 FLAC extractor
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
/frameworks/av/media/libstagefright/StagefrightMediaScanner.cpp
|
| 0a095d09464ba18e288a3f529410af0f1257ac2a |
|
26-Jan-2011 |
Mike Lockwood <lockwood@android.com> |
StagefrightMediaScanner: Close metadata retriever after we are done scanning
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>
/frameworks/av/media/libstagefright/StagefrightMediaScanner.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/libstagefright/StagefrightMediaScanner.cpp
|
| 11f8109ad8646d3acd9a0987613229cde59d52c1 |
|
06-Jan-2011 |
Marco Nelissen <marcone@google.com> |
Add support for the "compilation" tag in mp3, mp4 and ogg, and also add
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
/frameworks/av/media/libstagefright/StagefrightMediaScanner.cpp
|
| 8577676b0f9247f994ca00bc59fdbcd1318e32b6 |
|
20-Nov-2010 |
Jean-Baptiste Queru <jbq@google.com> |
am 716f60ce: resolved conflicts for merge of e2ec61b2 to gingerbread-plus-aosp
* commit '716f60ce605131429dc9efe8f351f0da0c8cc8c2':
StagefrightMediaScanner: Call endFile() for MIDI and OGG files.
|
| 97c9a2ec2a67969de0c5fcbcc03e9ffc8f50e807 |
|
20-Nov-2010 |
Jean-Baptiste Queru <jbq@google.com> |
resolved conflicts for merge of e2ec61b2 to gingerbread-plus-aosp
Change-Id: I81930c62e2f78b129995cffb8b1bf3332879c7cf
|
| 6ed70d2d41f9929d1c3f5179d947766495f9efe5 |
|
06-Nov-2010 |
Hiroshi Takekawa <sian@big.or.jp> |
StagefrightMediaScanner: Call endFile() for MIDI and OGG files.
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
/frameworks/av/media/libstagefright/StagefrightMediaScanner.cpp
|
| c7fc37a3dab9bd1f96713649f351b5990e6316ff |
|
16-Nov-2010 |
James Dong <jdong@google.com> |
64-bit file size/offset support for media framework
Change-Id: I3452bc2c0f1d990cc67285df2fce1f9f86ff8e10
/frameworks/av/media/libstagefright/StagefrightMediaScanner.cpp
|
| 51ef3f681e275f6edc6886c7a2dd409e6734a0ee |
|
01-Nov-2010 |
Gloria Wang <gwang@google.com> |
Media scanner support for FL(Forward Lock) DRM file types
Change-Id: Id85edbfc2851d9054a7433d24bb5cf33a457a4e5
/frameworks/av/media/libstagefright/StagefrightMediaScanner.cpp
|
| cda17c606b0fe3ccda4dc68a6d43882410ea2462 |
|
07-Jun-2010 |
Andreas Huber <andih@google.com> |
Initial checkin of mpeg2 transport stream parser for stagefright.
Change-Id: I328ce77404daf7127933b48c9d58ed504fb8fc6f
/frameworks/av/media/libstagefright/StagefrightMediaScanner.cpp
|
| 4595be952e3b1d6776a023e3f447c057797f1505 |
|
25-May-2010 |
Andreas Huber <andih@google.com> |
Support for ogg(vorbis) metadata in stagefright including album art.
Change-Id: I0c8c0136cebe2d2d97caabb7bc0c65be86329dbb
related-to-bug: 2713414
/frameworks/av/media/libstagefright/StagefrightMediaScanner.cpp
|
| 093437c388e5dff6903a3d43f2ca9f8a1ba4744a |
|
20-May-2010 |
Andreas Huber <andih@google.com> |
Support for media extraction from .mkv/.mka Matroska files in stagefright.
Change-Id: I4c26579828ad575523ccf58b0b5cb144046c04ca
related-to-bug: 2483739
/frameworks/av/media/libstagefright/StagefrightMediaScanner.cpp
|
| ee7ff20e69498ebd53dd9717a0f984188341a75e |
|
07-May-2010 |
Andreas Huber <andih@google.com> |
A new OggExtractor/VorbisDecoder combo to support approximate seeking.
Change-Id: Id5d0c1c8b1adc62896bb5ed951f7b5cfda811e95
related-to-bug: 2654400
/frameworks/av/media/libstagefright/StagefrightMediaScanner.cpp
|
| 2e39c1ca101e01ff13b03129a87939e7982b25bf |
|
10-Mar-2010 |
Andreas Huber <andih@google.com> |
Instead of instantiating StagefrightMetadataRetriever directly, instantiate a MediaMetadataRetriever which will do-the-right-thing(tm) even for .wma/.wmv/.asf files.
Change-Id: Ibda4b5268514934f14a3d49a564902bc670f4384
related-to-bug: 2074137
/frameworks/av/media/libstagefright/StagefrightMediaScanner.cpp
|
| 66ac4df65516ebfd0e500bfca75dc4b5ef8d674e |
|
11-Feb-2010 |
Marco Nelissen <marcone@google.com> |
Add support for "album artist" tag.
/frameworks/av/media/libstagefright/StagefrightMediaScanner.cpp
|
| 6c8a9a4132337a3419a72a735f0b40df0b82061f |
|
08-Feb-2010 |
Marco Nelissen <marcone@google.com> |
Add support for the TPOS/TPA (disc number) id3 tag.
/frameworks/av/media/libstagefright/StagefrightMediaScanner.cpp
|
| 7be6407f2ad7f2b0782d195d9f792072c084d6f5 |
|
13-Jan-2010 |
Andreas Huber <andih@google.com> |
Support for determining the mime type of media via metadata extraction.
/frameworks/av/media/libstagefright/StagefrightMediaScanner.cpp
|
| fc9ba09e3bb368f823d473f5e2bb9aa32dba6289 |
|
12-Jan-2010 |
Andreas Huber <andih@google.com> |
Squashed commit of the following:
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
/frameworks/av/media/libstagefright/StagefrightMediaScanner.cpp
|
| 67e5a4f6f6879d512a859e5dba92e9beec7a2f91 |
|
08-Jan-2010 |
Andreas Huber <andih@google.com> |
Reorganize some of the stagefright implementation related to metadata.
/frameworks/av/media/libstagefright/StagefrightMediaScanner.cpp
|