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

3633 Commits

Author SHA1 Message Date
James Dong
8e7d626385 Merge "Expose average video frame rate via MPEG4Extractor" into honeycomb 2011-01-19 10:29:04 -08:00
Mike Lockwood
216a7b97eb am dc80b7ec: Merge "MTP: Close and reopen driver file after an error." into honeycomb 
* commit 'dc80b7ec053dd9e6f195bb807924d1e3891c00aa':
  MTP: Close and reopen driver file after an error.
 2011-01-19 10:23:44 -08:00
James Dong
cbb488d678 Expose average video frame rate via MPEG4Extractor 
bug - 3362483

Change-Id: Ifcbb75c1e8b80cb06c4b8fe7f5ff99bc6f18af69
 2011-01-19 10:20:59 -08:00
Mike Lockwood
dc80b7ec05 Merge "MTP: Close and reopen driver file after an error." into honeycomb 2011-01-19 10:20:38 -08:00
Mike Lockwood
897f894e88 MTP: Close and reopen driver file after an error. 
BUG: 3368665

Change-Id: Ib1580c0e98a4d192aa0c213406fd3bafae597ec0
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-01-19 10:11:28 -08:00
James Dong
1324e3b1a4 am 4061c9aa: Merge "Fix the presentation video resolution when it is different from the actual image resolution of the video." into honeycomb 
* commit '4061c9aa6d77bd7ad3b43d898b3e55fd62f57f18':
  Fix the presentation video resolution when it is different from the actual image resolution of the video.
 2011-01-19 10:06:23 -08:00
James Dong
4061c9aa6d Merge "Fix the presentation video resolution when it is different from the actual image resolution of the video." into honeycomb 2011-01-19 10:05:05 -08:00
Andreas Huber
d3bf3eeadd am 2597aedb: Merge "Turn another assertion into a runtime error. Damn you surfaces." into honeycomb 
* commit '2597aedb3869e46f945359c529e03263c77a944d':
  Turn another assertion into a runtime error. Damn you surfaces.
 2011-01-19 09:51:42 -08:00
Andreas Huber
ba1b16790a Turn another assertion into a runtime error. Damn you surfaces. 
Change-Id: Ib62957180949293a6fb84bb5a40af058798337ab
related-to-bug: 3335220
 2011-01-19 09:20:58 -08:00
James Dong
08adfd29ae Fix the presentation video resolution when it is different from the actual image resolution of the video. 
bug - 3352413

Change-Id: I8f08f3896e9fb90f09119dccdb88b82af60f79f2
 2011-01-19 08:33:07 -08:00
James Dong
456570ef55 am 5fb60c7a: Use metadata in video buffers for timelapse video recording by default to eliminate memcpy 
* commit '5fb60c7af2cbf59a99ae324c4284c7860b37c723':
  Use metadata in video buffers for timelapse video recording by default to eliminate memcpy
 2011-01-18 22:09:21 -08:00
James Dong
5fb60c7af2 Use metadata in video buffers for timelapse video recording by default to eliminate memcpy 
bug - 3361771

Change-Id: Ib37ffe4be8edc8708baa76b3507b6f11372536d9
 2011-01-18 21:33:58 -08:00
Mike Lockwood
6b280468f5 am 2bc6971d: Merge changes I7df1ff78,Ibc2e8adf into honeycomb 
* commit '2bc6971dd82d37273b0baafeeebf3ba90d15837f':
  MediaScanner: Make sure name field is set for file based playlists
  MTP: Fix problem with MTP starting up on the first try.
 2011-01-18 20:31:45 -08:00
Mike Lockwood
2bc6971dd8 Merge changes I7df1ff78,Ibc2e8adf into honeycomb 
* changes:
  MediaScanner: Make sure name field is set for file based playlists
  MTP: Fix problem with MTP starting up on the first try.
 2011-01-18 20:30:13 -08:00
Mike Lockwood
242d0cdc1a MediaScanner: Make sure name field is set for file based playlists 
Change-Id: I7df1ff783d815d6021ec2432467ba56cb3f3ad1b
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-01-18 20:29:08 -08:00
Mike Lockwood
a1c9180461 MTP: Fix problem with MTP starting up on the first try. 
BUG: 3361230

Change-Id: Ibc2e8adf24a14ea18385b306e786a77983ff8f5b
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-01-18 20:11:29 -08:00
Andreas Huber
f9846fcdf8 am 39560507: Merge "Apparently our native TCP sockets do not return an error from blocking "connect"" into honeycomb 
* commit '39560507215774873ba64b5f0ff61648488924ea':
  Apparently our native TCP sockets do not return an error from blocking "connect"
 2011-01-18 15:37:58 -08:00
Andreas Huber
3956050721 Merge "Apparently our native TCP sockets do not return an error from blocking "connect"" into honeycomb 2011-01-18 15:35:35 -08:00
Andreas Huber
eee580a495 Apparently our native TCP sockets do not return an error from blocking "connect" 
if the network interface is shutdown while connecting.

Change-Id: I1bd7e43475edf20f35e15dd4eae547126289f5f0
related-to-bug: 3362836
 2011-01-18 15:26:40 -08:00
James Dong
d2225a06a3 am 1418de7e: Merge "Fix the sluggish preview during timelapse video recording because software encoder is used." into honeycomb 
* commit '1418de7eff012c37cf34328eb368a547d70a1441':
  Fix the sluggish preview during timelapse video recording because software encoder is used.
 2011-01-18 14:44:58 -08:00
James Dong
183fa14b47 Fix the sluggish preview during timelapse video recording because software encoder is used. 
bug - 3361771

Change-Id: Ic5344e9eabe7f1b82910b65b4260e4ad8dc51c32
 2011-01-18 14:28:37 -08:00
Eric Laurent
2d1362b7b4 am 74ff70d2: Merge "Fix typo" into honeycomb 
* commit '74ff70d2f2e90c591c58723121bc26ab44a3adcc':
  Fix typo
 2011-01-18 14:27:17 -08:00
Eric Laurent
74ff70d2f2 Merge "Fix typo" into honeycomb 2011-01-18 14:25:17 -08:00
Glenn Kasten
ed6eae420f Fix typo 
Change-Id: I73e7c5cf13c5ed82398006af61308665eb1d3ad0
 2011-01-18 14:13:28 -08:00
Mike Lockwood
14032e3b3e am 5f31aa30: Merge "MTP: Set modification date for abstract playlists" into honeycomb 
* commit '5f31aa30cdf104dc10c2a503d7846178d6aa79cb':
  MTP: Set modification date for abstract playlists
 2011-01-18 13:32:12 -08:00
Mike Lockwood
5f31aa30cd Merge "MTP: Set modification date for abstract playlists" into honeycomb 2011-01-18 13:29:55 -08:00
James Dong
1b67fec7e1 am 0a3dbf6f: Merge "Fix the build break in git_master-without-vendor" into honeycomb 
* commit '0a3dbf6f69a72d557afca69f006a407fbfc2482d':
  Fix the build break in git_master-without-vendor
 2011-01-18 13:28:47 -08:00
Mike Lockwood
8ed67acf38 MTP: Set modification date for abstract playlists 
BUG: 3224269

Change-Id: I96ae8e6d2f7e28860e9217ceb911331b333e1391
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-01-18 13:27:25 -08:00
James Dong
0a3dbf6f69 Merge "Fix the build break in git_master-without-vendor" into honeycomb 2011-01-18 13:26:14 -08:00
Mike Lockwood
b5f0871459 am 26c1ab2e: Merge "MTP: Strip ".pla" file extension from name field for WMP playlists" into honeycomb 
* commit '26c1ab2e58f47ac94e638f69b9b626cc6b1925b6':
  MTP: Strip ".pla" file extension from name field for WMP playlists
 2011-01-18 13:17:27 -08:00
Mike Lockwood
26c1ab2e58 Merge "MTP: Strip ".pla" file extension from name field for WMP playlists" into honeycomb 2011-01-18 13:14:58 -08:00
Mike Lockwood
8cc6eb1e4c MTP: Strip ".pla" file extension from name field for WMP playlists 
BUG: 3309324

Change-Id: Ia136f94406496f971819f4f805f742f2a6829007
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-01-18 13:13:05 -08:00
Dharmaray Kundargi
a1a55bbe94 Fix the build break in git_master-without-vendor 
Change-Id: I8fff5ee69958212a80711e0d86fb86514c8797f4
 2011-01-18 12:40:56 -08:00
Andreas Huber
63e99c39e1 am 529fc53d: Merge "Implement parsing of vbv buffering info in RTSP." into honeycomb 
* commit '529fc53d3fd298ee5aef20e3a07bd263f7376b8d':
  Implement parsing of vbv buffering info in RTSP.
 2011-01-18 11:54:08 -08:00
Andreas Huber
529fc53d3f Merge "Implement parsing of vbv buffering info in RTSP." into honeycomb 2011-01-18 11:52:02 -08:00
Bryan Mawhinney
6d7d0da9fb am 3a4d547c: Merge "Don\'t report 100% buffered when the stream ends prematurely." into honeycomb 
* commit '3a4d547c588dc3a1abb48988595dc17874660bb8':
  Don't report 100% buffered when the stream ends prematurely.
 2011-01-18 11:31:51 -08:00
Bryan Mawhinney
3a4d547c58 Merge "Don't report 100% buffered when the stream ends prematurely." into honeycomb 2011-01-18 11:30:30 -08:00
Mike Lockwood
f9828f6584 am 0de274b3: Merge "MTP: Fix problems with modification dates for folders and non-media files" into honeycomb 
* commit '0de274b34c554a0e87b1071e001e41e416cd7678':
  MTP: Fix problems with modification dates for folders and non-media files
 2011-01-18 11:20:22 -08:00
Andreas Huber
77034e6393 Implement parsing of vbv buffering info in RTSP. 
Change-Id: I7d871cafda2c4c65670a40ad9ab4f24317f8568a
related-to-bug: 3351915
 2011-01-18 11:19:13 -08:00
Bryan Mawhinney
e26275bdac Don't report 100% buffered when the stream ends prematurely. 
Change-Id: Ia4e80d02f28104427a3309e3d5b155faa5702757
 2011-01-18 19:12:21 +00:00
Mike Lockwood
7a0bd17bce MTP: Fix problems with modification dates for folders and non-media files 
Also removed an unnecessary parameter to MtpDatabase.endSendobject()

BUG: 3352142

Change-Id: I6fd812dcba4814956bc8bc1cbd6bd5c868197790
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-01-18 11:07:11 -08:00
Dharmaray Kundargi
b7d3312449 am 9ed99405: Merge "Video editor API update - rework for Patch Set 3" into honeycomb 
* commit '9ed99405ae8cdd9038071a872e7d92cf256f2165':
  Video editor API update - rework for Patch Set 3
 2011-01-17 11:40:27 -08:00
Dharmaray Kundargi
bf6ccb04b9 am 307003a8: Merge "integrate videoeditor preview player." into honeycomb 
* commit '307003a844c90458bcfd7398c44bbae734936238':
  integrate videoeditor preview player.
 2011-01-17 11:40:16 -08:00
Dharmaray Kundargi
f7465eb652 am 4e4f3d1d: Merge "videoeditor JNI files on honeycomb" into honeycomb 
* commit '4e4f3d1df475b03a1a49954d2b3b4530e39778ab':
  videoeditor JNI files on honeycomb
 2011-01-17 11:40:11 -08:00
Eric Laurent
20fd4c8b96 am 72b83b59: Merge "Fix issue 3354692." into honeycomb 
* commit '72b83b5938a997b4d69edcd09a46a06ac39102d4':
  Fix issue 3354692.
 2011-01-17 10:53:06 -08:00
Dharmaray Kundargi
9ed99405ae Merge "Video editor API update - rework for Patch Set 3" into honeycomb 2011-01-17 10:52:29 -08:00
Dharmaray Kundargi
307003a844 Merge "integrate videoeditor preview player." into honeycomb 2011-01-17 10:52:23 -08:00
Dharmaray Kundargi
4e4f3d1df4 Merge "videoeditor JNI files on honeycomb" into honeycomb 2011-01-17 10:52:13 -08:00
Eric Laurent
117b7bb5b5 Fix issue 3354692. 
The problem is that SoundPool never calls the onLoadComplete() callback
when load() method fails because the file cannot be opened.
AudioService loadSoundEffects() was blocked waiting for a callback
that never came.
In this particular case, this happened on a specific build where sound
effects assets were not included.

The fix consists in waiting for the callback only if at least one sample is
accepted by SoundPool load().

Also moved the initial loading of sound effect samples from the boot completed
broadcast receiver to the audio service message handler to avoid waiting in the
main system server thread.

Change-Id: I902e5988f8b644a81d8e585c52eed1df4ca0ec05
 2011-01-17 10:36:12 -08:00
Dharmaray Kundargi
cd196d3727 videoeditor JNI files on honeycomb 
Change-Id: I2e6a23ae918fda4fb1bc4c2c938efd546991b58c
 2011-01-16 19:19:07 -08:00