772 Commits

Author SHA1 Message Date
Basavapatna Dattaguru
64a2c359ae Merge "Fix Issue: 3373525: reduces app. 100mS in create" into honeycomb 2011-01-27 13:54:52 -08:00
Basavapatna Dattaguru
737bd08db0 Fix Issue: 3373525: reduces app. 100mS in create
Updated by removing code duplication

Updated with review comments

Change-Id: I57a596ed09d4d543964059e18a86e143108305ec
2011-01-27 12:24:19 -08:00
Gil Dobjanschi
eea200a96a Bug fix: 3398192 NPE at android.media.videoeditor.VideoEditorImpl.clearSurface
Change-Id: Ib7cb994e995d934cf896b856da462c9240fcb5f0
2011-01-27 09:51:46 -08:00
James Dong
20586a128c Eliminate duplicated code in export method
bug - 3385135

Change-Id: I26b8113b457bf08bf8a89cef25cf45cdba79c08d
2011-01-26 20:15:49 -08:00
Dharmaray Kundargi
9c077e44c0 Overlay java files Issue 3370836
Change-Id: If062ad12dc2f5faf58936436527234ce80dffad9
2011-01-26 11:35:29 -08:00
Santosh Madhava
4991a00b28 Merge "Review rework for issue 3385068 : Play gets out of sync" into honeycomb 2011-01-25 22:44:07 -08:00
Santosh Madhava
1abe0050fa Fix for issue 3366265 : Native crash exporting movie
Change-Id: I04195198031eeb7d34d4249b49a1092321a2eb0a
2011-01-25 20:41:55 -08:00
Santosh Madhava
de412d277c Review rework for issue 3385068 : Play gets out of sync
Change-Id: I7f7435bd898a72302500cdc15874e469922cbebe
2011-01-25 20:22:41 -08:00
Mike Lockwood
2b3da7ab61 Merge "MTP: Fix race conditions in MtpServer JNI code" into honeycomb 2011-01-25 15:44:28 -08:00
Mike Lockwood
071b2b6739 MTP: Fix race conditions in MtpServer JNI code
Make sure previous MtpThread has exited before starting another to avoid
EBUSY opening MTP kernel driver.

BUG: 3317803

Change-Id: I81dcbac42bcf5f680ed1b1469839bc0b0e49d53d
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-01-25 15:10:31 -08:00
Santosh Madhava
1c9ac91634 Merge "Fix for issue 3385068 : Play gets out of sync" into honeycomb 2011-01-25 14:46:15 -08:00
Jaikumar Ganesh
5cbb162262 Merge "Rename virtual call API to ScoUsingVirtualCall." into honeycomb 2011-01-25 13:56:02 -08:00
Jaikumar Ganesh
dde68c64fd Rename virtual call API to ScoUsingVirtualCall.
This API makes more sense with regard to headset profile.
Bug: 3381532

Change-Id: Ife07d101a3b04bcddb31e7ae86712e1d97a660c5
2011-01-25 13:49:35 -08:00
Santosh Madhava
a6714ce2bb Fix for issue 3385068 : Play gets out of sync
Change-Id: Iaf5e2f246b9cbfc5c8093d34ed085fe255ae500b
2011-01-25 13:15:43 -08:00
Dheeraj Sharma
1ac760afab Issue no : 3370622
VideoEditor: Fix for Clear Surface API

Change-Id: I8d4ad90dd2a0d37bd5363c36582a16f08b161bee
2011-01-24 22:52:40 -08:00
Santosh Madhava
9c0bd864a3 Merge "Review rework on Patch Set 2 for issue 3372849" into honeycomb 2011-01-24 22:33:44 -08:00
Santosh Madhava
6bcbb3bd09 Review rework on Patch Set 2 for issue 3372849
Change-Id: I3c077f3318e44035e8ea6eb160d0024e77aaa710
2011-01-24 22:10:19 -08:00
Wu-cheng Li
c8de291ee5 Merge "Improved conversion accuracy of exif geotag data" into honeycomb 2011-01-24 18:48:34 -08:00
James Dong
98dcca909a Reduce the JNI native method visibility
bug -3385135

Change-Id: I568b53d2279622b44ca5b8a23a8691ca3395f9a5
2011-01-24 15:56:11 -08:00
Santosh Madhava
4ff8a0b410 Resubmit of 'Fix for isssue 3369932 : stopPreview returns 0'
Change-Id: Id2e4598f29191c506ab99a112bd7743f6a794cd6
2011-01-24 10:17:05 -08:00
Dheeraj Sharma
05d9f81bd6 VideoEditor:Clear Surface API addition
Change-Id: I824c4a9d7f0a11ad60f8045eccc8b6139b66af22
2011-01-23 21:41:34 -08:00
Oscar Rydhe
a113a075ca Improved conversion accuracy of exif geotag data
Changed degrees and minutes of geotag data into double to avoid
data loss during cast.

Also improved error handling if geotag data can't be parsed.

bug:3381761
Change-Id: I864843c7fc699fe81e6acba801fe46d10a01925b
2011-01-24 12:52:07 +08:00
Mike Lockwood
f26a586c86 Remove MTP related log spam
Change-Id: I9de1792cbeec07fa5ab42ff9a10813f0c3d30fc1
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-01-21 21:00:54 -08:00
Santosh Madhava
9d5ca4a14c Fix for issue 3370052 : Export progress percentage is incorrect
Change-Id: If1a39ab4c34e44b84dc6ada7b4d7b634ac347099
2011-01-20 17:10:40 -08:00
Santosh Madhava
bdb2e79a41 Fix for PR 3369866 : Project thumbnail should have the same aspect ratio
Change-Id: I028f0c74f71c8b5497a6c904b93a3f09dde559e0
2011-01-20 14:52:06 -08:00
Gil Dobjanschi
c4edeb5a60 Bug fix: 368813 Transition is regenerated when overlay duration changes outside the transition
Change-Id: I8217e7fe00392455427e117dc54c3461301f95c5
2011-01-19 14:10:32 -08:00
Mike Lockwood
2bc6971dd8 Merge changes I7df1ff78,Ibc2e8adf into honeycomb
* changes:
  MediaScanner: Make sure name field is set for file based playlists
  MTP: Fix problem with MTP starting up on the first try.
2011-01-18 20:30:13 -08:00
Mike Lockwood
242d0cdc1a MediaScanner: Make sure name field is set for file based playlists
Change-Id: I7df1ff783d815d6021ec2432467ba56cb3f3ad1b
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-01-18 20:29:08 -08:00
Eric Laurent
74ff70d2f2 Merge "Fix typo" into honeycomb 2011-01-18 14:25:17 -08:00
Glenn Kasten
ed6eae420f Fix typo
Change-Id: I73e7c5cf13c5ed82398006af61308665eb1d3ad0
2011-01-18 14:13:28 -08:00
Mike Lockwood
8ed67acf38 MTP: Set modification date for abstract playlists
BUG: 3224269

Change-Id: I96ae8e6d2f7e28860e9217ceb911331b333e1391
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-01-18 13:27:25 -08:00
Mike Lockwood
8cc6eb1e4c MTP: Strip ".pla" file extension from name field for WMP playlists
BUG: 3309324

Change-Id: Ia136f94406496f971819f4f805f742f2a6829007
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-01-18 13:13:05 -08:00
Mike Lockwood
7a0bd17bce MTP: Fix problems with modification dates for folders and non-media files
Also removed an unnecessary parameter to MtpDatabase.endSendobject()

BUG: 3352142

Change-Id: I6fd812dcba4814956bc8bc1cbd6bd5c868197790
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-01-18 11:07:11 -08:00
Dharmaray Kundargi
9ed99405ae Merge "Video editor API update - rework for Patch Set 3" into honeycomb 2011-01-17 10:52:29 -08:00
Eric Laurent
117b7bb5b5 Fix issue 3354692.
The problem is that SoundPool never calls the onLoadComplete() callback
when load() method fails because the file cannot be opened.
AudioService loadSoundEffects() was blocked waiting for a callback
that never came.
In this particular case, this happened on a specific build where sound
effects assets were not included.

The fix consists in waiting for the callback only if at least one sample is
accepted by SoundPool load().

Also moved the initial loading of sound effect samples from the boot completed
broadcast receiver to the audio service message handler to avoid waiting in the
main system server thread.

Change-Id: I902e5988f8b644a81d8e585c52eed1df4ca0ec05
2011-01-17 10:36:12 -08:00
Santosh Madhava
9bcedf7cf3 Video editor API update - rework for Patch Set 3
Change-Id: I75bfa17fe98bec13f672ff9a4edf623bb85020c8
2011-01-16 16:56:12 -08:00
James Dong
c14b10c306 Merge "Add audio encoding parameters check" into honeycomb 2011-01-13 10:21:28 -08:00
Marco Nelissen
f679ba7d94 Cherrypick from GB. Do Not Merge.
Send "compilation" tag when inserting into the database.
It's not actually inserted into the database, but the media provider uses it
for disambiguating albums.
b/3311831

Change-Id: I67deb044800a6cb626c69bf3d54d51df4bf830f2
2011-01-13 07:17:20 -08:00
James Dong
54815a78af Add audio encoding parameters check
bug - 3345296

Change-Id: If3f33955f5473b0c5ad9c9b85f8b5cb21ddd7e65
2011-01-12 20:45:16 -08:00
Marco Nelissen
a8a656b0c5 Fix scanning of modified files.
When a media file, particularly a music file, is updated, the media
scanner should use the correct Uri to update it, and not the generic
files Uri. Otherwise, things like artist and album name will not
be properly updated.

Change-Id: I576629c51282bfbeb61c23f1e43b072700084a6c
2011-01-12 14:46:49 -08:00
James Dong
068b41d5d4 Merge "Publish MediaMetadataRetriever.java as public API" into honeycomb 2011-01-12 14:31:34 -08:00
Mike Lockwood
0dd9f4de3e MediaScanner: Do not update the file path when updating records already in the database
The path should never change (media scanner treats renames as a delete and an insert)
and we want to preserve the mixed case paths in the database to avoid exposing the
lowercase squashing to MTP.

Change-Id: I79ef37e143c607242d438a4a0643d40191965b6a
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-01-12 17:27:37 -05:00
James Dong
11eab056dd 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
2011-01-12 14:14:11 -08:00
Mike Lockwood
1c4e88d0b0 Media Provider and MTP now use emulated /mnt/sdcard instead of /data/media
This rips out some complicated code that was added since gingerbread
that is no longer necessary.

Change-Id: Iab5ecb7314c06221475ce01ef483f34f17003b06
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-01-12 12:48:13 -05:00
Andreas Huber
52c7832e35 Increase cache size and low-watermark threshold, also
MediaPlayer now sends out MEDIA_INFO,MEDIA_INFO_VIDEO_TRACK_LAGGING messages
to the JAVA client informing it how much (if at all) the video lags behind
audio (arg2 is the media delay in ms).

Change-Id: I6933f573d8597a35112e4b5ee0fcb826a7f6ddd1
related-to-bug: 3335220
2011-01-11 15:05:28 -08:00
Eric Laurent
a60e212d0d Fix issue 3261656.
The problem can occur if a sample is started at the same time as the last AudioTrack callback
for a playing sample is called. At this time, allocateChannel() can be called concurrently with moveToFront()
which can cause an entry in mChannels being used by moveToFront() to be erased temporarily by allocateChannel().

The fix consists in making sure that the SoundPool mutex is held whenever play(), stop() or done() are called.

In addition, other potential weaknesses have been removed by making sure that the channel mutex is held while
starting, stopping and processing the AudioTrack call back.

To that purpose, a mechanism similar to the channel restart method is implemented to avoid stopping channels
from the AudioTrack call back but do it from the restart thread instead.

The sound effects SounPool management in AudioService has also been improved to make sure that the samples have
been loaded when a playback request is received and also to immediately release the SoundPool when the effects are
unloaded without waiting for the GC to occur.
The SoundPool.java class was modified to allow the use of a looper attached to the thread in which the sample
loaded listener is running and not to the thread in which the SoundPool is created.

The maximum number of samples that can be loaded in a SoundPool lifetime as been increased from 255 to 65535.

Change-Id: I368a3bdfda4239f807f857c3e97b70f6b31b0af3
2011-01-07 17:17:10 -08:00
Marco Nelissen
ee35aff744 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
2011-01-07 12:42:07 -08:00
Mike Lockwood
27480cd494 Remove support for obsolete PTP content provider
This will be replaced by a new PTP host API in an upcoming commit.

Change-Id: Ib914194e332b5c090cb8e34ed35bd691bc9f85d1
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-01-06 11:47:56 -05:00
Joe Onorato
c7fcba4b7b Make the volume keys adjust the media volume by default if the device is not "voice capable."
Change-Id: Ide396f8940a075c0b00b7c983c1769c1cc0f17bf
2011-01-05 16:53:11 -08:00
James Dong
df9b349b96 Replace extractAlbumArt() with getEmbeddedPicture() in MediaMetadataRetriever.java
Change-Id: I34dfc1daa3bed1f334f3f266cbe70d1e3d7924f6
2011-01-04 15:03:48 -08:00