4615 Commits

Author SHA1 Message Date
Mike Lockwood
9c112a86de DO NOT MERGE MediaScanner: reimplement the ".nomedia" feature for hiding files from the media provider
Previously we ignored any files and directories that had name started with '.'
and ignored any directories that contained a ".nomedia" file.
Now to support transferring any file via MTP, we now add these previously ignored files
to the media database, but will not mark them as audio, video, image or playlist files.
That way they will be included in the files table but will be hidden from the
audio, video, images and playlist views that are used by apps like Music and Gallery.

Bug: 3405327

Change-Id: Ibb37bb2856a0684ce9f685ed565ad35347622834
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-05-03 21:03:56 -04:00
Marco Nelissen
1cf74fb3c4 DO NOT MERGE Fix media scanner uri handling.
If a file was originally considered a video file (because it had
a .mp4 extension, for example), but was then discovered to have
only an audio track, it would update the type, but not the URI
for insertion into the media provider.

Change-Id: I25652a031b98d2ec2433263dd6f344ba90d2d112
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-05-03 21:03:56 -04:00
Mike Lockwood
7ae938be1b DO NOT MERGE MTP and media provider support for multiple storage devices:
- MTP support for multiple storage units

- Add storage_id column to media database for MTP storage ID

- Add framework resource for defining mount points and user visible descriptions
for multiple volumes

- Clean up locking in MtpServer JNI code

Change-Id: Ide6d47bd9aa1698ed2a13d695613e03f2a9b29e3
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-05-03 21:03:56 -04:00
Gloria Wang
c6091ddd3a Initial CL for the timed text support:
- Add support for MP4 timed text
- Add API for app to turn on/off a text track
- Add timed text metadata(language) in the MediaMetadataRetriever

Change-Id: I0055beba38ac761627dbcc6d581ae9582d68bb94
2011-05-03 16:41:17 -07:00
Iliyan Malchev
b2a153adc9 frameworks/base: android_native_buffer_t -> ANativeWindowBuffer
Change-Id: Idc2eabaa805bb6d308ebb315872623f28d428417
Signed-off-by: Iliyan Malchev <malchev@google.com>
2011-05-03 16:40:14 -07:00
Mike Lockwood
ade06df0fe MediaScanner: Add special casing of WMP album art files to isNoMediaPath()
This will prevent MediaProvider from adding these files to the images table

Change-Id: I496a108b52a481c78dbf58c4e62996656b1fcbb9
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-05-02 18:53:45 -04:00
Mike Lockwood
214f9db054 MediaScanner: Fix bug in "no media" handling logic
Don't let the "no media" status of one directory leak to the remaining files
and directories in the same parent.

Bug: 4364077

Change-Id: I30943222dc292818cff00ee8169be7a695eed174
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-05-02 17:04:19 -04:00
Gloria Wang
efc69d72c9 Merge "Add setParameter/getParameter to MediaPlayer API. for bug 1982947" 2011-04-29 16:35:26 -07:00
James Dong
a1f6a09a86 am f181e416: am ec78f551: Add avg bandwidth estimate every 2 seconds - do not merge.
* commit 'f181e416ee3f104e79be2c2a76e9c1c25a214e17':
  Add avg bandwidth estimate every 2 seconds - do not merge.
2011-04-29 14:53:30 -07:00
James Dong
f181e416ee am ec78f551: Add avg bandwidth estimate every 2 seconds - do not merge.
* commit 'ec78f551b575b0274cbe796f8e08a9df1a706680':
  Add avg bandwidth estimate every 2 seconds - do not merge.
2011-04-29 14:42:58 -07:00
Gloria Wang
f16e1ab0a9 Add DRM errors in the DRM frameworks to MediaErrors also.
For bug 4350156.

Change-Id: Ib5711ec642178a49203a448b7f5114e675d49394
2011-04-29 11:01:36 -07:00
Gloria Wang
d01ec6eab0 Add setParameter/getParameter to MediaPlayer API.
for bug 1982947

Change-Id: If3f40e4f18cbba155af29944af38bdc627f8cd53
2011-04-29 10:24:03 -07:00
Conley Owens
c5505f6a15 Merge "Improved conversion accuracy of exif geotag data" 2011-04-29 09:48:10 -07:00
James Dong
ec78f551b5 Add avg bandwidth estimate every 2 seconds - do not merge.
This patch is meant for testing only.
We will remove this patch once we tracked down all those spinning issues.

related-to-bug: 4339075

Change-Id: I4cf1927f1067d4f7dbc589ceb3c47407eaf40ae7
2011-04-28 17:16:03 -07:00
Dima Zavin
058520e9ee Merge changes I22d9e018,Ib0701fcc,Ibc637918,I9eb7e002,I4adcec73
* changes:
  audioflinger: don't do work in constructor, instead do it in onFirstRef
  audioflinger: enumerate all the possible audio interfaces
  audio/media: convert to using the audio HAL and new audio defs
  libmedia: move AudioParameter out of AudioSystem
  audioflinger: move legacy audio hw/policy out to libhardware_legacy
2011-04-27 17:13:46 -07:00
Andreas Huber
e23a392f70 Fix omx_tests to no longer refer to test files that are no longer available.
Also make sure that a seek beyond EOF does not just seek the final syncframe.

Change-Id: I0a58490ef719ce095a94f1d6909c60eb20074a0b
2011-04-27 15:01:50 -07:00
Dima Zavin
24fc2fb1c5 audio/media: convert to using the audio HAL and new audio defs
Change-Id: Ibc637918637329e4f2b62f4ac7781102fbc269f5
Signed-off-by: Dima Zavin <dima@android.com>
2011-04-27 13:10:10 -07:00
Dima Zavin
4dc22e77cf libmedia: move AudioParameter out of AudioSystem
Change-Id: I9eb7e002d141936258050d4fa4f0ccd8202bfc54
Signed-off-by: Dima Zavin <dima@android.com>
2011-04-27 10:48:38 -07:00
James Dong
a277c4328f Merge "Give PSP and QuickTime compatible mp4 files a chance to play" 2011-04-25 21:54:56 -07:00
Mike Lockwood
c89f22242b MTP: Implement GetThumb command
This allows the PC to access thumbnails in JPEG files over MTP/PTP

Bug: 3219495

Change-Id: I4964f8b4826dffb7f0f77464ec91bd2e97a2f007
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-04-25 17:40:33 -07:00
Mike Lockwood
466e3a22db Merge "MTP: Fix file descriptor leak in file editing extensions" 2011-04-25 13:37:44 -07:00
Mike Lockwood
1003199cb8 MTP: Fix file descriptor leak in file editing extensions
Change-Id: I6d0de5efe705d8060bbfd526c6880dc995a3aa30
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-04-25 13:36:11 -07:00
James Dong
a13802d880 Merge "Return status code from invoke()" 2011-04-25 10:21:43 -07:00
Mike Lockwood
997354e4b4 MediaScanner: reimplement the ".nomedia" feature for hiding files from the media provider
Previously we ignored any files and directories that had name started with '.'
and ignored any directories that contained a ".nomedia" file.
Now to support transferring any file via MTP, we now add these previously ignored files
to the media database, but will not mark them as audio, video, image or playlist files.
That way they will be included in the files table but will be hidden from the
audio, video, images and playlist views that are used by apps like Music and Gallery.

Bug: 3405327

Change-Id: I2d7285bd32e06c1a5c4ef6a8a15f8f8b2c33b39b
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-04-25 09:21:54 -07:00
Mike Lockwood
653935da6b Remove log spam
Change-Id: I3182576158c7c0410c19036a580fd46c6ab079f9
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-04-24 11:09:42 -07:00
Mike Lockwood
825e8716a6 Merge "MTP: Add extended operations to support in-place editing of files" 2011-04-23 08:55:59 -07:00
Mans Rullgard
c290b590db stagefright aacenc/amrwbenc: Convert line breaks to Unix style
Change-Id: I6219725a9fbd72432bad71a176c14f26fabdbd5f
2011-04-23 16:11:46 +03:00
James Dong
34d76acc4e Remove the assertion and report content malform error to application
Change-Id: I8e30c586048d38334fd4366959a124a99d8efe28
related-to-bug: 4267147
2011-04-22 13:21:49 -07:00
hongteng
2fb605a088 Fix for issue 3385135 "source code cleanup" engine part
- remove the unused header files

Change-Id: I78971f7a6ae9325ce96a474e448c6f3d586d7ba6
2011-04-22 11:46:10 -07:00
Mike Lockwood
9df53fae3a MTP: Add extended operations to support in-place editing of files
MTP does not support partial writes of files (the entire file must be transferred at once).
This makes it impossible to implement a FUSE file system for MTP
with acceptable performance.
To fix this problem, this change adds extended MTP operations to allow
partial writes to files:

SendPartialObject - allows writing a subset of a file, or appending to the end of a file

TruncateObject - allows changing the size of a file

BeginEditObject - must be called before using SendPartialObject and TruncateObject

EndEditObject - commits changes to a file after it has been edited with SendPartialObject or TruncateObject

We also add GetPartialObject64, which is the same as GetPartialObject
but has a 64 bit offset rather than 32.

Change-Id: I4b110748b97ae05cdc8aab02ecdbbbeb263f7840
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-04-22 07:11:20 -07:00
Shyam Pallapothu
c0125dd4f1 Fix for issue 4133431 "Remove OSAL layer" in JNI part
Change-Id: I4d38454cdf32cb87dadeedcecd19261dd0b0b927
2011-04-21 19:13:56 -07:00
Dianne Hackborn
4c1f4f7144 Merge "Rework display size access." 2011-04-21 16:10:28 -07:00
Dianne Hackborn
f50e54e64b Remove config_caseSensitiveExternalStorage; no longer needed.
Change-Id: Id51c9e05be21d8087359cf918081109ba325569a
2011-04-21 15:20:34 -07:00
Dianne Hackborn
44bc17c6b5 Rework display size access.
Applications now get the display size from the window manager.  No
behavior should be changed yet, this is just prep for some real
changes.

Change-Id: I2958a6660895c1cba2b670509600014e55ee9273
2011-04-21 15:17:52 -07:00
Shyam Pallapothu
3feb41ff6f Fix for issue 4133431 "Remove OSAL layer" in JNI
Change-Id: I55f43989a8b89a3811468b30646fe1af0c87b386
2011-04-20 20:28:32 -07:00
Dheeraj Sharma
7743fa64b1 Fix for issue 4133431 "Remove OSAL layer" in JNI part"
Fix for issue 4133431

Change-Id: I5879b740e7104abca7f4e1e831629997a6eec781
2011-04-20 18:33:02 -07:00
Andreas Huber
72e738a428 Unhide MediaPlayer's setDataSource method that takes optional http headers to be
passed to the server.

Change-Id: I3c7ce140b2d9cd2483cf05c8aff9b374feff2f18
related-to-bug: 4315346
2011-04-20 10:55:54 -07:00
Andreas Huber
5087494011 Add extra headers specified in the media player's setDataSource call
to all http requests made by the http live implementation.

Change-Id: I9dd78bb261bc678ea98c82009ca2634b74f3cd58
related-to-bug: 4315346
2011-04-20 09:22:06 -07:00
Andreas Huber
bb32a94fb4 Make sure a read restarts the prefetcher if necessary.
Change-Id: I87cac0e61e4dce7987ddf29c32f51e1672d1bbed
related-to-bug: 4286618
2011-04-19 10:10:06 -07:00
Andreas Huber
d6309d6884 Merge "Remove streamability verification, it's taking too long. Also..." 2011-04-19 10:01:00 -07:00
Andreas Huber
5ce9eb9a34 am f0f1ceeb: DO NOT MERGE: Make sure we restart the prefetcher immediately when trying to satisfy a read.
* commit 'f0f1ceeb517ff226532a407da6d55602f195e5b5':
  DO NOT MERGE: Make sure we restart the prefetcher immediately when trying to satisfy a read.
2011-04-18 15:39:09 -07:00
Jean-Michel Trivi
2c3bf8e93d Merge "Fix bug 2659754 ConcurrentModificationException in audio focus changes" 2011-04-18 11:20:20 -07:00
Jean-Michel Trivi
95814b0268 Merge "Fix bug 2724503 Persist media button receiver across reboots" 2011-04-18 11:02:34 -07:00
Jean-Michel Trivi
72843377d5 Fix bug 2659754 ConcurrentModificationException in audio focus changes
While iterating over the audio focus stack or the media button
 receiver stacks, do not modify the stack other than through the
 iterator object.

Change-Id: Ice8827e7d29afed72b40c93edf7401cd54ba4b0c
2011-04-18 10:21:27 -07:00
Jean-Michel Trivi
d589fea865 Fix bug 2724503 Persist media button receiver across reboots
Whenever a new media button receiver is registered, save it
 in the settings.

When the system audio settings are reloaded or when the
 AudioService is created, the registered media button receiver
 is restored.

Whenever a package is removed from the system, remove
 any media button receiver from the same package that are in
 the media button receiver stack. If this causes the currently
 registered receiver to change (i.e. the top of the stack),
 this will cause an update of the receiver stored in the
 system settings.

Note that unregistering a media button receiver will not
 cause the receiver saved in the settings to be updated,
 this is ON PURPOSE. This is to prevent well behaved
 application who unregister their receiver at the destruction
 of their service, to not receive the intent after a reboot,
 and to not encourage applications to never unregister
 their receiver.

Change-Id: I941b777debaa56e88de93c3b03aec40331ea9ab1
2011-04-18 10:07:01 -07:00
Andreas Huber
44fdac0c62 Remove streamability verification, it's taking too long. Also...
make sure that findSampleAtTime uses composition time instead of decoding time,
at the expense of extra memory.

Change-Id: I67d09389b3df7ed265f614bdd0b142ca7f19f86a
related-to-bug: 4294536
2011-04-15 11:52:29 -07:00
Andreas Huber
f0f1ceeb51 DO NOT MERGE: Make sure we restart the prefetcher immediately when trying to satisfy a read.
Change-Id: I27c2b5d20ae577e71936d32522f70f6ba08cc247
related-to-bug: 4286618
2011-04-14 10:10:36 -07:00
Gloria Wang
966f9e558d Merge "- Add another parameter in notify() to be able to send timed text sample through listener during video playback. - Add OnTimedTextListener in the MediaPlayer For feature request 800939." 2011-04-13 15:36:14 -07:00
Glenn Kasten
3220d0a1de am 8d2e14da: am 34cd123a: am b0d6f10e: Bug 4167061 remove debugging code
* commit '8d2e14daa752d657b9747fc9734fbfd7b34c1f7a':
  Bug 4167061 remove debugging code
2011-04-13 11:56:41 -07:00
Glenn Kasten
8d2e14daa7 am 34cd123a: am b0d6f10e: Bug 4167061 remove debugging code
* commit '34cd123a2ee1aa9d13d7eb9ee9c9dd5a1cea50a4':
  Bug 4167061 remove debugging code
2011-04-13 11:52:32 -07:00