| 8409c0691fb128fef6244305977342776bddf919 |
|
19-Jan-2016 |
Jaesung Chung <jaesung@google.com> |
Enable reading a thumbnail from RAW image files in MtpDatabase
Also introduce new supported RAW image file formats, PEF and SRW.
RAW image file formats are not defined in PTP 1.2 specification except
for DNG. They are mostly built on top of TIFF or TIFF/EP. (Fuji's RAF
is the exception).
In this CL, image file formats are classified newly as below:
DNG: dng
TIFF: cr2, nrw, arw, rw2, orf, pef, srw
TIFF/EP: nef
Unknown Image Formats(FORMAT_DEFINED): wbmap, webp, raf
I referred to the following documents for defining MTP formats of RAW
images:
* http://www.rags-int-inc.com/PhotoTechStuff/RawStandards/RawSummary.html
* https://en.wikipedia.org/wiki/Raw_image_format
Bug: 26552863, Bug: 26626825
Change-Id: Ia218f6320c4c1ff051a23ca0060ceac46134b0d7
/frameworks/base/media/java/android/media/MediaFile.java
|
| 5a8b9627c7fdacc94791fb3024386739f8cf9a56 |
|
18-Dec-2015 |
Jaesung Chung <jaesung@google.com> |
Extend MediaScanner and MtpDatabase to support RAW image files
Bug: 25871812
Change-Id: Iee92632585dc9020238a9b562defd06d6d2a91dc
/frameworks/base/media/java/android/media/MediaFile.java
|
| 6090995951c6e2e4dcf38102f01793f8a94166e1 |
|
19-Nov-2013 |
John Spurlock <jspurlock@google.com> |
Remove unused imports from frameworks/base.
Change-Id: Ia1f99bd2c1105b0b0f70aa614f1f4a67b2840906
/frameworks/base/media/java/android/media/MediaFile.java
|
| dcb1a58cf9d66b36de825dae2fa0cb0529e60680 |
|
02-Aug-2013 |
Elliott Hughes <enh@google.com> |
If media wants ASCII lowercasing, it needs to ask for it.
http://elliotth.blogspot.com/2012/01/beware-convenience-methods.html
Use toLowerCase(Locale.ROOT) if you want ASCII for machine consumption,
and use toLowerCase(Locale.getDefault()) if you want the user's locale's
casing rules for human consumption.
Bug: https://code.google.com/p/android/issues/detail?id=58359
Change-Id: Id9005a17e34217a81bef3b40031b9e2e6272f45d
/frameworks/base/media/java/android/media/MediaFile.java
|
| 2d286f4984d478cc5947a3a3ceea85b292d5f920 |
|
07-Aug-2012 |
Mike Lockwood <lockwood@google.com> |
MediaFile: Fix case sensitive file extension matching for computing MTP format code
Bug: 6939136
Change-Id: Iefd4083aefbd4b175a2f8c860a9e13c99ded9c82
Signed-off-by: Mike Lockwood <lockwood@google.com>
/frameworks/base/media/java/android/media/MediaFile.java
|
| 0237d04b9564b9ef3e443091a4bce7dc5a2f1826 |
|
08-Jun-2012 |
Jean-Baptiste Queru <jbq@google.com> |
am 644e43e0: am 3e3d641c: Merge "Added mpga as valid MediaFile extension"
* commit '644e43e06ffa5b493ca3682c24b8db606deed664':
Added mpga as valid MediaFile extension
|
| 2fe37b7005776c50fbb3a3661f5823fb6c890b81 |
|
28-Sep-2010 |
Mathias Franzén <mathias.franzen@sonyericsson.com> |
Added mpga as valid MediaFile extension
Added mpga as a valid media file extension, it is treated as mp3.
Change-Id: Ie39036d61b6ca50439861fa10be0d824dcc65ed3
/frameworks/base/media/java/android/media/MediaFile.java
|
| dc912ed9c6f1a0812bd07e5a24600c5b438a54bb |
|
03-Apr-2012 |
Marco Nelissen <marcone@google.com> |
Support audio/ogg mimetype
audio/ogg has been the official mimetype for ogg vorbis audio for
a while now, so we should support it.
b/5824157
Change-Id: Ica86bdb3099a10785f1da9c3413284f3e11dc27e
/frameworks/base/media/java/android/media/MediaFile.java
|
| 30c918ce7fbe171944b28fc91b3f22b3d631872d |
|
11-Nov-2011 |
Glenn Kasten <gkasten@google.com> |
Use final on new member variables
Use final for member fields initialized to a new and that are never modified.
Change-Id: I042352c7bc21879613e7a50b1205b6923f8083cf
/frameworks/base/media/java/android/media/MediaFile.java
|
| bc554956128d69d8d2e60365fb6cffe6facf659b |
|
08-Sep-2011 |
Andreas Huber <andih@google.com> |
Support for an MPEG2 Program Stream extractor.
Change-Id: I606d87c278f72b22a5b6d7ee57bce6b02e280d41
/frameworks/base/media/java/android/media/MediaFile.java
|
| ff535914825f63999648030a02f57767593462f0 |
|
10-Aug-2011 |
Mike Lockwood <lockwood@android.com> |
Use video/webm mime type for WEBM files
Bug: 5042137
Change-Id: I677af1b4f34c37c78f84229551a8d82f1a7bf245
Signed-off-by: Mike Lockwood <lockwood@android.com>
/frameworks/base/media/java/android/media/MediaFile.java
|
| bd682b040833fce9e212c00c395b32bec7050f87 |
|
11-Jul-2011 |
Mike Lockwood <lockwood@android.com> |
MediaScanner: Use bulk inserts when in batch mode
To do this we need to move the logic for determining media type to MediaProvider
Make some things in MediaFile public so they can be used from MediaProvider
Bug: 4948188
Change-Id: I6ab168b6b4d45b2fc91ea8bd52ca58283b0efc14
Signed-off-by: Mike Lockwood <lockwood@android.com>
/frameworks/base/media/java/android/media/MediaFile.java
|
| 7f61f5919d193d8ae158ce8a52ca69c9f2be8777 |
|
06-Jul-2011 |
Vikas Arora <vikasa@google.com> |
Associate WebP Mime-Type with FILE_TYPE_WEBP.
The last change for adding WEBP Mime-Type
(https://android-git.corp.google.com/g/#change,112919) had this bug.
Fixing the bug in this change.
Change-Id: I084b66de4aabb3892fb0e6fa36062a52d4dcc224
/frameworks/base/media/java/android/media/MediaFile.java
|
| d0881d95e2d4eceab37288f88f43f771e08eab65 |
|
02-Jun-2011 |
Vikas Arora <vikasa@google.com> |
Add WebP Mime-Type support in Android Media File
Change-Id: Ifaa64c8fc55d1f1ad14db3057821696b565e0c26
/frameworks/base/media/java/android/media/MediaFile.java
|
| f9cf277cda5d7cdf8383331892cca0734a850e19 |
|
19-May-2011 |
Gloria Wang <gwang@google.com> |
Add one more MIME type (audio/aac-adts) for aac file.
Fix for bug 4463059.
Change-Id: Ie2125349667e65b41871a228d87e4dce6b513398
/frameworks/base/media/java/android/media/MediaFile.java
|
| cabb7da7125a80c55233bd23959327424e9646cc |
|
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/base/media/java/android/media/MediaFile.java
|
| eecadb9a84f357fb224592cc77603ff3e7c28f08 |
|
29-Mar-2011 |
Andreas Huber <andih@google.com> |
Adding support for the '.mxmf' MIDI file extension.
Change-Id: Ic73e2f843f8640dd794d090413cf63232f0182b9
related-to-bug: 4186454
/frameworks/base/media/java/android/media/MediaFile.java
|
| 16dc3073a2f06a77d9873e536f633a4adf575fce |
|
18-Feb-2011 |
Mike Lockwood <lockwood@android.com> |
Don't treat WMV and ASF files as video files unless WMV is supported
Change-Id: I512d1db67e06273d9c23d10fa30d2d62f9f75a75
Signed-off-by: Mike Lockwood <lockwood@android.com>
/frameworks/base/media/java/android/media/MediaFile.java
|
| f9f223edb408cdc9fd946dc099a86857079a639f |
|
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/base/media/java/android/media/MediaFile.java
|
| 0cd0136d440cf6ad9d5fab430269116786e671ec |
|
30-Dec-2010 |
Mike Lockwood <lockwood@android.com> |
Move MTP Java classes to android.mtp.* package.
Change-Id: Ib18bcaabf314241a95e517d0b93be5845d988e2c
Signed-off-by: Mike Lockwood <lockwood@android.com>
/frameworks/base/media/java/android/media/MediaFile.java
|
| b5c6afc208bd70eba386dbb2c0fb29b34e44e4d4 |
|
02-Dec-2010 |
Andreas Huber <andih@google.com> |
Squashed commit of the following:
commit de99ae4a523ff5ec40b47071f22fdde1a4b2a0bf
Author: Andreas Huber <andih@google.com>
Date: Thu Dec 2 13:18:40 2010 -0800
Scan for sync words to find H.264 frame/AAC frame boundaries if PES packets do not start with them.
Change-Id: If2861982ecb3006fac806105dbfcd1d43c2a4205
commit be23791ff0d037aa7073589cdc8bfc362e1c281d
Author: Andreas Huber <andih@google.com>
Date: Thu Dec 2 13:12:39 2010 -0800
Properly expand relative key URLs and strip surrounding quotes in the M3UParser.
Change-Id: I013a6d83a64f095d090e5c7730298bdac7d03ab4
commit 0f1d8f65effe0cc42a265dd91d8b91dce6534325
Author: Andreas Huber <andih@google.com>
Date: Thu Dec 2 13:11:27 2010 -0800
Ugly hack that assumes that any http url containing "m3u8" refers to an httplive stream.
Change-Id: I05d7bbc5dab0f9822558122b5b9dc2a109ed8518
commit 255f0d5cdb1072ecd66b47ee614bf574f1388e5a
Author: Andreas Huber <andih@google.com>
Date: Thu Dec 2 13:10:56 2010 -0800
Add one more mimetype "application/x-mpegurl" to identify httplive playlists.
Change-Id: I63fd3b8c2539c9ee23c077df533157af78b10863
Change-Id: I135687383009dbe32d690c9ba8dea60159adc616
/frameworks/base/media/java/android/media/MediaFile.java
|
| 5dffd0e3af502acdc2e45425139ef8081fa4f0a8 |
|
15-Nov-2010 |
Andreas Huber <andih@google.com> |
Add http live mime types to MediaFile, add support for playlist mime types to browser.
Change-Id: I1f0b31dd2f4e6cfa33a61ff8505e8396aca3c20f
related-to-bug: 2368598
/frameworks/base/media/java/android/media/MediaFile.java
|
| 28d1a4aaf3c338f42d7b71d4653be707f06948a6 |
|
11-Nov-2010 |
Mike Lockwood <lockwood@android.com> |
MediaFile: Recognize MPG file extension as MPEG video
Change-Id: Ief7308e5f562754a27f07e4fda970ffd7b1eb98e
Signed-off-by: Mike Lockwood <lockwood@android.com>
/frameworks/base/media/java/android/media/MediaFile.java
|
| 5d143ad4a8f8c90f44e185a494ff3ff638e6c103 |
|
01-Nov-2010 |
Gloria Wang <gwang@google.com> |
Media scanner support for FL(Forward Lock) DRM file types
Change-Id: Id85edbfc2851d9054a7433d24bb5cf33a457a4e5
/frameworks/base/media/java/android/media/MediaFile.java
|
| 45b43622e329c25c6070a3f2f2fc2ba5a14533bb |
|
27-Oct-2010 |
Vasu Nori <vnori@google.com> |
add method in MediaFile to determine if a file is a mediatype of not
this helps DownloadService to avoid invoking MediaScanner on
pdf or other non-mediatype files.
Change-Id: I92514e1a11f5119229c0c7292e410e352a9dbcdd
/frameworks/base/media/java/android/media/MediaFile.java
|
| fde2ca180ea63ebd314770ec55b97e0a3c5a0788 |
|
11-Sep-2010 |
Mike Lockwood <lockwood@android.com> |
MediaFile: Add support for some popular non-media file types.
Change-Id: I68379740b535b08e707158f357e4e58a9c4d74ec
Signed-off-by: Mike Lockwood <lockwood@android.com>
/frameworks/base/media/java/android/media/MediaFile.java
|
| c37255d5d0fd9e0ec02b0d7cb5c4b235e200d367 |
|
10-Sep-2010 |
Mike Lockwood <lockwood@android.com> |
Media scanner support for tracking files of arbitrary type.
The native media scanner no longer filters files based on file extension.
Audio, video, image and playlist files are handled as before, but non-media
files are now inserted into the "files" table, which was originally added
to support MTP.
Change-Id: I9053218fb6d2671a3bb181405c34442b94678afc
Signed-off-by: Mike Lockwood <lockwood@android.com>
/frameworks/base/media/java/android/media/MediaFile.java
|
| 5367ab6aab2a61aaf534b18576dcdd0bca1b9681 |
|
30-Aug-2010 |
Mike Lockwood <lockwood@android.com> |
MTP: Move all MTP protocol constants for Java to a central location.
Change-Id: I770d8727f84d25f0781fc23eedd9e9ac9ded1992
Signed-off-by: Mike Lockwood <lockwood@android.com>
/frameworks/base/media/java/android/media/MediaFile.java
|
| d815f79766984fce499e147ecbacc01914683f74 |
|
12-Jul-2010 |
Mike Lockwood <lockwood@android.com> |
Integrate host to device file transfer with the media provider.
MTP file transfers happen in two stages. The SendObjectInfo command sends
some information about the file and reserves an ObjectHandle for the new file.
The file transfer is then performed using the SendObject command.
To support this in the media provider, MtpDatabase.beginSendObject receives
the information from SendObjectInfo and creates an row for it in the MTP objects
table for the new file. After the file transfer has completed, then
MtpDatabase.endSendObject is called. In endSendObject, we run the media scanner
on the new file, which will add a row to the images, audio, video
or audio playlist table.
To avoid the media scanner creating a second row for the file in the MTP objects
table, we pass the ObjectHandle created in beginSendObject to the media scanner,
which then passes it to the media provider via the content values when it
performs its insert.
Change-Id: I1ebcc63d6bd4404b0d3a93c703a9d3c097381d3a
Signed-off-by: Mike Lockwood <lockwood@android.com>
/frameworks/base/media/java/android/media/MediaFile.java
|
| d21eac9c70940f2c73da5faaf401dbbc44b70a15 |
|
03-Jul-2010 |
Mike Lockwood <lockwood@android.com> |
MTP: Use media provider database to implement MTP device support.
Uses a new "MTP objects" table in the media provider to support basic
enumeration of the external storage file system.
Support for accessing audio, video and image metadata in the existing
media provider tables will be added in a later commit.
The C++ MtpDatabase class is now abstract, to support a proxy subclass that
calls through JNI to the Java MtpDatabase class in the media provider.
Change-Id: I90f0db5f3acc5d35ae78c27a8507edff16d14305
Signed-off-by: Mike Lockwood <lockwood@android.com>
/frameworks/base/media/java/android/media/MediaFile.java
|
| a557b24ac4dd568d86b08753f7c0361d04f80d46 |
|
07-Jun-2010 |
Andreas Huber <andih@google.com> |
Initial checkin of mpeg2 transport stream parser for stagefright.
Change-Id: I328ce77404daf7127933b48c9d58ed504fb8fc6f
/frameworks/base/media/java/android/media/MediaFile.java
|
| 072f5247ef893e683728263a540bb93daafda376 |
|
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/base/media/java/android/media/MediaFile.java
|
| 68db99ef761456ffaa0c4b918ce75dfc0892784a |
|
17-Feb-2010 |
James Dong <jdong@google.com> |
Replace system property retrieval calls with DecoderCapabilities Java API calls.
/frameworks/base/media/java/android/media/MediaFile.java
|
| 1b50044a271208bdb0893ed941bd21168faf90c4 |
|
16-Dec-2009 |
James Dong <jdong@google.com> |
Add MPEG to the file extensions that scanner cares
/frameworks/base/media/java/android/media/MediaFile.java
|
| 9a488b44cb479bc42375d2cfcdd4aa6161dc17cf |
|
05-Jan-2010 |
Marco Nelissen <marcone@google.com> |
MediaFile.UNKNOWN_STRING -> MediaStore.UNKNOWN_STRING
/frameworks/base/media/java/android/media/MediaFile.java
|
| 0ddbc35dc4974fbe18a4191e579b1eda5a7ef2b1 |
|
27-Sep-2009 |
Marco Nelissen <marcone@google.com> |
Only scan windows media files when those codecs are enabled.
/frameworks/base/media/java/android/media/MediaFile.java
|
| 974ff946d114610ec41172fb6076d9d8810c3680 |
|
27-Jun-2009 |
Ravi K Yenduri <yenduri@pv.com> |
Add support for .aac and .asf extensions.
/frameworks/base/media/java/android/media/MediaFile.java
|
| d282ac8610f72d964105efefe41120a5340f1ce0 |
|
14-May-2009 |
Marco Nelissen <marcone@google.com> |
Findbugs fixes.
/frameworks/base/media/java/android/media/MediaFile.java
|
| 9066cfe9886ac131c34d59ed0e2d287b0e3c0087 |
|
04-Mar-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //depot/cupcake/@135843
/frameworks/base/media/java/android/media/MediaFile.java
|
| d83a98f4ce9cfa908f5c54bbd70f03eec07e7553 |
|
04-Mar-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //depot/cupcake/@135843
/frameworks/base/media/java/android/media/MediaFile.java
|
| d24b8183b93e781080b2c16c487e60d51c12da31 |
|
11-Feb-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //branches/cupcake/...@130745
/frameworks/base/media/java/android/media/MediaFile.java
|
| 54b6cfa9a9e5b861a9930af873580d6dc20f773c |
|
21-Oct-2008 |
The Android Open Source Project <initial-contribution@android.com> |
Initial Contribution
/frameworks/base/media/java/android/media/MediaFile.java
|