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

3598 Commits

Author SHA1 Message Date
Dharmaray Kundargi
fe93351cf1 Merge "remove eng developement local tags in make file" into honeycomb 2011-01-19 14:02:12 -08:00
James Dong
fc37018a90 Merge "Logging the duration range from different media tracks for recording" into honeycomb 2011-01-19 13:57:06 -08:00
Dharmaray Kundargi
6dbd3ee67b remove eng developement local tags in make file 
Change-Id: I24511cd588c19592bce57e36ccadbf1fb4d44647
 2011-01-19 12:14:46 -08:00
Andreas Huber
0353459d40 Merge "Always revert to the previous bandwidth if the required sequence number cannot be found" into honeycomb 2011-01-19 11:56:15 -08:00
James Dong
da58076a6b Logging the duration range from different media tracks for recording 
Change-Id: I8c3edcf97ce35301f8645e4a1e232d9bfc2c0349
 2011-01-19 11:54:59 -08:00
James Dong
581cad2221 Turn error/exception logging on at the native layer 
o also fixed some compilation warnings

Change-Id: I66fc1f9972e9fb4b9a25ff3e5835d744d6c71455
 2011-01-19 11:42:53 -08:00
Andreas Huber
283e031d11 Always revert to the previous bandwidth if the required sequence number cannot be found 
Change-Id: I098dba37f4a70fc703c9ce65346907c3e10f27f6
 2011-01-19 11:30:43 -08:00
Andreas Huber
0cf2616fac Return a runtime error if decryption fails instead of asserting. 
Change-Id: Ibab7f2cae3ff7a2e19bc3f31005d5059775a664a
 2011-01-19 11:24:39 -08:00
Andreas Huber
069ee21a20 Merge "Make parameter blocks read/writable even for SET_PARAMETER/SET_CONFIG requests." into honeycomb 2011-01-19 10:38:16 -08:00
Andreas Huber
d95b46a1d1 Make parameter blocks read/writable even for SET_PARAMETER/SET_CONFIG requests. 
Refactor the logic a little.

Change-Id: Idd7a26678d846c96b0b11f096305e7467381bda3
 2011-01-19 10:34:52 -08:00
James Dong
8e7d626385 Merge "Expose average video frame rate via MPEG4Extractor" into honeycomb 2011-01-19 10:29:04 -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
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
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
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
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
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
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
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
5f31aa30cd Merge "MTP: Set modification date for abstract playlists" into honeycomb 2011-01-18 13:29:55 -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
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
529fc53d3f Merge "Implement parsing of vbv buffering info in RTSP." into honeycomb 2011-01-18 11:52:02 -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
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
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
Santosh Madhava
9bcedf7cf3 Video editor API update - rework for Patch Set 3 
Change-Id: I75bfa17fe98bec13f672ff9a4edf623bb85020c8
 2011-01-16 16:56:12 -08:00
Dharmaray Kundargi
3b3cddccc1 integrate videoeditor preview player. 
Change-Id: I83084f494605c8e6f4d198afa8c36f9e29579667
 2011-01-16 16:43:20 -08:00
James Dong
ac0e4bdf05 Fixed thrashing in the cached buffer during 720p YT video streaming 
bug - 3340194

Change-Id: Ic59bb18ab1731d7dd7cae7cc8aeb393900bce7f6
 2011-01-14 15:15:12 -08:00
James Dong
c14b10c306 Merge "Add audio encoding parameters check" into honeycomb 2011-01-13 10:21:28 -08:00
Marco Nelissen
f679ba7d94 Cherrypick from GB. Do Not Merge. 
Send "compilation" tag when inserting into the database.
It's not actually inserted into the database, but the media provider uses it
for disambiguating albums.
b/3311831

Change-Id: I67deb044800a6cb626c69bf3d54d51df4bf830f2
 2011-01-13 07:17:20 -08:00
James Dong
54815a78af Add audio encoding parameters check 
bug - 3345296

Change-Id: If3f33955f5473b0c5ad9c9b85f8b5cb21ddd7e65
 2011-01-12 20:45:16 -08:00
James Dong
4507cef05e Remove legacy code that should not be used 
Change-Id: I9209e3a32b64a30627848d2a425f32ed6b73e8a2
 2011-01-12 16:38:45 -08:00
Marco Nelissen
a8a656b0c5 Fix scanning of modified files. 
When a media file, particularly a music file, is updated, the media
scanner should use the correct Uri to update it, and not the generic
files Uri. Otherwise, things like artist and album name will not
be properly updated.

Change-Id: I576629c51282bfbeb61c23f1e43b072700084a6c
 2011-01-12 14:46:49 -08:00