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

4328 Commits

Author SHA1 Message Date
Andreas Huber
2edbdcc6f2 Merge "After a seek there's a brief period where audio time isn't reestablished." into honeycomb-mr1 2011-03-28 08:11:26 -07:00
Christer Fletcher
375fb9bfd2 Handle OutOfMemoryError when decoding images in ThumbnailUtils 
Added handling of OutOfMemoryError handling to createImageThumbnail
method in ThumbnailUtils.java. During mediascanner run it would run
out of memory when trying to decode very large images. Now it handles
this error and returns null which is handled by the media scanner.

Change-Id: Ie68722dfa1cedd3c0847bf483baa40c4827ad5a8
 2011-03-28 14:47:55 +02:00
Mathias Agopian
1b339099b9 Merge "merge libsurfaceflinger_client into libgui" 2011-03-25 19:25:32 -07:00
Mathias Agopian
696257ccf3 merge libsurfaceflinger_client into libgui 
this is the first step in unifying surfacetexture and surface.
for this reason the header files were not moved, as most of them
will eventually go away.

NOTE: currently we keep libsurfaceflinger_client.so as an empty
library to workaround prebuilt binaries wrongly linking against
it.

Change-Id: I130f0de2428e8579033dc41394d093f4e1431a00
 2011-03-25 18:42:40 -07:00
Andreas Huber
59529e1474 After a seek there's a brief period where audio time isn't reestablished. 
Don't use audio time to trigger a "we're very late, skipping ahead" action
until it's reestablished.

Change-Id: Ia8534e5bed60203d49a457d14b2e55eb972b5fa1
related-to-bug: 4173683
 2011-03-25 16:40:50 -07:00
Andreas Huber
e8ab51f593 am e2cb08bd: am 2fee96bc: am 1457ef74: Merge "Make sure we post a video event when seeking after seeing video EOS before." into honeycomb-mr1 
* commit 'e2cb08bd4c3bc7e7045e107af41f7228d780be04':
  Make sure we post a video event when seeking after seeing video EOS before.
 2011-03-25 16:38:57 -07:00
Andreas Huber
2fee96bcc0 am 1457ef74: Merge "Make sure we post a video event when seeking after seeing video EOS before." into honeycomb-mr1 
* commit '1457ef74d49ee56097ad97cc078e898326beb7db':
  Make sure we post a video event when seeking after seeing video EOS before.
 2011-03-25 15:38:34 -07:00
Andreas Huber
16ede3c535 Make sure we post a video event when seeking after seeing video EOS before. 
Change-Id: I513bf94c0732a85324160977ea5723d8aafd6aba
related-to-bug: 3316960
 2011-03-25 14:47:38 -07:00
James Dong
f4aa99aa56 am 70a5b031: am 9fb98238: am 837430dd: Merge "Switch to use SF cached source" into honeycomb-mr1 
* commit '70a5b0317d5029b34be26a423c0ebeaa74b728ed':
  Switch to use SF cached source
 2011-03-25 10:29:20 -07:00
James Dong
9fb98238e5 am 837430dd: Merge "Switch to use SF cached source" into honeycomb-mr1 
* commit '837430dd3440f6e71f68ef755399e22386dee084':
  Switch to use SF cached source
 2011-03-25 10:24:44 -07:00
James Dong
3be1593628 Switch to use SF cached source 
bug - 3500025

Change-Id: I96c416d39af498f091d2d52f5923f556382a9c1f
 2011-03-25 08:41:57 -07:00
Glenn Kasten
7c06ac00e1 am 64233b86: am 503f4daf: am 0b1b2a32: Merge "Bug 4159373 Use HDCP debug settings" into honeycomb-mr1 
* commit '64233b86f3a78d2c4a21092b242ad071a6b38bd5':
  Bug 4159373 Use HDCP debug settings
 2011-03-23 17:09:55 -07:00
Glenn Kasten
503f4daf01 am 0b1b2a32: Merge "Bug 4159373 Use HDCP debug settings" into honeycomb-mr1 
* commit '0b1b2a3212cc6c96959e009a9705f94f2ed8b4f4':
  Bug 4159373 Use HDCP debug settings
 2011-03-23 17:06:12 -07:00
Glenn Kasten
0b1b2a3212 Merge "Bug 4159373 Use HDCP debug settings" into honeycomb-mr1 2011-03-23 17:03:46 -07:00
Glenn Kasten
1b11b64bb6 Bug 4159373 Use HDCP debug settings 
Change-Id: Iefc0a0d4b574ee94fbc83bf74b57c1d3465c821c
 2011-03-23 16:08:18 -07:00
shailendra
88a14dcd1c am 6b49e9a8: am a450ef06: am ac390b8c: Merge "Fix for Media Server memory leak" into honeycomb-mr1 
* commit '6b49e9a8829c87088dc7fbc0945237030e63327a':
  Fix for Media Server memory leak
 2011-03-23 16:03:46 -07:00
shailendra
a450ef0668 am ac390b8c: Merge "Fix for Media Server memory leak" into honeycomb-mr1 
* commit 'ac390b8cacc45c866ae2e60c0e492a914cf6ec78':
  Fix for Media Server memory leak
 2011-03-23 15:47:47 -07:00
shailendra
ac390b8cac Merge "Fix for Media Server memory leak" into honeycomb-mr1 2011-03-23 15:33:51 -07:00
shailendra
2d06aee095 Fix for Media Server memory leak 
bug - 4081123

Change-Id: Ic88c13f8006227cff2c91a31f5d1828d007125af
 2011-03-22 21:30:35 -07:00
Andreas Huber
c8e14bf5d5 Merge "Delay signaling the end of audio playback until all frames have actually played." 2011-03-22 13:19:41 -07:00
Andreas Huber
4dc482daac Delay signaling the end of audio playback until all frames have actually played. 
Change-Id: I1fa07358a885a818fd0a5d7da425740f86095e10
related-to-bug: 3404000
 2011-03-22 13:18:09 -07:00
James Dong
3c111d7815 Merge "Fix AAC encoder test util and remove files that are not needed" 2011-03-22 12:40:40 -07:00
James Dong
1056ec04cb Merge "Fix AMRWB test util and remove useless files" 2011-03-22 12:40:35 -07:00
shailendra
35c654c3f5 am 8e0f2d71: am b819dcd4: am 8483073e: Merge "Fix for testPropertiesWMVFile case failed with build HMI75B(4128259)" into honeycomb-mr1 
* commit '8e0f2d71a1d2353228ba04562c8189f4904a11d1':
  Fix for testPropertiesWMVFile case failed with build HMI75B(4128259)
 2011-03-22 11:54:44 -07:00
shailendra
b819dcd49d am 8483073e: Merge "Fix for testPropertiesWMVFile case failed with build HMI75B(4128259)" into honeycomb-mr1 
* commit '8483073ec21b5e2332deaad914eba1d087b1d1e3':
  Fix for testPropertiesWMVFile case failed with build HMI75B(4128259)
 2011-03-22 11:50:15 -07:00
shailendra
8483073ec2 Merge "Fix for testPropertiesWMVFile case failed with build HMI75B(4128259)" into honeycomb-mr1 2011-03-22 11:48:12 -07:00
Yu Shan Emily Lau
8b17346a43 am 5460bb3e: am 112852b5: am 02109972: Merge "Add the mem logging into test utility. Bug# 4108259" into honeycomb-mr1 
* commit '5460bb3e09766d45105dfb05f54f97da1dbc57a3':
  Add the mem logging into test utility. Bug# 4108259
 2011-03-22 11:42:26 -07:00
Andreas Huber
dce4a0f0d5 am 6834f061: am 970d7dd9: am e2c32e9f: If nothing is to be copied, return right away. 
* commit '6834f0617aea626dfc0f306c9fa3610f32cee1f7':
  If nothing is to be copied, return right away.
 2011-03-22 11:42:08 -07:00
Andreas Huber
3da107288d am 453c0d5f: Merge "DO NOT MERGE: Enable http-live support for https:// urls, fix a parsing issue." into honeycomb-mr1 
* commit '453c0d5f16a09473b0653566973bf8b6a867cf79':
  DO NOT MERGE: Enable http-live support for https:// urls, fix a parsing issue.
 2011-03-22 08:48:58 -07:00
Andreas Huber
453c0d5f16 Merge "DO NOT MERGE: Enable http-live support for https:// urls, fix a parsing issue." into honeycomb-mr1 2011-03-22 08:37:58 -07:00
James Dong
bc40f9d27e Fix AMRWB test util and remove useless files 
Change-Id: Ia11a1ec053855c9e692070d23c7a690c39cb3d5e
 2011-03-21 21:59:32 -07:00
James Dong
9cd4844819 Fix AAC encoder test util and remove files that are not needed 
Change-Id: Ib6cbe78de9f85e4df357d53365a35d1f9f0bb1d3
 2011-03-21 20:55:06 -07:00
Yu Shan Emily Lau
112852b577 am 02109972: Merge "Add the mem logging into test utility. Bug# 4108259" into honeycomb-mr1 
* commit '0210997218fc22b77c71a43a2396419cd0a39166':
  Add the mem logging into test utility. Bug# 4108259
 2011-03-21 18:00:32 -07:00
Eric Laurent
931b7f269c Merge "Fix issue 3509396: AudioEffect.getParameter JAVA." 2011-03-21 17:51:25 -07:00
Yu Shan Emily Lau
0210997218 Merge "Add the mem logging into test utility. Bug# 4108259" into honeycomb-mr1 2011-03-21 17:32:17 -07:00
Eric Laurent
602b3286ff Fix issue 3509396: AudioEffect.getParameter JAVA. 
Removed dead/buggy code in AudioEffect.getParameter() and
AudioEffect.command() that was meant to return the actual length of
meaningful data in the returned parameter or command reply.

This is replaced by the method return status indicating this length when
positive (negative return codes still indicate the same errors as before).

Modified automated AudioEffect tests accordingly.

Change-Id: Ie89617f912766b8dee73b81f92af9c48027c982d
 2011-03-21 17:11:59 -07:00
Andreas Huber
8505f2fe1e DO NOT MERGE: Enable http-live support for https:// urls, fix a parsing issue. 
Change-Id: Ic683201dcfcd11fb4bccfeefc63427a4c9bfabb4
related-to-bug: 4148291
 2011-03-21 16:45:25 -07:00
Andreas Huber
554d0ea10f Enable http-live support for https:// urls, fix a parsing issue. 
Change-Id: I2284e1d62babde7f739fba6a3cb4e2619f0e62f9
related-to-bug: 4148291
 2011-03-21 16:34:02 -07:00
Andreas Huber
970d7dd95f am e2c32e9f: If nothing is to be copied, return right away. 
* commit 'e2c32e9f966cf9f2c9ed94bf0703344a2cca284b':
  If nothing is to be copied, return right away.
 2011-03-21 16:21:29 -07:00
James Dong
f84433fb0a Add read and write option in opening file for output in the writers 
Change-Id: Ibfba0aacd3c8587c04a2e903b636de337cc30104
 2011-03-21 14:27:30 -07:00
Andreas Huber
e2c32e9f96 If nothing is to be copied, return right away. 
This avoids a potential out-of-bounds problem in the code below.

Change-Id: I942d55da0a5288b37512cb74407f900a2d824c0c
related-to-bug: 4139974
 2011-03-21 14:16:03 -07:00
Eric Laurent
7a4b8bd588 Merge "Fix issue 3483718: audio streaming and A2DP." 2011-03-21 14:06:33 -07:00
Andreas Huber
5bb357f4cc Fixing the build. 
Change-Id: I89daa503029491e6f1a8321f7e45c9439315ad23
 2011-03-21 11:55:01 -07:00
Eric Laurent
6667ac33f4 Fix issue 3483718: audio streaming and A2DP. 
The problem is that when switching from A2DP to device speakers or headset,
The AudioTrack binder interface to AudioFlinger must be destroyed and restored
to accomodate new buffer size requirements. Current AudioTrack implementation
did not restore properly the PCM buffer write index which caused a mismatch between
the written frame count in the mediaplayer renderer and the AudioTrack. The renderer
could then believe the AudioTrack buffer was full and stop writing data preventing the
AudioTrack to reach a bufffer full condition and resume playback.

The rendered was also modified to refresh the AudioTrack frame count (buffer size)
inside the write loop in NuPlayer::Renderer::onDrainAudioQueue() as this count can change
from one write to the next.

Also modified AudioTrack::obtainBuffer() to check for track invalidated status before
querying for available space in the buffer. This avoids writing to the old track's
buffer until full before detecting the invalidated condition and create a new track.

Change-Id: I16a857e464e466880847f52f640820aa271539ad
 2011-03-21 11:49:00 -07:00
Andreas Huber
14a80afa51 Merge "Support passing headers to MediaMetadataRetriever's setDataSource API" 2011-03-21 11:23:15 -07:00
Andreas Huber
5b7ced6a4e Support passing headers to MediaMetadataRetriever's setDataSource API 
Change-Id: Ib1a5c08fc5034cac05034db27007a35c9b660b26
related-to-bug: 3506316
 2011-03-21 11:13:59 -07:00
James Dong
9f2cde3cdb Scale the thumbnail if display dimension is different from the actual buffer size 
bug - 3379293

Change-Id: I31c08010c97387716433da99d648bd364847b6aa
 2011-03-20 14:46:30 -07:00
Andreas Huber
c42faa1e61 Merge "Squashed commit of the following:" 2011-03-18 16:03:40 -07:00
James Dong
c8fcf93249 Merge "Better organize media recorder error and information event and types" 2011-03-18 15:33:11 -07:00
Andreas Huber
8885e679fc Squashed commit of the following: 
commit ed615e2803839ef28e0eab50d17844c207083ad6
Author: Andreas Huber <andih@google.com>
Date:   Fri Mar 18 12:38:30 2011 -0700

    Support for live streaming of webm content over http.

    Change-Id: Ie9ebd23d2c44d192d348b9fa3f3a0f3f28ac9e4c

commit 9c50b1392471a3d652b4a875c823bee854f8855b
Author: Andreas Huber <andih@google.com>
Date:   Thu Mar 17 13:33:22 2011 -0700

    Upgrade to the latest version of libwebm.

    Change-Id: Ic7965dda84131a38f9d3c72b6acd2025ace939ce

Change-Id: I3c993a89f749f05741594ef0ea47864e17ee783b
 2011-03-18 15:11:52 -07:00