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

361 Commits

Author SHA1 Message Date
Steve Block
ec193dec4d Rename LOG_ASSERT to ALOG_ASSERT DO NOT MERGE 
See https://android-git.corp.google.com/g/157519

Bug: 5449033
Change-Id: I8ceb2dba1b031a0fd68d15d146960d9ced62bbf3
 2012-01-09 21:36:22 +00:00
Steve Block
3762c31172 Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE 
See https://android-git.corp.google.com/g/#/c/157220

Bug: 5449033
Change-Id: Ic9c19d30693bd56755f55906127cd6bd7126096c
 2012-01-08 13:19:13 +00:00
Steve Block
8564c8da81 Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGE 
See https://android-git.corp.google.com/g/157065

Bug: 5449033
Change-Id: I00a4b904f9449e6f93b7fd35eac28640d7929e69
 2012-01-06 10:07:54 +00:00
Steve Block
6215d3ff4b Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGE 
See https://android-git.corp.google.com/g/156801

Bug: 5449033
Change-Id: Ib08fe86d23db91ee153e9f91a99a35c42b9208ea
 2012-01-04 20:05:49 +00:00
Steve Block
5baa3a62a9 Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGE 
See https://android-git.corp.google.com/g/156016

Bug: 5449033
Change-Id: I4c4e33bb9df3e39e11cd985e193e6fbab4635298
 2012-01-03 22:38:27 +00:00
Glenn Kasten
d9a723bc92 Merge "Fix build error when verbose logging is enabled" 2011-12-15 10:46:14 -08:00
Glenn Kasten
16dabac224 Fix build error when verbose logging is enabled 
Change-Id: I30f4e5d35d1b24dce2e6152a13fd0fb61414a3e2
 2011-12-15 08:34:59 -08:00
Owen Lin
130f62ab01 Fix the build. (Change LOGV to ALOGV) 
Change-Id: I14104540cfbd2bcdd7af1534db20554b88c4c0ce
 2011-12-12 16:17:34 +08:00
Andreas Huber
1f7817e146 am ebfce84f: am 68f592a8: Merge "Don\'t perform RTSP seeks right away but queue them for 200ms" into ics-mr1 
* commit 'ebfce84f7fd3e25fa08c36b155db91df90a59b3d':
  Don't perform RTSP seeks right away but queue them for 200ms
 2011-12-09 18:09:21 -08:00
Andreas Huber
61a8b5301b am aa82c39b: am 0ba9380a: Merge "Fix Bitreader "putBits" implementation, make sure we emulate timestamps" into ics-mr1 
* commit 'aa82c39bdb4ad9c1fdcb09f3bea11be5197d3ce6':
  Fix Bitreader "putBits" implementation, make sure we emulate timestamps
 2011-12-09 18:09:19 -08:00
Andreas Huber
68f592a821 Merge "Don't perform RTSP seeks right away but queue them for 200ms" into ics-mr1 2011-12-08 13:33:16 -08:00
Andreas Huber
21902a8a48 Don't perform RTSP seeks right away but queue them for 200ms 
and only execute the last one.

Change-Id: I9ab342396ec9c9c03624a4b0306d1e180ceca000
related-to-bug: 5732960
 2011-12-08 13:04:50 -08:00
Andreas Huber
f6ae711450 Fix Bitreader "putBits" implementation, make sure we emulate timestamps 
if we don't receive npt time mapping from the rtsp server (i.e. live stream)

Change-Id: I5147d665bd90c9a303ad6ffdafbf770f930f917c
related-to-bug: 5660357
 2011-12-08 12:27:47 -08:00
Andreas Huber
db85b54395 resolved conflicts for merge of 3d630e86 to master 
Change-Id: I9eb7b7c1668b5f0de85ec8b1e9257cf1ec4d8b9e
 2011-11-30 09:53:40 -08:00
Andreas Huber
848bffd8fa am 074133b2: am 351143fb: Merge "Updated (internal) API for IStreamSource to signal discontinuities" into ics-mr1 
* commit '074133b260f8d12e484e93b9aa5a33a4983b7349':
  Updated (internal) API for IStreamSource to signal discontinuities
 2011-11-29 16:33:02 -08:00
Andreas Huber
a3f887bd30 resolved conflicts for merge of 998a929a to master 
Change-Id: Id5cfbcf20e5ec28782cc88075040cf9edebfdfe8
 2011-11-29 15:14:44 -08:00
Andreas Huber
564fee3666 Merge "Make sure we can properly shutdown even if" into ics-mr1 2011-11-29 14:09:10 -08:00
Andreas Huber
351143fb0e Merge "Updated (internal) API for IStreamSource to signal discontinuities" into ics-mr1 2011-11-29 14:08:45 -08:00
Andreas Huber
a10613fea8 Updated (internal) API for IStreamSource to signal discontinuities 
Change-Id: Idd4b9d8e7cec16b3e3c91c70e75144d42be30f96
related-to-bug: 5553055
 2011-11-29 11:59:10 -08:00
Andreas Huber
66a051af37 Finer granularity discontinuity support. 
No clients can signal a format change on either audio or video track (or both)
and a time discontinuity (timestamps changed) independantly.

Change-Id: I3e6cf4e7c260e85759879d61a9b517f68431c22f
related-to-bug: 5553055
 2011-11-28 16:45:13 -08:00
Andreas Huber
551aeac336 Make sure we can properly shutdown even if 
a) one of the two decoders has a pending discontinuity
b) the renderer holds on to all output buffers for that decoder
c) the renderer is paused

if all three conditions are met the decoder won't ask for more input data
and therefore never see the discontinuity.

To avoid this we briefly resume the renderer just before shutting down.

Change-Id: I9e08af2a1eb4298d1cd00497d6aa33f4ad184e9a
related-to-bug: 5655016
 2011-11-28 16:27:35 -08:00
Glenn Kasten
376c393039 MidiFile uses C++ Thread not createThreadEtc 
This permits leveraging future improvements to Thread.

Change-Id: I323b709e935c47fa3c6041cb8b82fda994e78b56
 2011-11-16 15:43:31 -08:00
Glenn Kasten
714211068e am bb1b7d5c: am 19998120: Merge "Bug 5478024 drop after decode if can\'t drop before" into ics-mr0 
* commit 'bb1b7d5cb3c5502484269bfd0cdcd0d5a6d6bfad':
  Bug 5478024 drop after decode if can't drop before
 2011-11-09 21:19:00 +00:00
Glenn Kasten
f2c2b1c484 am 19998120: Merge "Bug 5478024 drop after decode if can\'t drop before" into ics-mr0 
* commit '19998120f53caceb620f138c6eea182f1e693660':
  Bug 5478024 drop after decode if can't drop before
 2011-11-09 16:41:19 +00:00
Glenn Kasten
bb1b7d5cb3 am 19998120: Merge "Bug 5478024 drop after decode if can\'t drop before" into ics-mr0 
* commit '19998120f53caceb620f138c6eea182f1e693660':
  Bug 5478024 drop after decode if can't drop before
 2011-11-09 14:35:18 +00:00
Andreas Huber
ea427b0c87 resolved conflicts for merge of 26f70db9 to master 
Change-Id: Ib1536b1a4c9eeff80e0726b3e61cee12057cd120
 2011-11-08 10:40:20 -08:00
Andreas Huber
26f70db99f Merge "Remove surface legacy APIs and code." into ics-mr1 2011-11-08 08:48:31 -08:00
Glenn Kasten
f330986fa8 Bug 5478024 drop after decode if can't drop before 
Change-Id: Iaa64553be1a710da5d42be4e3a1e1d6dc873e371
 2011-11-04 18:05:35 -07:00
Andreas Huber
efa4015ae3 DO NOT MERGE Poll input data with a small timeout and don't consume a full core. 
Change-Id: I3c288698920fe6ead0df24a52330483609821a41
related-to-bug: 5549263
 2011-11-03 18:15:43 -07:00
Andreas Huber
57f2887c33 am e395f645: Poll input data with a small timeout and don\'t consume a full core. 
* commit 'e395f645aa4c30a4fad8beb3da6f8fad72338617':
  Poll input data with a small timeout and don't consume a full core.
 2011-11-03 18:12:39 +00:00
Andreas Huber
e395f645aa Poll input data with a small timeout and don't consume a full core. 
Change-Id: I3c288698920fe6ead0df24a52330483609821a41
related-to-bug: 5549263
 2011-11-03 11:00:21 -07:00
Andreas Huber
95be24585f Remove surface legacy APIs and code. 
All surfaces are now supported through surface textures.

Change-Id: I95dd823e7099c0c32a48a1121624149dcc29d9c6
 2011-10-28 09:39:23 -07:00
Andreas Huber
e10d9126e5 am 27ed1249: Merge "Properly report that we\'re no longer playing after receiving event" into ics-mr1 
* commit '27ed12492dfbec6ec67b66ff3cf60febce370b01':
  Properly report that we're no longer playing after receiving event
 2011-10-28 16:17:54 +00:00
Andreas Huber
27ed12492d Merge "Properly report that we're no longer playing after receiving event" into ics-mr1 2011-10-28 09:13:54 -07:00
Jamie Gennis
e396e993a5 am fc9592f8: am 08479cee: Merge "Stagefright: ANW::connect in MediaPlayerService" into ics-mr0 
* commit 'fc9592f8a5f2f75207e5e532655ac294eb2b334b':
  Stagefright: ANW::connect in MediaPlayerService
 2011-10-28 02:53:20 +00:00
Jamie Gennis
fc9592f8a5 am 08479cee: Merge "Stagefright: ANW::connect in MediaPlayerService" into ics-mr0 
* commit '08479ceeba56c460fb52f60a24df27776f1936c3':
  Stagefright: ANW::connect in MediaPlayerService
 2011-10-28 02:14:01 +00:00
Jamie Gennis
2fa0ac2e44 Stagefright: ANW::connect in MediaPlayerService 
This change moves the ANativeWindow connect and disconnect logic from
MediaPlayer to MediaPlayerService::Client.

Bug: 5502654
Change-Id: Ifc43b98b01ad8f35d62d7ece43110724ec7fda3d
 2011-10-26 18:40:00 -07:00
Andreas Huber
e96e84b577 Properly report that we're no longer playing after receiving event 
MEDIA_PLAYBACK_COMPLETE or MEDIA_ERROR.

Change-Id: I03eeba751d3728adb33d9c66de4c7444a91696f3
 2011-10-26 15:23:31 -07:00
Steve Block
71f2cf116a Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF) DO NOT MERGE 
See https://android-git.corp.google.com/g/#/c/143865

Bug: 5449033
Change-Id: I0122812ed6ff6f5b59fe4a43ab8bff0577adde0a
 2011-10-26 09:57:54 +01:00
James Dong
c7d927466e am b3cdadb6: Merge "Check whether media recorder client exists before dumping." into ics-mr0 
* commit 'b3cdadb639027f62c7c1637ca962a70d2d1f3b4d':
  Check whether media recorder client exists before dumping.
 2011-10-19 17:57:58 -07:00
James Dong
dc8bbe79b8 Check whether media recorder client exists before dumping. 
Change-Id: I1f3a644a958975e4cf6c02099c53e30cc4d2fd82
related-to-bug: 5477177
 2011-10-18 22:29:20 -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
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
d33b3881f7 Merge "Signal an appropriate error even if there are no active streams yet." 2011-09-27 13:36:22 -07:00
Andreas Huber
7922619e9c Signal an appropriate error even if there are no active streams yet. 
Change-Id: I3ac1053ad288558b62ee18056dfd0a9ce0da8f49
related-to-bug: 5372901
 2011-09-27 12:13:37 -07:00
Eric Laurent
53719fc4c5 Merge "Fix issue 5373048: AudioCache decode errors" 2011-09-27 10:32:17 -07:00
Eric Laurent
9968a36f29 Fix issue 5373048: AudioCache decode errors 
When decoding a file for the SoundPool, do not
reject the entire file in case of error but
return what was decoded so far instead.

Change-Id: Iff199a1b6a4c8e064e42a0dfe0704e0ae36a27fd
 2011-09-27 10:23:38 -07:00
Andreas Huber
928baf1f54 Propagate error signalled by the source all the way to the output EOS notification. 
Change-Id: I30e959a6d669f09745c59fbdebee08f869511cf7
related-to-bug: 5372901
 2011-09-26 10:53:29 -07:00
Glenn Kasten
cd5c896381 Bug 5234242 audio continues after discontinuity 
Reduce to 8 buffers of 10 packets from 16 buffers of 20 packets.

Change-Id: Ifdb5e15535989fbb6e5e1b70d5f9f71dc66a5c83
 2011-09-21 10:40:01 -07:00
Andreas Huber
950fc9d115 In order to recover from video lagging behind audio, drop avc frames 
that are not referenced by other frames before feeding them into the decoder.

Change-Id: I822190af8f8329567bff8da1ea23136d0a765481
 2011-09-16 15:19:59 -07:00