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
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
James Dong
c512fd065c
am 9a176507: am b7a000a6: Merge "Unhide the key to retriever location information in 3gp/mp4 files" into ics-mr1
...
* commit '9a176507a96ceb3640a56a5449e96fc3e406a765':
Unhide the key to retriever location information in 3gp/mp4 files
2011-11-11 11:51:19 -08:00
Andreas Huber
3dc44d9afe
am 8a065423: am 23217182: Merge "Didn\'t mean to check this in..." into ics-mr1
...
* commit '8a0654231ff36d938bc3451190cf67231195f1d0':
Didn't mean to check this in...
2011-11-11 11:51:17 -08:00
Eric Laurent
ff1fa5ef93
am 2c29a5cf: am 1f8c6212: Merge "visualizer: reset buffer if playback is idle" into ics-mr1
...
* commit '2c29a5cf1658532bca4e34f816fa30312241a336':
visualizer: reset buffer if playback is idle
2011-11-11 11:51:14 -08:00
Andreas Huber
d8ad2fab90
am 40461ee7: am cd556b82: Merge "Instead of asserting, signal a runtime error if the session doesn\'t contain" into ics-mr1
...
* commit '40461ee70161d8568663332f72be2353b04c34e7':
Instead of asserting, signal a runtime error if the session doesn't contain
2011-11-11 11:51:12 -08:00
Andreas Huber
ff0bd468d8
am 9c981cd3: am d9f25bc9: Merge "Disconnect on socket error on the RTSP control connection." into ics-mr1
...
* commit '9c981cd3d53238f10842368c1cd82d625b701a47':
Disconnect on socket error on the RTSP control connection.
2011-11-11 11:51:09 -08:00
James Dong
b7a000a6fb
Merge "Unhide the key to retriever location information in 3gp/mp4 files" into ics-mr1
2011-11-11 10:49:24 -08:00
Andreas Huber
2321718274
Merge "Didn't mean to check this in..." into ics-mr1
2011-11-11 10:46:02 -08:00
Andreas Huber
54c7efa4dd
Didn't mean to check this in...
...
Change-Id: Ie5a1902ff2613cd349ca5724f63a3fe3306640c7
2011-11-11 10:17:00 -08:00
Eric Laurent
1f8c621279
Merge "visualizer: reset buffer if playback is idle" into ics-mr1
2011-11-11 08:17:22 -08:00
Andreas Huber
cd556b82fd
Merge "Instead of asserting, signal a runtime error if the session doesn't contain" into ics-mr1
2011-11-11 07:39:25 -08:00
Andreas Huber
5d42075e45
Merge "DO NOT MERGE: Instead of asserting, remove active streams if their sockets" into ics-mr1
2011-11-11 07:39:18 -08:00
Andreas Huber
d9f25bc941
Merge "Disconnect on socket error on the RTSP control connection." into ics-mr1
2011-11-11 07:39:11 -08:00
James Dong
f4c3cc06cb
am 510180f1: am 08e42967: Merge "Add support for retrieving location information in mp4/3gpp files" into ics-mr1
...
* commit '510180f162dee3ae5416a98caa07f58a754f4b3f':
Add support for retrieving location information in mp4/3gpp files
2011-11-11 15:34:21 +00:00
Glenn Kasten
62b9aec7a0
Don't check return value of new for being == null
...
new either succeeds or throws an exception
Change-Id: I1615e10c4f6730495c49e56b64714a00141ea8ff
2011-11-11 07:30:19 -08:00
James Dong
00aa51b355
Unhide the key to retriever location information in 3gp/mp4 files
...
Change-Id: I71c651b403955c0f6f8df096e995a5f5f4e39130
related-to-bug: 5560253
2011-11-11 01:49:01 -08:00
James Dong
03466e35f2
Merge "Adds handler type 'sbtl' to support subtitles in various containers."
2011-11-10 16:14:56 -08:00
Andreas Huber
58c94bf434
Disconnect on socket error on the RTSP control connection.
...
Change-Id: Ib52a69f9b0830b481c6f5c9b1991d1f4cb36ec7b
2011-11-10 15:10:15 -08:00
Andreas Huber
4d7dff1706
DO NOT MERGE: Instead of asserting, remove active streams if their sockets
...
return failure
Change-Id: Icb47adfd2fbe0398c473ba66e068186311c9cc79
related-to-bug: 5593654
2011-11-10 12:41:51 -08:00
Andreas Huber
57cc14fcc1
Instead of asserting, signal a runtime error if the session doesn't contain
...
any playable tracks at all.
Change-Id: Ibbbe2fdcd53b7e020da80c84c8229856107a87e6
2011-11-10 12:40:30 -08:00
James Dong
77c500c9a1
Add support for retrieving location information in mp4/3gpp files
...
Change-Id: Ib8427704ef9ee5a4fa8fe1818c8a62d77b4ea687
related-to-bug: 5560253
2011-11-10 11:40:11 -08:00
Andreas Huber
62c0c3215d
am 9e2949c6: am 2375d163: Merge "Send RTSP control connection keep-alive requests" into ics-mr1
...
* commit '9e2949c6ab4e791b5c20d5e85c3eff62f206a99b':
Send RTSP control connection keep-alive requests
2011-11-10 19:39:38 +00:00
Andreas Huber
58941d8dcb
am 2dff5cdc: am b42aea5b: Merge "Don\'t believe the PV decoder\'s lies..." into ics-mr1
...
* commit '2dff5cdc362ff6026e71d4b96faea8f2d7bd7063':
Don't believe the PV decoder's lies...
2011-11-10 19:39:36 +00:00
Andreas Huber
2276b1774a
am ec04f4ac: am 7c063cf9: Merge "There\'s no point in trying to continue to decode after an error was signalled." into ics-mr1
...
* commit 'ec04f4ac23e5fe8f90267d09ddda8c0aa684c147':
There's no point in trying to continue to decode after an error was signalled.
2011-11-10 19:39:34 +00:00
Eric Laurent
7707cd9920
am 58f3a712: am 7c61fa70: Merge "Fix problems in tablet silent mode." into ics-mr1
...
* commit '58f3a7123d0da6d35424429f3c0bbfbd32c00117':
Fix problems in tablet silent mode.
2011-11-10 19:39:29 +00:00
Eric Laurent
df8ab51ca6
visualizer: reset buffer if playback is idle
...
Visualizer capture buffer must be reset if audio framework has stopped
calling process for a given period of time to get read of residual
data from previous captures.
Issue 5571920.
Change-Id: I6e73f971bb812cdbb2979a3b5e763abab07634eb
2011-11-10 10:27:05 -08:00