drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
39,518 Commits 1 Branch 0 Tags
Commit Graph

734 Commits

Author SHA1 Message Date
Mike Lockwood
6458935331 MediaScanner: don't call pruneDeadThumbnailFiles unless the images table is empty 
BUG: 3063257

Change-Id: I648ff8c4d4026e3d2a97853257865c9b5f712712
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-10-07 17:43:57 -04:00
Gil Dobjanschi
b27f2d3126 Remove MediaVideoItem and AudioTrack playback APIs. 
Change-Id: If3e5f341af7f581c90f04c91afb3681f9e8d5f82
 2010-10-07 13:57:54 -07:00
Gil Dobjanschi
0ca0a12c6b Added VideoEditor reference to protected AudioTrack constructor 
Change-Id: Icfac392f8060d424b27105c6ae718e35b2d6c705
 2010-10-06 10:53:49 -07:00
Gil Dobjanschi
53f89e1230 Added the video editor to the media items and audio track constructors. 
Change-Id: I5db229d28c28e17b487257a9c4ed8c5fb7570a8d
 2010-10-06 09:54:34 -07:00
Gil Dobjanschi
e5867ef3f0 Adjust start time and duration for overlays and effects. 
Change-Id: Ia5030d15a7c98f37307a0e78821052f05fec9fe6
 2010-10-05 17:25:23 -07:00
Gil Dobjanschi
61f9184547 Added mute APIs for MediaVideoItem and AudioTrack 
Change-Id: I2e4e8b213a5d19f895d9e3431b7d4f1acad70762
 2010-10-04 19:02:28 -07:00
Gil Dobjanschi
3398abafca Save AudioTrack to XML 
Change-Id: Ie9afe8c620e21e160b56c36f489870db0a3987cc
 2010-10-04 17:20:43 -07:00
Gil Dobjanschi
52ac301ee1 Added audio track playback API 
Change-Id: I9884ab5d3a7d8d8310f4b4426e50b0496cbbd295
 2010-10-04 13:56:39 -07:00
Gil Dobjanschi
048449ebfa Added ability to instantiate various implementations of the VideoEditor 
Change-Id: I5b09afafff1c009bada4f49a5568286fe3cd9aef
 2010-09-29 16:58:21 -07:00
Jaikumar Ganesh
82aa7f017d Update code for new BT APIs. 
Change-Id: Idf806cba8160e6075e33e26ee9936663b850e96c
 2010-09-28 20:02:58 -07:00
Gil Dobjanschi
5665fd6ac2 Save overlays to XML 
Change-Id: I549c40b55a85022136dbd4899cc0d2d4da6e33de
 2010-09-28 17:54:09 -07:00
Gil Dobjanschi
b0725a4aeb Merge "Validate Overlay and effect duration and start time." 2010-09-28 10:08:53 -07:00
Gil Dobjanschi
f8b04868e6 Validate Overlay and effect duration and start time. 
Change-Id: I3235573f9edc65f148541adacd01eb5caa0b8615
 2010-09-28 09:24:29 -07:00
Mike Lockwood
90bbe5e486 MtpCursor: Remove some unused variables 
Change-Id: Ie1c88bd817c45fc19e34165f8d8557f00514188d
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-09-28 08:36:15 -04:00
Dharmaray Kundargi
c73305cfd7 work on review comments and code formating. 
Removed white spaces

Change-Id: Ic54817bfc205be536ec086bdfd34b35b0eeac1a3
 2010-09-27 17:32:00 -07:00
Gil Dobjanschi
bf836ec6ed Merge "Bug fix: getDuration vs. getDurationTimeline" 2010-09-27 11:15:24 -07:00
Gil Dobjanschi
4b66f7a53f Bug fix: getDuration vs. getDurationTimeline 
Change-Id: I41a40a3fc3b3674b5fcacecda174e924211b4ad2
 2010-09-27 10:26:11 -07:00
Mike Lockwood
ae078f7dac MTP: Implement extra object properties for audio, video and image files 
Read-only support at this point.

BUG: 2869730

Change-Id: I424ba760c8f5f4af394bd65276f19438fa6da6cb
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-09-27 13:16:53 -04:00
Gil Dobjanschi
d66a3fe171 Merge "Adjust the duration of transitions if needed." 2010-09-24 18:08:02 -07:00
Gil Dobjanschi
05152ffd67 Adjust the duration of transitions if needed. 
Change-Id: I2e5f9431b1f1c25b30e2d144916140365b10021b
 2010-09-24 14:52:05 -07:00
Marco Nelissen
920d649949 Send album artist to the media provider again. 
Change-Id: I13f44bab2024adcfbc4b9491ac565cfdf15ef9d9
 2010-09-24 09:22:55 -07:00
Mike Lockwood
dbaa3c8f68 Merge changes Ie8bd9107,I1065179a 
* changes:
  MTP: Reenable GetObjectPropValue and SetObjectPropValue
  MTP: Minor debug output cleanup
 2010-09-23 20:09:46 -07:00
Mike Lockwood
d3bfecb0c9 MTP: Reenable GetObjectPropValue and SetObjectPropValue 
Windows no longer chokes now that we implement the minimum set of properties

BUG: 2869730

Change-Id: Ie8bd9107610b9b38f060ad8a2f05334a3b4aff9b
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-09-23 23:04:28 -04:00
Mike Lockwood
2c2d06da2a Merge changes I75c4c7dc,Ie9f3dea3 
* changes:
  MTP: List all the formats we support in addition to FORMAT_UNDEFINED
  MTP: Fix problems with signed ints in MtpCursor.cpp
 2010-09-23 19:11:21 -07:00
Mike Lockwood
12b8a99fc1 MTP: List all the formats we support in addition to FORMAT_UNDEFINED 
Fixes Windows Media Player support

BUG: 3003770

Change-Id: I75c4c7dcdd833b3b5b200339e24c38d583efb1fa
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-09-23 22:08:24 -04:00
Gil Dobjanschi
7eb805707f Merge "1. Added OverlayFrame constuctor 2. Invalidate transitions when trimming video 3. Remove image file when removing an OverlayFrame 4. Bug fixes in the VideoEditor implementation" 2010-09-23 13:48:33 -07:00
Eric Laurent
bb7684bafa resolved conflicts for merge of ac4a284a to master 
Change-Id: Ia644f67b5d7d7e7137eef2284e9533b5819c12d8
 2010-09-23 12:22:44 -07:00
Eric Laurent
ac4a284ab4 am 7864c72b: Merge "Fix issue 3022800." into gingerbread 
Merge commit '7864c72b91a21eeb282e2e38d688fbbc3cd3ecb8' into gingerbread-plus-aosp

* commit '7864c72b91a21eeb282e2e38d688fbbc3cd3ecb8':
  Fix issue 3022800.
 2010-09-23 11:34:40 -07:00
Eric Laurent
1a5149e5d7 Fix issue 3022800. 
- Created sub-package android.media.audiofx for audio effects.
- Hid AudioEffect class contructor, methods and variables not needed by
applications
- Added more javadoc comments for AudioEffect Class

Change-Id: Ibbb40d4e714bb248aa32cf82d7763d74efae96d1
 2010-09-23 11:04:03 -07:00
Mike Lockwood
ff371cf0ed MediaScanner: disable album artist support until MediaProvider really supports it 
Fixes a "no such column" exception in MediaProvider.update() that I somehow
missed when testing the MediaProvider refactoring.

Change-Id: Icc502a5c0e3bd150b353972d000b978a9e044abc
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-09-22 23:25:33 -04:00
Gil Dobjanschi
21e9da6f44 1. Added OverlayFrame constuctor 
2. Invalidate transitions when trimming video
3. Remove image file when removing an OverlayFrame
4. Bug fixes in the VideoEditor implementation

Change-Id: I7bd3c888848edaf659a4faef14ad1c5a6603c3cc
 2010-09-22 20:12:07 -07:00
Mike Lockwood
a9158425cc Merge "Changes to support MediaProvider refactoring" 2010-09-22 18:50:06 -07:00
Mike Lockwood
5a08b50e80 Merge "MTP host: Use Java longs for storage and object IDs" 2010-09-22 12:33:35 -07:00
Eric Laurent
dab59d1534 am 6943b94b: am a6dc4699: Merge "Fix issue 2913071." into gingerbread 
Merge commit '6943b94b8f267c83060946bae0961efc30444dee'

* commit '6943b94b8f267c83060946bae0961efc30444dee':
  Fix issue 2913071.
 2010-09-21 16:53:20 -07:00
Eric Laurent
6943b94b8f am a6dc4699: Merge "Fix issue 2913071." into gingerbread 
Merge commit 'a6dc4699222a484222d1c54d5319f302a02e406b' into gingerbread-plus-aosp

* commit 'a6dc4699222a484222d1c54d5319f302a02e406b':
  Fix issue 2913071.
 2010-09-21 15:59:23 -07:00
Eric Laurent
672c0dc3a0 Fix issue 2913071. 
Scale audio signal during capture according to peak level so that
returned values on 8 bits contain enough information even for weak
signals.

Also do not reject requests to enable/disable the visualizer if we are
already in the requested state.

Change-Id: I07a705619764350834e61f82d161761eab688747
 2010-09-21 15:11:50 -07:00
Gil Dobjanschi
c2087e3c7a Merge "Added the behavior paramter to transition constructors" 2010-09-21 13:09:49 -07:00
Gil Dobjanschi
590f87fe9a Added the behavior paramter to transition constructors 
Change-Id: Ic8758fb81e9b9c30982f3ced2d9fffc3439b7c7e
 2010-09-21 13:08:03 -07:00
Eric Laurent
8dc81c1014 am 96d5c17e: am 8d1513e1: Merge "Made audio effect control panel intents public." into gingerbread 
Merge commit '96d5c17e7828f1a5cbeb3d87e0146d145870558f'

* commit '96d5c17e7828f1a5cbeb3d87e0146d145870558f':
  Made audio effect control panel intents public.
 2010-09-21 10:56:30 -07:00
Eric Laurent
96d5c17e78 am 8d1513e1: Merge "Made audio effect control panel intents public." into gingerbread 
Merge commit '8d1513e13c1e3d0142423570c0028e147bf0ea37' into gingerbread-plus-aosp

* commit '8d1513e13c1e3d0142423570c0028e147bf0ea37':
  Made audio effect control panel intents public.
 2010-09-21 10:52:27 -07:00
Eric Laurent
92cf2d6085 Made audio effect control panel intents public. 
Change-Id: If927606a24966605eb3e02788b2477937349d518
 2010-09-21 10:45:41 -07:00
Mike Lockwood
f1f5361e32 MTP host: Use Java longs for storage and object IDs 
This avoids problems with unsigned 32 bit numbers with cameras that use
storage and object IDs > 0x7FFFFFFF

Change-Id: I615f2d468851e9d6ff8882d22966d3687697d8eb
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-09-21 10:41:33 -04:00
Gil Dobjanschi
11dd325466 Merge "I splitted the start and end transtions into separate classes." 2010-09-17 16:43:25 -07:00
Gil Dobjanschi
7c1df82880 I splitted the start and end transtions into separate classes. 
Change-Id: Ia8fbf5b34ee4b96fa4339d6dda78ec03c8a08615
 2010-09-17 16:35:31 -07:00
Nipun Kwatra
8726305905 Merge "Adding default profiles for specific levels." 2010-09-17 13:54:55 -07:00
Nipun Kwatra
d48a15c3fe Adding default profiles for specific levels. 
The low and high profiles should each match one of the
specific profiles. So we need to add the specific profiles
corresponding to the low/high profiles. This makes the
default profile compliant to documentation + cts.

Also fixed javadoc to account time lapse profiles.

Change-Id: I34e7307d00ce261c69dc10ead2900025c7f6d428
 2010-09-17 13:19:13 -07:00
Gil Dobjanschi
ec7291c99f Merge "Initial Video Editor API" 2010-09-16 16:40:12 -07:00
Gil Dobjanschi
fdacc8be92 Initial Video Editor API 
Change-Id: Iaa91e78d0e50f45ceb943bab93c4f1ea1bdee003
 2010-09-16 15:19:46 -07:00
Mike Lockwood
c2206a0710 Changes to support MediaProvider refactoring 
Update table columns in MediaStore and adjust media scanner MTP support.

Change-Id: Ide41315a6d7650aadb703f93c7e022fc5c40d4dd
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-09-16 11:49:13 -04:00
Eric Laurent
30ef985b70 am 23b8054e: am eea35ce8: Merge "Added intents for audio effects control application" into gingerbread 
Merge commit '23b8054e85eaffa515c597e7b386e3892968302d'

* commit '23b8054e85eaffa515c597e7b386e3892968302d':
  Added intents for audio effects control application
 2010-09-15 11:39:09 -07:00