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

5363 Commits

Author SHA1 Message Date
James Dong
278e53a3e0 am 3c563ce6: am 5264f600: Merge "Bail out after kMaxColorFormatSupported calls to OMX_GetParameter(). Avoid infinite loop in querying omx component about the supported color format." into ics-mr0 
* commit '3c563ce672e6b1827b33ab4ce0f0c28e894214d5':
  Bail out after kMaxColorFormatSupported calls to OMX_GetParameter(). Avoid infinite loop in querying omx component about the supported color format.
 2011-10-18 22:19:30 -07:00
James Dong
3c563ce672 am 5264f600: Merge "Bail out after kMaxColorFormatSupported calls to OMX_GetParameter(). Avoid infinite loop in querying omx component about the supported color format." into ics-mr0 
* commit '5264f6003bbcb8ca70df034379154914260cc322':
  Bail out after kMaxColorFormatSupported calls to OMX_GetParameter(). Avoid infinite loop in querying omx component about the supported color format.
 2011-10-18 22:17:34 -07:00
James Dong
5a37afa87c Bail out after kMaxColorFormatSupported calls to OMX_GetParameter(). 
Avoid infinite loop in querying omx component about the supported color format.

Change-Id: I4997efd36462c792a6d8b5e04c79a80966a559fe
related-to-bug: 5466057
 2011-10-18 16:27:53 -07:00
Eric Laurent
fb8c12048b am 46c8f153: am c0a87dc1: Merge "Fix issue 5462427: Volume should never be 0 ..." into ics-mr0 
* commit '46c8f1535a884a77137c294cad94f811a33f07aa':
  Fix issue 5462427: Volume should never be 0 ...
 2011-10-17 19:53:29 -07:00
Eric Laurent
46c8f1535a am c0a87dc1: Merge "Fix issue 5462427: Volume should never be 0 ..." into ics-mr0 
* commit 'c0a87dc10cc74918518457e96b48f16bcc0ea2cd':
  Fix issue 5462427: Volume should never be 0 ...
 2011-10-17 19:50:36 -07:00
Eric Laurent
c0a87dc10c Merge "Fix issue 5462427: Volume should never be 0 ..." into ics-mr0 2011-10-17 19:48:31 -07:00
Dave Burke
18ca6a9dae am 499e2522: am 6f13adb2: Merge "Don\'t hold onto the lock while reconnecting to the server" into ics-mr0 
* commit '499e2522455440e7e68c2df8b30a727aa9ef46b3':
  Don't hold onto the lock while reconnecting to the server
 2011-10-17 18:38:58 -07:00
Dave Burke
499e252245 am 6f13adb2: Merge "Don\'t hold onto the lock while reconnecting to the server" into ics-mr0 
* commit '6f13adb22afcb47a1cd45a90eaa3c154522089d4':
  Don't hold onto the lock while reconnecting to the server
 2011-10-17 18:36:48 -07:00
Dave Burke
6f13adb22a Merge "Don't hold onto the lock while reconnecting to the server" into ics-mr0 2011-10-17 18:35:11 -07:00
Andreas Huber
96e35f2e57 Don't hold onto the lock while reconnecting to the server 
to avoid stalling the readers.

Change-Id: I73b646587c8a654a73ff7d800c0f17bd78001855
 2011-10-17 15:49:01 -07:00
Jamie Gennis
e210cbbbd6 am 29fe8cb9: am c4de6f81: Merge "MediaPlayer: properly handle released surfaces" into ics-mr0 
* commit '29fe8cb941648cbd9d684680f2660a95c565ad51':
  MediaPlayer: properly handle released surfaces
 2011-10-17 12:42:47 -07:00
Jamie Gennis
29fe8cb941 am c4de6f81: Merge "MediaPlayer: properly handle released surfaces" into ics-mr0 
* commit 'c4de6f81d4533acbfc162d051de480d474b72e76':
  MediaPlayer: properly handle released surfaces
 2011-10-17 12:40:49 -07:00
Jamie Gennis
f76afc80d2 MediaPlayer: properly handle released surfaces 
Bug: 5396571
Change-Id: I6af87cb04f09f9ae6ea77cd7ba31108a3e93d24a
 2011-10-14 19:55:12 -07:00
Eric Laurent
b024c30a80 Fix issue 5462427: Volume should never be 0 ... 
Make sure that ring or notification volume index
never reaches 0 unless in silent mode.
Conversely, enter silent mode when this volume is set to 0.

Change-Id: Iff5e5e972b607f4736e7a704b26b2dadb40074b0
 2011-10-14 17:19:27 -07:00
Eric Laurent
326f9080ea am e04783cc: am 615858a8: Merge "Indicate screen off condition to audio framework." into ics-mr0 
* commit 'e04783ccde79730f239d739ad515224245683f22':
  Indicate screen off condition to audio framework.
 2011-10-14 13:01:11 -07:00
Eric Laurent
e04783ccde am 615858a8: Merge "Indicate screen off condition to audio framework." into ics-mr0 
* commit '615858a8ebb12b3541fd709e6e965ac814880261':
  Indicate screen off condition to audio framework.
 2011-10-14 12:58:40 -07:00
Eric Laurent
950e8cb40a Indicate screen off condition to audio framework. 
Add a mechanism for AudioService to notify audio framework and audio HAL
that screen is turned on or off. This indication can be used by lower
audio layers to trigger low power audio playback mode.
Current implementaiton based on setParameters() method is experimental
and will be replaced by a different interface when ready.

Change-Id: Ie72ada0a8edec3d71b47681b9f51cb5bc839d45b
 2011-10-14 11:40:24 -07:00
Jean-Michel Trivi
9a5ac6857a am 414b74c5: am e48440d5: Merge "Fix 5153611 remove remote control client/display log from AudioService" into ics-mr0 
* commit '414b74c564d29da933a650d5193bb2152b704c06':
  Fix 5153611 remove remote control client/display log from AudioService
 2011-10-14 08:48:47 -07:00
Jean-Michel Trivi
414b74c564 am e48440d5: Merge "Fix 5153611 remove remote control client/display log from AudioService" into ics-mr0 
* commit 'e48440d59a52c0f13166da2fd32023356d9215d9':
  Fix 5153611 remove remote control client/display log from AudioService
 2011-10-14 08:46:08 -07:00
Jean-Michel Trivi
7ff866e8cf Fix 5153611 remove remote control client/display log from AudioService 
Do not log debug messages for the RemoteControlClient and
 IRemoteControlDisplay related features.

Change-Id: I81bfeec1770f81b78b679dc03fb40806393b170a
 2011-10-13 18:09:26 -07:00
Andreas Huber
f314276df5 resolved conflicts for merge of 6e80c50f to ics-aah 
Conflicts:
	media/libmediaplayerservice/MediaPlayerService.cpp

Change-Id: Icb9371dcace4609fffd048b7fdc27ee59d589a92
 2011-10-13 12:59:54 -07:00
Andreas Huber
a6be6dcd03 NuPlayer is now taking on the task of streaming over RTSP. 
Change-Id: Ie204db8810807f1e7981959e34dc0149e5d9563a
 2011-10-13 11:31:06 -07:00
Andreas Huber
0bb20d2e42 am 0eb6ef17: Merge "Support for an MPEG2 Program Stream extractor." 
* commit '0eb6ef1798362d15696618debdb2478b386398c5':
  Support for an MPEG2 Program Stream extractor.
 2011-10-13 10:05:33 -07:00
Andreas Huber
0eb6ef1798 Merge "Support for an MPEG2 Program Stream extractor." 2011-10-13 10:03:26 -07:00
Mike Lockwood
fe626d5f11 am 745e3601: am 0c265c88: Merge "MtpServer: Pass 0xFFFFFFFF for file size when receiving files >= 4GB in size" into ics-mr0 
* commit '745e360103e81facb6641d035c5e3ccc8ace855e':
  MtpServer: Pass 0xFFFFFFFF for file size when receiving files >= 4GB in size
 2011-10-13 08:59:17 -07:00
Mike Lockwood
8334038f9e MtpServer: Pass 0xFFFFFFFF for file size when receiving files >= 4GB in size 
Bug: 5432487

Change-Id: Ie86e72d9d85476941eab6a9d271948b8fdde6926
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-10-13 11:38:20 -04:00
Andreas Huber
51e29473d2 am eb763a7b: am 8c7951af: Merge "Assume a PTS of 0 if absent, don\'t bail on fragmented PES packets not having PTS" into ics-mr0 
* commit 'eb763a7b0259f57ee33500ec99b040a16793119f':
  Assume a PTS of 0 if absent, don't bail on fragmented PES packets not having PTS
 2011-10-12 20:42:57 -07:00
Jean-Michel Trivi
1b3fb2fc92 am 21e188fd: Merge "Fix 5389442 RemoteControlClient javadoc" 
* commit '21e188fd6f264d93746d5c412fa7a210050680e8':
  Fix 5389442 RemoteControlClient javadoc
 2011-10-12 12:37:37 -07:00
Andreas Huber
33d94067ad Assume a PTS of 0 if absent, don't bail on fragmented PES packets not having PTS 
Change-Id: I3b31f08428fb7195b98f145ae0675006c8756de1
related-to-bug: 5450187
 2011-10-12 12:14:23 -07:00
Jean-Michel Trivi
09b4d99822 DO NOT MERGE Fix 5389442 RemoteControlClient javadoc 
Extend RemoteControlClient class description with an example
 of instance creation showing how the PendingIntent is created
 and how it uses the same ComponentName as the one used
 in AudioManager.registerMediaButtonEventReceiver()

Change-Id: I1af61ddbf5cfb9160ea5b814bed7b881d51b7eff
 2011-10-11 18:59:34 -07:00
Jean-Michel Trivi
ad87f5b40f Fix 5389442 RemoteControlClient javadoc 
Extend RemoteControlClient class description with an example
 of instance creation showing how the PendingIntent is created
 and how it uses the same ComponentName as the one used
 in AudioManager.registerMediaButtonEventReceiver()

Change-Id: If8f050f94b112f9680ba6bf32ba622bc648fb1d0
 2011-10-11 14:09:23 -07:00
James Dong
966e418cfa am 50c31024: Merge "Support AMR as a file type so that it can be imported into movie studio" 
* commit '50c31024e30f26720321bbd5adeb46a554beca7e':
  Support AMR as a file type so that it can be imported into movie studio
 2011-10-10 15:24:07 -07:00
James Dong
50c31024e3 Merge "Support AMR as a file type so that it can be imported into movie studio" 2011-10-10 15:22:04 -07:00
Andreas Huber
1aadad2678 am a5da78f0: Merge "YouTube can now request custom cache/prefetch parameters and disconnect-at-highwater" 
* commit 'a5da78f09df49ed379028ccaaa383c68dcb58397':
  YouTube can now request custom cache/prefetch parameters and disconnect-at-highwater
 2011-10-10 12:46:52 -07:00
Andreas Huber
7f3259403d YouTube can now request custom cache/prefetch parameters and disconnect-at-highwater 
through the use of pseudo http headers specified in the setDataSource call.

x-cache-config: -1/-1/0
x-disconnect-at-highwatermark: 1

turns off keep-alives and disconnects every time the cache is full (will attempt
to reconnect once it run below lowwater mark)

related-to-bug: 5433309

Change-Id: Id2f942fc956e0e156834cfcd6bb08dae6a29fae1
 2011-10-10 12:41:21 -07:00
James Dong
f58ba65069 Support AMR as a file type so that it can be imported into movie studio 
Change-Id: I3fc4f49ae0a210f53b1bab68716f4e558b3d91c5
related-to-bug: 5419452
 2011-10-09 21:14:58 -07:00
Andreas Huber
6e76804d9e am 41c95f36: Merge "Specifying -1 for both low and highwater marks would not actually do the right thing" 
* commit '41c95f3642323ec4cfdc84a3bb70537af0da8cca':
  Specifying -1 for both low and highwater marks would not actually do the right thing
 2011-10-07 10:10:20 -07:00
Andreas Huber
b987d875c6 Specifying -1 for both low and highwater marks would not actually do the right thing 
before this change. Also make it more consistent in that specifying -1 for the
keepalive settings specifies the default.

Change-Id: I086f530fbf42abce66d1c8e61157215cb474e044
 2011-10-07 10:00:38 -07:00
Andreas Huber
89d0c9e153 am 59797e6b: Merge "Allow a system property "media.stagefright.cache-params" to override cache/prefetcher" 
* commit '59797e6bece0ac2d649d8d93d02ed81979950145':
  Allow a system property "media.stagefright.cache-params" to override cache/prefetcher
 2011-10-07 08:01:49 -07:00
Andreas Huber
59797e6bec Merge "Allow a system property "media.stagefright.cache-params" to override cache/prefetcher" 2011-10-07 07:59:35 -07:00
James Dong
a2a1d96a09 am f3c00568: Merge "Fix an issue where we should allow negative values but did not" 
* commit 'f3c00568163b186202cab8d79b2f11eeacb88646':
  Fix an issue where we should allow negative values but did not
 2011-10-06 20:40:14 -07:00
James Dong
f3c0056816 Merge "Fix an issue where we should allow negative values but did not" 2011-10-06 20:38:29 -07:00
Andreas Huber
594f0ba996 Allow a system property "media.stagefright.cache-params" to override cache/prefetcher 
default parameters. To override specify a property

adb shell setprop media.stagefright.cache-params "4096/20480/15" to
set the low water threshold to 4096 KB, the high water threshold to 20 MB
and the keepalive interval to 15 secs.

if high and/or lowwater mark are negative, the default values are used for
the respective value.

if keep-alive interval is 0, keep-alives are disabled.

Change-Id: I89a4a06836e4a2f473d7a92b567ab07818c2f87d
 2011-10-06 15:27:24 -07:00
Andreas Huber
2ee46d4d26 am beedd862: Merge "Return a runtime error instead of assertion if seeking beyond EOS in mpeg4 files." 
* commit 'beedd8627a82007de61480c9e794dd967b708ded':
  Return a runtime error instead of assertion if seeking beyond EOS in mpeg4 files.
 2011-10-06 09:18:07 -07:00
Andreas Huber
90ba107fcf Return a runtime error instead of assertion if seeking beyond EOS in mpeg4 files. 
Change-Id: If6531b4a1ff45460cfcdcc04764c5c63a2f5a749
related-to-bug: 5418914
 2011-10-06 09:07:12 -07:00
James Dong
56f71d7dfa Fix an issue where we should allow negative values but did not 
Change-Id: Ia8d718b4e6aec4c17db86e30134132f767fd72c5
related-to-bug: 5419527
 2011-10-05 20:43:52 -07:00
Andreas Huber
f5d7ed6d74 am 50dabc5f: Merge "Set crop params to ANative Window during Initialization." 
* commit '50dabc5f0efbe2c4a987579cb2ad94132ee587be':
  Set crop params to ANative Window during Initialization.
 2011-10-05 10:37:55 -07:00
Lakshman Gowda
db62a245f9 Set crop params to ANative Window during Initialization. 
The native_window_set_crop() is called when port reconfig event callback comes from decoder's and
crop parameters are changed from default getconfig() OMX_IndexConfigCommonOutputCrop values.
Since the default crop params are same as port reconfig crop params, the native_window_set_crop()
is not called, hence resulting in displaying the whole frame(paddedWidth x paddedHeight).
By calling native_window_set_crop() during initilaization of output port of decoder ensures
in setting up ANative window to crop region.

Change-Id: I68926464a1f5c7e6053804615c8b9bd32ea85688
Signed-off-by: Lakshman Gowda <lakshman79@ti.com>
 2011-10-05 10:29:27 -07:00
Andreas Huber
bc55495612 Support for an MPEG2 Program Stream extractor. 
Change-Id: I606d87c278f72b22a5b6d7ee57bce6b02e280d41
 2011-09-30 15:26:31 -07:00
Marco Nelissen
dcd2e0b67d am ce0a7ade: Merge "Remove Ringtone.setWakeMode, it\'s not needed." 
* commit 'ce0a7ade96ddbdcb342e0b382e9d3ea43962cafd':
  Remove Ringtone.setWakeMode, it's not needed.
 2011-09-30 11:14:40 -07:00