OSDN Git Service
Richard Fitzgerald [Tue, 14 May 2013 12:18:21 +0000 (13:18 +0100)]
libmediaplayerservice: offload playback support
Main change is to how recycled tracks are used for gapless
playback. If we are playing offloaded tracks that can't be
recycled we don't open a new offloaded output until we have
closed the previous one. This is because offloaded tracks
are a limited resource so we don't want to spuriously create
unnecessary instances. If the tracks cannot be recycled
this means that the formats are incompatible and so the
hardware most likely will also be unable to use the existing
output channel for the new track. If we already have the
maximum number of hardware offload channels open (which could
be only one) then creation of the next output would fail if
we attempted it while the previous output was still open.
Change-Id: I4f5958074e7ffd2e17108157fee86329506730ea
Signed-off-by: Eric Laurent <elaurent@google.com>
Richard Fitzgerald [Tue, 14 May 2013 11:12:21 +0000 (12:12 +0100)]
libmedia: offloaded playback support
- start() returns a status so that upper layers can
recreate a non offloaded track in case of error.
- Added states to handle offloaded tracks specific:
- waiting for stream end (drain) notification by
audio flinger
- allow pause while waiting for stream end notification
- getPosition() queries the render position directly from
audio HAL.
- disable APIs not applicable to offloaded tracks
- Modified track restoring behavior for invalidated
offloaded tracks: just send the callback and wait for
upper layers to create a new track.
- Added wait for stream end management in audio track client
proxy. Similar to obtainBuffer and should be factored in.
Change-Id: I0fc48117946364cb255afd653195498891f622bd
Signed-off-by: Eric Laurent <elaurent@google.com>
Eric Laurent [Mon, 7 Jan 2013 17:53:42 +0000 (09:53 -0800)]
AudioFlinger: offload playback, non-blocking write
- Added specialized playback thread class for offload playback,
derived from directoutput thread.
This thread type handles specific state transitions for offloaded
tracks and offloading commands (pause/resume/drain/flush..) to audio HAL.
As opposed to other threads, does not go to standby if the track is paused.
- Added support for asynchronous write and drain operations at audio HAL.
Use a thread to handle async callback events from HAL: this avoids locking
playback thread mutex when executing the callback and cause deadlocks when
calling audio HAL functions with the playback thread mutex locked.
- Better accouting for track activity: call start/stop and release Output
methods in audio policy manager when tracks are actually added and removed
from the active tracks list.
Added a command thread in audio policy service to handle stop/release commands
asynchronously and avoid deadlocks with playback thread.
- Track terminated status is not a state anymore. This condition is othogonal
to state to permitted state transitions while terminated.
Change-Id: Id157f4b3277620568d8eace7535d9186602564de
Andy McFadden [Thu, 25 Jul 2013 14:27:30 +0000 (14:27 +0000)]
Merge "Update error message"
Andy McFadden [Wed, 24 Jul 2013 23:35:12 +0000 (16:35 -0700)]
Update error message
The color format used for surfaces has two different names. The
one in the error message is the "native" name, which doesn't mean
anything to external developers.
Change-Id: Ic0561f4ad12970b0e0a60bd17b4e3997af1a9f0e
Zhijun He [Wed, 24 Jul 2013 20:56:24 +0000 (20:56 +0000)]
Merge "camera2: Implement ICameraDeviceUser::waitUntilIdle"
Jeff Tinker [Wed, 24 Jul 2013 19:38:27 +0000 (19:38 +0000)]
Merge "Remove obsolete drm manager code"
Andy McFadden [Wed, 24 Jul 2013 00:26:25 +0000 (00:26 +0000)]
Merge "Don't abort on unusual state transition"
Andy McFadden [Tue, 23 Jul 2013 22:49:10 +0000 (22:49 +0000)]
Merge "Prototype screen recording command"
Andy McFadden [Mon, 22 Jul 2013 19:23:07 +0000 (12:23 -0700)]
Prototype screen recording command
This records the screen contents as a movie. It works by feeding
the output of a virtual display to the video/avc encoder. Recording
continues until Ctrl-C is hit.
Video only, no sound. Does not track screen rotations.
Change-Id: I91d5c4e781792c740699b7a83590e846295b3617
Andy McFadden [Tue, 23 Jul 2013 20:05:29 +0000 (13:05 -0700)]
Don't abort on unusual state transition
The state transition check was too strict, and we were crashing
mediaserver inappropriately.
Bug
9819944
Change-Id: I1482ed1cfee37088d4893ee81cf1b2b950d2e930
Jeff Tinker [Mon, 22 Jul 2013 22:54:42 +0000 (15:54 -0700)]
Remove obsolete drm manager code
bug:
9545965
Change-Id: Ia6e09efa826b1349d027045e782980daeb7d7596
Geremy Condra [Tue, 23 Jul 2013 18:11:55 +0000 (18:11 +0000)]
Merge "Fix typo in socket name"
Chad Brubaker [Tue, 23 Jul 2013 18:09:19 +0000 (11:09 -0700)]
Fix typo in socket name
Change-Id: I29171368f1b69333ef7eae53ada2fab94e3e28b9
Zhijun He [Tue, 23 Jul 2013 15:02:53 +0000 (08:02 -0700)]
camera2: Implement ICameraDeviceUser::waitUntilIdle
Also fixed some logging typo
Change-Id: Ib254bdb137dca10b12595c23aeb1c53097423425
Geremy Condra [Tue, 23 Jul 2013 17:56:36 +0000 (17:56 +0000)]
Merge "Add routing sockets for the requesting user"
Zhijun He [Tue, 23 Jul 2013 00:34:34 +0000 (17:34 -0700)]
Camera: ProCamera connect need support HAL3 device
Change-Id: Iae7e5f9e6387f61f1c4bbb91f75803fc1fdf2668
Glenn Kasten [Mon, 22 Jul 2013 15:02:08 +0000 (15:02 +0000)]
Merge "Use AudioSystem::setLowRamDevice() to configure memory"
Glenn Kasten [Mon, 22 Jul 2013 14:43:59 +0000 (14:43 +0000)]
Merge "Revert "Fix Audioflinger crash when TeeSink is enabled""
Glenn Kasten [Mon, 22 Jul 2013 14:43:19 +0000 (14:43 +0000)]
Merge "Fix compile warning"
Zhijun He [Sat, 20 Jul 2013 01:09:39 +0000 (01:09 +0000)]
Merge "camera2: Fix request ID bug"
Mathias Agopian [Sat, 20 Jul 2013 01:02:37 +0000 (01:02 +0000)]
Merge "update to new Consumer APIs"
The Android Open Source Project [Fri, 19 Jul 2013 23:02:29 +0000 (16:02 -0700)]
am
f2d744d9: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
* commit '
f2d744d9535ca59be6cd878830176f81a0a8fbc6':
Camera2/3: Fix deadlock when starting recording before preview.
Eino-Ville Talvala [Fri, 19 Jul 2013 23:02:11 +0000 (16:02 -0700)]
am
b0177ff2: am
46910bdc: Camera2/3: Fix deadlock when starting recording before preview.
* commit '
b0177ff25e3e620be6ebe1e2c3f645b2f05dd57e':
Camera2/3: Fix deadlock when starting recording before preview.
Glenn Kasten [Fri, 19 Jul 2013 22:59:07 +0000 (22:59 +0000)]
Merge "Make AudioFlinger::instantiate() more resilient when called from separate module"
Chad Brubaker [Tue, 16 Jul 2013 04:17:03 +0000 (21:17 -0700)]
Add routing sockets for the requesting user
Mediaserver sockets are now routed as if the connection was in the
requesting app in per user routing.
Change-Id: I60f4649c3c4145a65264b54c1aa2c6c7741efaba
The Android Open Source Project [Fri, 19 Jul 2013 21:20:40 +0000 (14:20 -0700)]
Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: I48e936434971feedd176c2d5eafd0fdf43b75f74
Andreas Huber [Fri, 19 Jul 2013 18:00:43 +0000 (11:00 -0700)]
Enable support for explicitly requesting an encoded keyframe from the vp8
encoder.
Change-Id: I370d5831f7d6037faf361a92521390f19f179cbe
Eino-Ville Talvala [Fri, 19 Jul 2013 20:43:00 +0000 (13:43 -0700)]
am
46910bdc: Camera2/3: Fix deadlock when starting recording before preview.
* commit '
46910bdc57c35ac36bd4adcbb76f4f3a590e3f21':
Camera2/3: Fix deadlock when starting recording before preview.
Zhijun He [Fri, 19 Jul 2013 20:18:43 +0000 (13:18 -0700)]
camera2: Fix request ID bug
Wrong request id was pushed in request list.
Change-Id: I55bf7ae84ca41eec79db1a81d2cde35beaa2a6b9
Andreas Huber [Fri, 19 Jul 2013 18:32:07 +0000 (11:32 -0700)]
Minor tweaks to DirectRenderer and Converter
Converter now supports automatic prepending of SPS/PPS to IDR frames (h264)
as well as using the encoder in "surface-input" mode.
The new features are all opt-in and should not affect existing clients.
Change-Id: I543cf1d31ba068c1a01ab4e6814ac8d817b63faa
Glenn Kasten [Fri, 19 Jul 2013 17:32:41 +0000 (10:32 -0700)]
Fix compile warning
Change-Id: I80de4a013dc65eb7c532561438fd10e005354c03
Glenn Kasten [Mon, 15 Jul 2013 21:45:07 +0000 (14:45 -0700)]
Use AudioSystem::setLowRamDevice() to configure memory
Bug:
9798886
Change-Id: I9321e3f369f1ed9429ae222e3926ebdeb012b8b0
Glenn Kasten [Mon, 15 Jul 2013 23:09:26 +0000 (16:09 -0700)]
Revert "Fix Audioflinger crash when TeeSink is enabled"
This reverts commit
84e391686d7eced293913d1d7993721224ee0ba1.
Bug:
8834855
Change-Id: I8211ef5ea5d87d97ada115723df31c8057f38ca8
Glenn Kasten [Mon, 15 Jul 2013 18:23:36 +0000 (11:23 -0700)]
Make AudioFlinger::instantiate() more resilient when called from separate module
Bug:
8834855
Change-Id: I4cd842cdfb09d2aaaaab9df9ac3bec6179709bd3
Eino-Ville Talvala [Fri, 19 Jul 2013 02:15:17 +0000 (19:15 -0700)]
Camera2/3: Fix deadlock when starting recording before preview.
Move 3A notification synthesis for HAL3 devices from
Camera3Device::processCaptureResult to Camera2Client's
FrameProcessor. This will ensure that calls to processCaptureResult
from HAL can never block on Camera2Client internal mutexes.
Bug:
9923891
Change-Id: I5184649bf45c0807babe6b8c0e1239e959cd3480
Eino-Ville Talvala [Fri, 19 Jul 2013 02:15:17 +0000 (19:15 -0700)]
Camera2/3: Fix deadlock when starting recording before preview.
Move 3A notification synthesis for HAL3 devices from
Camera3Device::processCaptureResult to Camera2Client's
FrameProcessor. This will ensure that calls to processCaptureResult
from HAL can never block on Camera2Client internal mutexes.
Bug:
9923891
Change-Id: I5184649bf45c0807babe6b8c0e1239e959cd3480
Andreas Huber [Thu, 18 Jul 2013 22:14:33 +0000 (22:14 +0000)]
Merge "ANetworkSession and ParsedMessage are now part of stagefright foundation."
Andreas Huber [Thu, 18 Jul 2013 21:36:18 +0000 (14:36 -0700)]
ANetworkSession and ParsedMessage are now part of stagefright foundation.
Also fixes some bugs in ParseMessage and adds "WebSocket" mode to
ANetworkSession, something that's opt-in and should not affect existing clients
of the API.
Change-Id: I86d5748e0d818231d85d3590d86c2b41d4f8b1f1
Dima Zavin [Thu, 18 Jul 2013 20:37:19 +0000 (20:37 +0000)]
Merge "stagefright: set scaling mode for blank frames in ACodec"
Dima Zavin [Thu, 18 Jul 2013 18:43:39 +0000 (11:43 -0700)]
stagefright: set scaling mode for blank frames in ACodec
Analogous to
1d5ac80d0c6d3deabcc9e9b4abc9e3ef536aeb27
(by jgennis), this sets the scaling mode for the ANativeWindow
to SCALE_TO_WINDOW prior to pushing the blank frames during
decoder tear down.
Without this, the window defaults to FREEZE and SF ignores the
new frames.
Bug:
9516405
Change-Id: I39ef30922d733034bf01100d7ff24ac9c0c33b7d
Signed-off-by: Dima Zavin <dima@android.com>
Glenn Kasten [Thu, 18 Jul 2013 14:59:36 +0000 (14:59 +0000)]
Merge "Fix theoretical memory leak in mConfigEvents"
Glenn Kasten [Wed, 17 Jul 2013 16:08:51 +0000 (09:08 -0700)]
Fix theoretical memory leak in mConfigEvents
Change-Id: I137f70676c8919661e716c33e0dd9c25c2b6285c
Glenn Kasten [Wed, 17 Jul 2013 23:26:33 +0000 (23:26 +0000)]
Merge "Clean up references to AUDIO_FORMAT_PCM_8_24_BIT"
Andreas Huber [Wed, 17 Jul 2013 22:29:43 +0000 (22:29 +0000)]
Merge "Support "suspension" of a video encoder in "surface-input" mode."
Andreas Huber [Wed, 17 Jul 2013 20:55:26 +0000 (13:55 -0700)]
Support "suspension" of a video encoder in "surface-input" mode.
i.e. feed no more input frames to the encoder while suspended.
Change-Id: I51391e18c1517548e869f8ddece19f4af37e78f9
Andreas Huber [Wed, 17 Jul 2013 22:13:17 +0000 (22:13 +0000)]
Merge "Experimental support for enabling the use of "surface input" mode"
Andreas Huber [Wed, 17 Jul 2013 21:02:31 +0000 (14:02 -0700)]
Experimental support for enabling the use of "surface input" mode
even with the software VP8 encoder.
This relies heavily on the fact that the "Nexus" devices use ARGB32 as
the colorspace for the data underlying a surface provided by SurfaceFlinger
(mirroring). Generally there are no such guarantees.
Change-Id: I1de32f591a3bb935ca76151816b3a02665bec40b
leozwang@google.com [Wed, 17 Jul 2013 21:14:37 +0000 (21:14 +0000)]
Merge "Output more detailed error message if loading library fails"
leozwang@google.com [Sun, 14 Jul 2013 04:52:50 +0000 (21:52 -0700)]
Output more detailed error message if loading library fails
Bug:
9805979
Change-Id: I77b19d6a65ff9fb72e7428ce79b117628e4c8658
Glenn Kasten [Wed, 17 Jul 2013 15:14:16 +0000 (15:14 +0000)]
Merge "Fix indentation"
Glenn Kasten [Wed, 17 Jul 2013 14:44:50 +0000 (14:44 +0000)]
Merge "Add comments"
Glenn Kasten [Wed, 17 Jul 2013 14:24:14 +0000 (14:24 +0000)]
Merge "Fix typo in logs"
Mathias Agopian [Wed, 17 Jul 2013 05:54:39 +0000 (22:54 -0700)]
update to new Consumer APIs
Change-Id: I3c5d4be2a2e8783fbf98b3e268fd02658f71dc7d
Mathias Agopian [Tue, 16 Jul 2013 02:17:39 +0000 (02:17 +0000)]
Merge "always pass the BufferQueue explicitely to consumers"
Igor Murashkin [Sat, 13 Jul 2013 00:52:16 +0000 (17:52 -0700)]
camera2: Implement ICameraDeviceUser::getCameraInfo
Bug:
9529161
Change-Id: I927e39c124cd5fb19e38423506f4463acc381cb0
Mathias Agopian [Sat, 13 Jul 2013 05:06:20 +0000 (22:06 -0700)]
always pass the BufferQueue explicitely to consumers
Change-Id: Ic2d9a9cf184a482b3c78a481ed693ee32df5ca13
Glenn Kasten [Thu, 11 Jul 2013 20:11:55 +0000 (20:11 +0000)]
Merge "AudioTrackShared cleanup"
Glenn Kasten [Thu, 11 Jul 2013 20:07:50 +0000 (20:07 +0000)]
Merge "Fix AudioTrack::flush()"
Glenn Kasten [Thu, 11 Jul 2013 17:35:38 +0000 (10:35 -0700)]
Fix AudioTrack::flush()
It was only flushing at a surface level, and even then only the first time
the server observed the client's flush request. Now it flushes at a
deeper level, but there may be even deeper device-specific flushing.
Bug:
9770947
Change-Id: I687cc3410ff9e5e5d4a5dcb9e3b129501e53d247
The Android Open Source Project [Thu, 11 Jul 2013 17:17:25 +0000 (10:17 -0700)]
am
1bb59258: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
* commit '
1bb59258458350af518170558120783bc2f9e61d':
The Android Open Source Project [Thu, 11 Jul 2013 15:08:09 +0000 (08:08 -0700)]
am
0a95b17c: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
* commit '
0a95b17c93f8ca0a4ed46bdc5797aa81f46f028c':
Andy McFadden [Thu, 11 Jul 2013 14:40:58 +0000 (14:40 +0000)]
Merge "Pass additional arg to acquireBuffer calls."
Zhijun He [Thu, 11 Jul 2013 08:54:37 +0000 (01:54 -0700)]
am
adaa78c9: am
a2520db0: camera2/3: set preview callback oneshot flag during still capture
* commit '
adaa78c901a2f2509965b7acc1cde848dfc6bafe':
camera2/3: set preview callback oneshot flag during still capture
Glenn Kasten [Thu, 11 Jul 2013 00:20:54 +0000 (17:20 -0700)]
Fix indentation
Change-Id: Ia28720a7d0fad8cf110c2448b967d5648d42e017
Glenn Kasten [Thu, 11 Jul 2013 00:03:19 +0000 (17:03 -0700)]
Add comments
Change-Id: Ifbf3a46a4183c8abc0feee1c588953ab10303cc1
Glenn Kasten [Wed, 10 Jul 2013 23:52:47 +0000 (16:52 -0700)]
Fix type error in AudioTrack::processAudioBuffer
It returned a bool instead of nsecs_t
Change-Id: If0c096dac411afc0a4142ec1e59c1fdd36d4867c
Glenn Kasten [Tue, 18 Jun 2013 18:46:28 +0000 (11:46 -0700)]
Clean up references to AUDIO_FORMAT_PCM_8_24_BIT
Change-Id: I08771eb2664b7082561a40937218c7f4414e2cce
The Android Open Source Project [Wed, 10 Jul 2013 15:34:46 +0000 (08:34 -0700)]
Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: Ie4a7e41d8d28b46966f6aadfd38af5516c082f04
The Android Automerger [Wed, 10 Jul 2013 12:55:16 +0000 (05:55 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
The Android Open Source Project [Tue, 9 Jul 2013 16:37:21 +0000 (09:37 -0700)]
Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: I9a9eea4a01ba78b06cb79a26db9b0bcb52f5fd7b
Zhijun He [Tue, 9 Jul 2013 15:00:35 +0000 (08:00 -0700)]
am
a2520db0: camera2/3: set preview callback oneshot flag during still capture
* commit '
a2520db02bead68d4980783c41500ae96511bdf8':
camera2/3: set preview callback oneshot flag during still capture
The Android Automerger [Tue, 9 Jul 2013 12:55:21 +0000 (05:55 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
Andy McFadden [Fri, 28 Jun 2013 21:03:03 +0000 (14:03 -0700)]
Pass additional arg to acquireBuffer calls.
Bug
7900302
Change-Id: I30b9cca783e0a48f77035b745b7d5e20edf10f27
Zhijun He [Mon, 8 Jul 2013 23:12:32 +0000 (16:12 -0700)]
camera2/3: set preview callback oneshot flag during still capture
Preview callback oneshot flag need set when a still picture is being captured
and preview callback oneshot is enabled, otherwise, the callback enabling status
could be lost when preview is restarted after still catpure.
Bug
9742091
Change-Id: If9562369013e53727edfdd16f3d00d6a9392e70d
Eino-Ville Talvala [Mon, 8 Jul 2013 23:49:36 +0000 (16:49 -0700)]
am
06a4604e: am
4a5c009b: Camera2/3: As a fallback, unilaterally free old recording buffers
* commit '
06a4604e77b5872857ef95fe712b6ce00c7aa506':
Camera2/3: As a fallback, unilaterally free old recording buffers
Eino-Ville Talvala [Mon, 8 Jul 2013 23:47:27 +0000 (16:47 -0700)]
am
4a5c009b: Camera2/3: As a fallback, unilaterally free old recording buffers
* commit '
4a5c009bc2389304cf078c270bceb656479367d2':
Camera2/3: As a fallback, unilaterally free old recording buffers
The Android Open Source Project [Mon, 8 Jul 2013 22:37:11 +0000 (15:37 -0700)]
am
29196772: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
* commit '
291967728b02ad9a7d5545b0eb1ec0c4c3d664af':
The Android Open Source Project [Mon, 8 Jul 2013 22:33:11 +0000 (15:33 -0700)]
Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: I13e45e13c3abf52cef3fb58de3f4707fb8fedaac
Jean-Baptiste Queru [Mon, 8 Jul 2013 20:43:29 +0000 (13:43 -0700)]
am
1468dd9c: am
c582fde9: resolved conflicts for merge of
c158971f to stage-aosp-master
* commit '
1468dd9cefe11d5938a5497688f99701b6b14706':
Store rtsp accessunit until PLAY response parsed
Jean-Baptiste Queru [Mon, 8 Jul 2013 20:42:25 +0000 (13:42 -0700)]
am
c582fde9: resolved conflicts for merge of
c158971f to stage-aosp-master
* commit '
c582fde93ded7219107157333a9e46d780adcf9c':
Store rtsp accessunit until PLAY response parsed
Jean-Baptiste Queru [Mon, 8 Jul 2013 20:36:08 +0000 (13:36 -0700)]
resolved conflicts for merge of
c158971f to stage-aosp-master
Change-Id: I3d77b86f7e616af62a826fc37126706ad8ff6158
Eino-Ville Talvala [Wed, 3 Jul 2013 23:56:11 +0000 (16:56 -0700)]
Camera2/3: As a fallback, unilaterally free old recording buffers
When starting a recording session, check for and clear out recording
buffers still owned by stagefright from a previous recording session,
if any. There should never be any, but in case they are due to a bug
elsewhere in the system, clearing out the buffers makes recovery
possible.
Bug:
9591080
Change-Id: I3a2a1256860bd174381cd525948419f985c9b415
Jean-Baptiste Queru [Mon, 8 Jul 2013 19:35:13 +0000 (19:35 +0000)]
Merge "Store rtsp accessunit until PLAY response parsed"
Jean-Baptiste Queru [Mon, 8 Jul 2013 19:23:00 +0000 (12:23 -0700)]
am
8ebdfa8b: am
5de9ef20: am
365ed394: Merge "Typo in CameraParameters::set"
* commit '
8ebdfa8b021ed338f9916a1f30d756b989afa3bd':
Typo in CameraParameters::set
Jean-Baptiste Queru [Mon, 8 Jul 2013 19:20:16 +0000 (12:20 -0700)]
am
5de9ef20: am
365ed394: Merge "Typo in CameraParameters::set"
* commit '
5de9ef20d596bc20f53cba664f1ac7e358910ea2':
Typo in CameraParameters::set
Jean-Baptiste Queru [Mon, 8 Jul 2013 19:15:36 +0000 (12:15 -0700)]
am
365ed394: Merge "Typo in CameraParameters::set"
* commit '
365ed394c4135d9d42082c85638c076aed4bd156':
Typo in CameraParameters::set
Jean-Baptiste Queru [Mon, 8 Jul 2013 19:00:51 +0000 (19:00 +0000)]
Merge "Typo in CameraParameters::set"
Jean-Baptiste Queru [Mon, 8 Jul 2013 18:31:25 +0000 (11:31 -0700)]
am
c26ab375: am
5d2ab2a6: am
8eef093c: Merge "libstagefright: Use LOG_BASIC when use chromium http stack"
* commit '
c26ab375ebb1bce6c3a99a46a72d8369170255ca':
libstagefright: Use LOG_BASIC when use chromium http stack
Jean-Baptiste Queru [Mon, 8 Jul 2013 18:29:15 +0000 (11:29 -0700)]
am
5d2ab2a6: am
8eef093c: Merge "libstagefright: Use LOG_BASIC when use chromium http stack"
* commit '
5d2ab2a6d5e90c045d0989ef1be6c66a2295ee2d':
libstagefright: Use LOG_BASIC when use chromium http stack
Jean-Baptiste Queru [Mon, 8 Jul 2013 18:27:53 +0000 (11:27 -0700)]
am
046d9c8d: am
06197925: am
267363ee: Merge "Prevent Media Server crash while the AwesomePlayer getBitrate return true with mBitrate equals to zero."
* commit '
046d9c8dad97118535778cf93efc662ceb5fec8d':
Prevent Media Server crash while the AwesomePlayer getBitrate return true with mBitrate equals to zero.
Jean-Baptiste Queru [Mon, 8 Jul 2013 18:27:52 +0000 (11:27 -0700)]
am
9f0e0597: am
7266bc80: am
ca7f1609: Merge "Prevent double disconnects in RTSPSource"
* commit '
9f0e05978e236352fd2a4a7c6dce909755c36ead':
Prevent double disconnects in RTSPSource
Jean-Baptiste Queru [Mon, 8 Jul 2013 18:25:40 +0000 (11:25 -0700)]
am
06197925: am
267363ee: Merge "Prevent Media Server crash while the AwesomePlayer getBitrate return true with mBitrate equals to zero."
* commit '
061979253985e59c4fcb82ede232717736e633b1':
Prevent Media Server crash while the AwesomePlayer getBitrate return true with mBitrate equals to zero.
Jean-Baptiste Queru [Mon, 8 Jul 2013 18:25:39 +0000 (11:25 -0700)]
am
8eef093c: Merge "libstagefright: Use LOG_BASIC when use chromium http stack"
* commit '
8eef093c213094c7efb655ef4d9e31439646bd7f':
libstagefright: Use LOG_BASIC when use chromium http stack
Jean-Baptiste Queru [Mon, 8 Jul 2013 18:25:34 +0000 (11:25 -0700)]
am
7266bc80: am
ca7f1609: Merge "Prevent double disconnects in RTSPSource"
* commit '
7266bc80850dc327e9f18c27b81613f959399630':
Prevent double disconnects in RTSPSource
Jean-Baptiste Queru [Mon, 8 Jul 2013 18:23:45 +0000 (18:23 +0000)]
Merge "libstagefright: Use LOG_BASIC when use chromium http stack"
Jean-Baptiste Queru [Mon, 8 Jul 2013 18:21:48 +0000 (11:21 -0700)]
am
267363ee: Merge "Prevent Media Server crash while the AwesomePlayer getBitrate return true with mBitrate equals to zero."
* commit '
267363ee2836ff9bc18d7fdd93aaedf19de546ad':
Prevent Media Server crash while the AwesomePlayer getBitrate return true with mBitrate equals to zero.
Jean-Baptiste Queru [Mon, 8 Jul 2013 18:21:45 +0000 (11:21 -0700)]
am
ca7f1609: Merge "Prevent double disconnects in RTSPSource"
* commit '
ca7f160921a4a1a5da32ebe8fab1067bd8998a1f':
Prevent double disconnects in RTSPSource
Jean-Baptiste Queru [Mon, 8 Jul 2013 18:17:43 +0000 (18:17 +0000)]
Merge "Prevent Media Server crash while the AwesomePlayer getBitrate return true with mBitrate equals to zero."
Jean-Baptiste Queru [Mon, 8 Jul 2013 18:17:02 +0000 (18:17 +0000)]
Merge "Prevent double disconnects in RTSPSource"