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

73492 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eric Laurent
b1853f7063 am 2a0d685e: Merge "MediaPlayerService: fix AudioSink latency" into ics-mr1 
* commit '2a0d685ed62ff7a5e5a40be0748860c092165984':
  MediaPlayerService: fix AudioSink latency
 2012-03-16 15:01:03 -07:00
Eric Laurent
393dd03eaf am 3fe7ee65: Merge "AudioTrack: relax check on minimum buffer size" into ics-mr1 
* commit '3fe7ee651db0aae9485ead227c89db1e24b9e245':
  AudioTrack: relax check on minimum buffer size
 2012-03-16 15:01:01 -07:00
Eric Laurent
2a0d685ed6 Merge "MediaPlayerService: fix AudioSink latency" into ics-mr1 2012-03-16 14:58:21 -07:00
Eric Laurent
3fe7ee651d Merge "AudioTrack: relax check on minimum buffer size" into ics-mr1 2012-03-16 14:58:07 -07:00
Victoria Lease
793ce52d7c Merge "proposed public API for asynchronous find-on-page" 2012-03-16 14:56:11 -07:00
Victoria Lease
abeb6a7915 proposed public API for asynchronous find-on-page 
Bug: 6052412

Change-Id: I63bff3bfda50eede958cb885f5068ae94bdcfe7d
 2012-03-16 14:19:37 -07:00
John Reck
a5408e619a Pipe down isHardwareAccelerated 
Change-Id: I19285ea03409279aea09f9e44a1870364762f877
 2012-03-16 14:18:44 -07:00
Amith Yamasani
634db5823f Merge branch 'ics-scoop-plus-aosp' of ssh://android-git:29418/platform/frameworks/base into ics-scoop-plus-aosp 2012-03-16 14:17:09 -07:00
Amith Yamasani
65e4b90d6c am 31f7ef24: am 90e3bcae: Increase line limit for summary text 
* commit '31f7ef2436ca7cbe754f33d536593f9640a31fb0':
  Increase line limit for summary text
 2012-03-16 14:17:05 -07:00
Amith Yamasani
e57de5838a am 8e34dc93: am 90e3bcae: Increase line limit for summary text 
* commit '8e34dc93123dc4e4fd5cd5b0fd92ae551a905615':
  Increase line limit for summary text
 2012-03-16 14:16:45 -07:00
Amith Yamasani
579922e331 am 5fd6deb0: am 90e3bcae: Increase line limit for summary text 
* commit '5fd6deb0497d6763514f125b5fde69ee4efdc3c2':
  Increase line limit for summary text
 2012-03-16 14:16:27 -07:00
Amith Yamasani
8e34dc9312 am 90e3bcae: Increase line limit for summary text 
* commit '90e3bcae6771df767c3377ca3bd6c08d99062ca3':
  Increase line limit for summary text
 2012-03-16 14:14:05 -07:00
Amith Yamasani
31f7ef2436 am 90e3bcae: Increase line limit for summary text 
* commit '90e3bcae6771df767c3377ca3bd6c08d99062ca3':
  Increase line limit for summary text
 2012-03-16 14:13:48 -07:00
Amith Yamasani
5fd6deb049 am 90e3bcae: Increase line limit for summary text 
* commit '90e3bcae6771df767c3377ca3bd6c08d99062ca3':
  Increase line limit for summary text
 2012-03-16 14:13:45 -07:00
Craig Mautner
1dd3ed09e8 Perform finish animation actions. 
When stepAnimation returns false, do not return false immediately.
Instead carry out finish actions. Also, remove state machine that is no
longer necessary.

Fixes bug 6184070.

Change-Id: I530eb2b62b864bbce929f573d10b31b102152f1f
 2012-03-16 14:05:07 -07:00
Andreas Huber
a7110640d0 Report an error instead of waiting for EOS indefinitely in sf2. 
Change-Id: Id7bcfb90a3b6a61f0df8bd8f39ea4ffa3c433d87
 2012-03-16 13:19:20 -07:00
Andreas Huber
4108fbc299 Merge "ACodec is a little more aggressive in its error checking now." 2012-03-16 13:15:53 -07:00
Amith Yamasani
90e3bcae67 Increase line limit for summary text 
Doing this to accomodate some really long warning text in a
checkbox widget. Needs 5 lines for English. Probably a lot
more for German, etc., so increasing it to 10 lines.

Please don't abuse that. 4 lines is still a reasonable max.

Change-Id: Ife5858f2165cb2bc046ce606f29d31010d26ecc2
 2012-03-16 13:13:50 -07:00
Eric Laurent
dc63f3fe40 MediaPlayerService: fix AudioSink latency 
The AudioSink latency is currently cached when the associated AudioTrack
is created. However, the AudioTrack latency can change if the AudioTrack is moved
from one output stream to another.
The AudioPlayer must also periodically update its view of the latency
as it is needed to compensate the real audio time used for A/V sync.

This fixes an A/V sync problem seen when switching A2DP on and off while
playing a video.

Change-Id: I28b24049ca114e1af3e24791dcc900f463536ba4

Conflicts:

	media/libmediaplayerservice/MediaPlayerService.cpp
 2012-03-16 12:25:31 -07:00
Eric Laurent
0df689495a AudioTrack: relax check on minimum buffer size 
Current AudioTrack implementation enforces that the requested audio
buffer size is at least corresponding the audio latency.
This requirement is too strong and leads to problems with current
stagefright and AudioSink implementations when playing over output
streams with long latency.

Ultimately, the AudioSink design should be changed to specify a minimum
buffer size in time or frames units but not in buffer count units.

Change-Id: I8ba603956f92ac49143a8249572665aa548f2f0f

Conflicts:

	media/libmedia/AudioTrack.cpp
 2012-03-16 12:22:07 -07:00
Katie McCormick
f518e0e82b am 2f8b35dd: am 2b056c6e: Merge "Doc update: DDMS Network Traffic tool." into ics-mr1 
* commit '2f8b35dd88501d9174565f7f377933b0e516032c':
 2012-03-16 12:15:26 -07:00
Katie McCormick
7a2cfddcba am 8140f3f4: am 2b056c6e: Merge "Doc update: DDMS Network Traffic tool." into ics-mr1 
* commit '8140f3f4f1ddeb1fab6904c2fc6f44bafaaf5177':
  Doc update: DDMS Network Traffic tool.
 2012-03-16 12:14:18 -07:00
Katie McCormick
86d5301b0d am 45660f46: am 2b056c6e: Merge "Doc update: DDMS Network Traffic tool." into ics-mr1 
* commit '45660f46d3877cc146ae52b9c152dc606d622485':
  Doc update: DDMS Network Traffic tool.
 2012-03-16 12:13:03 -07:00
Katie McCormick
8140f3f4f1 am 2b056c6e: Merge "Doc update: DDMS Network Traffic tool." into ics-mr1 
* commit '2b056c6e6759d63045c22556c5418a08fcb3f80c':
  Doc update: DDMS Network Traffic tool.
 2012-03-16 12:11:31 -07:00
Katie McCormick
2f8b35dd88 am 2b056c6e: Merge "Doc update: DDMS Network Traffic tool." into ics-mr1 
* commit '2b056c6e6759d63045c22556c5418a08fcb3f80c':
  Doc update: DDMS Network Traffic tool.
 2012-03-16 12:11:30 -07:00
Katie McCormick
45660f46d3 am 2b056c6e: Merge "Doc update: DDMS Network Traffic tool." into ics-mr1 
* commit '2b056c6e6759d63045c22556c5418a08fcb3f80c':
  Doc update: DDMS Network Traffic tool.
 2012-03-16 12:11:16 -07:00
Katie McCormick
2b056c6e67 Merge "Doc update: DDMS Network Traffic tool." into ics-mr1 2012-03-16 12:09:59 -07:00
Andreas Huber
ad3e7e2233 ACodec is a little more aggressive in its error checking now. 
Update components to do the right thing.

Change-Id: Ibfbad3f53effc16368cca4a0e978d01d54d08a1d
 2012-03-16 12:00:18 -07:00
Jeff Sharkey
561d7a43c1 Merge "Remove network subtype check when building template." 2012-03-16 11:58:39 -07:00
Dianne Hackborn
8b28ebd5f2 am df3228e5: am ce06c000: Merge "Debugging code for #6169553: Make Phone launch faster" into ics-mr1 
* commit 'df3228e561636832436d45911befa0798ad50594':
 2012-03-16 11:58:23 -07:00
Dianne Hackborn
1fec6aaf73 am 5da418d3: am ce06c000: Merge "Debugging code for #6169553: Make Phone launch faster" into ics-mr1 
* commit '5da418d3319add35f15197db39195984b0262e84':
  Debugging code for #6169553: Make Phone launch faster
 2012-03-16 11:57:53 -07:00
Dianne Hackborn
354e034697 am c032a73b: am ce06c000: Merge "Debugging code for #6169553: Make Phone launch faster" into ics-mr1 
* commit 'c032a73b511d4006e083a646b7dd23d54ed373ac':
  Debugging code for #6169553: Make Phone launch faster
 2012-03-16 11:57:45 -07:00
Katie McCormick
4099e17228 Doc update: DDMS Network Traffic tool. 
Change-Id: I9aa0d94e9bdc20681ec7be3f98233223c0e742d8
 2012-03-16 11:55:55 -07:00
Dianne Hackborn
5da418d331 am ce06c000: Merge "Debugging code for #6169553: Make Phone launch faster" into ics-mr1 
* commit 'ce06c000b4133c63414c3244c3325e25315ab179':
  Debugging code for #6169553: Make Phone launch faster
 2012-03-16 11:55:48 -07:00
Dianne Hackborn
c032a73b51 am ce06c000: Merge "Debugging code for #6169553: Make Phone launch faster" into ics-mr1 
* commit 'ce06c000b4133c63414c3244c3325e25315ab179':
  Debugging code for #6169553: Make Phone launch faster
 2012-03-16 11:55:05 -07:00
Dianne Hackborn
df3228e561 am ce06c000: Merge "Debugging code for #6169553: Make Phone launch faster" into ics-mr1 
* commit 'ce06c000b4133c63414c3244c3325e25315ab179':
  Debugging code for #6169553: Make Phone launch faster
 2012-03-16 11:55:00 -07:00
Jeff Sharkey
f9f1d06678 Remove network subtype check when building template. 
Change-Id: I069d82a77d27dae6bfffe3b7e65d73b63f258ad9
 2012-03-16 11:54:01 -07:00
Dianne Hackborn
ce06c000b4 Merge "Debugging code for #6169553: Make Phone launch faster" into ics-mr1 2012-03-16 11:53:53 -07:00
Glenn Kasten
ae75f994cc Add libmedia_native 
Change-Id: Ib8cff8abd73723b793f08da99ad59549f219e0e7
 2012-03-16 11:51:30 -07:00
Jeff Sharkey
2937a9ea0a Merge "Combine network subtypes by default." 2012-03-16 11:40:40 -07:00
Andreas Huber
996598bf30 Merge "Remove obsolete software codec header files and amr encoders." 2012-03-16 11:38:38 -07:00
Jeff Sharkey
d4dd7716fb Combine network subtypes by default. 
Subtype controls (3G-vs-4G) aren't exposed in the UI, so tracking
data with that granularity creates unnecessary overhead. For example,
some GSM networks can regularly flap between two subtypes.

Bug: 6118868
Change-Id: Id098891dba52336d00d0f96632a7924e228b4713
 2012-03-16 11:35:29 -07:00
Jeff Brown
543ec1c808 Merge "If an application calls System.exit() terminate it immediately." 2012-03-16 11:01:20 -07:00
Andreas Huber
949a0640d4 Remove obsolete software codec header files and amr encoders. 
Change-Id: Ifbdf252ee312c9cb5ab29498f1e06dae8f23faf7
 2012-03-16 11:01:11 -07:00
Jeff Brown
c1ac23db26 Merge "Delete useless JNI methods." 2012-03-16 11:01:04 -07:00
Joe Fernandez
0b8f459c53 am 14a5c93d: am 6b163632: am 1f60afc5: docs: Emulator Hardware Acceleration docs for SDK r17 
* commit '14a5c93d18ba1a6a01caec52c33fb368797f258d':
 2012-03-16 10:52:52 -07:00
Joe Fernandez
80262cea60 am d90576c9: am c8e83aa7: am 1f60afc5: docs: Emulator Hardware Acceleration docs for SDK r17 
* commit 'd90576c91e9f99a6e795c126d943ea04f253fb86':
  docs: Emulator Hardware Acceleration docs for SDK r17
 2012-03-16 10:50:20 -07:00
Joe Fernandez
14a5c93d18 am 6b163632: am 1f60afc5: docs: Emulator Hardware Acceleration docs for SDK r17 
* commit '6b16363232e107047f430614b4a81e61b7f391c1':
 2012-03-16 10:48:33 -07:00
Joe Fernandez
d90576c91e am c8e83aa7: am 1f60afc5: docs: Emulator Hardware Acceleration docs for SDK r17 
* commit 'c8e83aa73e174be163649bb80989b9099fbb74cf':
  docs: Emulator Hardware Acceleration docs for SDK r17
 2012-03-16 10:47:38 -07:00
Joe Fernandez
b590afdb8a am a1faacd2: am 1f60afc5: docs: Emulator Hardware Acceleration docs for SDK r17 
* commit 'a1faacd268b431f73c07be7db5e1b7388f6655c1':
  docs: Emulator Hardware Acceleration docs for SDK r17
 2012-03-16 10:46:37 -07:00