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

5451 Commits

Author SHA1 Message Date
Jeff Tinker
a6e549455a am dc44e06e: am ef664f62: Merge "Fix drm flag setting missed in false drm recognition fix." into ics-mr1 
* commit 'dc44e06ef305be8de060af69a468e003e231ba05':
  Fix drm flag setting missed in false drm recognition fix.
 2011-12-12 15:30:16 -08:00
James Dong
b7e0281900 am 406dd5d1: am aadbd80b: Fixed the false drm recognition. 
* commit '406dd5d1e48752177753666867403542e1f400ca':
  Fixed the false drm recognition.
 2011-12-12 15:29:46 -08:00
Andreas Huber
2fc93533d2 Merge "Support for parsing of "folded" RTSP header values and some tweaks to the AMR assembler" 2011-12-12 08:32:28 -08:00
Owen Lin
130f62ab01 Fix the build. (Change LOGV to ALOGV) 
Change-Id: I14104540cfbd2bcdd7af1534db20554b88c4c0ce
 2011-12-12 16:17:34 +08:00
Andreas Huber
1f7817e146 am ebfce84f: am 68f592a8: Merge "Don\'t perform RTSP seeks right away but queue them for 200ms" into ics-mr1 
* commit 'ebfce84f7fd3e25fa08c36b155db91df90a59b3d':
  Don't perform RTSP seeks right away but queue them for 200ms
 2011-12-09 18:09:21 -08:00
Andreas Huber
61a8b5301b am aa82c39b: am 0ba9380a: Merge "Fix Bitreader "putBits" implementation, make sure we emulate timestamps" into ics-mr1 
* commit 'aa82c39bdb4ad9c1fdcb09f3bea11be5197d3ce6':
  Fix Bitreader "putBits" implementation, make sure we emulate timestamps
 2011-12-09 18:09:19 -08:00
Andreas Huber
9f62e15f40 Support for parsing of "folded" RTSP header values and some tweaks to the AMR assembler 
contributed by Samsung (untested).

Change-Id: I182561fe0a1a564126bdbb317e96aa52bf525726
 2011-12-09 15:09:56 -08:00
Jeff Tinker
aac2f9c66c am a5038d16: am a693a4b5: Merge "Fix ANRs due to Widevine DRM plugin sniff taking too long." into ics-mr1 
* commit 'a5038d169f47b2e2278c0056495dfd4808803f8a':
  Fix ANRs due to Widevine DRM plugin sniff taking too long.
 2011-12-09 14:25:49 -08:00
Jeff Tinker
9f704f6c46 Fix drm flag setting missed in false drm recognition fix. 
Change-Id: Ie38668c8a32969ef7c7df4ca3350e2364291953c
related-to-bug: 5732033
 2011-12-09 09:09:08 -08:00
James Dong
aadbd80b30 Fixed the false drm recognition. 
Change-Id: If0198e52ff7bbd7422f219f55a37aae97f7d74f1

related-to-bug: 5732033
 2011-12-08 21:01:31 -08:00
Andreas Huber
68f592a821 Merge "Don't perform RTSP seeks right away but queue them for 200ms" into ics-mr1 2011-12-08 13:33:16 -08:00
Andreas Huber
21902a8a48 Don't perform RTSP seeks right away but queue them for 200ms 
and only execute the last one.

Change-Id: I9ab342396ec9c9c03624a4b0306d1e180ceca000
related-to-bug: 5732960
 2011-12-08 13:04:50 -08:00
Andreas Huber
f6ae711450 Fix Bitreader "putBits" implementation, make sure we emulate timestamps 
if we don't receive npt time mapping from the rtsp server (i.e. live stream)

Change-Id: I5147d665bd90c9a303ad6ffdafbf770f930f917c
related-to-bug: 5660357
 2011-12-08 12:27:47 -08:00
Jeff Tinker
a693a4b555 Merge "Fix ANRs due to Widevine DRM plugin sniff taking too long." into ics-mr1 2011-12-08 00:13:43 -08:00
James Dong
1321bc1fa3 Merge "Update onVideoSizeChanged() callback method Java doc to explicitly specify the conditions under which the width/height passed to the callback could be 0." 2011-12-07 23:05:03 -08:00
Jeff Tinker
d0d19db1ca Fix ANRs due to Widevine DRM plugin sniff taking too long. 
Add a Widevine-specific format sniffer to avoid having to
refetch data from the remote server.

Change-Id: I5fdb21fe7a0d6e74f2a6f06e6fbf8070b068ac60
related-to-bug: 5725548
 2011-12-07 20:23:20 -08:00
Eric Laurent
71087709aa Merge "Fix audio effect tests" 2011-12-07 16:45:07 -08:00
Dave Burke
7554c57c17 am 6727a43f: am 54a53841: Merge "Fetch at least 192KB to avoid our mp3 sniffer from blocking on data." into ics-mr1 
* commit '6727a43f6d8ff193b86ca90b2daa761c47157638':
  Fetch at least 192KB to avoid our mp3 sniffer from blocking on data.
 2011-12-07 14:11:14 -08:00
Andreas Huber
7dea9aaff5 Fetch at least 192KB to avoid our mp3 sniffer from blocking on data. 
Change-Id: Icb10c129249bb9b69e91f6633a385840c94efa59
related-to-bug: 5666532
 2011-12-07 12:50:47 -08:00
Narayan Kamath
b808af7daf Merge "Allow data uris to be data sources" 2011-12-07 04:15:43 -08:00
James Dong
ca402cdcac Update onVideoSizeChanged() callback method Java doc to explicitly specify the conditions under which the width/height passed 
to the callback could be 0.

Change-Id: Ie921f0af8284eccfd02c4a5826ed41fe19f9676f
related-to-bug: 5613451
 2011-12-06 17:58:22 -08:00
Hong Teng
2fe9130f22 am 2be608f8: am 6db79c35: Merge "Fix for issue 5712743 video editor functional test : testPreviewDuringExport fails -Correct the invalid filename, which contains control character. And with the invalid filename, the cts fails only on crespo, but passes on stingray an 
* commit '2be608f88cd469b40a472551f22a9d40903beede':
  Fix for issue 5712743 video editor functional test : testPreviewDuringExport fails -Correct the invalid filename, which contains control character.  And with the invalid filename, the cts fails only on crespo, but passes on stingray and prime.
 2011-12-06 16:59:45 -08:00
Amith Yamasani
9c316f3c6a am d49ec62c: am f3364080: Merge "New and improved silent mode on lockscreen." into ics-mr1 
* commit 'd49ec62cfb0469c39f2b5d79cbf2a6f69cceb7d7':
  New and improved silent mode on lockscreen.
 2011-12-06 16:59:44 -08:00
Hong Teng
6db79c35c0 Merge "Fix for issue 5712743 video editor functional test : testPreviewDuringExport fails -Correct the invalid filename, which contains control character. And with the invalid filename, the cts fails only on crespo, but passes on stingray and prime." into ics-mr1 2011-12-06 15:37:25 -08:00
Amith Yamasani
f336408000 Merge "New and improved silent mode on lockscreen." into ics-mr1 2011-12-06 15:36:10 -08:00
Amith Yamasani
6243edd818 New and improved silent mode on lockscreen. 
3-state item to toggle between Silent/Vibrate/Ringer in long-press power menu.
No volume dialog on lockscreen, unless Power menu is up.

Set VIBRATE_IN_SILENT=1 when upgrading device.

Change-Id: I097d216f96c4abdbd83420e0c477106951b3607d
 2011-12-06 14:48:38 -08:00
James Dong
6b8b5a0a41 Merge "DO NOT MERGE - Consider I-Frame at zeroeth position when searching for sync frames" into ics-mr1 2011-12-06 12:52:52 -08:00
Hong Teng
96bea6a5e9 Fix for issue 5712743 video editor functional test : testPreviewDuringExport fails 
-Correct the invalid filename, which contains control character.
 And with the invalid filename, the cts fails only on crespo, but passes on stingray and prime.

Change-Id: I77862e55e8ee990f72f617a804f26fd724914b5b
 2011-12-06 11:51:47 -08:00
Andreas Huber
92f604c4d4 DO NOT MERGE: Remove the AVI extractor. 
Change-Id: Ifce6c0d3d87aad2f5cc7f40ad6304936cbfa795e
 2011-12-06 11:24:34 -08:00
Narayan Kamath
6b67215235 Allow data uris to be data sources 
bug:5571010
Change-Id: I0b6ae6c729ac34d46e9990fcceb08294eb4f7c58
 2011-12-06 17:31:39 +00:00
James Dong
cb064917cf DO NOT MERGE - Consider I-Frame at zeroeth position when searching for sync frames 
The current logic does not check the I-frame at zeroeth position and therefore
for the files with only 1 I-Frame at zeroeth postion does not play.

Originally authored by Braganza Sam Robertsh <sam.braganza@samsung.com>

Do not merge to master branch since we made some improvement to SampleTable.cpp in the master branch.

Change-Id: I068184dec71986f14a586f769c2af1f52b4bcf94
related-to-bug: 5711942
 2011-12-05 14:29:18 -08:00
Andreas Huber
68d2f95328 resolved conflicts for merge of 07bacabe to master 
Change-Id: Idb56996f7c1b78d96e3d3d3f08419c4d122db0b1
 2011-12-05 13:31:17 -08:00
Andreas Huber
b8e651a675 Properly identify how much metadata we need to cache in order to instantiate 
the extractor without blocking (and therefore be able to abort).

Change-Id: Id2acdde897e02baaeabadae70b7c95b66c9041b3
related-to-bug: 5666532
 2011-12-05 11:34:43 -08:00
Amith Yamasani
89972657bd am f8dad0b3: am afd01086: Merge "Further volume improvements." into ics-mr1 
* commit 'f8dad0b37d9aa2476ef3ab84b9f4a7a9f4c960e4':
  Further volume improvements.
 2011-12-02 17:49:31 -08:00
Hong Teng
29f1c32eea am 5126f1d4: am 613ed4c6: Merge "Fixd for 5490443 Native crash while exporting a video - Add new onError callback to PreviewProgressListener, which is used to indicate video editor application for the error that has occurred during priviewing. With this modification, 
* commit '5126f1d413b4fcb0aff5b364e1e5a41c89ca665c':
  Fixd for 5490443 Native crash while exporting a video - Add new onError callback to PreviewProgressListener, which is used to indicate video editor application for the error that has occurred during priviewing. With this modification, the application must implement the onError method, and then VideoEditorPreviewTest.java is changed accordingly.
 2011-12-02 13:44:10 -08:00
Mike Lockwood
7944c1b19f MTP: Add support for restricting PTP to only certain subdirectories of the storage DO NOT MERGE 
Bug: 5527220

Change-Id: I81d6de590ea3002118ba46eb4b6d5fe9061c998c
Signed-off-by: Mike Lockwood <lockwood@google.com>
 2011-12-02 15:12:47 -05:00
Mike Lockwood
7a1ad63d16 MTP: Don't attempt to read more than 16K at a time from the MTP driver DO NOT MERGE 
This could happen sometimes if other operations increased the size of the
data packet buffer to > 16K

Change-Id: I10f85f0ce32df39f46b0a984361958c0a13f6800
Signed-off-by: Mike Lockwood <lockwood@google.com>
 2011-12-02 15:12:30 -05:00
Amith Yamasani
afd0108679 Merge "Further volume improvements." into ics-mr1 2011-12-02 11:22:32 -08:00
Jean-Michel Trivi
d62da2d0da Remove unused variable and imports in AudioManager 
Remove unused imports.
Remove private mHandler variable: it was assigned a new Handler
 object but was never accessed.

Change-Id: I63cd08aa38701ea157fef7d3185a58a6e2a95822
 2011-12-02 09:54:16 -08:00
Hong Teng
613ed4c69a Merge "Fixd for 5490443 Native crash while exporting a video - Add new onError callback to PreviewProgressListener, which is used to indicate video editor application for the error that has occurred during priviewing. With this modification, the application must implement the onError method, and then VideoEditorPreviewTest.java is changed accordingly." into ics-mr1 2011-12-02 09:32:02 -08:00
Mike Lockwood
6a5c1a9574 Merge "MTP: Add support for restricting PTP to only certain subdirectories of the storage" 2011-12-02 08:17:33 -08:00
Mike Lockwood
09bd918c5d Merge "MTP: Don't attempt to read more than 16K at a time from the MTP driver" 2011-12-02 08:10:03 -08:00
Mike Lockwood
73e56d935e MTP: Add support for restricting PTP to only certain subdirectories of the storage 
Bug: 5527220

Change-Id: If68e7481617ecb62abd24e2d89e6b7dfdf95ba2b
Signed-off-by: Mike Lockwood <lockwood@google.com>
 2011-12-02 11:08:39 -05:00
Eric Laurent
ee07e110d9 am 6cfa9e6c: am 0d3a2e93: Merge "AudioService: strengthen A2DP device detection" into ics-mr1 
* commit '6cfa9e6c507a721f647518569c89db9560056079':
  AudioService: strengthen A2DP device detection
 2011-12-01 20:38:15 -08:00
Eric Laurent
0d3a2e9339 Merge "AudioService: strengthen A2DP device detection" into ics-mr1 2011-12-01 20:34:08 -08:00
Mike Lockwood
1958dc27c9 MTP: Don't attempt to read more than 16K at a time from the MTP driver 
This could happen sometimes if other operations increased the size of the
data packet buffer to > 16K

Change-Id: I4d316c7e2e558d3dd861d39accae6514fd9a62f5
Signed-off-by: Mike Lockwood <lockwood@google.com>
 2011-12-01 18:37:29 -05:00
Amith Yamasani
2ef6f1bb56 Further volume improvements. 
- Remove silent mode from Power menu
- Show volume dialog on lockscreen
- Allow beeps when adjusting volume in lockscreen

Bug: 5586083
Change-Id: I93052a8ec5004c784f20e04488af9382d495e711
 2011-12-01 15:05:54 -08:00
Glenn Kasten
d01d261183 Merge "Add README for media "automated" tests" 2011-12-01 13:55:41 -08:00
Glenn Kasten
a54a06b3f0 Add README for media "automated" tests 
Change-Id: I92e611fb6df2d870ded9e246963277ecc35b0d15
 2011-12-01 13:35:32 -08:00
Andreas Huber
f8ebb32d1f am 10526a0b: am 2c2ed7be: Merge "Fixes a typo in AVIExtractor that would advertise the wrong video dimensions" into ics-mr1 
* commit '10526a0bfe070ac4d1e550a81ed68be35d261b16':
  Fixes a typo in AVIExtractor that would advertise the wrong video dimensions
 2011-12-01 10:22:19 -08:00