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

4509 Commits

Author SHA1 Message Date
Andreas Huber
6c3f60e3d5 am 399792b8: am 06ac0399: am b676b73e: Merge "When http streaming and Content-Length is unknown, make sure to return all" into honeycomb-mr1 
* commit '399792b83174a835840a4f47adcd34aed4e0b9ba':
  When http streaming and Content-Length is unknown, make sure to return all
 2011-03-30 16:40:43 -07:00
Andreas Huber
05e11b29b2 am 66ec9068: am 8de5df43: am ebf6a72b: Merge "Surfaceflinger expects rectangles to be specified right/bottom edge exclusive." into honeycomb-mr1 
* commit '66ec90687f3579fe73f6baa2a188f8a4583167a3':
  Surfaceflinger expects rectangles to be specified right/bottom edge exclusive.
 2011-03-30 16:38:38 -07:00
Brad Fitzpatrick
36bafb0b7d am 0ddcc8bc: am b618b2ef: am f0dbf00d: Merge "Handle OutOfMemoryError when decoding images in ThumbnailUtils" 
* commit '0ddcc8bc60ffa00e103f420f95b7f8a7c77639b6':
  Handle OutOfMemoryError when decoding images in ThumbnailUtils
 2011-03-30 16:38:03 -07:00
Andreas Huber
399792b831 am 06ac0399: am b676b73e: Merge "When http streaming and Content-Length is unknown, make sure to return all" into honeycomb-mr1 
* commit '06ac039962c7f15938afc4bbb74c2f14de4dc505':
  When http streaming and Content-Length is unknown, make sure to return all
 2011-03-30 15:22:57 -07:00
Andreas Huber
06ac039962 am b676b73e: Merge "When http streaming and Content-Length is unknown, make sure to return all" into honeycomb-mr1 
* commit 'b676b73e391b10a4ec5fbd6a1a02054fb3d8aa4b':
  When http streaming and Content-Length is unknown, make sure to return all
 2011-03-30 15:19:46 -07:00
Andreas Huber
b676b73e39 Merge "When http streaming and Content-Length is unknown, make sure to return all" into honeycomb-mr1 2011-03-30 15:16:36 -07:00
Andreas Huber
45ad57aab3 When http streaming and Content-Length is unknown, make sure to return all 
data that we successfully received before signalling the error.

Change-Id: I7e60602d41b4df85aa85e413c590687305e9bbce
related-to-bug: 4190765
 2011-03-30 15:00:34 -07:00
Andreas Huber
cabb7da712 Support for divx files, i.e. mpeg 4 video + mpeg audio layer III in .avi files 
Change-Id: I6e1e989c43300ddb0d341e3e9183cdccd69eeae6
related-to-bug: 4192562
 2011-03-30 13:13:25 -07:00
Andreas Huber
fc2143473a Merge "Stagefright DataSources now expose the underlying content mime type." 2011-03-30 11:26:04 -07:00
Andreas Huber
a2e57ca650 Stagefright DataSources now expose the underlying content mime type. 
Use that mime type to determine if we should do upfront buffering at the start of
playback and don't for audio streams to ensure playback starts fairly instantly.

Change-Id: If21e36d1b024f0e5c723911bceadaa2e0307ab42
related-to-bug: 4090916
 2011-03-30 11:15:27 -07:00
James Dong
4d3cdb5515 Check whether WAVE extractor can be initialized successfully in the sniffer for WAVE 
bug - 3373994

Change-Id: I91c420815caae3b868fe9184ba48f37046b495fb
 2011-03-30 10:54:58 -07:00
Andreas Huber
66ec90687f am 8de5df43: am ebf6a72b: Merge "Surfaceflinger expects rectangles to be specified right/bottom edge exclusive." into honeycomb-mr1 
* commit '8de5df439244e77d7892deceb86520551ff0499c':
  Surfaceflinger expects rectangles to be specified right/bottom edge exclusive.
 2011-03-30 09:34:15 -07:00
Andreas Huber
8de5df4392 am ebf6a72b: Merge "Surfaceflinger expects rectangles to be specified right/bottom edge exclusive." into honeycomb-mr1 
* commit 'ebf6a72b3536646ade389c7afa828e316eb93c21':
  Surfaceflinger expects rectangles to be specified right/bottom edge exclusive.
 2011-03-30 09:27:14 -07:00
Brad Fitzpatrick
0ddcc8bc60 am b618b2ef: am f0dbf00d: Merge "Handle OutOfMemoryError when decoding images in ThumbnailUtils" 
* commit 'b618b2ef8722964730d09a86a06a85ca34df6de4':
  Handle OutOfMemoryError when decoding images in ThumbnailUtils
 2011-03-30 08:20:58 -07:00
James Dong
5c8eff3308 Merge "Fix missing cross-ref links in the MediaPlayer.java javadoc" 2011-03-29 15:17:47 -07:00
Marco Nelissen
30ec6c2bf5 Merge "Fix media scanner uri handling." 2011-03-29 15:16:55 -07:00
Andreas Huber
35eebbab59 Merge "Add a user-agent header to our RTSP requests." 2011-03-29 13:52:15 -07:00
Andreas Huber
b0e7381ccb Add a user-agent header to our RTSP requests. 
Change-Id: I02f8ff6a4a37fa59cc8c5fcfd3afb64ee11ba576
related-to-bug: 4173725
 2011-03-29 13:34:28 -07:00
Andreas Huber
8fddd761f9 Merge "Adding support for the '.mxmf' MIDI file extension." 2011-03-29 13:33:58 -07:00
Marco Nelissen
3e5e805594 Fix media scanner uri handling. 
If a file was originally considered a video file (because it had
a .mp4 extension, for example), but was then discovered to have
only an audio track, it would update the type, but not the URI
for insertion into the media provider.

Change-Id: Ifdf3a177750f1e71ca5a058fa534d272e1505653
 2011-03-29 13:29:42 -07:00
Andreas Huber
eecadb9a84 Adding support for the '.mxmf' MIDI file extension. 
Change-Id: Ic73e2f843f8640dd794d090413cf63232f0182b9
related-to-bug: 4186454
 2011-03-29 13:17:30 -07:00
James Dong
c36b3c6956 Fix missing cross-ref links in the MediaPlayer.java javadoc 
Change-Id: Ie5fba234d226ff792661ec346ddf87f43b5a0dc7
 2011-03-29 12:16:59 -07:00
Andreas Huber
21e73bf25a Make sure we don't trigger a log warning if calling ALooper::stop() from the looper thread. 
Change-Id: I669d589ab4521fe44a3e8f638c7ce8e79174d625
related-to-bug: 4179898
 2011-03-29 11:50:24 -07:00
Andreas Huber
b13c4a9b6c Surfaceflinger expects rectangles to be specified right/bottom edge exclusive. 
Change-Id: Ib493572c614dbb74fa23b13c3e43899e3b31cf0e
related-to-bug: 4147205
 2011-03-29 10:00:20 -07:00
Iliyan Malchev
d2b1f29aa0 Merge "frameworks/base: some camera-interface cleanup" 2011-03-28 17:07:02 -07:00
Iliyan Malchev
40c364136f frameworks/base: some camera-interface cleanup 
Methods getNumberOfVideoBuffers() and getVideoBuffer() as well as struct
image_rect_struct are no longer used (instead, the necessary information is
passed through ANativeWindow.)

Change-Id: If4b11446fc9ccbde1f6b45bc70c0d0b8e54376eb
Signed-off-by: Iliyan Malchev <malchev@google.com>
 2011-03-28 16:28:57 -07:00
Andreas Huber
3a28b022bc Ignore OMX codec messages once we're in ERROR state. 
Change-Id: I2bdf58ed705a641be1f3aec89fa41cada6acfc96
related-to-bug: 4175573
 2011-03-28 14:48:28 -07:00
Andreas Huber
ab13a89c99 am a4a81aef: am e7cedad2: am 2edbdcc6: Merge "After a seek there\'s a brief period where audio time isn\'t reestablished." into honeycomb-mr1 
* commit 'a4a81aef39b15649bda146476d98f23ac554887f':
  After a seek there's a brief period where audio time isn't reestablished.
 2011-03-28 08:34:06 -07:00
Brad Fitzpatrick
b618b2ef87 am f0dbf00d: Merge "Handle OutOfMemoryError when decoding images in ThumbnailUtils" 
* commit 'f0dbf00d37c349e8c615045876d6bc89b6bb8c54':
  Handle OutOfMemoryError when decoding images in ThumbnailUtils
 2011-03-28 08:26:02 -07:00
Andreas Huber
e7cedad2b8 am 2edbdcc6: Merge "After a seek there\'s a brief period where audio time isn\'t reestablished." into honeycomb-mr1 
* commit '2edbdcc6f2572e5f84253617b1850908344b3f8c':
  After a seek there's a brief period where audio time isn't reestablished.
 2011-03-28 08:16:52 -07:00
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