OSDN Git Service
Lajos Molnar [Wed, 12 Jun 2013 16:32:30 +0000 (09:32 -0700)]
am
f8af99b7: am
0662f7b6: Merge "stagefright: synchronously change nativewindow crop" into jb-mr2-dev
* commit '
f8af99b7c10f1441d9a52676724b168f20752270':
stagefright: synchronously change nativewindow crop
Lajos Molnar [Wed, 12 Jun 2013 16:29:43 +0000 (09:29 -0700)]
am
0662f7b6: Merge "stagefright: synchronously change nativewindow crop" into jb-mr2-dev
* commit '
0662f7b6735df0a140f6512285d05f8f9a38bb98':
stagefright: synchronously change nativewindow crop
Lajos Molnar [Wed, 12 Jun 2013 16:27:40 +0000 (16:27 +0000)]
Merge "stagefright: synchronously change nativewindow crop" into jb-mr2-dev
Eric Laurent [Wed, 12 Jun 2013 15:47:34 +0000 (08:47 -0700)]
am
bb35be24: am
7be48189: Merge "audioflinger: fix effects on direct output threads" into jb-mr2-dev
* commit '
bb35be24239f05f59715960a93cd491a4cd3b4d6':
audioflinger: fix effects on direct output threads
Eric Laurent [Wed, 12 Jun 2013 15:46:03 +0000 (08:46 -0700)]
am
7be48189: Merge "audioflinger: fix effects on direct output threads" into jb-mr2-dev
* commit '
7be48189c0aefb82825a7689d9e1005175570779':
audioflinger: fix effects on direct output threads
Eric Laurent [Wed, 12 Jun 2013 15:44:42 +0000 (15:44 +0000)]
Merge "audioflinger: fix effects on direct output threads" into jb-mr2-dev
The Android Open Source Project [Wed, 12 Jun 2013 14:25:58 +0000 (07:25 -0700)]
am
765f99f3: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
* commit '
765f99f30fdc18396ce4edc9facbe6632c9b858e':
The Android Open Source Project [Wed, 12 Jun 2013 14:23:29 +0000 (07:23 -0700)]
Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: I87a7986866714bfd922259cf961d6d5f5b752362
The Android Automerger [Wed, 12 Jun 2013 12:55:52 +0000 (05:55 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
Lajos Molnar [Wed, 12 Jun 2013 00:56:24 +0000 (17:56 -0700)]
stagefright: synchronously change nativewindow crop
Only change the nativewindow crop before queuing frames
with the new crop.
Change-Id: Icd8a84c82e66a8be3d6bc1675c777b1de8dc39b9
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug:
9395753
Eino-Ville Talvala [Wed, 12 Jun 2013 01:23:26 +0000 (18:23 -0700)]
am
44ade05f: am
ea26c777: Camera3: Skip no-op stream configurations.
* commit '
44ade05f8d030ae3af8d05359734b18eac433935':
Camera3: Skip no-op stream configurations.
Eino-Ville Talvala [Wed, 12 Jun 2013 01:21:05 +0000 (18:21 -0700)]
am
ea26c777: Camera3: Skip no-op stream configurations.
* commit '
ea26c7772f4721657db409068d4bed194ae49c94':
Camera3: Skip no-op stream configurations.
Eino-Ville Talvala [Tue, 11 Jun 2013 23:04:06 +0000 (16:04 -0700)]
Camera3: Skip no-op stream configurations.
If configuring the same set of streams more than once, don't actually
call into the HAL for the second and subsequent configure calls, since
they're no-ops.
This can speed up camera operation substantially if the
HAL implementation does not detect no-ops on its own and does a full
shutdown/restart on each configure call.
Bug:
9392513
Change-Id: I23baf4acbae2304735899adcf8e17565fa94d31d
Eric Laurent [Tue, 11 Jun 2013 21:38:48 +0000 (14:38 -0700)]
audioflinger: fix effects on direct output threads
PlaybackThread::addTrack_l() uses the assumption that
effects are attached to a track only if the track accumulation
buffer is different from the mixer thread output buffer.
This is not true for direct output threads where only one track is active
an only one buffer is needed.
This assumption is an optimization to avoid checking for effect chains with
the same session ID each time a track is processed. The optimization
is not key if only one track is attached to the thread which is the case for
direct outputs.
Current code fails to increment the active track count in the effect chain
on direct output threads when a track is started thus making the effect
framework clear the mix buffer and produce silence each time the mixer runs.
The fix consists in removing the optimization described above.
Bug:
9324989.
Change-Id: Id7a6337450ed90d326299c2ce9fc02f4b9e2fa6f
Igor Murashkin [Tue, 11 Jun 2013 20:44:58 +0000 (20:44 +0000)]
Merge "camera: Make some binder interfaces compatible with AIDL"
Igor Murashkin [Fri, 31 May 2013 00:47:38 +0000 (17:47 -0700)]
camera: Make some binder interfaces compatible with AIDL
Done:
* ICameraService
* ICameraServiceListener
Partial:
* ICamera (disconnect only)
* IProCameraUser (disconnect only)
Bug:
9213377
Change-Id: I8e2e6e05cfd02ec36be1d5b2c551f10ffb43b5b4
Eino-Ville Talvala [Mon, 10 Jun 2013 20:34:08 +0000 (20:34 +0000)]
Merge "Camera3: Add more tracing"
The Android Open Source Project [Mon, 10 Jun 2013 18:11:53 +0000 (11:11 -0700)]
am
6c72c187: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
* commit '
6c72c1877fadca5068fa94f7a0249c0609e85534':
camera2/3: Fix deadlock take picture while preview callback
camera3: Fix crash in set error state.
camera2/3: Add protection to callback processing call
The Android Open Source Project [Mon, 10 Jun 2013 15:13:42 +0000 (08:13 -0700)]
Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
Change-Id: I9864de7c2785357cea0c4b669607fee76e9f09e8
The Android Automerger [Sun, 9 Jun 2013 12:55:29 +0000 (05:55 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
Zhijun He [Thu, 6 Jun 2013 23:52:02 +0000 (16:52 -0700)]
camera2/3: Fix deadlock take picture while preview callback
Acquiring mInputMutex before SharedParameters mutex in preview callback thread
causes circular locking dependency between callback thread and capture callback
thread.
Enforce the right lock ordering to break the dead lock.
Bug:
9323319
Change-Id: Iea2e025e4d9e29debcf74297c19930075017e179
Eino-Ville Talvala [Mon, 3 Jun 2013 23:53:32 +0000 (16:53 -0700)]
Camera3: Add more tracing
Change-Id: I5f5d0d3f37244f19446c473db70373bdf16cce56
Zhijun He [Fri, 7 Jun 2013 17:01:13 +0000 (10:01 -0700)]
am
574ca4f4: am
ba696bbf: Merge "camera2/3: Fix deadlock take picture while preview callback" into jb-mr2-dev
* commit '
574ca4f4f15a42d6159150149f68bf3cb800d869':
camera2/3: Fix deadlock take picture while preview callback
Zhijun He [Fri, 7 Jun 2013 16:59:47 +0000 (09:59 -0700)]
am
ba696bbf: Merge "camera2/3: Fix deadlock take picture while preview callback" into jb-mr2-dev
* commit '
ba696bbff88d5627beaa0be95be78ba30138983d':
camera2/3: Fix deadlock take picture while preview callback
Zhijun He [Fri, 7 Jun 2013 16:58:12 +0000 (16:58 +0000)]
Merge "camera2/3: Fix deadlock take picture while preview callback" into jb-mr2-dev
Eric Laurent [Fri, 7 Jun 2013 15:59:12 +0000 (08:59 -0700)]
am
d3a5b48a: am
18b46679: Merge "AudioFlinger: do not cache audio device when 0." into jb-mr2-dev
* commit '
d3a5b48a1bc4f5d6ff4472f54f909abaadd5fa39':
AudioFlinger: do not cache audio device when 0.
Eric Laurent [Fri, 7 Jun 2013 15:57:00 +0000 (08:57 -0700)]
am
18b46679: Merge "AudioFlinger: do not cache audio device when 0." into jb-mr2-dev
* commit '
18b466790aa0a55ff4282ed8b5e550e58e0444b2':
AudioFlinger: do not cache audio device when 0.
Eric Laurent [Fri, 7 Jun 2013 15:52:59 +0000 (15:52 +0000)]
Merge "AudioFlinger: do not cache audio device when 0." into jb-mr2-dev
Glenn Kasten [Fri, 7 Jun 2013 14:11:34 +0000 (07:11 -0700)]
am
1c540f7d: am
911a184b: am
132bc5bd: Merge "Noise will be heard if audio sample rate not matched with audio track"
* commit '
1c540f7d1b04cfd74847587f127b7539c3c15864':
Noise will be heard if audio sample rate not matched with audio track
Glenn Kasten [Fri, 7 Jun 2013 14:09:39 +0000 (07:09 -0700)]
am
911a184b: am
132bc5bd: Merge "Noise will be heard if audio sample rate not matched with audio track"
* commit '
911a184bb5f5177a00bb4a8c80453f22e67b449c':
Noise will be heard if audio sample rate not matched with audio track
Glenn Kasten [Fri, 7 Jun 2013 14:06:15 +0000 (07:06 -0700)]
am
132bc5bd: Merge "Noise will be heard if audio sample rate not matched with audio track"
* commit '
132bc5bd1c68aa807a20e1655f009f74433be588':
Noise will be heard if audio sample rate not matched with audio track
Glenn Kasten [Fri, 7 Jun 2013 14:04:45 +0000 (14:04 +0000)]
Merge "Noise will be heard if audio sample rate not matched with audio track"
Ming Zhou [Wed, 27 Feb 2013 09:12:37 +0000 (17:12 +0800)]
Noise will be heard if audio sample rate not matched with audio track
When audio sample rate which set to audio track is not the same with
the actual pcm data, noise will be heard. Fix the bug when write 8 bit
pcm samples.
Change-Id: Idcb0d7b0e9aaa250dd22b758c8337e23d1706049
Signed-off-by: Ming Zhou <b42586@freescale.com>
Signed-off-by: guoyin.chen <guoyin.chen@freescale.com>
Eric Laurent [Fri, 7 Jun 2013 01:29:01 +0000 (18:29 -0700)]
AudioFlinger: do not cache audio device when 0.
AudioFlinger should not cache the audio device
passed to the audio HAL when it is AUDIO_DEVICE_NONE
but keep previous valid selection instead.
Bug:
9323399.
Change-Id: I6f9480e55a21be4115453e6a5eebc5cf2536c476
Zhijun He [Thu, 6 Jun 2013 23:52:02 +0000 (16:52 -0700)]
camera2/3: Fix deadlock take picture while preview callback
Acquiring mInputMutex before SharedParameters mutex in preview callback thread
causes circular locking dependency between callback thread and capture callback
thread.
Enforce the right lock ordering to break the dead lock.
Bug:
9323319
Change-Id: Iea2e025e4d9e29debcf74297c19930075017e179
Mike Lockwood [Thu, 6 Jun 2013 22:00:14 +0000 (15:00 -0700)]
Remove "LOCAL_MODULE_TAGS := debug" for stagefright tests
Change-Id: I53815d2f6d7dfe7eebb26c3802eb3d195244aab1
Zhijun He [Thu, 6 Jun 2013 20:51:22 +0000 (13:51 -0700)]
camera3: Fix crash in set error state.
When camera open fails in camera3device initialize call, setErrorStateLockedV()
tries to access RequestThread object that is not created yet.
Bug:
9319518
Change-Id: Id5c6c0150ecaecb198045d5c6eb1b2ceebf5a727
Zhijun He [Thu, 6 Jun 2013 03:00:09 +0000 (20:00 -0700)]
camera2/3: Add protection to callback processing call
Callback stream in callbackprocessor could be delleted while process or
discard callback are ongoing, which leads CpuConsumer related call crash.
Bug
9303911
Change-Id: Ib6137e512208e5603468eba166640729b744e8f9
Zhijun He [Thu, 6 Jun 2013 21:22:29 +0000 (14:22 -0700)]
am
e097efde: am
b05eeaed: camera3: Fix crash in set error state.
* commit '
e097efde4363f80d5ffc34da6ec6253fbd4e5397':
camera3: Fix crash in set error state.
Zhijun He [Thu, 6 Jun 2013 21:18:06 +0000 (14:18 -0700)]
am
b05eeaed: camera3: Fix crash in set error state.
* commit '
b05eeaedacaff92b6e5ac89f99b0fccdf7643f09':
camera3: Fix crash in set error state.
Zhijun He [Thu, 6 Jun 2013 20:51:22 +0000 (13:51 -0700)]
camera3: Fix crash in set error state.
When camera open fails in camera3device initialize call, setErrorStateLockedV()
tries to access RequestThread object that is not created yet.
Bug:
9319518
Change-Id: Id5c6c0150ecaecb198045d5c6eb1b2ceebf5a727
Zhijun He [Thu, 6 Jun 2013 18:12:05 +0000 (11:12 -0700)]
am
1d263b89: am
62a8f67f: camera2/3: Add protection to callback processing call
* commit '
1d263b89bd1c5d73389f53976e104dd6b088ab6e':
camera2/3: Add protection to callback processing call
Zhijun He [Thu, 6 Jun 2013 18:09:54 +0000 (11:09 -0700)]
am
62a8f67f: camera2/3: Add protection to callback processing call
* commit '
62a8f67f33faf19d0ff815672dd19bb71dd0d650':
camera2/3: Add protection to callback processing call
Zhijun He [Thu, 6 Jun 2013 03:00:09 +0000 (20:00 -0700)]
camera2/3: Add protection to callback processing call
Callback stream in callbackprocessor could be delleted while process or
discard callback are ongoing, which leads CpuConsumer related call crash.
Bug
9303911
Change-Id: Ib6137e512208e5603468eba166640729b744e8f9
The Android Open Source Project [Thu, 6 Jun 2013 17:38:56 +0000 (10:38 -0700)]
am
25c8c528: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
* commit '
25c8c528101360119f2aafc1871811cc1a5ad519':
Camera2/3: Move recording frame processing to its own thread.
stagefright: Fix port-reconfiguration & output-buffer-filled race condition
Camera2/3: Don't trigger AF when in INFINITY focus mode.
The Android Open Source Project [Thu, 6 Jun 2013 17:37:16 +0000 (10:37 -0700)]
Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
Change-Id: I0aa9bb7e725a8352da3eae512c2a62df4f12e3b3
The Android Automerger [Thu, 6 Jun 2013 12:55:27 +0000 (05:55 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
Eino-Ville Talvala [Tue, 4 Jun 2013 23:34:35 +0000 (16:34 -0700)]
Camera2/3: Move recording frame processing to its own thread.
Due to new deadlock opportunities from HAL3 integration, recording
frame processing needs to move out of the new frame handler into its
own thread in StreamingProcessor.
Bug:
9282913
Change-Id: I8d2926f2de9d0d395eef3c328c65caebbdbd2827
Lajos Molnar [Fri, 26 Apr 2013 23:11:45 +0000 (16:11 -0700)]
stagefright: Fix port-reconfiguration & output-buffer-filled race condition
Remove the invalid assumption that when a port-reconfiguration event
is received, buffers cannot be downstream (waiting to be rendered).
Luckily, these buffers are properly handled (freed) after they are
sent to be rendered.
Change-Id: I1df39c1ffc2bfb96f8b7b4ee5be07cae654f956f
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug:
8736466
Lajos Molnar [Wed, 5 Jun 2013 02:35:18 +0000 (19:35 -0700)]
stagefright: created SoftVideoDecoderOMXComponent
Created common base class for all software video decoders to make
adding new features easier.
Change-Id: Id89964e572d5cc5add02662273e6ae96c6b7eb12
Signed-off-by: Lajos Molnar <lajos@google.com>
Eino-Ville Talvala [Wed, 5 Jun 2013 18:46:46 +0000 (11:46 -0700)]
am
4dd110ae: am
254446a8: Camera2/3: Move recording frame processing to its own thread.
* commit '
4dd110ae6d9f00e1ec036f697045f4b3326b7873':
Camera2/3: Move recording frame processing to its own thread.
Eino-Ville Talvala [Wed, 5 Jun 2013 18:43:49 +0000 (11:43 -0700)]
am
254446a8: Camera2/3: Move recording frame processing to its own thread.
* commit '
254446a80cb13d5beb606bfc3e60a17473869478':
Camera2/3: Move recording frame processing to its own thread.
The Android Automerger [Wed, 5 Jun 2013 17:11:30 +0000 (10:11 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
Lajos Molnar [Wed, 5 Jun 2013 02:35:03 +0000 (19:35 -0700)]
Track exact timestamps in SoftMPEG4/H263 decoders
Change-Id: I7772e3afec020f889dea80fd6372afbc36cd68d6
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug:
9285553
(cherry picked from commit
e113aa1f078cb3d5f8182058e144fd14ce945fca)
Lajos Molnar [Wed, 5 Jun 2013 01:43:08 +0000 (18:43 -0700)]
Reset PV decoder on SoftMPEG4 decoder reset
Otherwise, state may be undefined for subsequent frames.
Change-Id: Icdc0126247e1422eba21f2008a04cf7867d93f5d
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug:
9284771
(cherry picked from commit
0f15875b8e80fb49a3b18d88964b063326f307b9)
Eino-Ville Talvala [Tue, 4 Jun 2013 23:34:35 +0000 (16:34 -0700)]
Camera2/3: Move recording frame processing to its own thread.
Due to new deadlock opportunities from HAL3 integration, recording
frame processing needs to move out of the new frame handler into its
own thread in StreamingProcessor.
Bug:
9282913
Change-Id: I8d2926f2de9d0d395eef3c328c65caebbdbd2827
Glenn Kasten [Tue, 4 Jun 2013 23:44:55 +0000 (23:44 +0000)]
Merge "Fix underruns when sample rate != native sample rate"
Glenn Kasten [Mon, 3 Jun 2013 22:00:29 +0000 (15:00 -0700)]
Fix underruns when sample rate != native sample rate
This forces a minimum of 3 application buffers when the sample rates
don't match, using the normal mixer and low latency HAL.
There is still an issue that the latency() varies depending on whether
screen was off or on at the time of creating the AudioTrack.
With screen on:
I/AudioTrack( 2028): afFrameCount=960, minBufCount=2, afSampleRate=48000, afLatency=50
I/AudioTrack( 2028): minFrameCount: 2646, afFrameCount=960, minBufCount=3, sampleRate=44100, afSampleRate=48000, afLatency=50
With screen off:
I/AudioTrack( 2817): afFrameCount=960, minBufCount=4, afSampleRate=48000, afLatency=84
I/AudioTrack( 2817): minFrameCount: 3528, afFrameCount=960, minBufCount=4, sampleRate=44100, afSampleRate=48000, afLatency=84
Change-Id: Ib45515edff2afcd672dda34881b658c800ffc25a
Eino-Ville Talvala [Mon, 3 Jun 2013 23:50:53 +0000 (16:50 -0700)]
Camera2/3: Don't trigger AF when in INFINITY focus mode.
While the HAL should ignore it, it's faster to immediately respond
with success.
Also filter out cancel autofocus calls for FIXED/INFINITY focus.
Bug:
9263856
Change-Id: I637ec7c8b459d654ef11cb1142b959f2674224c5
Eino-Ville Talvala [Tue, 4 Jun 2013 18:17:10 +0000 (11:17 -0700)]
am
cbbd6c83: am
8f908c0c: Merge "Camera2/3: Don\'t trigger AF when in INFINITY focus mode." into jb-mr2-dev
* commit '
cbbd6c8354f7323933081b217ce53461d99215c4':
Camera2/3: Don't trigger AF when in INFINITY focus mode.
Eino-Ville Talvala [Tue, 4 Jun 2013 16:19:14 +0000 (09:19 -0700)]
am
8f908c0c: Merge "Camera2/3: Don\'t trigger AF when in INFINITY focus mode." into jb-mr2-dev
* commit '
8f908c0c211f8051f339bc85b01a6450f0dfd7d0':
Camera2/3: Don't trigger AF when in INFINITY focus mode.
Eino-Ville Talvala [Tue, 4 Jun 2013 16:17:17 +0000 (16:17 +0000)]
Merge "Camera2/3: Don't trigger AF when in INFINITY focus mode." into jb-mr2-dev
Eino-Ville Talvala [Mon, 3 Jun 2013 23:50:53 +0000 (16:50 -0700)]
Camera2/3: Don't trigger AF when in INFINITY focus mode.
While the HAL should ignore it, it's faster to immediately respond
with success.
Also filter out cancel autofocus calls for FIXED/INFINITY focus.
Bug:
9263856
Change-Id: I637ec7c8b459d654ef11cb1142b959f2674224c5
Andreas Huber [Mon, 3 Jun 2013 23:03:38 +0000 (23:03 +0000)]
Merge "Fix uninitialized variable error in HLS bandwidth determination."
Andreas Huber [Mon, 3 Jun 2013 23:02:19 +0000 (23:02 +0000)]
Merge "Fix our software decoders to reset (more of) their internal state"
Andreas Huber [Mon, 3 Jun 2013 23:00:13 +0000 (16:00 -0700)]
Fix uninitialized variable error in HLS bandwidth determination.
Change-Id: I647e79443f2a06e5b1b4f9068c02b424b0e57989
Andreas Huber [Mon, 3 Jun 2013 22:48:11 +0000 (15:48 -0700)]
Fix our software decoders to reset (more of) their internal state
properly on a transition from idle->loaded.
Change-Id: I56ccfeef24c391e50e42b522194206e35c7ab700
related-to-bug:
9105408
Lajos Molnar [Mon, 3 Jun 2013 20:34:42 +0000 (13:34 -0700)]
am
e64d4133: am
25b5617c: Merge "stagefright: Fix port-reconfiguration & output-buffer-filled race condition" into jb-mr2-dev
* commit '
e64d41332776e3c91f51c3239589695bf2cd0aeb':
stagefright: Fix port-reconfiguration & output-buffer-filled race condition
Lajos Molnar [Mon, 3 Jun 2013 20:32:36 +0000 (13:32 -0700)]
am
25b5617c: Merge "stagefright: Fix port-reconfiguration & output-buffer-filled race condition" into jb-mr2-dev
* commit '
25b5617c56488fe5413473ffae6b43f6c5bddc96':
stagefright: Fix port-reconfiguration & output-buffer-filled race condition
Lajos Molnar [Mon, 3 Jun 2013 20:30:48 +0000 (20:30 +0000)]
Merge "stagefright: Fix port-reconfiguration & output-buffer-filled race condition" into jb-mr2-dev
Glenn Kasten [Mon, 3 Jun 2013 19:14:50 +0000 (19:14 +0000)]
Merge "Use sp<AudioTrack> instead of raw AudioTrack *"
Chong Zhang [Mon, 3 Jun 2013 18:53:14 +0000 (18:53 +0000)]
Merge "wifi-display: fix resolution list and keepalive interval"
Glenn Kasten [Thu, 30 May 2013 21:33:29 +0000 (14:33 -0700)]
Use sp<AudioTrack> instead of raw AudioTrack *
This change prepares for the new implementation of AudioTrack client, which
will require clients to use only sp<AudioTrack>, not raw AudioTrack *.
A raw delete will cause a race condition during AudioTrack destruction.
AudioTrack was made a RefBase by commit
b68a91a70bc8d0d18e7404e14443d4e4020b3635
on 2011/11/15, when it was needed by OpenSL ES (for the callback protector).
At that time, the only other client that was also converted from
AudioTrack * to sp<AudioTrack> was android.media.AudioTrack JNI in
project frameworks/base (file android_media_AudioTrack.cpp).
Details:
* Use .clear() instead of delete followed by = NULL.
* ALOG %p need .get().
* sp<> don't need to be listed in constructor initializer, if initially 0.
* Use == 0 for sp<> vs == NULL for raw pointers.
* Use if (sp != 0) instead of if (raw).
Change-Id: Ic7cad25795d6e862e112abdc227b6d33afdfce17
Andreas Huber [Mon, 3 Jun 2013 15:48:27 +0000 (08:48 -0700)]
am
f9bb8358: am
b7319a7e: Update HTTP proxy configuration for all media playback inside stagefright.
* commit '
f9bb8358e454be6dc88403171db7e0e182407f17':
Update HTTP proxy configuration for all media playback inside stagefright.
Andreas Huber [Mon, 3 Jun 2013 15:46:18 +0000 (08:46 -0700)]
am
b7319a7e: Update HTTP proxy configuration for all media playback inside stagefright.
* commit '
b7319a7eb0a06ef4fd3a0c9157ee63e637ad7aa1':
Update HTTP proxy configuration for all media playback inside stagefright.
Andreas Huber [Wed, 29 May 2013 21:20:52 +0000 (14:20 -0700)]
Update HTTP proxy configuration for all media playback inside stagefright.
Change-Id: Ie0dd00045aba668d8b49da73224e7a7c9c04f69b
related-to-bug:
8873723
(cherry picked from commit
2704965b8a1ff3b7450ff58ccecf86d8ec688c40)
Andreas Huber [Fri, 31 May 2013 20:09:34 +0000 (20:09 +0000)]
Merge "New HLS implementation supporting independent stream sources, audio-only streams"
Lajos Molnar [Fri, 26 Apr 2013 23:11:45 +0000 (16:11 -0700)]
stagefright: Fix port-reconfiguration & output-buffer-filled race condition
Remove the invalid assumption that when a port-reconfiguration event
is received, buffers cannot be downstream (waiting to be rendered).
Luckily, these buffers are properly handled (freed) after they are
sent to be rendered.
Change-Id: I1df39c1ffc2bfb96f8b7b4ee5be07cae654f956f
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug:
8736466
Glenn Kasten [Fri, 31 May 2013 18:51:47 +0000 (18:51 +0000)]
Merge "Consistent whitespace"
Andreas Huber [Tue, 15 Jan 2013 17:04:18 +0000 (09:04 -0800)]
New HLS implementation supporting independent stream sources, audio-only streams
and more.
Change-Id: Icfc45a0100243b2f7a14a9e65696be45b67d6495
Chong Zhang [Fri, 31 May 2013 04:51:38 +0000 (21:51 -0700)]
wifi-display: fix resolution list and keepalive interval
- add all resolutions lower than 1280x720p30
- schedule next keepalive when sending M16
bug
9116665
Change-Id: I7b3fea2101d3d882c0af5c153af5c502b8ce98f6
Chong Zhang [Fri, 31 May 2013 03:22:49 +0000 (03:22 +0000)]
Merge "wifi-display: fixes for PAUSE/PLAY state"
Marco Nelissen [Thu, 30 May 2013 21:55:07 +0000 (21:55 +0000)]
Merge "Edit list uses timescale from movie header"
The Android Open Source Project [Thu, 30 May 2013 21:24:11 +0000 (14:24 -0700)]
am
268f5ccf: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '
268f5ccf7b8adf80f18ef8a9dac46a0813cec19f':
Glenn Kasten [Wed, 26 Dec 2012 22:43:16 +0000 (14:43 -0800)]
Consistent whitespace
Change-Id: I118cce68d3b777f9ec9b6bfb70367496422a40f2
Vineeta Srivastava [Thu, 30 May 2013 19:48:25 +0000 (19:48 +0000)]
Merge "libstagefright: Check for duration > 0 to avoid divide-by-zero exception"
Alex Ray [Thu, 30 May 2013 07:12:13 +0000 (00:12 -0700)]
camera: Dont segfault when result lacks timestamp
Also make a log message more useful.
Change-Id: Id8b65a9b55e1ebe41598dc2db4b0b2aa3f161965
Marco Nelissen [Thu, 30 May 2013 18:00:47 +0000 (11:00 -0700)]
Edit list uses timescale from movie header
not from track media header
Change-Id: I24063183f44027b999782cc9006e9a1b56e87355
Chong Zhang [Thu, 30 May 2013 16:46:20 +0000 (09:46 -0700)]
wifi-display: fixes for PAUSE/PLAY state
PAUSE could be initiated by either source (via trigger method)
or sink, in latter case we have to allow PAUSE from PLAYING state.
Similarly PLAY should be allowed from PAUSED state.
Bug:
8922515
Change-Id: I475534aa4ffa6dc6844f59c5868d8f88291019ae
The Android Open Source Project [Thu, 30 May 2013 14:31:31 +0000 (07:31 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: Ia17841b4d49f0fe09e1034ff0b28efe55947f03a
The Android Automerger [Thu, 30 May 2013 12:55:32 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Alex Ray [Wed, 29 May 2013 03:18:22 +0000 (20:18 -0700)]
camera3: Error on minimum buffer count
Change-Id: Idf16de20e940e411286ec3e477534b36ef1c9b11
Lajos Molnar [Wed, 29 May 2013 22:21:25 +0000 (15:21 -0700)]
am
1cd68527: am
41688da2: Merge "MediaMuxer: Remove SAMPLE_FLAG_SYNC flag" into jb-mr2-dev
* commit '
1cd68527a6c4cc92608dfe8a8c6ba51e5e2c4fc2':
MediaMuxer: Remove SAMPLE_FLAG_SYNC flag
Lajos Molnar [Wed, 29 May 2013 22:14:04 +0000 (15:14 -0700)]
am
41688da2: Merge "MediaMuxer: Remove SAMPLE_FLAG_SYNC flag" into jb-mr2-dev
* commit '
41688da226e91c97ea3b2fe096044e1e5b0520bc':
MediaMuxer: Remove SAMPLE_FLAG_SYNC flag
Lajos Molnar [Wed, 29 May 2013 19:11:25 +0000 (19:11 +0000)]
Merge "MediaMuxer: Remove SAMPLE_FLAG_SYNC flag" into jb-mr2-dev
Marco Nelissen [Wed, 29 May 2013 19:03:45 +0000 (19:03 +0000)]
Merge "Don't crash if no timescale was given"
Alex Ray [Wed, 29 May 2013 18:32:11 +0000 (18:32 +0000)]
Merge "Camera: static parameter default values"
Alex Ray [Wed, 29 May 2013 18:31:46 +0000 (18:31 +0000)]
Merge "libcameraservice: missing argument when logging"
Marco Nelissen [Wed, 29 May 2013 17:58:08 +0000 (10:58 -0700)]
Don't crash if no timescale was given
b/
9175577
Change-Id: Ie159a9c9b42e6c8d9366d0ef6a607234af569e36
The Android Open Source Project [Wed, 29 May 2013 15:10:31 +0000 (08:10 -0700)]
am
197d3e07: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '
197d3e077384087a8674bbfcbecf63a88e611426':