OSDN Git Service
Jamie Gennis [Wed, 30 Nov 2011 18:50:49 +0000 (10:50 -0800)]
am
c040e1e7: am
6f1dd757: Merge "SurfaceMediaSource: use the vid enc usage bit" into ics-mr1
* commit '
c040e1e77923d81050f2d3dbdac5d07e01be72f6':
SurfaceMediaSource: use the vid enc usage bit
Andreas Huber [Wed, 30 Nov 2011 17:53:40 +0000 (09:53 -0800)]
resolved conflicts for merge of
3d630e86 to master
Change-Id: I9eb7b7c1668b5f0de85ec8b1e9257cf1ec4d8b9e
Wu-cheng Li [Wed, 30 Nov 2011 02:45:06 +0000 (18:45 -0800)]
Merge "Add camera focus move callback."
James Dong [Wed, 30 Nov 2011 01:59:29 +0000 (17:59 -0800)]
Fix the broken build
Change-Id: Ib508514891474d24f14ac69d721b0c9c700a0c3f
Jamie Gennis [Wed, 30 Nov 2011 01:26:32 +0000 (17:26 -0800)]
am
6f1dd757: Merge "SurfaceMediaSource: use the vid enc usage bit" into ics-mr1
* commit '
6f1dd757cb158d17c76baeb170f7db2271802ef8':
SurfaceMediaSource: use the vid enc usage bit
Jamie Gennis [Wed, 30 Nov 2011 01:25:09 +0000 (17:25 -0800)]
Merge "SurfaceMediaSource: use the vid enc usage bit" into ics-mr1
Andreas Huber [Wed, 30 Nov 2011 00:33:04 +0000 (16:33 -0800)]
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
Andreas Huber [Wed, 30 Nov 2011 00:33:02 +0000 (16:33 -0800)]
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
Andreas Huber [Tue, 29 Nov 2011 23:14:44 +0000 (15:14 -0800)]
resolved conflicts for merge of
998a929a to master
Change-Id: Id5cfbcf20e5ec28782cc88075040cf9edebfdfe8
Andreas Huber [Tue, 29 Nov 2011 22:12:21 +0000 (14:12 -0800)]
am
564fee36: Merge "Make sure we can properly shutdown even if" into ics-mr1
* commit '
564fee36667e2699c59a29102136220dc2f65862':
Make sure we can properly shutdown even if
Andreas Huber [Tue, 29 Nov 2011 22:12:20 +0000 (14:12 -0800)]
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
Andreas Huber [Tue, 29 Nov 2011 22:12:18 +0000 (14:12 -0800)]
am
351143fb: Merge "Updated (internal) API for IStreamSource to signal discontinuities" into ics-mr1
* commit '
351143fb0e2fcfb7dc2ef1045d693c71eb0ea329':
Updated (internal) API for IStreamSource to signal discontinuities
Andreas Huber [Tue, 29 Nov 2011 22:10:09 +0000 (14:10 -0800)]
am
405a4e34: Merge "Finer granularity discontinuity support." into ics-mr1
* commit '
405a4e34032f8a07028138266fe9f79f6753b466':
Finer granularity discontinuity support.
Andreas Huber [Tue, 29 Nov 2011 22:09:10 +0000 (14:09 -0800)]
Merge "Make sure we can properly shutdown even if" into ics-mr1
Andreas Huber [Tue, 29 Nov 2011 22:09:03 +0000 (14:09 -0800)]
Merge "If an error occurs that prevents us from reallocating buffers during a format change" into ics-mr1
Andreas Huber [Tue, 29 Nov 2011 22:08:45 +0000 (14:08 -0800)]
Merge "Updated (internal) API for IStreamSource to signal discontinuities" into ics-mr1
Andreas Huber [Tue, 29 Nov 2011 19:57:35 +0000 (11:57 -0800)]
Updated (internal) API for IStreamSource to signal discontinuities
Change-Id: Idd4b9d8e7cec16b3e3c91c70e75144d42be30f96
related-to-bug:
5553055
Wu-cheng Li [Mon, 14 Nov 2011 12:30:14 +0000 (20:30 +0800)]
Add camera focus move callback.
bug:
5534973
Change-Id: Iaadcb2738ad040f94849be30ee531326f6199431
Andreas Huber [Mon, 28 Nov 2011 20:36:11 +0000 (12:36 -0800)]
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
Andreas Huber [Tue, 29 Nov 2011 00:27:35 +0000 (16:27 -0800)]
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
Mathias Agopian [Fri, 18 Nov 2011 01:48:35 +0000 (17:48 -0800)]
split ComposerService out of SurfaceComposerClient.h
Change-Id: I1eb691f7ca263d5895d871ab675bb5826e0323c6
Glenn Kasten [Mon, 28 Nov 2011 22:54:28 +0000 (14:54 -0800)]
Merge "Make AudioTrack a RefBase so wrappers not needed"
Andreas Huber [Mon, 28 Nov 2011 18:54:12 +0000 (10:54 -0800)]
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
Eric Laurent [Wed, 23 Nov 2011 20:35:01 +0000 (12:35 -0800)]
am
f6422f5f: am
20398fac: Merge "audioflinger: reduce sleep time to avoid underrun" into ics-mr1
* commit '
f6422f5f5d04aab47f8f36a0ea92e2140bed0105':
audioflinger: reduce sleep time to avoid underrun
Eric Laurent [Wed, 23 Nov 2011 20:32:53 +0000 (12:32 -0800)]
am
20398fac: Merge "audioflinger: reduce sleep time to avoid underrun" into ics-mr1
* commit '
20398fac99ff78cb3ec3dd122930e45d409e0524':
audioflinger: reduce sleep time to avoid underrun
Eric Laurent [Wed, 23 Nov 2011 02:50:29 +0000 (18:50 -0800)]
audioflinger: reduce sleep time to avoid underrun
Progressively reduce the sleep time applied in MixerThread::threadLoop()
in case of consecutive application underruns to avoid starving the audio HAL.
As the default sleep time is longer than the duration of an audio buffer
we ended up writing less data than needed by the audio HAL if
the condition persisted.
Issue
5553055.
Change-Id: I2b23ee79c032efa945025db228beaecd1e07a2e5
James Dong [Wed, 23 Nov 2011 01:36:45 +0000 (17:36 -0800)]
Merge "Fix a subtitle bug: multiple blank lines in SubRip(srt) file."
The Android Open Source Project [Tue, 22 Nov 2011 21:25:45 +0000 (13:25 -0800)]
Reconcile with ics-mr0-release ics-mr1-release
Change-Id: I3200e581a74858b3b7728db974f10c2ed68004ad
The Android Automerger [Tue, 22 Nov 2011 19:56:20 +0000 (11:56 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Andreas Huber [Tue, 22 Nov 2011 16:43:28 +0000 (08:43 -0800)]
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.
Andreas Huber [Tue, 22 Nov 2011 16:41:04 +0000 (08:41 -0800)]
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.
Andreas Huber [Tue, 22 Nov 2011 16:39:11 +0000 (08:39 -0800)]
Merge "Report a runtime error instead of asserting on malformed avc configuration data." into ics-mr1
Insun Kang [Tue, 22 Nov 2011 11:59:31 +0000 (20:59 +0900)]
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
James Dong [Tue, 22 Nov 2011 05:08:55 +0000 (21:08 -0800)]
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
James Dong [Tue, 22 Nov 2011 04:29:59 +0000 (20:29 -0800)]
am
02740dc4: Merge "Fix log spamming during time lapse video recording" into ics-mr1
* commit '
02740dc49df86fc94c872454aa9db98737d5e8c8':
Fix log spamming during time lapse video recording
Jamie Gennis [Tue, 22 Nov 2011 00:51:47 +0000 (16:51 -0800)]
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
James Dong [Sun, 20 Nov 2011 17:45:44 +0000 (09:45 -0800)]
Fix log spamming during time lapse video recording
Change-Id: I4fc0809203684ebb02eaf217d7abad00aefc898f
related-to-bug:
5626569
The Android Open Source Project [Fri, 18 Nov 2011 23:42:32 +0000 (15:42 -0800)]
Reconcile with ics-mr0-release ics-mr1-release
Change-Id: I31643242d240b4d1efef685583ec21934a88cc02
Marco Nelissen [Fri, 18 Nov 2011 23:35:00 +0000 (15:35 -0800)]
Marco Nelissen [Fri, 18 Nov 2011 23:10:54 +0000 (15:10 -0800)]
am
7ff7821a: am
d4b22ab4: status_t != bool
* commit '
7ff7821a601a39fffb318e29873957b4a3703c46':
status_t != bool
Marco Nelissen [Fri, 18 Nov 2011 23:07:21 +0000 (15:07 -0800)]
am
d4b22ab4: status_t != bool
* commit '
d4b22ab4889f9b1885bfc0dc45667c846a171a98':
status_t != bool
Marco Nelissen [Fri, 18 Nov 2011 21:10:56 +0000 (13:10 -0800)]
status_t != bool
b/
5567433
Change-Id: I255ab8c3b0b5e0ea6a5cc7c05df757c667f3855e
Marco Nelissen [Fri, 18 Nov 2011 21:10:56 +0000 (13:10 -0800)]
status_t != bool
b/
5567433
Change-Id: I255ab8c3b0b5e0ea6a5cc7c05df757c667f3855e
Andreas Huber [Fri, 18 Nov 2011 20:22:59 +0000 (12:22 -0800)]
Report a runtime error instead of asserting on malformed avc configuration data.
Change-Id: Ibcd9c3fb5b6532eba843ed80ecdcdacaf50d8845
related-to-bug:
5641069
Glenn Kasten [Thu, 17 Nov 2011 22:08:31 +0000 (14:08 -0800)]
Merge "Bug
5522189 re-enable ARM opts but disable inline"
Glenn Kasten [Thu, 17 Nov 2011 21:27:22 +0000 (13:27 -0800)]
Bug
5522189 re-enable ARM opts but disable inline
PIE did not work together with inlining. This change combines (almost
all of) the performance benefits of ARM optimizations together with PIE.
Change-Id: I4594d33ae5a0a7bac327ae08e30fb35343a06256
Andreas Huber [Thu, 17 Nov 2011 21:20:16 +0000 (13:20 -0800)]
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...
Andreas Huber [Thu, 17 Nov 2011 17:07:36 +0000 (09:07 -0800)]
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...
Andreas Huber [Thu, 17 Nov 2011 17:05:17 +0000 (09:05 -0800)]
Merge "Make sure not to cancel pending seek/EOS notifications on a cache underrun..." into ics-mr1
Glenn Kasten [Thu, 17 Nov 2011 15:14:41 +0000 (07:14 -0800)]
Merge "MidiFile uses C++ Thread not createThreadEtc"
Glenn Kasten [Thu, 17 Nov 2011 15:14:29 +0000 (07:14 -0800)]
Merge "JetPlayer uses C++ Thread not createThreadEtc"
The Android Automerger [Thu, 17 Nov 2011 14:46:36 +0000 (06:46 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
The Android Open Source Project [Thu, 17 Nov 2011 12:08:27 +0000 (04:08 -0800)]
Glenn Kasten [Fri, 24 Jun 2011 00:11:35 +0000 (17:11 -0700)]
MidiFile uses C++ Thread not createThreadEtc
This permits leveraging future improvements to Thread.
Change-Id: I323b709e935c47fa3c6041cb8b82fda994e78b56
Glenn Kasten [Thu, 23 Jun 2011 23:43:24 +0000 (16:43 -0700)]
JetPlayer uses C++ Thread not createThreadEtc
This permits leveraging future improvements to Thread.
Change-Id: I60deed8565ed54f13d9f770c76504e411b154276
Glenn Kasten [Wed, 22 Jun 2011 23:15:25 +0000 (16:15 -0700)]
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
Andreas Huber [Wed, 16 Nov 2011 18:46:05 +0000 (10:46 -0800)]
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
The Android Open Source Project [Wed, 16 Nov 2011 17:48:16 +0000 (09:48 -0800)]
The Android Open Source Project [Wed, 16 Nov 2011 17:27:57 +0000 (09:27 -0800)]
No-op merge from ics-mr0
Change-Id: I6be81522ac3e6d4d8fab545abde4d81e5bb2a2c6
The Android Open Source Project [Wed, 16 Nov 2011 16:55:42 +0000 (08:55 -0800)]
Reconcile with ics-factoryrom-2-release
Change-Id: Idf18e15df810885a373fb4057f0db064771afc8e
The Android Automerger [Wed, 16 Nov 2011 14:46:22 +0000 (06:46 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Glenn Kasten [Tue, 15 Nov 2011 21:55:13 +0000 (13:55 -0800)]
Make AudioTrack a RefBase so wrappers not needed
Change-Id: I2305abe586ac41251af04a194bc818c110a1b293
Hong Teng [Tue, 15 Nov 2011 21:07:07 +0000 (13:07 -0800)]
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.
Hong Teng [Tue, 15 Nov 2011 17:45:29 +0000 (09:45 -0800)]
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.
Hong Teng [Tue, 15 Nov 2011 17:42:37 +0000 (09:42 -0800)]
Merge "Fix for issue
5309336 -add videoeditor maximum prefetch YUV frames in media_profiles.xml to limit the total memory usage." into ics-mr1
The Android Automerger [Tue, 15 Nov 2011 14:46:10 +0000 (06:46 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Hong Teng [Thu, 10 Nov 2011 22:54:26 +0000 (14:54 -0800)]
Fix for issue
5309336
-add videoeditor maximum prefetch YUV frames in media_profiles.xml to limit the total memory usage.
Change-Id: I41ffbc192fcce4c7635e5b0a1f2835852e5ee509
Eric Laurent [Mon, 14 Nov 2011 16:41:40 +0000 (08:41 -0800)]
am
25924f8f: am
030bb998: Merge "audioflinger: fix noise when skipping to next song" into ics-mr1
* commit '
25924f8f6c0a4ca4a2eb257b72d9625f69d2525e':
audioflinger: fix noise when skipping to next song
Eric Laurent [Mon, 14 Nov 2011 16:39:33 +0000 (08:39 -0800)]
am
030bb998: Merge "audioflinger: fix noise when skipping to next song" into ics-mr1
* commit '
030bb99814157b6424c0bf290bd2ede217b5ba77':
audioflinger: fix noise when skipping to next song
Eric Laurent [Mon, 14 Nov 2011 16:38:05 +0000 (08:38 -0800)]
Merge "audioflinger: fix noise when skipping to next song" into ics-mr1
The Android Automerger [Sun, 13 Nov 2011 14:46:51 +0000 (06:46 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Eric Laurent [Fri, 11 Nov 2011 23:42:52 +0000 (15:42 -0800)]
audioflinger: fix noise when skipping to next song
When audio effects are enabled, a noise can be heard at the
beginning of the new song when skipping to next song in music app.
This is because some effects (especially virtualizer) have a tail.
This tail was not played when previous song was stopped because effects were
not processed when no tracks were present on a given session. This is to
reduce CPU load when effects are enabled but no audio is playing.
The tail was then rendered when the new song was started.
Added a delay before stopping effect process after all tracks have been removed from a session.
Issue
5584880.
Change-Id: I815e0f7441f9302e8dfe413dc269a94e4cc6fd95
Andreas Huber [Fri, 11 Nov 2011 19:51:17 +0000 (11:51 -0800)]
am
8a065423: am
23217182: Merge "Didn\'t mean to check this in..." into ics-mr1
* commit '
8a0654231ff36d938bc3451190cf67231195f1d0':
Didn't mean to check this in...
Eric Laurent [Fri, 11 Nov 2011 19:51:14 +0000 (11:51 -0800)]
am
2c29a5cf: am
1f8c6212: Merge "visualizer: reset buffer if playback is idle" into ics-mr1
* commit '
2c29a5cf1658532bca4e34f816fa30312241a336':
visualizer: reset buffer if playback is idle
Andreas Huber [Fri, 11 Nov 2011 19:51:12 +0000 (11:51 -0800)]
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
Andreas Huber [Fri, 11 Nov 2011 19:51:11 +0000 (11:51 -0800)]
am
9a87a838: (-s ours) am
5d42075e: Merge "DO NOT MERGE: Instead of asserting, remove active streams if their sockets" into ics-mr1
* commit '
9a87a838028f3911a066a729cdb5ec688903a5ae':
DO NOT MERGE: Instead of asserting, remove active streams if their sockets
Andreas Huber [Fri, 11 Nov 2011 19:51:09 +0000 (11:51 -0800)]
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.
Andreas Huber [Fri, 11 Nov 2011 19:48:16 +0000 (11:48 -0800)]
am
23217182: Merge "Didn\'t mean to check this in..." into ics-mr1
* commit '
23217182743521063655c6fb1b1580d3558cfbe7':
Didn't mean to check this in...
Eric Laurent [Fri, 11 Nov 2011 19:48:05 +0000 (11:48 -0800)]
am
1f8c6212: Merge "visualizer: reset buffer if playback is idle" into ics-mr1
* commit '
1f8c621279ddb163ee3d63bf32d79955679db0c5':
visualizer: reset buffer if playback is idle
Andreas Huber [Fri, 11 Nov 2011 19:48:00 +0000 (11:48 -0800)]
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
Andreas Huber [Fri, 11 Nov 2011 19:47:58 +0000 (11:47 -0800)]
am
5d42075e: Merge "DO NOT MERGE: Instead of asserting, remove active streams if their sockets" into ics-mr1
* commit '
5d42075e450a49af2bb37ca3a9610921df7607f2':
DO NOT MERGE: Instead of asserting, remove active streams if their sockets
Andreas Huber [Fri, 11 Nov 2011 19:47:57 +0000 (11:47 -0800)]
am
d9f25bc9: Merge "Disconnect on socket error on the RTSP control connection." into ics-mr1
* commit '
d9f25bc941746f268ab978e6b2af7b7c4ec2ea89':
Disconnect on socket error on the RTSP control connection.
Andreas Huber [Fri, 11 Nov 2011 18:46:02 +0000 (10:46 -0800)]
Merge "Didn't mean to check this in..." into ics-mr1
Andreas Huber [Fri, 11 Nov 2011 18:17:00 +0000 (10:17 -0800)]
Didn't mean to check this in...
Change-Id: Ie5a1902ff2613cd349ca5724f63a3fe3306640c7
Eric Laurent [Fri, 11 Nov 2011 16:17:22 +0000 (08:17 -0800)]
Merge "visualizer: reset buffer if playback is idle" into ics-mr1
Andreas Huber [Fri, 11 Nov 2011 15:39:25 +0000 (07:39 -0800)]
Merge "Instead of asserting, signal a runtime error if the session doesn't contain" into ics-mr1
Andreas Huber [Fri, 11 Nov 2011 15:39:18 +0000 (07:39 -0800)]
Merge "DO NOT MERGE: Instead of asserting, remove active streams if their sockets" into ics-mr1
Andreas Huber [Fri, 11 Nov 2011 15:39:11 +0000 (07:39 -0800)]
Merge "Disconnect on socket error on the RTSP control connection." into ics-mr1
James Dong [Fri, 11 Nov 2011 15:34:21 +0000 (15:34 +0000)]
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
James Dong [Fri, 11 Nov 2011 15:28:32 +0000 (15:28 +0000)]
am
08e42967: Merge "Add support for retrieving location information in mp4/3gpp files" into ics-mr1
* commit '
08e42967b9e459b7beb22e859f1f1eba0546741b':
Add support for retrieving location information in mp4/3gpp files
James Dong [Fri, 11 Nov 2011 00:14:56 +0000 (16:14 -0800)]
Merge "Adds handler type 'sbtl' to support subtitles in various containers."
Glenn Kasten [Thu, 10 Nov 2011 23:14:12 +0000 (15:14 -0800)]
Merge "Fix log message"
Andreas Huber [Thu, 10 Nov 2011 22:48:20 +0000 (14:48 -0800)]
Disconnect on socket error on the RTSP control connection.
Change-Id: Ib52a69f9b0830b481c6f5c9b1991d1f4cb36ec7b
Glenn Kasten [Thu, 10 Nov 2011 22:58:44 +0000 (14:58 -0800)]
Fix log message
Log did not have a tag, and was wrong level
Change-Id: I8d12895c80483e1e39f117a393b8be2f4bdd3e1d
The Android Open Source Project [Thu, 10 Nov 2011 22:53:50 +0000 (14:53 -0800)]
Reconcile with ics-mr1-release
Change-Id: I86cac837a23dff6367af0e69d07ad3983845ff1e
Andreas Huber [Wed, 9 Nov 2011 22:26:43 +0000 (14:26 -0800)]
DO NOT MERGE: Instead of asserting, remove active streams if their sockets
return failure
Change-Id: Icb47adfd2fbe0398c473ba66e068186311c9cc79
related-to-bug:
5593654
Andreas Huber [Thu, 10 Nov 2011 20:40:30 +0000 (12:40 -0800)]
Instead of asserting, signal a runtime error if the session doesn't contain
any playable tracks at all.
Change-Id: Ibbbe2fdcd53b7e020da80c84c8229856107a87e6
James Dong [Wed, 9 Nov 2011 08:48:56 +0000 (00:48 -0800)]
Add support for retrieving location information in mp4/3gpp files
Change-Id: Ib8427704ef9ee5a4fa8fe1818c8a62d77b4ea687
related-to-bug:
5560253
Andreas Huber [Thu, 10 Nov 2011 19:39:38 +0000 (19:39 +0000)]
am
9e2949c6: am
2375d163: Merge "Send RTSP control connection keep-alive requests" into ics-mr1
* commit '
9e2949c6ab4e791b5c20d5e85c3eff62f206a99b':
Send RTSP control connection keep-alive requests
Andreas Huber [Thu, 10 Nov 2011 19:39:36 +0000 (19:39 +0000)]
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...