OSDN Git Service
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.
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 [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':
The Android Open Source Project [Wed, 29 May 2013 15:05:57 +0000 (08:05 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I55d8c1a91b9750864f82176768ea93bf11337726
The Android Automerger [Wed, 29 May 2013 12:55:12 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
Alex Ray [Thu, 23 May 2013 00:44:26 +0000 (17:44 -0700)]
Camera: static parameter default values
Use sane default values for static metadata parameters.
Change-Id: I180d9b6560ebba468a083e847b78e02b845db788
Alex Ray [Fri, 24 May 2013 22:41:53 +0000 (15:41 -0700)]
libcameraservice: missing argument when logging
Change-Id: I6f3da400f8f47a387968b9da4ee7cd8e0c9dea70
Ajay Dudani [Thu, 23 May 2013 05:16:33 +0000 (22:16 -0700)]
libstagefright: Check for duration > 0 to avoid divide-by-zero exception
Change-Id: I58ccacbf7ede892dff9626715162ea7b1f2ddbc6
Igor Murashkin [Tue, 28 May 2013 23:51:18 +0000 (16:51 -0700)]
am
9f013a46: am
3c89a2e9: Merge "camera3: Don\'t try to disconnect stream native windows more than once" into jb-mr2-dev
* commit '
9f013a46e150da01ebb267574d8095eef399cd0c':
camera3: Don't try to disconnect stream native windows more than once
Igor Murashkin [Tue, 28 May 2013 23:49:02 +0000 (16:49 -0700)]
am
3c89a2e9: Merge "camera3: Don\'t try to disconnect stream native windows more than once" into jb-mr2-dev
* commit '
3c89a2e9d4ee10b9e955783af2ab9e9dd137922f':
camera3: Don't try to disconnect stream native windows more than once
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
The Android Open Source Project [Tue, 28 May 2013 20:50:15 +0000 (13:50 -0700)]
am
30ca8004: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '
30ca8004cf259c5dceab5cec06cab5ae9a17d89b':
The Android Open Source Project [Tue, 28 May 2013 14:37:26 +0000 (07:37 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: Id0d9ce35d7c0fe8ec3d2edd00e42df41fba064ea
The Android Automerger [Sun, 26 May 2013 12:55:19 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to jb-mr2-dev
The Android Open Source Project [Fri, 24 May 2013 22:30:14 +0000 (15:30 -0700)]
am
dd6b47e6: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '
dd6b47e675a9601280ee1375fccee7c1ec01d9eb':
Camera3: Fix the deadlock during recording pinch zooming
camera3: Disable ZSL for limited mode camera HALs
camera3: Fix zsl buffers released-while-in-use race condition
The Android Open Source Project [Fri, 24 May 2013 22:28:17 +0000 (15:28 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: Icbc5d05e35b35baffce494c53fca9caf82658760
Zhijun He [Fri, 24 May 2013 19:41:03 +0000 (12:41 -0700)]
am
22a5ddb6: am
6f6b31da: Merge "Camera3: Fix the deadlock during recording pinch zooming" into jb-mr2-dev
* commit '
22a5ddb68173b75053d838a30d091920cd0a1dca':
Camera3: Fix the deadlock during recording pinch zooming
Ed Heyl [Fri, 24 May 2013 19:40:59 +0000 (12:40 -0700)]
am
14e585c8: am
6947f125: Merge "camera3: Disable ZSL for limited mode camera HALs" into jb-mr2-dev
* commit '
14e585c8e0667c13202dbefc52f9d00ffe161cf1':
camera3: Disable ZSL for limited mode camera HALs
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
Zhijun He [Fri, 24 May 2013 15:34:46 +0000 (08:34 -0700)]
am
6f6b31da: Merge "Camera3: Fix the deadlock during recording pinch zooming" into jb-mr2-dev
* commit '
6f6b31da6097f1d770137ebadac5023dd8b79413':
Camera3: Fix the deadlock during recording pinch zooming
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:17:51 +0000 (22:17 -0700)]
am
6947f125: Merge "camera3: Disable ZSL for limited mode camera HALs" into jb-mr2-dev
* commit '
6947f125f76dde6664779126415d11b3365225da':
camera3: Disable ZSL for limited mode camera HALs
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
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 [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 [Thu, 23 May 2013 23:51:44 +0000 (16:51 -0700)]
camera3: Disable ZSL for limited mode camera HALs
Bug:
9111852
Change-Id: Idad7e0d2f912341bd643d0ad1a0861fb2043aa90
Marco Nelissen [Thu, 23 May 2013 22:40:45 +0000 (22:40 +0000)]
Merge "Add support for MPEG editlist gapless info"
Marco Nelissen [Thu, 23 May 2013 22:17:24 +0000 (15:17 -0700)]
Add support for MPEG editlist gapless info
Change-Id: I862d89c805d738db9bdf81a8f1c5b317ff968dff
Lajos Molnar [Wed, 15 May 2013 19:59:19 +0000 (12:59 -0700)]
stagefright: BufferProducer updates
Update BufferQueue and ConsumerBase users to new BufferQueue
API, to allow BufferQueue slots to be reused. Buffer consumers
generally now need to track the unique frameNumber belonging to
each frame acquired if they are using BufferQueue directly.
Otherwise, they can simply track the graphicBuffer.
Change-Id: I30ee3158cf40fb10bbd085241646d5f1128ee480
Signed-off-by: Lajos Molnar <lajos@google.com>
Related-to-bug:
7093648
Igor Murashkin [Thu, 23 May 2013 20:45:08 +0000 (13:45 -0700)]
am
9b89c15d: am
ca3fb120: Merge "camera3: Fix zsl buffers released-while-in-use race condition" into jb-mr2-dev
* commit '
9b89c15d9d8abb9408760ffdb022df4c4367685b':
camera3: Fix zsl buffers released-while-in-use race condition
Igor Murashkin [Thu, 23 May 2013 20:44:15 +0000 (13:44 -0700)]
am
ca3fb120: Merge "camera3: Fix zsl buffers released-while-in-use race condition" into jb-mr2-dev
* commit '
ca3fb120f5697c05e3ea1a50abe913a9cc4a8d73':
camera3: Fix zsl buffers released-while-in-use race condition
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 18:05:36 +0000 (11:05 -0700)]
am
98730cd7: am
1f7f83b7: Merge "Camera3: Make sure new metadata results signal other threads waiting" into jb-mr2-dev
* commit '
98730cd7456b32255a37d691a70f49df22975a72':
Camera3: Make sure new metadata results signal other threads waiting
Igor Murashkin [Thu, 23 May 2013 18:01:51 +0000 (11:01 -0700)]
am
1f7f83b7: Merge "Camera3: Make sure new metadata results signal other threads waiting" into jb-mr2-dev
* commit '
1f7f83b7a1f2e2d01f808913ef0b869652c08949':
Camera3: Make sure new metadata results signal other threads waiting
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
The Android Open Source Project [Thu, 23 May 2013 15:06:43 +0000 (08:06 -0700)]
am
a842a2a6: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '
a842a2a61927be0c1f643e76c6ba072e6ae9f779':
The Android Open Source Project [Thu, 23 May 2013 15:05:05 +0000 (08:05 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I93c0800a90b8c82a59e9f2de7d89d78bf8304733
The Android Automerger [Thu, 23 May 2013 12:55:17 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to 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
Lajos Molnar [Wed, 22 May 2013 21:36:06 +0000 (14:36 -0700)]
stagefright: SoftVP8: Handle EOS flag on frames with content.
SoftVP8 decoder ignored frame content if EOS flag was set on
input frame. Now, decode the frame first, unless it is empty.
Change-Id: Id105a9eb86103a61390af3de60cae2507028e2d1
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug:
9091495
Igor Murashkin [Wed, 22 May 2013 19:58:34 +0000 (12:58 -0700)]
am
b7337d56: am
ed49d7b5: Merge "camera3: Fix recording failure when switching resolutions while preview on" into jb-mr2-dev
* commit '
b7337d56a72c9b20abf57e853953126d0aa3dd1a':
camera3: Fix recording failure when switching resolutions while preview on
Igor Murashkin [Wed, 22 May 2013 19:56:26 +0000 (12:56 -0700)]
am
ed49d7b5: Merge "camera3: Fix recording failure when switching resolutions while preview on" into jb-mr2-dev
* commit '
ed49d7b57e66cc2520817b345ef9de289d688bd4':
camera3: Fix recording failure when switching resolutions while preview on
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 19:19:26 +0000 (12:19 -0700)]
am
1d60db8b: am
c2c874d8: Camera3: Fix Bug minTimestamp is never greater than frame timestamp
* commit '
1d60db8bfce9becee9d101eacc58e2a673221622':
Camera3: Fix Bug minTimestamp is never greater than frame timestamp
Mansoor Aftab [Wed, 22 May 2013 19:17:38 +0000 (12:17 -0700)]
am
c2c874d8: Camera3: Fix Bug minTimestamp is never greater than frame timestamp
* commit '
c2c874d88df1b4be52f5415de6606785691bba1f':
Camera3: Fix Bug minTimestamp is never greater than frame timestamp
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
The Android Open Source Project [Wed, 22 May 2013 14:27:39 +0000 (07:27 -0700)]
am
cf2148e8: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '
cf2148e863e2fed037aa0793d2822d9898289f17':
Avoid a deadlock during EmptyBufferDone
The Android Open Source Project [Wed, 22 May 2013 14:22:53 +0000 (07:22 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I2a95a80d2225eb4a27e8bab567f3838b838daf70
The Android Automerger [Wed, 22 May 2013 12:55:13 +0000 (05:55 -0700)]
merge in jb-mr2-release history after reset to 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