1152 Commits

Author SHA1 Message Date
Gloria Wang
d211f41f76 - Add method in MediaPlayerService to collect and pull
codec usage (duration) for the battery app
- Collect MediaPlayer decoding usage data

Change-Id: I0ef4e32b6a041ba1fe73c19f9c67185c61d03965
2011-02-22 22:42:05 -08:00
James Dong
9a146d9d65 am d97c598f: am 6c9b500f: Merge "Added more warnings in javadoc for failure to call MediaPlayer.release() immediately if a MediaPlayer is not needed" into honeycomb
* commit 'd97c598ff4d902583f9083960b088b31350d0018':
  Added more warnings in javadoc for failure to call MediaPlayer.release() immediately if a MediaPlayer is not needed
2011-02-22 21:41:25 -08:00
James Dong
d97c598ff4 am 6c9b500f: Merge "Added more warnings in javadoc for failure to call MediaPlayer.release() immediately if a MediaPlayer is not needed" into honeycomb
* commit '6c9b500fc59edd8cb3b5a9ac4a0ddadf54bdf525':
  Added more warnings in javadoc for failure to call MediaPlayer.release() immediately if a MediaPlayer is not needed
2011-02-22 21:15:19 -08:00
Santosh Madhava
3f48207ea4 Cleanup for issue 3471160 : video editor calls System.gc
Change-Id: I8cdebde25a45767a1c1b9b6c2c59b7e65cacc0bd
2011-02-22 20:19:38 -08:00
Mike Lockwood
16dc3073a2 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>
2011-02-22 17:49:00 -08:00
Mike Lockwood
66e57f6aa9 MTP: Disable MTP when the keyguard is locked and secure
BUG:  3402847

Change-Id: I6c77efe18f525cd0af37911c8b6aac4f17352552
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-02-22 13:57:23 -08:00
James Dong
14460b9564 Added more warnings in javadoc for failure to call MediaPlayer.release() immediately if a MediaPlayer is not needed
bug - 3040402

Change-Id: I455d2a664851c73212711e8c4b88e97b50ee5b62
2011-02-22 13:45:57 -08:00
Rajneesh Chowdury
dab9689491 Merge "Fix for 3458686 Play button is enabled before loading the transition. Play results in Native Crash" 2011-02-22 10:50:21 -08:00
Rajneesh Chowdury
06a087a52b Fix for 3458686 Play button is enabled before loading the transition. Play results in Native Crash
Change-Id: Ib257484ff8646b8e6a0a6a4bb9b937d5338c060c
2011-02-21 17:46:41 -08:00
Santosh Madhava
df4723ef3c Fix for issue 3439595 : Java/JNI - Movide studio playback picks previous frames
Change-Id: I0f9257a1bfb96c00acfdffa0f4f7f8188646c713
2011-02-16 22:32:02 -08:00
Basavapatna Dattaguru
699587da4b VideoEditor:Inconsistance defines:Issue ID:3419090
Assigned with MediaProperties array values

Change-Id: I97efa98954eb1be3b21a9e42b989def6bb657d77
2011-02-14 17:50:32 -08:00
Basavapatna Dattaguru
b27a1ca53e Merge "VideoEditor: Fixes Issue ID:3448077" 2011-02-11 18:11:21 -08:00
Basavapatna Dattaguru
4eb7a98342 VideoEditor: Fixes Issue ID:3448077
Updated with review comments. checks width & height

Change-Id: I79bd28862f511e7653e7e7a63c88772834ee6559
2011-02-11 18:03:01 -08:00
Basavapatna Dattaguru
2b06e56031 VideoEditor: Populate profile&level: Issue:3419090
Updated with new values for Profiles and levels

Change-Id: Ib0abcab1be741c151ce44b54eb1deff64828af00
2011-02-11 17:18:54 -08:00
Mike Lockwood
540380fb0a Add MTP/PTP host support to the public API
Needed for unbundling the Gallery app

Change-Id: I57e6b76ee5c9e57cb8c055329ac13251879baafd
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-02-11 09:09:11 -05:00
Glenn Kasten
8132a8caf3 Merge "Bug 3352047 Wrong message when adjusting volume" 2011-02-10 15:27:59 -08:00
Glenn Kasten
8b4b97a14a Bug 3352047 Wrong message when adjusting volume
Add hidden AudioManager.getDevicesForStream and output device codes.

Change-Id: I4d1c1d3b6a077cd117720817d1f733dda557b947
2011-02-10 14:37:42 -08:00
Eric Laurent
04f7861cfa Merge "Fix issue 3435692" 2011-02-10 14:01:27 -08:00
Eric Laurent
a25c5d88d1 Fix issue 3435692
The problem is that the AudioService is not notified of the death of
IAudioFlinger binder interface because no methods was called on AudioFlinger
from system_server since the device booted. Therefore, AudioSystem did not created any
IAudioFlinger interface in the system_server process.
The root cause was always present but more likely to happen on a tablet than on a phone
as for instance no beeps are played when volume is adjusted.

The fix consists in having AudioSystem explicitly call a method on AudioFlinger when a
callback is installed to make sure that an IAudioFlinger binder interface is created
regardless of any other activity in the client process.

Change-Id: I9df34a36825af0b25cd0246dd02edbd712263f41
2011-02-10 13:24:04 -08:00
Marco Nelissen
cb613a04c1 Better genre support.
Expand the list of genres, and support genres that look like "(192)CustomGenre".
b/3349415

Change-Id: I617ea7dfeace708bbd0d9c00ff04de72fa2d383e
2011-02-10 12:09:16 -08:00
Mike Lockwood
fd22edc668 MTP: Fix NPE in MtpPropertyGroup
Change-Id: I65fbd3f2f62724434136c6ae310e6647884902d2
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-02-08 21:45:22 -05:00
Dharmaray Kundargi
3ec816ba61 am 284f3128: am f7f24996: Merge "Fix issue 3426489 Overlay background changed when exported" into honeycomb
* commit '284f3128fa959c8c2aa901d0af359f1f1b4d8bc4':
  Fix issue 3426489 Overlay background changed when exported
2011-02-07 13:50:31 -08:00
Dharmaray Kundargi
88928ffc1c am 73edcfe8: am b894f895: Merge "Fix issue 3426200 Movie Studio crashes when a media item is deleted" into honeycomb
* commit '73edcfe8f4678c4d5e91c8018e00a72ea325da71':
  Fix issue 3426200 Movie Studio crashes when a media item is deleted
2011-02-07 13:49:38 -08:00
Eric Laurent
b82d4570d9 am 5f3e9e69: am d4b88c88: Merge "Issue 3395734: fix media server restart detection" into honeycomb
* commit '5f3e9e69a16f5a7bc70f3f010c8aae91f287e941':
  Issue 3395734: fix media server restart detection
2011-02-07 13:49:16 -08:00
Eric Laurent
3da2538aa1 am bdb23c26: am 2e96f15d: Merge "Fix issues 3425035 and 3423785." into honeycomb
* commit 'bdb23c26759089e29eb2f379e296bd006bc32b97':
  Fix issues 3425035 and 3423785.
2011-02-07 13:46:31 -08:00
Danny Fernandes
23dea9a139 am 1734e835: am 5e1f3e41: Merge "Fixed 3419090 Throwing exception for unsupported video codec profiles and level" into honeycomb
* commit '1734e8350f1aadbebf8234e3c470a9d4d0c96e8f':
  Fixed 3419090 Throwing exception for unsupported video codec profiles and level
2011-02-07 13:46:06 -08:00
Mike Lockwood
7da5fd29da Merge "MTP: Add support for querying all objects in GetObjectPropList" 2011-02-07 12:14:13 -08:00
Gil Dobjanschi
9d967a5530 am 99ec3e7f: am 7dd5763d: Merge "Bug fix: 3421011 ANR during delete video clip" into honeycomb
* commit '99ec3e7f27ec7767d1f1a2c596ff2bddb7907a9c':
  Bug fix: 3421011 ANR during delete video clip
2011-02-07 11:39:27 -08:00
Mike Lockwood
4356d81b34 MTP: Add support for querying all objects in GetObjectPropList
Change-Id: I1f31971c4c777462f485e52fac016dc0fff48ad9
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-02-07 13:58:08 -05:00
Dharmaray Kundargi
284f3128fa am f7f24996: Merge "Fix issue 3426489 Overlay background changed when exported" into honeycomb
* commit 'f7f2499638624392ce7665faba5246c46c5e5634':
  Fix issue 3426489 Overlay background changed when exported
2011-02-04 19:11:55 -08:00
Dharmaray Kundargi
ab280b8db6 Fix issue 3426489 Overlay background changed when exported
Change-Id: I53d05732f6de6363cfb64fc84b2539e957adfcd6
2011-02-04 18:23:20 -08:00
Dharmaray Kundargi
73edcfe8f4 am b894f895: Merge "Fix issue 3426200 Movie Studio crashes when a media item is deleted" into honeycomb
* commit 'b894f8959c6be2de5a0c89fedb9824012783dd14':
  Fix issue 3426200 Movie Studio crashes when a media item is deleted
2011-02-04 17:03:47 -08:00
Dharmaray Kundargi
b894f8959c Merge "Fix issue 3426200 Movie Studio crashes when a media item is deleted" into honeycomb 2011-02-04 17:01:51 -08:00
Eric Laurent
5f3e9e69a1 am d4b88c88: Merge "Issue 3395734: fix media server restart detection" into honeycomb
* commit 'd4b88c8829cdababbf16aaf903ba25a1669310e7':
  Issue 3395734: fix media server restart detection
2011-02-04 16:33:43 -08:00
Eric Laurent
d4b88c8829 Merge "Issue 3395734: fix media server restart detection" into honeycomb 2011-02-04 16:30:03 -08:00
Eric Laurent
086396a924 Issue 3395734: fix media server restart detection
Commit 25101b0b in AudioSystem for issue 3395734 broke the mechanism
in AudioService to poll and detect the restarting of media server
process after a crash.

The fix consists in changing the method used to poll AudioSystem and
trigger a callback indicating success when media server is responding
(the method must be on IAudioFlinger and not IAudioService to trigger the callback).

Change-Id: I843c0194de9cbf82c779cabbf2f3cbf8064603c8
2011-02-04 16:22:57 -08:00
Dharmaray Kundargi
0d99f5a95c Fix issue 3426200 Movie Studio crashes when a media item is deleted
Change-Id: I1149fbfd22b44b388897bbcc6970da74c1f6ac4f
2011-02-04 15:46:09 -08:00
Eric Laurent
bdb23c2675 am 2e96f15d: Merge "Fix issues 3425035 and 3423785." into honeycomb
* commit '2e96f15d8c6608c6bcb49c73fe13078a57245b28':
  Fix issues 3425035 and 3423785.
2011-02-04 14:08:25 -08:00
Eric Laurent
2e96f15d8c Merge "Fix issues 3425035 and 3423785." into honeycomb 2011-02-04 14:06:40 -08:00
Danny Fernandes
1734e8350f am 5e1f3e41: Merge "Fixed 3419090 Throwing exception for unsupported video codec profiles and level" into honeycomb
* commit '5e1f3e4112f77bdb99bfef8c3ba185f0cb89e5ef':
  Fixed 3419090 Throwing exception for unsupported video codec profiles and level
2011-02-04 13:39:50 -08:00
Danny Fernandes
7b3f26328b Fixed 3419090 Throwing exception for unsupported video codec profiles and level
Change-Id: I89e8723a6b89338ecedcfabf8b0c63ed2f7e9468
2011-02-04 12:45:31 -08:00
Eric Laurent
402f7f2963 Fix issues 3425035 and 3423785.
- Make sure that STREAM_MUSIC is affected by ringer mode on non voice capable
devices whatever the saved settings say.

- Added a hidden method to AudioManager for VolumePanel to override
the stream selection logic while the panel is showing.

Change-Id: Ib2ff2a7af63decb4e29c45700c41e5058f79d877
2011-02-04 12:39:14 -08:00
Gil Dobjanschi
99ec3e7f27 am 7dd5763d: Merge "Bug fix: 3421011 ANR during delete video clip" into honeycomb
* commit '7dd5763d0e6f96ff2a7bb48b816664b1ec7d645d':
  Bug fix: 3421011 ANR during delete video clip
2011-02-03 17:45:33 -08:00
Eric Laurent
2e8fbebff4 am 6f1bd261: am 9c0a1003: Merge "Fix issue 3371080" into honeycomb
* commit '6f1bd261b7fd86ac7817ca061dfb55b95150b836':
  Fix issue 3371080
2011-02-03 17:18:46 -08:00
Gil Dobjanschi
3f1c573940 Bug fix: 3421011 ANR during delete video clip
Change-Id: I9ba027619d611d76f41d9430a4ad3c9ee5211711
2011-02-03 17:18:17 -08:00
Dheeraj Sharma
7ee76cfeea am d13f987f: am 36b685ff: Merge "Fix for issue : 3419353 Crash during transition generation" into honeycomb
* commit 'd13f987f73df03b06c70c631452f6cafbdc254e1':
  Fix for issue :  3419353 Crash during transition generation
2011-02-03 17:18:13 -08:00
Gil Dobjanschi
223f2696bb am 3f9a851e: am ed2c5133: Merge "Bug fix: 3419287 Deleted images and video clips invalidate the entire project" into honeycomb
* commit '3f9a851e07f0fbe0f5440afd82f26b52ca79428e':
  Bug fix: 3419287 Deleted images and video clips invalidate the entire project
2011-02-03 17:16:43 -08:00
Glenn Kasten
f9f223edb4 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
2011-02-03 13:39:10 -08:00
Eric Laurent
6f1bd261b7 am 9c0a1003: Merge "Fix issue 3371080" into honeycomb
* commit '9c0a1003bd676121cf9b1c942ecebd5b486290d5':
  Fix issue 3371080
2011-02-03 10:28:24 -08:00
Eric Laurent
9c0a1003bd Merge "Fix issue 3371080" into honeycomb 2011-02-03 10:26:05 -08:00