OSDN Git Service
Eric Laurent [Wed, 5 Nov 2014 20:15:36 +0000 (12:15 -0800)]
IAudioPolicyService: bound array size in queryDefaultPreProcessing
Bug:
18226810.
Change-Id: Ib8e2bfe835a8681aac50bf23161db14e50c9a124
(cherry picked from commit
74adca9ad30b7f8a70d40c5237bade0d16c4ea58)
Eric Laurent [Thu, 30 Oct 2014 23:55:43 +0000 (23:55 +0000)]
am
9944ff09: am
70c3507d: am
450b10c9: am
d0f9dc71: am
e0a65f30: am
f5af3a72: am
6d80b687: audio policy: validate stream type received from binder calls.
* commit '
9944ff09ac4eb076cab994ef245b0103f60836ba':
audio policy: validate stream type received from binder calls.
Eric Laurent [Thu, 30 Oct 2014 23:48:47 +0000 (23:48 +0000)]
am
70c3507d: am
450b10c9: am
d0f9dc71: am
e0a65f30: am
f5af3a72: am
6d80b687: audio policy: validate stream type received from binder calls.
* commit '
70c3507d915baaa5a0ab163eeb0a445030f4f492':
audio policy: validate stream type received from binder calls.
Eric Laurent [Thu, 30 Oct 2014 23:41:08 +0000 (23:41 +0000)]
am
450b10c9: am
d0f9dc71: am
e0a65f30: am
f5af3a72: am
6d80b687: audio policy: validate stream type received from binder calls.
* commit '
450b10c97514411ef1d0d887d4e18851fd286f0b':
audio policy: validate stream type received from binder calls.
Eric Laurent [Thu, 30 Oct 2014 23:25:15 +0000 (23:25 +0000)]
am
d0f9dc71: am
e0a65f30: am
f5af3a72: am
6d80b687: audio policy: validate stream type received from binder calls.
* commit '
d0f9dc7156e531d5cd0615f6e682d2449e08e9a7':
audio policy: validate stream type received from binder calls.
Eric Laurent [Thu, 30 Oct 2014 23:01:01 +0000 (23:01 +0000)]
am
e0a65f30: am
f5af3a72: am
6d80b687: audio policy: validate stream type received from binder calls.
* commit '
e0a65f3008ac5874106b21d03e19296c8015da41':
audio policy: validate stream type received from binder calls.
Eric Laurent [Thu, 30 Oct 2014 22:52:48 +0000 (22:52 +0000)]
am
f5af3a72: am
6d80b687: audio policy: validate stream type received from binder calls.
* commit '
f5af3a72f308cd4dff7859e62922ee5a13bd4c15':
audio policy: validate stream type received from binder calls.
Eric Laurent [Thu, 30 Oct 2014 22:44:00 +0000 (22:44 +0000)]
am
6d80b687: audio policy: validate stream type received from binder calls.
* commit '
6d80b687c3b8d9c8da7cdad7d9813aa51c1cf15e':
audio policy: validate stream type received from binder calls.
Eric Laurent [Thu, 30 Oct 2014 21:46:18 +0000 (14:46 -0700)]
audio policy: validate stream type received from binder calls.
Bug:
18001784.
Bug:
18002005.
Change-Id: If08866a3c21bcbfd8cdbbf8336bcf1faad66f321
Robert Shih [Wed, 10 Sep 2014 20:26:40 +0000 (20:26 +0000)]
am
97d917bc: am
ab0b3212: am
9b51a37f: am
cb5dc219: am
74abb1ae: am
482b18bb: am
f106b199: SampleTable: check integer overflow during table alloc
* commit '
97d917bc1ccc958d8f1051de6a888de9a25dc6bd':
SampleTable: check integer overflow during table alloc
Robert Shih [Wed, 10 Sep 2014 20:19:54 +0000 (20:19 +0000)]
am
ab0b3212: am
9b51a37f: am
cb5dc219: am
74abb1ae: am
482b18bb: am
f106b199: SampleTable: check integer overflow during table alloc
* commit '
ab0b3212e0c15132f2dab2beeb39c47d31bb1dab':
SampleTable: check integer overflow during table alloc
Robert Shih [Wed, 10 Sep 2014 20:09:14 +0000 (20:09 +0000)]
am
9b51a37f: am
cb5dc219: am
74abb1ae: am
482b18bb: am
f106b199: SampleTable: check integer overflow during table alloc
* commit '
9b51a37fa8ad9d28be791213ceba4fcbec52b14d':
SampleTable: check integer overflow during table alloc
Robert Shih [Wed, 10 Sep 2014 19:58:37 +0000 (19:58 +0000)]
am
cb5dc219: am
74abb1ae: am
482b18bb: am
f106b199: SampleTable: check integer overflow during table alloc
* commit '
cb5dc219b78e6eeacb7ee2f5c93e6763db677122':
SampleTable: check integer overflow during table alloc
Robert Shih [Wed, 10 Sep 2014 19:47:42 +0000 (19:47 +0000)]
am
74abb1ae: am
482b18bb: am
f106b199: SampleTable: check integer overflow during table alloc
* commit '
74abb1ae32fbd3fa4112cc8b8d53882777feb191':
SampleTable: check integer overflow during table alloc
Robert Shih [Wed, 10 Sep 2014 19:41:45 +0000 (19:41 +0000)]
am
482b18bb: am
f106b199: SampleTable: check integer overflow during table alloc
* commit '
482b18bbfd6c9214157bfab47feae86df48a7178':
SampleTable: check integer overflow during table alloc
Robert Shih [Wed, 10 Sep 2014 19:31:46 +0000 (19:31 +0000)]
am
f106b199: SampleTable: check integer overflow during table alloc
* commit '
f106b1993143df44282777253244ce67974c9d4a':
SampleTable: check integer overflow during table alloc
Robert Shih [Mon, 28 Jul 2014 16:54:57 +0000 (09:54 -0700)]
SampleTable: check integer overflow during table alloc
Bug:
15328708
Bug:
15342615
Bug:
15342751
Change-Id: I6bb110a1eba46506799c73be8ff9a4f71c7e7053
(cherry picked from commit
edd4a76eb4747bd19ed122df46fa46b452c12a0d)
Marco Nelissen [Thu, 20 Mar 2014 20:18:07 +0000 (13:18 -0700)]
Marco Nelissen [Thu, 20 Mar 2014 20:13:35 +0000 (13:13 -0700)]
Marco Nelissen [Thu, 20 Mar 2014 20:08:17 +0000 (13:08 -0700)]
Marco Nelissen [Thu, 20 Mar 2014 20:04:11 +0000 (13:04 -0700)]
Marco Nelissen [Thu, 20 Mar 2014 20:00:07 +0000 (13:00 -0700)]
Marco Nelissen [Thu, 20 Mar 2014 19:32:48 +0000 (12:32 -0700)]
Fix build
As of jb-mr1, need to explicitly include library dependencies. The original
change in jb, which the automerger dutyfully merged, did not need this.
Change-Id: I429637e2d01b8084376bb97a02bb091a0ea9eaf7
Marco Nelissen [Thu, 20 Mar 2014 17:49:15 +0000 (10:49 -0700)]
Marco Nelissen [Thu, 20 Mar 2014 17:31:32 +0000 (10:31 -0700)]
Marco Nelissen [Thu, 20 Mar 2014 17:27:04 +0000 (10:27 -0700)]
Marco Nelissen [Thu, 20 Mar 2014 17:21:14 +0000 (10:21 -0700)]
am
dfd90c80: am
d434944b: am
3bc4f7ea: am
0c271b75: Verify certificates
* commit '
dfd90c8052a913ed2bbbea1873ee51838d40bfe1':
Verify certificates
Marco Nelissen [Thu, 20 Mar 2014 17:16:53 +0000 (10:16 -0700)]
am
d434944b: am
3bc4f7ea: am
0c271b75: Verify certificates
* commit '
d434944b00cf83a38019047e0d7db155a15d77f4':
Verify certificates
Marco Nelissen [Thu, 20 Mar 2014 17:11:20 +0000 (10:11 -0700)]
am
3bc4f7ea: am
0c271b75: Verify certificates
* commit '
3bc4f7eaf063201dc85ecc2f7c2bf2b70ab564ed':
Verify certificates
Marco Nelissen [Thu, 20 Mar 2014 17:04:18 +0000 (10:04 -0700)]
am
0c271b75: Verify certificates
* commit '
0c271b750f7314e187f8479f478ad9382d9a9045':
Verify certificates
Marco Nelissen [Thu, 13 Mar 2014 21:18:25 +0000 (14:18 -0700)]
Verify certificates
b/
13418320
Cherrypicked from
8a57d24c733b08da846b54d1adf029e606b5a5f3
https://googleplex-android-review.git.corp.google.com/#/c/433309/
Change-Id: I3052dd5f9ec057e700784cd713f6a7dab9ecfe7b
Adam Hampson [Wed, 13 Nov 2013 17:14:31 +0000 (17:14 +0000)]
Merge "StageFright: Removes hacks for Nvidia MPEG2 decoder" into jb-mr2-dev
Jeff Tinker [Mon, 19 Aug 2013 21:39:15 +0000 (14:39 -0700)]
am
31d49615: am
27b876d4: am
9bc40a2c: am
98603acb: am
36337f8f: am
7d72965f: am
60476336: Remove obsolete drm manager code
* commit '
31d49615007372621ac3fba55e9e3aab48c873f9':
Remove obsolete drm manager code
Jeff Tinker [Mon, 19 Aug 2013 21:36:05 +0000 (14:36 -0700)]
am
27b876d4: am
9bc40a2c: am
98603acb: am
36337f8f: am
7d72965f: am
60476336: Remove obsolete drm manager code
* commit '
27b876d4cf78b262854b9f2aec26467f9323d3ad':
Remove obsolete drm manager code
Jeff Tinker [Mon, 19 Aug 2013 21:32:42 +0000 (14:32 -0700)]
am
9bc40a2c: am
98603acb: am
36337f8f: am
7d72965f: am
60476336: Remove obsolete drm manager code
* commit '
9bc40a2cfdd307074ef5c23ad444fc8a782bab84':
Remove obsolete drm manager code
Jeff Tinker [Mon, 19 Aug 2013 21:31:11 +0000 (14:31 -0700)]
am
98603acb: am
36337f8f: am
7d72965f: am
60476336: Remove obsolete drm manager code
* commit '
98603acbce87c3a451c8e4c26625048363c3f7f7':
Remove obsolete drm manager code
Jeff Tinker [Mon, 19 Aug 2013 21:27:45 +0000 (14:27 -0700)]
am
36337f8f: am
7d72965f: am
60476336: Remove obsolete drm manager code
* commit '
36337f8f1c4d7384cb1528205582148c85c69f4d':
Remove obsolete drm manager code
Jeff Tinker [Mon, 19 Aug 2013 21:24:50 +0000 (14:24 -0700)]
am
7d72965f: am
60476336: Remove obsolete drm manager code
* commit '
7d72965ff6a4bf9f91213fbdafcd12cfad8334e5':
Remove obsolete drm manager code
Jeff Tinker [Mon, 19 Aug 2013 21:21:48 +0000 (14:21 -0700)]
am
60476336: Remove obsolete drm manager code
* commit '
6047633622328711cc6b23667c8d6381bae179bf':
Remove obsolete drm manager code
Jeff Tinker [Mon, 22 Jul 2013 22:54:42 +0000 (15:54 -0700)]
Remove obsolete drm manager code
bug:
9545965
Change-Id: Ia6e09efa826b1349d027045e782980daeb7d7596
(cherry picked from commit
f355f18aa2cc1706761e373fe19298a9ccc9c75a)
Suresh Choudhary [Tue, 30 Jul 2013 13:30:10 +0000 (19:00 +0530)]
StageFright: Removes hacks for Nvidia MPEG2 decoder
Removes the NVIDIA MPEG2 decoder specific hacks in legacy code as
Nvidia HW MPEG2 decoder is enabled and tested now.
Change-Id: Ifc67e1119d9741551336753f85f9cfdfd3fc8600
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
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 [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
Jeff Tinker [Sun, 7 Jul 2013 19:21:55 +0000 (19:21 +0000)]
Merge "Part of fix for TEE resource leaks when app crashes" into jb-mr2-dev
Jeff Tinker [Wed, 3 Jul 2013 22:38:58 +0000 (15:38 -0700)]
Part of fix for TEE resource leaks when app crashes
bug:
9672606
Change-Id: I98cf65260d5e43d34e3897452f6f26ed2c89294e
Eric Laurent [Tue, 2 Jul 2013 18:15:41 +0000 (11:15 -0700)]
fix scheduling policy service death detection
Check status of transactions to scheduling policy service
and re-acquire a binder interface in case of DEAD_OBJECT.
Bug:
8875559.
Change-Id: I1e00bd44e2d4723b3ec95d5c31d9652ba08e238a
Eino-Ville Talvala [Thu, 27 Jun 2013 01:23:23 +0000 (18:23 -0700)]
Camera2/3: Don't allow recording and callbacks to coexist.
- Tear down conflicting streams when necessary.
- Shut down callbacks if recording starts
- Do not allow callbacks to start if recording is active
Per the current camera API, recording and preview callbacks cannot be
active simultaneously. However, the framework did not explicitly
disallow this, and in fact left the streams configured once they were
created, even if switching between the two operational modes.
In addition, no guards existed for trying to enable both recording and
callbacks at the same time.
Bug:
9423825
Change-Id: I7d6e6114c2e14fcfb5299b4c72ad557895cbf4b8
Jean-Michel Trivi [Thu, 20 Jun 2013 23:49:25 +0000 (16:49 -0700)]
Apply EQ and bass boost first in effect chain
EQ and bass boost can improperly interact with other effects
(e.g. virtualizer) outside of the bundle. Apply them first
in an effect chain, which is equivalent to using them to affect
the content of a track, rather than how a track is presented,
when additional effects are cascaded behind EQ and BB.
Bug
8589316
Change-Id: Ifb34e46bc1969f613cdc90ee2a79af677e2fad92
Eino-Ville Talvala [Wed, 19 Jun 2013 15:42:17 +0000 (08:42 -0700)]
Camera2/3: Avoid shutdown race in callback processor.
It's possible, during shutdown, for callback processor's heap to be
destroyed when it's about to send the callback back to the user.
Properly copy the heap reference to a local variable before unlocking
the mutex.
Bug:
9485959
Change-Id: I301347b77145f19c7ac721b9127dc74f122acce2
Eino-Ville Talvala [Mon, 17 Jun 2013 20:29:16 +0000 (13:29 -0700)]
Camera3: Power: Properly shut down unused thread.
Bug:
9466221
Change-Id: I9ed0740561b2e04954eebc1b8aec89cfab40a3a0
Eino-Ville Talvala [Fri, 14 Jun 2013 01:04:28 +0000 (18:04 -0700)]
Camera2/3: Make sure to wait for idle after still capture.
While this wait should be immediate, it's important to guarantee
that preview is stopped when takePicture completes, and that the
device knows itself to be idle.
Bug:
9413025
Change-Id: I1c151ba920e226107ee048918187364990f444c0
Eino-Ville Talvala [Thu, 13 Jun 2013 19:20:02 +0000 (12:20 -0700)]
Camera3: Always close HAL device even in face of errors.
To improve robustness, make sure the HAL device instance is always
closed, even if it cannot be put into the IDLE state.
Bug:
9414167
Change-Id: I8e7035ff0afe7214951f9824e561b340cb37592e
Eino-Ville Talvala [Thu, 13 Jun 2013 17:33:20 +0000 (17:33 +0000)]
Merge "Camera3: Skipping no-ops good, not updating state machine bad." into jb-mr2-dev
Eino-Ville Talvala [Thu, 13 Jun 2013 17:33:07 +0000 (17:33 +0000)]
Merge "Camera2/3: Create JPEG stream unconditionally." into jb-mr2-dev
Eino-Ville Talvala [Thu, 13 Jun 2013 00:06:41 +0000 (17:06 -0700)]
Camera3: Skipping no-ops good, not updating state machine bad.
If a HAL-level stream reconfigure is not needed, still need to
transition camera device to ACTIVE state in configureStreams.
Otherwise, shutdown functions will not wait for device to drain
properly.
Bug:
9413025
Change-Id: I0b15792097c7e5771015f2a362735d5f88b8c6ea
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:44:42 +0000 (15:44 +0000)]
Merge "audioflinger: fix effects on direct output threads" into 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 [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
Eino-Ville Talvala [Mon, 10 Jun 2013 22:12:01 +0000 (15:12 -0700)]
Camera2/3: Create JPEG stream unconditionally.
Instead of creating the JPEG output stream only at first use,
create it at time of preview start. This is important for reducing
the first-capture latency on HAL3 devices, and for ZSL on them.
Bug:
9339858
Change-Id: I4296f706cfd151c47ef315149e87d01fe554aaa4
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:52:59 +0000 (15:52 +0000)]
Merge "AudioFlinger: do not cache audio device when 0." into jb-mr2-dev
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
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
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
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
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
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)
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, 29 May 2013 19:11:25 +0000 (19:11 +0000)]
Merge "MediaMuxer: Remove SAMPLE_FLAG_SYNC flag" into jb-mr2-dev
Igor Murashkin [Tue, 28 May 2013 23:47:00 +0000 (23:47 +0000)]
Merge "camera3: Don't try to disconnect stream native windows more than once" into jb-mr2-dev
Lajos Molnar [Tue, 28 May 2013 17:11:35 +0000 (10:11 -0700)]
MediaMuxer: Remove SAMPLE_FLAG_SYNC flag
MediaMuxer.writeSampleData() uses MediaCodec.BufferInfo
objects to specify the flags, so use directly the MediaCodec
flags. This is more intuitive and avoids users of the
MediaMuxer API having to create translations between
MediaMuxer's and MediaCodec's flag constants.
Change-Id: I18e12a6839ffb2c63da62516a4dc4c94e8bb3d17
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug:
9169479
Igor Murashkin [Tue, 28 May 2013 22:31:39 +0000 (15:31 -0700)]
camera3: Don't try to disconnect stream native windows more than once
This fixes the multiple-disconnect-from-BufferQueue bug.
(In logs)
BufferQueue: [SurfaceView] disconnect: connected to another api (cur=0, req=4)
Bug:
9114681
Change-Id: I21ae1c5bd993701eea13648aa9994979a24eb210
Zhijun He [Fri, 24 May 2013 15:32:48 +0000 (15:32 +0000)]
Merge "Camera3: Fix the deadlock during recording pinch zooming" into jb-mr2-dev
Ed Heyl [Fri, 24 May 2013 05:15:23 +0000 (05:15 +0000)]
Merge "camera3: Disable ZSL for limited mode camera HALs" into jb-mr2-dev
Igor Murashkin [Thu, 23 May 2013 23:51:44 +0000 (16:51 -0700)]
camera3: Disable ZSL for limited mode camera HALs
Bug:
9111852
Change-Id: Idad7e0d2f912341bd643d0ad1a0861fb2043aa90
Igor Murashkin [Thu, 23 May 2013 20:42:32 +0000 (20:42 +0000)]
Merge "camera3: Fix zsl buffers released-while-in-use race condition" into jb-mr2-dev
Zhijun He [Wed, 22 May 2013 21:01:30 +0000 (14:01 -0700)]
Camera3: Fix the deadlock during recording pinch zooming
When zooming during recording, hal callback thread and request update thread run
into deadlock due to lock circular dependency. This change release lock during
queuebuffer in callback thread to break the dependency.
Bug:
9091576
Change-Id: Ia7b3f0ec17573cb32a5696dcde419ca28f42cfb8
Igor Murashkin [Thu, 23 May 2013 17:57:16 +0000 (17:57 +0000)]
Merge "Camera3: Make sure new metadata results signal other threads waiting" into jb-mr2-dev
Igor Murashkin [Wed, 22 May 2013 22:54:57 +0000 (15:54 -0700)]
camera3: Fix zsl buffers released-while-in-use race condition
Bug:
9007356
Change-Id: I0ced31020410978c549d408b2815f925e9c9ffcf
Igor Murashkin [Wed, 22 May 2013 19:54:28 +0000 (19:54 +0000)]
Merge "camera3: Fix recording failure when switching resolutions while preview on" into jb-mr2-dev
Mansoor Aftab [Wed, 22 May 2013 01:58:53 +0000 (18:58 -0700)]
Camera3: Fix Bug minTimestamp is never greater than frame timestamp
Bug in logic since minTimestamp is initialized to -1, and this needs
to be updated for the first frame atleast for logic to work correctly
for subsequent frames.
Bug:
9007356
Change-Id: I70edc4d9f34ff67a141c027c67396dc2ca9e413a
Signed-off-by: Igor Murashkin <iam@google.com>
Igor Murashkin [Tue, 21 May 2013 18:38:49 +0000 (11:38 -0700)]
camera3: Fix recording failure when switching resolutions while preview on
Bug:
9069574
Change-Id: Ife2ae5467f799dbe37e66714b3a6c9a51e1fe328
Igor Murashkin [Fri, 17 May 2013 21:39:53 +0000 (14:39 -0700)]
Camera3: Make sure new metadata results signal other threads waiting
- Also adds a lot of logging around shuffling around metadata frames
Bug:
9007356
Change-Id: I4285f4f55b4b899ea4928d43062c705619c8248a
Jamie Gennis [Tue, 21 May 2013 18:37:54 +0000 (18:37 +0000)]
Merge "Avoid a deadlock during EmptyBufferDone" into jb-mr2-dev
Andreas Huber [Mon, 20 May 2013 16:13:23 +0000 (09:13 -0700)]
Avoid a deadlock during EmptyBufferDone
The deadlock happens withen in the case where we use an OMX encoder with a
GraphicBufferSource.
Bug:
8329090
Change-Id: Icec58bb85ff3839ad1a2e3eca02fa9d6d133ca45
Zhijun He [Mon, 20 May 2013 18:18:39 +0000 (11:18 -0700)]
Camera2/3: Increase digital zoom steps
Digitial zoom number of steps was 30 and a bit rough. Change it to 100 to make
smooth zoom smoother.
Bug:
9050908
Change-Id: I141bc0335d58cdcd6530c14cbbfe6c4ffb4c6dc6
Mathias Agopian [Fri, 17 May 2013 17:15:07 +0000 (17:15 +0000)]
Merge "update to Fence::waitForever() API change" into jb-mr2-dev
Andy McFadden [Fri, 17 May 2013 16:48:14 +0000 (16:48 +0000)]
Merge "Adjust timestamp scale" into jb-mr2-dev
Mathias Agopian [Fri, 17 May 2013 01:07:35 +0000 (18:07 -0700)]
update to Fence::waitForever() API change
Bug:
8988871
Change-Id: I24a2620d356f3bb6207ed834c79fd3e48b429695
Andy McFadden [Wed, 15 May 2013 23:48:19 +0000 (16:48 -0700)]
Adjust timestamp scale
BufferQueue item timestamps are in nanoseconds, MediaCodec buffer
timestamps are in microseconds. Adjust.
Bug
8988357
Change-Id: Ib12824d7eea0316a14543c756e3a127c0866db6b
Chong Zhang [Thu, 16 May 2013 01:47:26 +0000 (18:47 -0700)]
wifi-display: retry UDP read/write to improve connection robustness
Bug:
8922753
Change-Id: Ie6d18f03afcb23d11e6f0e63403e8f0d59b70be8
Conley Owens [Wed, 15 May 2013 22:00:10 +0000 (15:00 -0700)]
Merge branch 'jb-mr1-dev-plus-aosp' into jb-mr2-dev
-s ours, so that jb-mr1-dev-plus-aosp can continue fastforwarding to
jb-mr2-dev.
Eino-Ville Talvala [Wed, 15 May 2013 15:58:27 +0000 (15:58 +0000)]
Merge "Camera3: Fix fast flexible YUV->NV21 path." into jb-mr2-dev
Chong Zhang [Wed, 15 May 2013 02:13:15 +0000 (02:13 +0000)]
Merge "wifi-display: misc fixes for M3 response parsing" into jb-mr2-dev