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
Andreas Huber
2375d16378
Merge "Send RTSP control connection keep-alive requests" into ics-mr1
2011-11-10 08:48:44 -08:00
Andreas Huber
b42aea5b4c
Merge "Don't believe the PV decoder's lies..." into ics-mr1
2011-11-10 08:48:34 -08:00
Andreas Huber
7c063cf967
Merge "There's no point in trying to continue to decode after an error was signalled." into ics-mr1
2011-11-10 08:47:25 -08:00
Insun Kang
1bc76127af
Adds handler type 'sbtl' to support subtitles in various containers.
...
Change-Id: I16d2c5d9aeb087b958e28052f266ca0ef42ea7f1
2011-11-10 16:41:04 +09:00
Eric Laurent
96a33d1caa
Fix problems in tablet silent mode.
...
Do not enter silent mode when ALARM stream volume is changed
to 0 by volume down key: Only RING, NOTIFICATION and MUSIC
streams control silent mode.
Report correct volume (0) for NOTIFICATION stream when silent mode
is entered by changing NOTIFICATION stream volume to 0 with
volume down key.
Change-Id: I3e0816dfae40bc127cc30cca02cdca6ec19e30a4
2011-11-09 18:06:37 -08:00
Andreas Huber
b516b96d88
Merge "Instead of asserting, remove active streams if their sockets return failure"
2011-11-09 14:47:51 -08:00
Andreas Huber
05079be184
Instead of asserting, remove active streams if their sockets return failure
...
Change-Id: Ic5cc786f718cf921876b181927cf1b03e8373ff1
related-to-bug: 5593654
2011-11-09 14:26:43 -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
Andreas Huber
3f99d95312
There's no point in trying to continue to decode after an error was signalled.
...
Change-Id: I2a2410cac9444eadd85be5d104799703171f1a24
related-to-bug: 5588658
2011-11-09 10:26:06 -08:00
Andreas Huber
977702929b
Don't believe the PV decoder's lies...
...
Change-Id: I97391235255afb8a4890a4ff52d4e8e9ca954f27
2011-11-09 10:03:07 -08: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
a1b3e3d49e
Send RTSP control connection keep-alive requests
...
default to 60 secs unless overridden by server's session-id response.
Change-Id: I7c3aff5b787dbb57cc0dccf9db3c75e5cf7e778c
related-to-bug: 5562303
2011-11-08 15:39:15 -08: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