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

416 Commits

Author SHA1 Message Date
Mike Lockwood
b607b884bd Merge "UsbManager: Remove redundant Intent extras from USB device and accessory broadcasts" 2011-02-24 14:05:02 -08:00
Glenn Kasten
cc562a3576 Bug 3438258 Add SurfaceTexture as MediaPlayer sink 
This change enables the use of a SurfaceTexture in place of a Surface
as the video sink for an android.media.MediaPlayer. The new API
MediaPlayer.setTexture is currently hidden.

This includes:
 - New Java and C++ interfaces
 - C++ plumbing and implementation (JNI, Binder)
 - Stagefright AwesomePlayer and NuPlayer use ANativeWindow
   (either Surface or SurfaceTextureClient)

Change-Id: I2b568bee143d9eaf3dfc6cc4533c1bebbd5afc51
 2011-02-23 15:02:56 -08:00
Mike Lockwood
188d00b07e UsbManager: Remove redundant Intent extras from USB device and accessory broadcasts 
These extras are also accessable via the UsbDevice and UsbAccessory classes,
which are also included as extras.
Since you can't filter Intents based on extras there is no point in duplicating
this information as separate extras.

Change-Id: I4c8d1e70d66023a1800b3f8f06118898da6b37af
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-02-23 13:14:33 -08:00
Basavapatna Dattaguru
3ed54d03ee Merge "VideoEditor:IssueID:3396697: Added Performance test code" 2011-02-22 10:56:29 -08:00
Basavapatna Dattaguru
f1f9ff28c3 VideoEditor:IssueID:3396697: Added Performance test code 
Updated with review comments: MediaFrameworkStressTestRunner.java deleted
Updated with growing heap report in Stress test case

Change-Id: I847f8810e2b844015c47b7d24e488a611d85287c
 2011-02-18 18:42:56 -08:00
Basavapatna Dattaguru
c2b9eb88fd VideoEditor:IssueID:3396697: Updated Preview Test code 
Change-Id: I895bcdbb0c65679b837e616de58e533a080bbf2f
 2011-02-17 20:43:08 -08:00
Yu Shan Emily Lau
414e15309c Fixed the media playback report format. 
Change-Id: I8b943f8cd914acc6c9ee81a71f0efbecece7263e
 2011-02-17 15:51:56 -08:00
Yu Shan Emily Lau
ce6ff2c2e6 Update the summary output format which match the PM data posting. 
Change-Id: I3e3f7313020da6d0d219acd90ac9edc8a4d0bce4
 2011-02-17 12:10:17 -08:00
Yu Shan Emily Lau
85305f04d5 Change the media player stress test to repor the total number of failure and the total number of info. 
Register the surface callback in the test application bug# 2909064

Change-Id: I3420b5bc81e276b50f612c126ed5fc1f4f16c08c
 2011-02-16 12:24:34 -08:00
Basavapatna Dattaguru
0554f32afd VideoEditor:IssueID:3396697: Added Preview Test code 
This has dependency on Ide5ee82b24806a52b4e612db4bc3c34f75e4465a
Removed trailing space in xml file
Removed dependency on test cases other than Preview & API

Change-Id: I835c0ca17d6ff15819407eb930cca8a08b095287
 2011-02-14 20:59:51 -08:00
Basavapatna Dattaguru
046dc1ea81 Merge "VideoEditor: IssueID:3396697:Added TN,MP,Exp,API test codes" 2011-02-14 19:31:52 -08:00
Basavapatna Dattaguru
c0171d3e7b VideoEditor: IssueID:3396697:Added TN,MP,Exp,API test codes 
Updated with review comments: code cleaning in MP.

Change-Id: Ide5ee82b24806a52b4e612db4bc3c34f75e4465a
 2011-02-14 18:00:57 -08:00
Basavapatna Dattaguru
fc04c1d67e VideoEditor: Issue ID:3396697 Missing Files added 
IMG_640x480_Overlay2: dimension correction done

Change-Id: I40960a44584fb27538d7e22829d293a34c654df7
 2011-02-13 16:54:51 -08:00
Yu Shan Emily Lau
bd508bdbe4 Add the open source test media contents. 
Change-Id: I956e06712454287f502bffb22e10612e980b936d
 2011-02-11 15:47:00 -08:00
Basavapatna Dattaguru
4c030b5616 Merge "Video Editor CTS Test Code: annotation suppress" 2011-02-11 15:17:06 -08:00
Basavapatna Dattaguru
31d19c80c7 VideoEditor Test contents: Issue ID:3396697 
Moved to folder contents/media_api/videoeditor

Change-Id: I809b684931130badca1c5bbf91178b142ba5017f
 2011-02-11 15:00:17 -08:00
Basavapatna Dattaguru
86e9e9be1e Video Editor CTS Test Code: annotation suppress 
Fix for Issue: ID:3396697
Updated with review comments

Change-Id: Ie20e60598f046b23ed49b2533e9d500607a23c17
 2011-02-11 13:30:07 -08:00
Yu Shan Emily Lau
5d386a1ae2 Fix the build. 
Change-Id: Ie02c5086c1dc8c4ef1c52c6ae43b018a48a18bdd
 2011-02-07 21:18:00 -08:00
Yu Shan Emily Lau
a58389bdc1 Remove the old media player stress test. 
Add the new playback stress that which caputred the total number of crashes, frame drops from a list of video which
side-loaded to the device.

Change-Id: I41d54b5286da0aecb52a37feec176d8ae5456d9e
 2011-02-07 18:59:40 -08:00
Basavapatna Dattaguru
655c66332e am 90982936: am 89378fd1: Merge "Revert "Video editor CTS: Framework modifications"" into honeycomb 
* commit '90982936a026f1f951fe06ad4d2bcfd72a99ab8f':
  Revert "Video editor CTS: Framework modifications"
 2011-01-26 22:54:41 -08:00
Basavapatna Dattaguru
a44f02a4ef am 141a2adb: am 3b728ca7: Merge "Revert "Fixes Issue ID: 3396697"" into honeycomb 
* commit '141a2adb25130bcbe8620ae239e94d33c7c92eef':
  Revert "Fixes Issue ID: 3396697"
 2011-01-26 22:54:37 -08:00
Basavapatna Dattaguru
90982936a0 am 89378fd1: Merge "Revert "Video editor CTS: Framework modifications"" into honeycomb 
* commit '89378fd1666cd589599a0c5a7d0c71fa2f8159a5':
  Revert "Video editor CTS: Framework modifications"
 2011-01-26 22:52:38 -08:00
Basavapatna Dattaguru
141a2adb25 am 3b728ca7: Merge "Revert "Fixes Issue ID: 3396697"" into honeycomb 
* commit '3b728ca70a4fe6760b682589505d76848c47d765':
  Revert "Fixes Issue ID: 3396697"
 2011-01-26 22:52:31 -08:00
Basavapatna Dattaguru
3b728ca70a Merge "Revert "Fixes Issue ID: 3396697"" into honeycomb 2011-01-26 22:50:50 -08:00
Basavapatna Dattaguru
d36b1f0739 Revert "Video editor CTS: Framework modifications" 
This reverts commit eb6d6ecf4ba7a3965ce6ab178dce48eb9416bfc7.
 2011-01-26 22:38:47 -08:00
Basavapatna Dattaguru
4b9969af57 Revert "Fixes Issue ID: 3396697" 
This reverts commit 8b9ba616444a265df6cd2b4f4a0a39d808c65ade.
 2011-01-26 22:36:10 -08:00
Basavapatna Dattaguru
e9ad1bf4ed am a33537c3: am 9af5da52: Merge "Video editor CTS: Framework modifications" into honeycomb 
* commit 'a33537c3f1dbe1a4fa57560c406bf45e8f52436e':
  Video editor CTS: Framework modifications
 2011-01-26 21:54:16 -08:00
Basavapatna Dattaguru
497c56f67f am 55bf9bdb: am 643e8476: Merge "Fixes Issue ID: 3396697" into honeycomb 
* commit '55bf9bdbcb3cab86a776fe6b5493b9bcec99fc21':
  Fixes Issue ID: 3396697
 2011-01-26 21:52:02 -08:00
Basavapatna Dattaguru
a33537c3f1 am 9af5da52: Merge "Video editor CTS: Framework modifications" into honeycomb 
* commit '9af5da5258d14c743150318e9887b7d10c0117d4':
  Video editor CTS: Framework modifications
 2011-01-26 21:51:49 -08:00
Basavapatna Dattaguru
55bf9bdbcb am 643e8476: Merge "Fixes Issue ID: 3396697" into honeycomb 
* commit '643e8476e1b9da93a06d073797863298ae268393':
  Fixes Issue ID: 3396697
 2011-01-26 21:49:34 -08:00
Basavapatna Dattaguru
9af5da5258 Merge "Video editor CTS: Framework modifications" into honeycomb 2011-01-26 21:48:02 -08:00
Basavapatna Dattaguru
eb6d6ecf4b Video editor CTS: Framework modifications 
Fixes Issue ID: 3396697

Copyright changed to 2011

Change-Id: I1b69c6903bb6b0434eb93337783f93c92fd20899
 2011-01-26 20:58:56 -08:00
Basavapatna Dattaguru
8b9ba61644 Fixes Issue ID: 3396697 
Updated with annotation LargeTest

Copyright changed to 2011

Review reworked and with new test contents

Video Editor CTS Test code

Change-Id: Ia37956ef39fafcc5d969996c1791fce8663aa0fe
 2011-01-26 20:31:11 -08:00
Mike Lockwood
20bc97fc54 CameraBrowser: new implementation based on new MTP host APIs 
Change-Id: I81300e3218d6f6fce87432ce506fc282aa4dc4b8
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-01-22 16:01:30 -08:00
James Dong
9efe47374b Squash commits of the following patches, cherry-picked from other branch - do not merge. 
o Prepare for publishing MediaMetadataRetriever as public API
  step one:
  o replaced captureFrame with getFrameAtTime
  o removed getMode

o Replace MediaMetadataRetriever.captureFrame() with MediaMetadataRetriever.getFrameAtTime()
  as part of the preparation for publishing MediaMetadataRetriever as public Java API

o Remove captureFrame from MediaMetadataRetriever.java class
  It has been replaced by getFrameAtTime() method

o Replace extractAlbumArt() with getEmbeddedPicture() in MediaMetadataRetriever.java

o 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 - 3309041

Change-Id: I2efb6e8b8d52897186b016cb4efda6862f5584c4
 2011-01-12 17:12:46 -08:00
James Dong
999fb5a5a9 am 068b41d5: Merge "Publish MediaMetadataRetriever.java as public API" into honeycomb 
* commit '068b41d5d41a4a78c96586b85ea89d464d302548':
  Publish MediaMetadataRetriever.java as public API
 2011-01-12 14:35:35 -08: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
Yu Shan Emily Lau
513f3ab050 am 5619da8d: am 2af4e71d: Merge "Fix the test application orientation. Bug# 3205196" into gingerbread 
* commit '5619da8d8b66337db182a016619efa1f31266a78':
  Fix the test application orientation. Bug# 3205196
 2011-01-11 14:21:59 -08:00
Mike Lockwood
65d2a4cb5f Remove CameraBrowser test app 
Change-Id: I7e04ef674746c5c2cdf421a2b9ec440d7ea831bd
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-01-06 11:47:25 -05:00
Yu Shan Emily Lau
d97943d5d0 Fix the test application orientation. Bug# 3205196 
Change-Id: I57085d6507482ce15dbf3b167965be4af43b3d88
 2011-01-04 20:57:09 -08:00
James Dong
df9b349b96 Replace extractAlbumArt() with getEmbeddedPicture() in MediaMetadataRetriever.java 
Change-Id: I34dfc1daa3bed1f334f3f266cbe70d1e3d7924f6
 2011-01-04 15:03:48 -08:00
Mike Lockwood
0cd0136d44 Move MTP Java classes to android.mtp.* package. 
Change-Id: Ib18bcaabf314241a95e517d0b93be5845d988e2c
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-12-30 11:54:33 -05:00
Mike Lockwood
4453aa4c30 CameraBrowser: Catch ActivityNotFoundException when attempting to display imported file. 
Change-Id: I448f2506caf0a5599c885654fd0078beb6240965
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-12-14 23:38:43 -08:00
Mike Lockwood
770126a678 Rename android.hardware.Usb to UsbManager and UsbObserver to UsbService 
In preparation for an upcoming change that will make UsbService into a real system service

Change-Id: Id85d624cfc6b10b49a08105cfaaacc667a492c12
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-12-09 22:52:05 -08:00
Mike Lockwood
485059de22 CameraBrowser: Give it ACCESS_USB permission, which is now required for PTP 
Change-Id: Ic5c7810ff4b7e25ba5f49a1107f5121391943108
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-12-09 11:45:44 -08:00
James Dong
25d7094279 Log the exception cause for better problem analysis 
Change-Id: Ia1f81adb6fc3be87098c9399509b68d5daf7f2da
 2010-12-06 14:41:00 -08:00
Yu Shan Emily Lau
28bec9ebce Merge "Suppress the unsupported camera recording size (ie QVGA and SQVGA)" 2010-12-06 10:14:16 -08:00
Yu Shan Emily Lau
e8f317d32c Suppress the unsupported camera recording size (ie QVGA and SQVGA) 
Change-Id: I34b6433f0aae4a117b2467069523a62e44bf9bbe
 2010-12-03 19:32:25 -08:00
James Dong
f6bd1ea0c7 Replace MediaMetadataRetriever.captureFrame() with MediaMetadataRetriever.getFrameAtTime() 
as part of the preparation for publishing MediaMetadataRetriever as public Java API

bug - 2433195

Change-Id: I6e8a771347e3d89bfe359ae403ebfe3205ea6313
 2010-12-03 17:14:25 -08:00
James Dong
7411c1b836 Renable the captureFrame unit tests 
o We need to make sure that
  /sdcard/media_api/metadata rwx to the test app
  before tests

Change-Id: Iaa2d58bb2d380bf7e93ec71f77c4c769d65b1d85
 2010-11-29 12:59:39 -08:00