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

5383 Commits

Author SHA1 Message Date
Jamie Gennis
c8f8263e35 am 6f1dd757: Merge "SurfaceMediaSource: use the vid enc usage bit" into ics-mr1 
* commit '6f1dd757cb158d17c76baeb170f7db2271802ef8':
  SurfaceMediaSource: use the vid enc usage bit
 2011-11-29 17:26:59 -08:00
Jamie Gennis
6f1dd757cb Merge "SurfaceMediaSource: use the vid enc usage bit" into ics-mr1 2011-11-29 17:25:09 -08:00
Andreas Huber
92f05b9020 am 564fee36: Merge "Make sure we can properly shutdown even if" into ics-mr1 
* commit '564fee36667e2699c59a29102136220dc2f65862':
  Make sure we can properly shutdown even if
 2011-11-29 14:30:46 -08:00
Andreas Huber
34fe2f4a7f am d12dc284: Merge "If an error occurs that prevents us from reallocating buffers during a format change" into ics-mr1 
* commit 'd12dc28460f622ab29e83fa688ad83a8263e9417':
  If an error occurs that prevents us from reallocating buffers during a format change
 2011-11-29 14:30:45 -08:00
Andreas Huber
bcb0588af5 am 351143fb: Merge "Updated (internal) API for IStreamSource to signal discontinuities" into ics-mr1 
* commit '351143fb0e2fcfb7dc2ef1045d693c71eb0ea329':
  Updated (internal) API for IStreamSource to signal discontinuities
 2011-11-29 14:30:43 -08:00
Andreas Huber
1dd8ea4e4c am 405a4e34: Merge "Finer granularity discontinuity support." into ics-mr1 
* commit '405a4e34032f8a07028138266fe9f79f6753b466':
  Finer granularity discontinuity support.
 2011-11-29 14:30:40 -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
Yu Shan Emily Lau
5d6b956341 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 '4e5d3f2ca05b513640d3163155756e01ae577d54':
  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:55:33 -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
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
dujin.cha
b31783b142 am eabde3d4: am fe464a76: [Prime K] Fix gabage character issue 
* commit 'eabde3d4a9027a19443a31c7c7cda3d44fb0ffe0':
  [Prime K] Fix gabage character issue
 2011-11-22 13:20:21 -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
1d72b75006 am cb6fbc89: Merge "Report a runtime error instead of asserting on malformed avc configuration data." into ics-mr1 
* commit 'cb6fbc89c25298643ab342b4a228e772b0e56978':
  Report a runtime error instead of asserting on malformed avc configuration data.
 2011-11-22 08:41:26 -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
James Dong
5662725277 am 02740dc4: Merge "Fix log spamming during time lapse video recording" into ics-mr1 
* commit '02740dc49df86fc94c872454aa9db98737d5e8c8':
  Fix log spamming during time lapse video recording
 2011-11-21 20:30:14 -08:00
Jamie Gennis
6deb4b538e SurfaceMediaSource: use the vid enc usage bit 
This change makes SurfaceMediaSource add the VIDEO_ENC usage bit when
allocating its GraphicBuffers rather than the HW_TEXTURE bit.

Change-Id: Ie20e225c894fdbc31cad6bb82b3b64c7e98074eb
 2011-11-21 17:48:19 -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
5b381ec95f am 7ff7821a: am d4b22ab4: status_t != bool 
* commit '7ff7821a601a39fffb318e29873957b4a3703c46':
  status_t != bool
 2011-11-18 15:10:38 -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
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
412dd05c09 am c1b1709b: Merge "Make sure not to cancel pending seek/EOS notifications on a cache underrun..." into ics-mr1 
* commit 'c1b1709b2faa985fb9c2b273ca2191b5bfba5fdd':
  Make sure not to cancel pending seek/EOS notifications on a cache underrun...
 2011-11-17 09:07:48 -08:00
Mike Lockwood
b0e6d4f87f Merge "AudioManager: Add wrapper methods for master volume support" into ics-aah 2011-11-16 11:35:23 -08:00
Mike Lockwood
c614df9650 AudioManager: Add wrapper methods for master volume support 
Change-Id: Ibfc24f052d05824175f71c2138ba041c94c3def7
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-11-16 11:30:47 -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
Mike Lockwood
47a0a8832f Merge "AudioManager: Add support for master mute" into ics-aah 2011-11-16 07:41:21 -08:00
James Dong
541e2e6695 am 4fdc36e6: Merge "Document that release() should be called with onPause() and onStop() for media objects" into ics-mr1 
* commit '4fdc36e6d6003cdce911678f0b233697554f8dbf':
  Document that release() should be called with onPause() and onStop() for media objects
 2011-11-15 20:16:45 -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
08b2d32628 am 0ddb0143: Merge "Fix 5623252 unlink to death of audio focus client early" into ics-mr1 
* commit '0ddb0143895b816d4ff5c174b346390e07f26556':
  Fix 5623252 unlink to death of audio focus client early
 2011-11-15 18:21:43 -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
Mike Lockwood
cfbcd3bf21 AudioManager: Add support for master mute 
Change-Id: I98e87d1e266e0523c4aacb23cc5c4b3fdc7a1eac
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-11-15 09:57:33 -08:00
Hong Teng
3f84160e95 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 '481ffa505bb1d8f5089ea98e3b5960d409b6819c':
  Fix for issue  5309336 -add videoeditor maximum prefetch YUV frames in media_profiles.xml to limit the total memory usage.
 2011-11-15 09:45:24 -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
0dba46f9b2 am 538dc6ac: Merge "Fix 5615747 Don\'t leak remote control client death handlers" into ics-mr1 
* commit '538dc6acfd14ea59f0b294531f9417ca04ca621f':
  Fix 5615747 Don't leak remote control client death handlers
 2011-11-15 09:26:02 -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
09d936feb8 am 258576a8: Merge "Fix 5607938 AudioFocusDeathHandler leaks GREF" into ics-mr1 
* commit '258576a82c2293c3a988bf2dc6744fd8082421f9':
  Fix 5607938 AudioFocusDeathHandler leaks GREF
 2011-11-14 14:36:11 -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
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
James Dong
0997fcb6db am b7a000a6: Merge "Unhide the key to retriever location information in 3gp/mp4 files" into ics-mr1 
* commit 'b7a000a6fb84ae75847e730332bae62ba1234999':
  Unhide the key to retriever location information in 3gp/mp4 files
 2011-11-11 11:50:41 -08:00
Andreas Huber
f86639183d am 23217182: Merge "Didn\'t mean to check this in..." into ics-mr1 
* commit '23217182743521063655c6fb1b1580d3558cfbe7':
  Didn't mean to check this in...
 2011-11-11 11:50:37 -08:00
Eric Laurent
9b5b5858e0 am 1f8c6212: Merge "visualizer: reset buffer if playback is idle" into ics-mr1 
* commit '1f8c621279ddb163ee3d63bf32d79955679db0c5':
  visualizer: reset buffer if playback is idle
 2011-11-11 11:50:28 -08:00
Andreas Huber
fa0da0e5a5 am cd556b82: Merge "Instead of asserting, signal a runtime error if the session doesn\'t contain" into ics-mr1 
* commit 'cd556b82fd12dceb49e9d6543f80212721b220ec':
  Instead of asserting, signal a runtime error if the session doesn't contain
 2011-11-11 11:50:23 -08:00