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

5394 Commits

Author SHA1 Message Date
Andreas Huber
db85b54395 resolved conflicts for merge of 3d630e86 to master 
Change-Id: I9eb7b7c1668b5f0de85ec8b1e9257cf1ec4d8b9e
 2011-11-30 09:53:40 -08:00
James Dong
44ddd1ff88 Fix the broken build 
Change-Id: Ib508514891474d24f14ac69d721b0c9c700a0c3f
 2011-11-29 18:00:03 -08:00
Andreas Huber
e7b3e09a5e am 52607c53: am d12dc284: Merge "If an error occurs that prevents us from reallocating buffers during a format change" into ics-mr1 
* commit '52607c5364446df6ac5b2f55cb50e146e6023a4f':
  If an error occurs that prevents us from reallocating buffers during a format change
 2011-11-29 16:33:04 -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
d12dc28460 Merge "If an error occurs that prevents us from reallocating buffers during a format change" into ics-mr1 2011-11-29 14:09:03 -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
405a4e3403 Merge "Finer granularity discontinuity support." into ics-mr1 2011-11-29 14:08:13 -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
Mathias Agopian
aa2892edc7 Merge changes If4126023,Iacda2386,I1eb691f7,Ib56139f8 
* changes:
  Add support for sending VSYNC events to the framework
  BitTube::read now handles EAGAIN
  split ComposerService out of SurfaceComposerClient.h
  rewrite SF's message loop on top of Looper
 2011-11-29 11:47:03 -08:00
Yu Shan Emily Lau
9a8246c8d1 am 77d1ebbd: am 4e5d3f2c: Merge "Add the min fps option to set the min fps in the media recorder test. Add the procmem log to the media memory stress test." into ics-mr1 
* commit '77d1ebbd7bd42d849911e680a63eec02e8b444db':
  Add the min fps option to set the min fps in the media recorder test. Add the procmem log to the media memory stress test.
 2011-11-28 19:57:26 -08:00
Yu Shan Emily Lau
99b4523b75 Add the min fps option to set 
the min fps in the media recorder test.
Add the procmem log to the media
memory stress test.

Change-Id: Icf82f12adeca7072a171991d1d6a994e4bb7764a
 2011-11-28 17:56:02 -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
Mathias Agopian
3f15700a01 split ComposerService out of SurfaceComposerClient.h 
Change-Id: I1eb691f7ca263d5895d871ab675bb5826e0323c6
 2011-11-28 15:21:57 -08:00
Andreas Huber
d03e7d62d5 If an error occurs that prevents us from reallocating buffers during a format change 
we need to transition to executing state anyway to be able to properly flush/shutdown
in the future.

Change-Id: Ie48bc09ea31942009ae3a5a45aabc9ffad9fb91f
related-to-bug: 5655016
 2011-11-28 10:54:12 -08:00
James Dong
f53453d596 Merge "Fix a subtitle bug: multiple blank lines in SubRip(srt) file." 2011-11-22 17:36:45 -08:00
dujin.cha
55cadf7eca am 4d592c59: am eabde3d4: am fe464a76: [Prime K] Fix gabage character issue 
* commit '4d592c59e684ed3e6f0db4b05c37ba8774b8d410':
  [Prime K] Fix gabage character issue
 2011-11-22 13:22:00 -08:00
dujin.cha
eabde3d4a9 am fe464a76: [Prime K] Fix gabage character issue 
* commit 'fe464a76d8fc858be971dbb5e67b1d22fd925347':
  [Prime K] Fix gabage character issue
 2011-11-22 13:18:27 -08:00
dujin.cha
fe464a76d8 [Prime K] Fix gabage character issue 
Korean characters show up as gabage characters in Music player.
Reason : MTP service does not set the locale for the MediaScanner
Solution : Set locale when MtpDatabase creates MediaScanner.

Bug ID : 5567433
Signed-off-by: dujin.cha <dujin.cha@samsung.com>

Change-Id: I4bfe5f603c113170d45bd57a8709c21c665e260b
 2011-11-22 10:28:21 -08:00
Andreas Huber
72a845d539 am 31626b30: am cb6fbc89: Merge "Report a runtime error instead of asserting on malformed avc configuration data." into ics-mr1 
* commit '31626b3075335f4cf579342e99436bb45870cf55':
  Report a runtime error instead of asserting on malformed avc configuration data.
 2011-11-22 08:43:28 -08:00
Andreas Huber
cb6fbc89c2 Merge "Report a runtime error instead of asserting on malformed avc configuration data." into ics-mr1 2011-11-22 08:39:11 -08:00
Insun Kang
7e6265e0d2 Fix a subtitle bug: multiple blank lines in SubRip(srt) file. 
TimedTextParser should handle multiple blank lines between subtitles
in SRT format.

Change-Id: Id81e0a14d9984141f68b9f0919942c85562301b3
 2011-11-22 21:11:49 +09:00
James Dong
4e2ecdd8a7 am d0a25456: am 02740dc4: Merge "Fix log spamming during time lapse video recording" into ics-mr1 
* commit 'd0a254566f5f0be5607b4d64839a575c888c94f6':
  Fix log spamming during time lapse video recording
 2011-11-21 21:08:55 -08:00
James Dong
96af14d9b0 Fix log spamming during time lapse video recording 
Change-Id: I4fc0809203684ebb02eaf217d7abad00aefc898f

related-to-bug: 5626569
 2011-11-21 12:09:51 -08:00
Marco Nelissen
7ff7821a60 am d4b22ab4: status_t != bool 
* commit 'd4b22ab4889f9b1885bfc0dc45667c846a171a98':
  status_t != bool
 2011-11-18 15:07:21 -08:00
Marco Nelissen
d4b22ab488 status_t != bool 
b/5567433

Change-Id: I255ab8c3b0b5e0ea6a5cc7c05df757c667f3855e
 2011-11-18 14:21:34 -08:00
Marco Nelissen
1cad15207d status_t != bool 
b/5567433

Change-Id: I255ab8c3b0b5e0ea6a5cc7c05df757c667f3855e
 2011-11-18 13:10:56 -08:00
Andreas Huber
0ba8660ea6 Report a runtime error instead of asserting on malformed avc configuration data. 
Change-Id: Ibcd9c3fb5b6532eba843ed80ecdcdacaf50d8845
related-to-bug: 5641069
 2011-11-18 12:22:59 -08:00
Andreas Huber
aa25761114 am 624efe45: am c1b1709b: Merge "Make sure not to cancel pending seek/EOS notifications on a cache underrun..." into ics-mr1 
* commit '624efe45671131903fb5165f6133ba39486092ab':
  Make sure not to cancel pending seek/EOS notifications on a cache underrun...
 2011-11-17 13:20:16 -08:00
Glenn Kasten
7418e385f4 Merge "MidiFile uses C++ Thread not createThreadEtc" 2011-11-17 07:14:41 -08:00
Glenn Kasten
b447e9ce1d Merge "JetPlayer uses C++ Thread not createThreadEtc" 2011-11-17 07:14:29 -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
9c0227a63c JetPlayer uses C++ Thread not createThreadEtc 
This permits leveraging future improvements to Thread.

Change-Id: I60deed8565ed54f13d9f770c76504e411b154276
 2011-11-16 15:25:30 -08:00
Glenn Kasten
99d544332a Bug 4903178 Restore priority and cgroup on stop 
On AudioTrack and AudioRecord stop or failed start, restore the priority
and cgroup of the caller to their previous values, rather than forcing
to NORMAL.  Dependent on new thread APIs.

Also fixes bug where priority was set to AUDIO but cgroup not set.

Change-Id: Ib83893918fb4fdf57c6b87884b51038997a631d8
 2011-11-16 14:52:55 -08:00
Andreas Huber
22cf4b0c5f Make sure not to cancel pending seek/EOS notifications on a cache underrun... 
or they are lost for good.

Change-Id: I2f9f53efb05db4077961137c9dc8c27edac4ec62
related-to-bug: 5544907
 2011-11-16 10:46:05 -08:00
James Dong
0e7d85fa93 am 4e72e2bf: am 4fdc36e6: Merge "Document that release() should be called with onPause() and onStop() for media objects" into ics-mr1 
* commit '4e72e2bfc24afe053ca98c6de2591a4057cfd9fa':
  Document that release() should be called with onPause() and onStop() for media objects
 2011-11-15 20:19:55 -08:00
James Dong
4fdc36e6d6 Merge "Document that release() should be called with onPause() and onStop() for media objects" into ics-mr1 2011-11-15 20:13:03 -08:00
Jean-Michel Trivi
29270da5f7 am 4978c1a5: am 0ddb0143: Merge "Fix 5623252 unlink to death of audio focus client early" into ics-mr1 
* commit '4978c1a5b07782d622ca9e3eedd649a5927d226f':
  Fix 5623252 unlink to death of audio focus client early
 2011-11-15 18:28:39 -08:00
James Dong
89ca6983eb Document that release() should be called with onPause() and onStop() for media objects 
Change-Id: I12dd734b4314df4f0573ad56a1714348e50da05e
related-to-bug: 5616833
 2011-11-15 18:08:06 -08:00
Jean-Michel Trivi
e7edc86853 Fix 5623252 unlink to death of audio focus client early 
When removing an entry in the audio focus stack, don't wait for
 this object's finalizer to unlink to the death of the associated
 client, and unlink right away.
The FocusStackEntry.unlinkToDeath() method is made safe to call
 by catching the exception it can throw inside its body.

Change-Id: Id347a933d72dcb41531adff2854fb00277032cc9
 2011-11-15 17:41:05 -08:00
Hong Teng
cc6c20f532 am 716747f7: am 481ffa50: Merge "Fix for issue 5309336 -add videoeditor maximum prefetch YUV frames in media_profiles.xml to limit the total memory usage." into ics-mr1 
* commit '716747f7cb29b45e41c2870f12d39095f4ed80c8':
  Fix for issue  5309336 -add videoeditor maximum prefetch YUV frames in media_profiles.xml to limit the total memory usage.
 2011-11-15 13:07:07 -08:00
Jean-Michel Trivi
eb80b31b55 am 87597d9c: am 538dc6ac: Merge "Fix 5615747 Don\'t leak remote control client death handlers" into ics-mr1 
* commit '87597d9ce00691f05703f728c17548df2bbc9cc2':
  Fix 5615747 Don't leak remote control client death handlers
 2011-11-15 13:06:57 -08:00
Hong Teng
481ffa505b Merge "Fix for issue 5309336 -add videoeditor maximum prefetch YUV frames in media_profiles.xml to limit the total memory usage." into ics-mr1 2011-11-15 09:42:37 -08:00
Jean-Michel Trivi
a9509736c8 Fix 5615747 Don't leak remote control client death handlers 
Whenever a remote control stack entry is GC'd or removed from
 the stack, unlink its death handler.

Change-Id: Ia4ed6667351849fd388272591e24ffc16959beaf
 2011-11-14 17:30:23 -08:00
Jean-Michel Trivi
f1ec32db68 am 9d36a995: am 258576a8: Merge "Fix 5607938 AudioFocusDeathHandler leaks GREF" into ics-mr1 
* commit '9d36a99582518ed1a7fb005382e0128479b43e18':
  Fix 5607938 AudioFocusDeathHandler leaks GREF
 2011-11-14 14:38:30 -08:00
Hong Teng
7eb5319703 Fix for issue 5309336 
-add videoeditor maximum prefetch YUV frames in media_profiles.xml to limit the total memory usage.

Change-Id: I41ffbc192fcce4c7635e5b0a1f2835852e5ee509
 2011-11-14 13:02:59 -08:00
Glenn Kasten
527c44e8a4 Merge "Don't check return value of new for being == null" 2011-11-14 10:50:33 -08:00
Jean-Michel Trivi
de1f065be1 Fix 5607938 AudioFocusDeathHandler leaks GREF 
The AudioFocus death handler was correctly updating the audio
 focus stack when an audio focus client dies, but the death handler
 was leaking GREF if unlinkToDeath() is not called.
The fix consists in making sure unlinkToDeath() is always called
 by calling it in its finalizer.

Change-Id: I0c5343b4986ab582cadbf171fc53816952dc16f5
 2011-11-11 16:13:48 -08:00