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

4577 Commits

Author SHA1 Message Date
James Dong
2646219aaa resolved conflicts for merge of d5762583 to master 
Change-Id: Icba2bcdbc9f967288a65c930b198405fd8566abd
 2011-05-24 08:04:45 -07:00
Jeffrey Tinker
c41a17de2b am 6e5cdca1: am ef89cc14: Merge "Multi-repository checkin, goes with https://android-git.corp.google.com/g/111038" into honeycomb-mr2 
* commit '6e5cdca12bdbc26dd4d4eb1b1d986783b13601aa':
  Multi-repository checkin, goes with https://android-git.corp.google.com/g/111038
 2011-05-23 18:47:17 -07:00
Jeffrey Tinker
6e5cdca12b am ef89cc14: Merge "Multi-repository checkin, goes with https://android-git.corp.google.com/g/111038" into honeycomb-mr2 
* commit 'ef89cc14957ab631346564801841190346632ac9':
  Multi-repository checkin, goes with https://android-git.corp.google.com/g/111038
 2011-05-23 18:15:47 -07:00
Jeffrey Tinker
ef89cc1495 Merge "Multi-repository checkin, goes with https://android-git.corp.google.com/g/111038" into honeycomb-mr2 2011-05-23 18:10:10 -07:00
Huahui Wu
ea0bad0574 b/4452171 Dumping video playbacks to files. 
MediaDump: a tool app to dump video playback into raw files and
 a viewer to display the dumped files.

Change-Id: I7bf116e38bb1f9e85d5a1680ae92b5b72bc10ea8
 2011-05-23 15:34:29 -07:00
Jeffrey Tinker
8264641c98 Multi-repository checkin, goes with https://android-git.corp.google.com/g/111038 
Fix for b/4198446 HC - Support for Widevine Adaptive VOD

Change-Id: Ia777c80825e3416bab6ae6273fba46a194135e60
 2011-05-23 11:09:16 -07:00
James Dong
d5762583bd am ebae1923: am a5293d1c: Add some logging to track down where ANR happens during MediaPlayer._release(). 
* commit 'ebae1923869ee71ab119f766ac01c5a320619290':
  Add some logging to track down where ANR happens during MediaPlayer._release().
 2011-05-23 10:26:40 -07:00
James Dong
ebae192386 am a5293d1c: Add some logging to track down where ANR happens during MediaPlayer._release(). 
* commit 'a5293d1ca4459293f4993ea39c09ea703a022844':
  Add some logging to track down where ANR happens during MediaPlayer._release().
 2011-05-23 09:59:59 -07:00
James Dong
a5293d1ca4 Add some logging to track down where ANR happens during MediaPlayer._release(). 
o add a log message in AwesomePlayer::reset before acquiring the lock

Change-Id: I9f228f615f99c03c394e9d0dd78c855c0b9fcfbb
related-to-bug: 4409547
 2011-05-23 09:36:31 -07:00
Mans Rullgard
219e2627f1 Convert line breaks to Unix style 
Change-Id: I6219725a9fbd72432bad71a176c14f26fabdbd5f
 2011-05-21 09:39:22 -07:00
Glenn Kasten
850ae9acda Merge "Bug 4184736 unhide MediaPlayer.setTexture" 2011-05-20 15:42:31 -07:00
Gloria Wang
24ff7fae02 am 4d8ceada: am dbfd055d: am a6f1104b: Use pread() to get the decrypted data for container based DRM file. For bug 4392094. 
* commit '4d8ceada09441f43a98f5c7dadde9192e7d6abf9':
  Use pread() to get the decrypted data for container based DRM file. For bug 4392094.
 2011-05-20 11:05:43 -07:00
Gloria Wang
4d8ceada09 am dbfd055d: am a6f1104b: Use pread() to get the decrypted data for container based DRM file. For bug 4392094. 
* commit 'dbfd055d51b51b7a6f412155c2391666efbb638a':
  Use pread() to get the decrypted data for container based DRM file. For bug 4392094.
 2011-05-20 11:02:31 -07:00
Gloria Wang
dbfd055d51 am a6f1104b: Use pread() to get the decrypted data for container based DRM file. For bug 4392094. 
* commit 'a6f1104b9d829c636b60b9387e379f9667b5df09':
  Use pread() to get the decrypted data for container based DRM file. For bug 4392094.
 2011-05-20 10:57:51 -07:00
Gloria Wang
a6f1104b9d Use pread() to get the decrypted data for container based DRM file. 
For bug 4392094.

Change-Id: Icc64a26c5b413313cc35dcd02d60484dc8245dfb
 2011-05-20 10:15:21 -07:00
Kristian Monsen
56031fb1de Merge "Merge Chromium at 10.0.621.0: Fixes for libstagefreight" 2011-05-20 08:40:13 -07:00
Glenn Kasten
817c161ef2 Bug 4184736 unhide MediaPlayer.setTexture 
Change-Id: I4c8456465611b717e42c0a11e3ce3b4dc0a34270
 2011-05-20 07:30:00 -07:00
James Dong
3c707256cf Merge "Publish setLocation() method as a public Java API" 2011-05-19 11:51:37 -07:00
Gloria Wang
612956c914 Merge "Add one more MIME type (audio/aac-adts) for aac file. Fix for bug 4463059." 2011-05-19 11:15:16 -07:00
Gloria Wang
f9cf277cda Add one more MIME type (audio/aac-adts) for aac file. 
Fix for bug 4463059.

Change-Id: Ie2125349667e65b41871a228d87e4dce6b513398
 2011-05-19 10:45:45 -07:00
James Dong
ba43d4282c resolved conflicts for merge of a8939e0d to master 
Change-Id: I090479ed09618e1aa3685ca79e16202d9c82f523
 2011-05-19 08:49:09 -07:00
James Dong
a8939e0d48 am 380244e9: am d148a499: Merge "Using widevine:// to stream adaptive bitrate wvm content no longer" into honeycomb-mr2 
* commit '380244e9d6c8016bc1a04691a3af0fd999ddf6b0':
  Using widevine:// to stream adaptive bitrate wvm content no longer
 2011-05-18 16:33:20 -07:00
James Dong
380244e9d6 am d148a499: Merge "Using widevine:// to stream adaptive bitrate wvm content no longer" into honeycomb-mr2 
* commit 'd148a499c27145e0473f89ece0500ebed38f875f':
  Using widevine:// to stream adaptive bitrate wvm content no longer
 2011-05-18 16:09:58 -07:00
James Dong
d148a499c2 Merge "Using widevine:// to stream adaptive bitrate wvm content no longer" into honeycomb-mr2 2011-05-18 16:06:14 -07:00
James Dong
af3131fe2e Publish setLocation() method as a public Java API 
related-to-bug: 4260295

Change-Id: I91b923af8549127eb08f0d7e535cd53ad229e1f6
 2011-05-18 09:41:57 -07:00
Andreas Huber
9516aee4c1 Merge "Properly forward rotation information from input format to output format." 2011-05-18 09:40:52 -07:00
Andreas Huber
0920bca3ab Properly forward rotation information from input format to output format. 
The software renderer would otherwise never rotate videos as it only has access to
the decoder's output format.

Change-Id: If893c0c23d0e85a3d9d4eb94390a114af5514b1c
 2011-05-18 09:31:22 -07:00
Gloria Wang
8d161fe1ea am 5a6c3d49: am 07e9267d: Merge "DO NOT MERGE For bug 4422428 Squashed commit of the following:" into honeycomb-mr2 
* commit '5a6c3d491ccac07ef3f6a624a8a3e0c36959b661':
  DO NOT MERGE For bug 4422428 Squashed commit of the following:
 2011-05-18 09:30:01 -07:00
Mike Lockwood
fa1e5561cc am 53b988ba: am 5a79cfd7: am 27ac64ec: Merge "StorageVolume: Add getStorageId() accessor" into honeycomb-mr2 
* commit '53b988ba1842f40e595bb85f2ca055c24787e6dc':
  StorageVolume: Add getStorageId() accessor
 2011-05-18 09:23:35 -07:00
Gloria Wang
5a6c3d491c am 07e9267d: Merge "DO NOT MERGE For bug 4422428 Squashed commit of the following:" into honeycomb-mr2 
* commit '07e9267d33bb199d0a2b8de221c64541bdf2465a':
  DO NOT MERGE For bug 4422428 Squashed commit of the following:
 2011-05-18 09:19:56 -07:00
Gloria Wang
07e9267d33 Merge "DO NOT MERGE For bug 4422428 Squashed commit of the following:" into honeycomb-mr2 2011-05-18 09:17:50 -07:00
James Dong
f84e4a657f Revert "Add const to the finders method in MetaData.cpp" 
This reverts commit 78fed171d9d62b25aa846d7373a7040e3fd2241e.

Conflicts:

	include/media/stagefright/MPEG4Writer.h

Change-Id: Ie6f497f67a473ad95b50bb949c1aa49e1804bac3
 2011-05-17 22:39:06 -07:00
Mike Lockwood
53b988ba18 am 5a79cfd7: am 27ac64ec: Merge "StorageVolume: Add getStorageId() accessor" into honeycomb-mr2 
* commit '5a79cfd7518defdce1911cecbc2441bb0a057e54':
  StorageVolume: Add getStorageId() accessor
 2011-05-17 16:49:40 -07:00
Mike Lockwood
5a79cfd751 am 27ac64ec: Merge "StorageVolume: Add getStorageId() accessor" into honeycomb-mr2 
* commit '27ac64eceee8d4e392983861c6bc6bd620e4c6f7':
  StorageVolume: Add getStorageId() accessor
 2011-05-17 16:44:51 -07:00
Mike Lockwood
fbfe555125 StorageVolume: Add getStorageId() accessor 
This ID is used for MTP as well as per volume querying in the media provider.

Change-Id: Ic4fc986d972bd477730643f7e9450c390c0b3a4b
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-05-17 17:19:37 -04:00
James Dong
0f32fb3ecf Make track informational event optional, depending on system property 
o also add a track informational event to return the encoded data in kilo-bytes

Change-Id: I7c383360d57048c8a3606d0b8141ba53e4f4b224
 2011-05-17 12:21:57 -07:00
Andreas Huber
c9eb18bb72 am bf81d4be: am c56e81c8: Merge "DO NOT MERGE: Properly construct the ESDS metadata even if sizeof(codec-specific-data) != 2" into honeycomb-mr2 
* commit 'bf81d4be0514265875d7deffe50c31a344f6eac5':
  DO NOT MERGE: Properly construct the ESDS metadata even if sizeof(codec-specific-data) != 2
 2011-05-17 10:34:41 -07:00
Andreas Huber
bf81d4be05 am c56e81c8: Merge "DO NOT MERGE: Properly construct the ESDS metadata even if sizeof(codec-specific-data) != 2" into honeycomb-mr2 
* commit 'c56e81c88706d79ce51a314b5bfd3e247ca6f86c':
  DO NOT MERGE: Properly construct the ESDS metadata even if sizeof(codec-specific-data) != 2
 2011-05-17 10:31:58 -07:00
Andreas Huber
c56e81c887 Merge "DO NOT MERGE: Properly construct the ESDS metadata even if sizeof(codec-specific-data) != 2" into honeycomb-mr2 2011-05-17 10:29:36 -07:00
Andreas Huber
708d908668 Claim support for .3gpp2 A/B files. 
Change-Id: I16dd3dcb93a50b3c808ae710d0ba4757c89ab9c8
related-to-bug: 4406745
 2011-05-17 10:12:34 -07:00
Andreas Huber
126a2cd686 Disable yuv->yuv mode and external display support until various driver fixes are in. 
Change-Id: Ib3838f779afc87caca7d78e18a5d72d2971ee306
 2011-05-16 16:14:13 -07:00
Andreas Huber
d6577a722a Merge "Instead of using an RGB surface and conversion yuv420->rgb565" 2011-05-16 15:21:26 -07:00
Mike Lockwood
e6f3f54e05 resolved conflicts for merge of b107f4de to master 
Change-Id: I0290c8517562bcbba7ac1f6ed358011c8e7e250e
 2011-05-16 16:08:12 -04:00
Dianne Hackborn
f97ed77197 am d90a2c4d: am 1e662c32: Merge "DO NOT MERGE. Integrate from master: Rework display size access." into honeycomb-mr2 
* commit 'd90a2c4d4463085155444efb07eba2d6579b444a':
  DO NOT MERGE.  Integrate from master: Rework display size access.
 2011-05-16 13:01:38 -07:00
Dianne Hackborn
d90a2c4d44 am 1e662c32: Merge "DO NOT MERGE. Integrate from master: Rework display size access." into honeycomb-mr2 
* commit '1e662c3294b740ff694ad98e4d9a366e1e4b5e62':
  DO NOT MERGE.  Integrate from master: Rework display size access.
 2011-05-16 12:57:00 -07:00
Dianne Hackborn
1e662c3294 Merge "DO NOT MERGE. Integrate from master: Rework display size access." into honeycomb-mr2 2011-05-16 12:54:22 -07:00
Mike Lockwood
b107f4dec3 am e23639e0: am 15afd076: Merge "MTP: Have GetStorageInfo command return correct storage type for removable storage" into honeycomb-mr2 
* commit 'e23639e0386735df50ad208078f638c38f662d42':
  MTP: Have GetStorageInfo command return correct storage type for removable storage
 2011-05-16 12:41:25 -07:00
Mike Lockwood
fc4a3d37ef am b822d246: am 0a93d875: Merge "StorageManager: Clean up and generalize storage configuration resources" into honeycomb-mr2 
* commit 'b822d2464dc59056f736b0c49f0ac514c7cbb9d9':
  StorageManager:  Clean up and generalize storage configuration resources
 2011-05-16 12:38:36 -07:00
Mike Lockwood
e23639e038 am 15afd076: Merge "MTP: Have GetStorageInfo command return correct storage type for removable storage" into honeycomb-mr2 
* commit '15afd076d6070374cbb4f9dcbe28dda67caa0718':
  MTP: Have GetStorageInfo command return correct storage type for removable storage
 2011-05-16 12:38:18 -07:00
Mike Lockwood
b822d2464d am 0a93d875: Merge "StorageManager: Clean up and generalize storage configuration resources" into honeycomb-mr2 
* commit '0a93d875527c52183080b63a0b19d567856952af':
  StorageManager:  Clean up and generalize storage configuration resources
 2011-05-16 12:36:29 -07:00