OSDN Git Service
Igor Murashkin [Mon, 6 May 2013 23:20:37 +0000 (16:20 -0700)]
am
ad60695f: am
1a95a727: Merge "camera: Use new camera_metadata structure validation functions" into jb-mr2-dev
* commit '
ad60695f2dcea0b6ea1d3a92a034b5067b87783e':
camera: Use new camera_metadata structure validation functions
Igor Murashkin [Mon, 6 May 2013 23:20:37 +0000 (16:20 -0700)]
am
41348da3: am
ef33d308: Merge "camera3: Don\'t eagerly finish configuring bidi streams more than once" into jb-mr2-dev
* commit '
41348da3a614bca05e7a4f6c96b0a91d7df924fe':
camera3: Don't eagerly finish configuring bidi streams more than once
Igor Murashkin [Mon, 6 May 2013 18:11:47 +0000 (11:11 -0700)]
am
1a95a727: Merge "camera: Use new camera_metadata structure validation functions" into jb-mr2-dev
* commit '
1a95a7275f8263a4ee7775af57543f80c4d700a0':
camera: Use new camera_metadata structure validation functions
Igor Murashkin [Mon, 6 May 2013 18:11:46 +0000 (11:11 -0700)]
am
ef33d308: Merge "camera3: Don\'t eagerly finish configuring bidi streams more than once" into jb-mr2-dev
* commit '
ef33d3085fd5ac92e90af80a9fca729daa001eca':
camera3: Don't eagerly finish configuring bidi streams more than once
Igor Murashkin [Mon, 6 May 2013 03:20:18 +0000 (03:20 +0000)]
Merge "camera: Use new camera_metadata structure validation functions" into jb-mr2-dev
Igor Murashkin [Mon, 6 May 2013 03:18:23 +0000 (03:18 +0000)]
Merge "camera3: Don't eagerly finish configuring bidi streams more than once" into jb-mr2-dev
Eric Laurent [Fri, 3 May 2013 21:54:07 +0000 (14:54 -0700)]
am
1641f328: am
4170f515: Merge "Remove timing jitter during startup of audio" into jb-mr2-dev
* commit '
1641f328d4de3b2b61481607dc482ccaefe808a9':
Remove timing jitter during startup of audio
Eric Laurent [Fri, 3 May 2013 18:19:06 +0000 (11:19 -0700)]
am
4170f515: Merge "Remove timing jitter during startup of audio" into jb-mr2-dev
* commit '
4170f515cd6148b952a07fcbe23364f5c76a2d9c':
Remove timing jitter during startup of audio
Eric Laurent [Fri, 3 May 2013 15:39:52 +0000 (15:39 +0000)]
Merge "Remove timing jitter during startup of audio" into jb-mr2-dev
Igor Murashkin [Wed, 1 May 2013 01:18:06 +0000 (18:18 -0700)]
camera: Use new camera_metadata structure validation functions
* Reject unvalidated metadata across binder boundaries
* Sanity check in-process CameraMetadata when mutating data
Bug:
8713951
Change-Id: I121d8e15f8fdc9cdbbaf27dfd947813e11831e1c
Igor Murashkin [Thu, 2 May 2013 23:07:57 +0000 (16:07 -0700)]
am
f9539bb7: am
2628bc9d: Merge "camera3: Don\'t crash when taking a still capture with ZSL disabled" into jb-mr2-dev
* commit '
f9539bb75101b85033eb45fd283b3fa40eaa8c98':
camera3: Don't crash when taking a still capture with ZSL disabled
Igor Murashkin [Thu, 2 May 2013 23:05:48 +0000 (16:05 -0700)]
am
2628bc9d: Merge "camera3: Don\'t crash when taking a still capture with ZSL disabled" into jb-mr2-dev
* commit '
2628bc9d1261c2942f3506baca348ccd71ea9c86':
camera3: Don't crash when taking a still capture with ZSL disabled
Igor Murashkin [Thu, 2 May 2013 23:03:48 +0000 (23:03 +0000)]
Merge "camera3: Don't crash when taking a still capture with ZSL disabled" into jb-mr2-dev
Igor Murashkin [Thu, 2 May 2013 21:59:28 +0000 (14:59 -0700)]
camera3: Don't eagerly finish configuring bidi streams more than once
Finishing all stream configuration immediately is good, but when a stream is
both input and output it attempted to finish configuring bidi streams twice.
Since all ZSL streams are bidi, when we had a ZSL stream active preview would
immediately stop working.
Bug:
8563838
Change-Id: Iec998f11f6405fc15f3f31bd7cd29f03a7968d14
Andreas Huber [Thu, 2 May 2013 21:47:25 +0000 (14:47 -0700)]
am
db1a066a: am
f2ae7606: A reference to the psi section data could become invalid if more
* commit '
db1a066a3bac0289817843289d8b85ccd21e858a':
A reference to the psi section data could become invalid if more
Andreas Huber [Thu, 2 May 2013 21:45:23 +0000 (14:45 -0700)]
am
f2ae7606: A reference to the psi section data could become invalid if more
* commit '
f2ae760602a948598a168ad43673bfbd9d50fc6b':
A reference to the psi section data could become invalid if more
Andreas Huber [Mon, 29 Apr 2013 20:17:50 +0000 (13:17 -0700)]
A reference to the psi section data could become invalid if more
sections were added to the KeyedVector.
Change-Id: I095b5452ccfad89d69fc502fb21ce39495e201c3
related-to-bug:
8754565
Eino-Ville Talvala [Thu, 2 May 2013 21:21:41 +0000 (14:21 -0700)]
am
86150f33: am
a69f3213: Merge "Camera2/3: Fix still image FOV reporting." into jb-mr2-dev
* commit '
86150f33380a93cbc0d1554f5bcd0af2d3ebf246':
Camera2/3: Fix still image FOV reporting.
Andreas Huber [Thu, 2 May 2013 21:21:40 +0000 (14:21 -0700)]
am
bfc5b96c: am
09f842b0: Merge "The software FLAC encoder now properly signals an error if client" into jb-mr2-dev
* commit '
bfc5b96c326a6321f167a59de4a201e2b61f5ca4':
The software FLAC encoder now properly signals an error if client
Andreas Huber [Thu, 2 May 2013 21:21:40 +0000 (14:21 -0700)]
am
77cf463c: am
00bbca96: Merge "Don\'t even try to verify the native resolution validity a" into jb-mr2-dev
* commit '
77cf463c09662a999d6d9a667a1d1313bd08b225':
Don't even try to verify the native resolution validity a
Andreas Huber [Thu, 2 May 2013 21:21:39 +0000 (14:21 -0700)]
am
6756998e: am
de6bf9cc: Merge "Fix miracast source code to ignore the encoder output format change" into jb-mr2-dev
* commit '
6756998ef4ac1573e0f879e49a7936285ec61464':
Fix miracast source code to ignore the encoder output format change
Eino-Ville Talvala [Thu, 2 May 2013 21:19:51 +0000 (14:19 -0700)]
am
a69f3213: Merge "Camera2/3: Fix still image FOV reporting." into jb-mr2-dev
* commit '
a69f3213d122b09d04fb890efd6dbe87a8df4ecc':
Camera2/3: Fix still image FOV reporting.
Andreas Huber [Thu, 2 May 2013 21:19:51 +0000 (14:19 -0700)]
am
09f842b0: Merge "The software FLAC encoder now properly signals an error if client" into jb-mr2-dev
* commit '
09f842b03d8f9c0ab5e4541937f8061a7d1bf53d':
The software FLAC encoder now properly signals an error if client
Andreas Huber [Thu, 2 May 2013 21:19:51 +0000 (14:19 -0700)]
am
00bbca96: Merge "Don\'t even try to verify the native resolution validity a" into jb-mr2-dev
* commit '
00bbca96684cb995458fedd2e1f9dec5f047100b':
Don't even try to verify the native resolution validity a
Andreas Huber [Thu, 2 May 2013 21:19:50 +0000 (14:19 -0700)]
am
de6bf9cc: Merge "Fix miracast source code to ignore the encoder output format change" into jb-mr2-dev
* commit '
de6bf9cc0fd94452ffcd6685e1469092db74a454':
Fix miracast source code to ignore the encoder output format change
Eino-Ville Talvala [Thu, 2 May 2013 21:17:44 +0000 (21:17 +0000)]
Merge "Camera2/3: Fix still image FOV reporting." into jb-mr2-dev
Andreas Huber [Thu, 2 May 2013 21:17:20 +0000 (21:17 +0000)]
Merge "The software FLAC encoder now properly signals an error if client" into jb-mr2-dev
Andreas Huber [Thu, 2 May 2013 21:16:23 +0000 (21:16 +0000)]
Merge "Don't even try to verify the native resolution validity a" into jb-mr2-dev
Andreas Huber [Thu, 2 May 2013 21:16:08 +0000 (21:16 +0000)]
Merge "Fix miracast source code to ignore the encoder output format change" into jb-mr2-dev
Igor Murashkin [Thu, 2 May 2013 18:53:00 +0000 (11:53 -0700)]
camera3: Don't crash when taking a still capture with ZSL disabled
Bug:
8790212
Change-Id: I4bf7ac5ab856b0ea1738844182efb86137e14083
Eric Laurent [Wed, 1 May 2013 23:57:43 +0000 (16:57 -0700)]
am
e1aa2330: am
bf2bb00e: Merge "Fix reverb at 48kHz" into jb-mr2-dev
* commit '
e1aa23308048da5f2f9902b99b28fad281725011':
Fix reverb at 48kHz
Eric Laurent [Wed, 1 May 2013 23:55:59 +0000 (16:55 -0700)]
am
bf2bb00e: Merge "Fix reverb at 48kHz" into jb-mr2-dev
* commit '
bf2bb00e29f69b0de1cde8d31a6f1431d984388b':
Fix reverb at 48kHz
Eric Laurent [Wed, 1 May 2013 23:53:44 +0000 (23:53 +0000)]
Merge "Fix reverb at 48kHz" into jb-mr2-dev
Eric Laurent [Wed, 1 May 2013 23:15:49 +0000 (16:15 -0700)]
Fix reverb at 48kHz
The LVM reverb wrapper had a test to only accept input
sampling rate of 44.1 kHz. As the LVM reberb engine
supports multiple sampling rate we can remove this test.
The fix for issue
8512027 (commit
2a9c5cd4) caused a regression
because the framework now checks the return code of the effect
configure command and ignores subsequent commands in case of error.
Bug:
8630044
Change-Id: I3146871f1ad8f7945a2e63ea763dd7b87368337d
Andreas Huber [Wed, 1 May 2013 23:03:28 +0000 (16:03 -0700)]
Fix miracast source code to ignore the encoder output format change
it doesn't care about.
Change-Id: Iec1594775a98b0c1aba662cc9f08652d2f8d4805
related-to-bug:
8616651
Eino-Ville Talvala [Mon, 29 Apr 2013 20:50:24 +0000 (13:50 -0700)]
Camera2/3: Fix still image FOV reporting.
Still FOV can vary as a function of the output sizes, with
the function depending on the HAL version.
Calculate and update the FOV whenever the output sizes might change.
Bug:
8484377
Change-Id: I56f2cc768a1e128a159b326588be55b2752db06e
Andreas Huber [Wed, 1 May 2013 21:50:07 +0000 (14:50 -0700)]
am
9db1b382: am
deff6910: Merge "Support MediaCodec::getOutputFormat for encoders" into jb-mr2-dev
* commit '
9db1b382c279f992dcd33a56226b1f5d2a24afca':
Support MediaCodec::getOutputFormat for encoders
Andreas Huber [Wed, 1 May 2013 21:49:02 +0000 (14:49 -0700)]
am
deff6910: Merge "Support MediaCodec::getOutputFormat for encoders" into jb-mr2-dev
* commit '
deff69107566cfe76dc33eff1b4250893956a244':
Support MediaCodec::getOutputFormat for encoders
Andreas Huber [Wed, 1 May 2013 21:47:29 +0000 (21:47 +0000)]
Merge "Support MediaCodec::getOutputFormat for encoders" into jb-mr2-dev
Andreas Huber [Wed, 1 May 2013 21:13:26 +0000 (14:13 -0700)]
Don't even try to verify the native resolution validity a
miracast sink advertises, even if it were valid we couldn't use it
since it's not consistently implemented by sinks.
Change-Id: Ibee6b3e23b5a55270fc3c419a581e2626530e3af
related-to-bug:
8772006
Andreas Huber [Wed, 1 May 2013 20:58:36 +0000 (13:58 -0700)]
The software FLAC encoder now properly signals an error if client
attempts to configure it with too large an input buffer size.
Previously this would lead to memory corruption during encoding due to a
typo.
Change-Id: I229b07b7dbe87fb8424419706671b66a8d58ec6b
related-to-bug:
8778893
Igor Murashkin [Wed, 1 May 2013 18:30:00 +0000 (11:30 -0700)]
am
1931e9b9: am
3c7c39af: Merge "Camera3: Add missing buffer listener include (for ZSL)" into jb-mr2-dev
* commit '
1931e9b9e5ff613f3c45f298e30d717b4a2b15a5':
Camera3: Add missing buffer listener include (for ZSL)
Igor Murashkin [Wed, 1 May 2013 18:28:17 +0000 (11:28 -0700)]
am
3c7c39af: Merge "Camera3: Add missing buffer listener include (for ZSL)" into jb-mr2-dev
* commit '
3c7c39afbc8931ef2cec1bed3c477a19c139f87e':
Camera3: Add missing buffer listener include (for ZSL)
Igor Murashkin [Wed, 1 May 2013 18:25:44 +0000 (18:25 +0000)]
Merge "Camera3: Add missing buffer listener include (for ZSL)" into jb-mr2-dev
Igor Murashkin [Wed, 1 May 2013 18:18:40 +0000 (11:18 -0700)]
Camera3: Add missing buffer listener include (for ZSL)
Bug:
8563838
Change-Id: Ie053655f5583d20003abdabccee68980d7cdcbfd
Igor Murashkin [Wed, 1 May 2013 17:52:49 +0000 (10:52 -0700)]
am
7a0f7d9f: am
d24b0653: Merge changes I2feda142,I5a95e0be,Ia0c21ef0 into jb-mr2-dev
* commit '
7a0f7d9f6cdad84e4b5f6c6b164874393d541824':
Camera3: Add ZSL stream support
camera: Add new RingBufferConsumer to keep a ring buffer of acquired frames
Camera3: Add input stream support
Igor Murashkin [Wed, 1 May 2013 17:50:31 +0000 (10:50 -0700)]
am
d24b0653: Merge changes I2feda142,I5a95e0be,Ia0c21ef0 into jb-mr2-dev
* commit '
d24b0653c7620e07e92308c05b41f7df9943f83b':
Camera3: Add ZSL stream support
camera: Add new RingBufferConsumer to keep a ring buffer of acquired frames
Camera3: Add input stream support
Igor Murashkin [Wed, 1 May 2013 17:48:57 +0000 (17:48 +0000)]
Merge changes I2feda142,I5a95e0be,Ia0c21ef0 into jb-mr2-dev
* changes:
Camera3: Add ZSL stream support
camera: Add new RingBufferConsumer to keep a ring buffer of acquired frames
Camera3: Add input stream support
Lajos Molnar [Wed, 1 May 2013 01:26:05 +0000 (01:26 +0000)]
Merge "stagefright: Fix port-reconfiguration & output-buffer-filled race condition"
Igor Murashkin [Wed, 1 May 2013 01:19:32 +0000 (18:19 -0700)]
am
6feba7db: am
d8c7ad1c: Camera: Don\'t complain repeatedly about missing android.led.availableLeds
* commit '
6feba7db1144dc383de22a521854d7e983c700fb':
Camera: Don't complain repeatedly about missing android.led.availableLeds
Igor Murashkin [Wed, 1 May 2013 01:16:09 +0000 (18:16 -0700)]
am
d8c7ad1c: Camera: Don\'t complain repeatedly about missing android.led.availableLeds
* commit '
d8c7ad1cbc2e6830560a085380a5828cc3d41010':
Camera: Don't complain repeatedly about missing android.led.availableLeds
Andreas Huber [Tue, 30 Apr 2013 23:08:47 +0000 (16:08 -0700)]
Support MediaCodec::getOutputFormat for encoders
codec specific data is provided as part of the MediaFormat if available.
Change-Id: I5a79c936e2411fe66ebc694791071faefc33941e
related-to-bug:
8616651
Igor Murashkin [Tue, 30 Apr 2013 20:06:15 +0000 (13:06 -0700)]
Camera: Don't complain repeatedly about missing android.led.availableLeds
Bug:
8765726
Change-Id: I78f5f98315068aaad3a39d56698b9c8a18cc8f4a
Andreas Huber [Mon, 29 Apr 2013 21:31:52 +0000 (21:31 +0000)]
Merge "A reference to the psi section data could become invalid if more"
Andreas Huber [Mon, 29 Apr 2013 20:17:50 +0000 (13:17 -0700)]
A reference to the psi section data could become invalid if more
sections were added to the KeyedVector.
Change-Id: I095b5452ccfad89d69fc502fb21ce39495e201c3
related-to-bug:
8754565
Igor Murashkin [Mon, 29 Apr 2013 19:14:25 +0000 (12:14 -0700)]
am
ce68884d: am
b7e2ef14: Merge "ProCamera: Add security permission checks for disabling transmit LED" into jb-mr2-dev
* commit '
ce68884da85fdc148756c0b233366b17507e72de':
ProCamera: Add security permission checks for disabling transmit LED
Eino-Ville Talvala [Mon, 29 Apr 2013 19:11:33 +0000 (12:11 -0700)]
resolved conflicts for merge of
c853784d to master
Change-Id: I8aecc3c4c533a0444ee5c696f05b5c48ac077dbf
Igor Murashkin [Mon, 22 Apr 2013 21:03:54 +0000 (14:03 -0700)]
Camera3: Add ZSL stream support
Bug:
8563838
Change-Id: I2feda142ff5172aba17ade5c8d502f9bb5d5b766
Igor Murashkin [Mon, 29 Apr 2013 17:31:06 +0000 (10:31 -0700)]
camera: Add new RingBufferConsumer to keep a ring buffer of acquired frames
Bug:
8563838
Change-Id: I5a95e0be94e5388b30639905efae42d3c3279f72
Igor Murashkin [Sat, 27 Apr 2013 00:47:17 +0000 (17:47 -0700)]
am
b7e2ef14: Merge "ProCamera: Add security permission checks for disabling transmit LED" into jb-mr2-dev
* commit '
b7e2ef14a93974935783e71829f4b3174001a0fb':
ProCamera: Add security permission checks for disabling transmit LED
Igor Murashkin [Sat, 27 Apr 2013 00:43:13 +0000 (00:43 +0000)]
Merge "ProCamera: Add security permission checks for disabling transmit LED" into jb-mr2-dev
Eino-Ville Talvala [Sat, 27 Apr 2013 00:16:08 +0000 (17:16 -0700)]
am
a307beb6: Merge "Camera2: Fix deadlock on shutdown due to client getting killed." into jb-mr2-dev
* commit '
a307beb68ac08d59525bbcb37ffb56bb3d4728c9':
Camera2: Fix deadlock on shutdown due to client getting killed.
Eino-Ville Talvala [Sat, 27 Apr 2013 00:10:38 +0000 (00:10 +0000)]
Merge "Camera2: Fix deadlock on shutdown due to client getting killed." into jb-mr2-dev
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.
Also, the case where buffers have been sent onto the native window
is already handled.
Change-Id: I1df39c1ffc2bfb96f8b7b4ee5be07cae654f956f
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug:
8736466
Igor Murashkin [Mon, 15 Apr 2013 21:59:22 +0000 (14:59 -0700)]
Camera3: Add input stream support
- Untested with actual CAMERA3_STREAM_INPUT streams.
Bug:
8629088
Change-Id: Ia0c21ef0a2c951e401ea8babd15d3cceb4bb25a1
Eino-Ville Talvala [Tue, 23 Apr 2013 22:16:57 +0000 (15:16 -0700)]
Camera2: Fix deadlock on shutdown due to client getting killed.
When the binder connection dies and is the only holder of a strong
pointer to the Camera2Client, disconnect is called from the
destructor. At this point, all weak pointers to Camera2Client are no
longer promotable, and lots of cleanup code paths are broken as a
result.
Rework all such code paths to not need the client pointer, and to
discard image buffers that arrive during shutdown.
Bug:
8696047
Change-Id: Ic0672ecde7c1baaf65079f925a45bd5be45f1fb3
Andreas Huber [Fri, 26 Apr 2013 15:42:50 +0000 (08:42 -0700)]
Revert "Remove all traces of wifi display sink implementation and supporting code."
This reverts commit
3a9682a86ead84d6f60d3f3aa01b2b4d34af983d.
Andreas Huber [Thu, 25 Apr 2013 23:57:31 +0000 (16:57 -0700)]
am
75f912ca: am
dd309b97: Merge "Handle the case where an asynchronous prepare was initiated and then" into jb-mr2-dev
* commit '
75f912ca9d8a03c91a421b80d96b81d87ef79d68':
Handle the case where an asynchronous prepare was initiated and then
Eric Laurent [Thu, 25 Apr 2013 23:57:31 +0000 (16:57 -0700)]
am
4fcff885: am
8d2d4932: audioflinger: fix duplicating track sampling rate
* commit '
4fcff8859393adce884ea958c66d471a4c36b55f':
audioflinger: fix duplicating track sampling rate
Andreas Huber [Thu, 25 Apr 2013 23:54:07 +0000 (16:54 -0700)]
am
dd309b97: Merge "Handle the case where an asynchronous prepare was initiated and then" into jb-mr2-dev
* commit '
dd309b97f3e30cb8ab30892b4bf6b5d824853a86':
Handle the case where an asynchronous prepare was initiated and then
Eric Laurent [Thu, 25 Apr 2013 23:54:07 +0000 (16:54 -0700)]
am
8d2d4932: audioflinger: fix duplicating track sampling rate
* commit '
8d2d4932b96632e9eb3af4a3d4000192ef603960':
audioflinger: fix duplicating track sampling rate
Andreas Huber [Thu, 25 Apr 2013 22:32:19 +0000 (22:32 +0000)]
Merge "Handle the case where an asynchronous prepare was initiated and then" into jb-mr2-dev
Andreas Huber [Thu, 25 Apr 2013 22:11:19 +0000 (15:11 -0700)]
Handle the case where an asynchronous prepare was initiated and then
the mediaplayer was reset.
Change-Id: Ib241747c5dc002b88a3854569c1f8340b2a8ef41
related-to-bug:
8688986
Igor Murashkin [Tue, 23 Apr 2013 21:51:29 +0000 (14:51 -0700)]
ProCamera: Add security permission checks for disabling transmit LED
Bug:
8554573
Change-Id: Ie909908a4cab3700bd622282e8342e8fa5b72376
Eric Laurent [Thu, 25 Apr 2013 19:56:18 +0000 (12:56 -0700)]
audioflinger: fix duplicating track sampling rate
Add missing initialization of client proxy sampling rate
and volumes in OutputTrack constructor.
Bug:
8687522
Change-Id: I813e700315bb97083a63dd32279f1998ac775483
Andreas Huber [Wed, 24 Apr 2013 17:45:13 +0000 (10:45 -0700)]
am
0fb06b85: am
0dbff625: Merge "Fix overflow of rand in ARTPConnection"
* commit '
0fb06b85e9f40cc695542a101113255693c91321':
Fix overflow of rand in ARTPConnection
Andreas Huber [Wed, 24 Apr 2013 17:45:12 +0000 (10:45 -0700)]
am
2c2345cf: am
628a8c0e: Merge "fix a race condition of MediaPlayerServce::Client::mClient"
* commit '
2c2345cf7e163f532f32597051f579cdb0e36bec':
fix a race condition of MediaPlayerServce::Client::mClient
Andreas Huber [Wed, 24 Apr 2013 16:52:49 +0000 (09:52 -0700)]
am
0dbff625: Merge "Fix overflow of rand in ARTPConnection"
* commit '
0dbff625c3128962b48f3476ceacb3ac80a3f421':
Fix overflow of rand in ARTPConnection
Andreas Huber [Wed, 24 Apr 2013 16:52:49 +0000 (09:52 -0700)]
am
628a8c0e: Merge "fix a race condition of MediaPlayerServce::Client::mClient"
* commit '
628a8c0ed91531468f5c615fea8745f63cc812aa':
fix a race condition of MediaPlayerServce::Client::mClient
Andreas Huber [Wed, 24 Apr 2013 16:28:13 +0000 (09:28 -0700)]
resolved conflicts for merge of
e55951df to master
Conflicts:
media/libstagefright/wifi-display/Android.mk
Change-Id: Icdf5e745a859506cbed7be93b6bc5def8046473c
Andreas Huber [Wed, 24 Apr 2013 15:49:25 +0000 (15:49 +0000)]
Merge "Fix overflow of rand in ARTPConnection"
Andreas Huber [Wed, 24 Apr 2013 15:46:11 +0000 (15:46 +0000)]
Merge "fix a race condition of MediaPlayerServce::Client::mClient"
Andreas Huber [Wed, 24 Apr 2013 15:44:22 +0000 (08:44 -0700)]
am
7f86d983: Merge "Remove all traces of wifi display sink implementation and supporting code." into jb-mr2-dev
* commit '
7f86d98317843838c4a5248c733bf95f9574fcab':
Remove all traces of wifi display sink implementation and supporting code.
Andreas Huber [Wed, 24 Apr 2013 15:42:23 +0000 (15:42 +0000)]
Merge "Remove all traces of wifi display sink implementation and supporting code." into jb-mr2-dev
Yajun Zeng [Wed, 24 Apr 2013 02:38:27 +0000 (10:38 +0800)]
Fix overflow of rand in ARTPConnection
without this fix, (rand()*1000)/RAND_MAX is mainly 0.
Change-Id: I48ae940a7b6974b197d81732774c9dcea107bcf1
Signed-off-by: Yajun Zeng <beanz@marvell.com>
Eino-Ville Talvala [Tue, 23 Apr 2013 22:01:31 +0000 (15:01 -0700)]
am
b524303e: am
5e437722: Merge "Camera3: Register all stream buffers at stream configuration time." into jb-mr2-dev
* commit '
b524303ec9c48377a3a47fb273e0017f8edec142':
Camera3: Register all stream buffers at stream configuration time.
Glenn Kasten [Tue, 23 Apr 2013 19:39:37 +0000 (12:39 -0700)]
Remove timing jitter during startup of audio
This fixes a regression introduced recently, that increased timing jitter
during the startup of the FastMixer and AudioTrack callback threads.
The regression was to make requestPriority() asynchronous as a way to
avoid an apparent priority inversion in system_server. This means that
the target thread could run briefly with the initial priority, before
the new priority takes effect.
This change removes the startup jitter for FastMixer, by making the
requestPriority() synchronous again for that case. It doesn't matter
that this restores the priority inversion involving normal mixer thread,
because it happens during startup of both threads.
The change also removes the startup jitter for the AudioTrack callback
thread, by having the target thread check whether the requestPriority()
has completed yet. If not, the target thread blocks with a timeout
until the priority boost finishes.
Finally, we now log an error message if the expected priority boost
doesn't happen.
Bug:
8698989
Change-Id: Id590e9a274b70ec1ba85b44a585ee37a22e41cbc
Andreas Huber [Tue, 23 Apr 2013 20:47:46 +0000 (13:47 -0700)]
Remove all traces of wifi display sink implementation and supporting code.
Change-Id: I64b681b7e3df1ef0dd80c0d261cacae293d5e684
related-to-bug:
8698812
Eino-Ville Talvala [Tue, 23 Apr 2013 16:18:16 +0000 (09:18 -0700)]
am
5e437722: Merge "Camera3: Register all stream buffers at stream configuration time." into jb-mr2-dev
* commit '
5e43772296d7c5b8faf4b0ce4efe68778729bc74':
Camera3: Register all stream buffers at stream configuration time.
Eino-Ville Talvala [Tue, 23 Apr 2013 16:16:35 +0000 (16:16 +0000)]
Merge "Camera3: Register all stream buffers at stream configuration time." into jb-mr2-dev
Marco Nelissen [Mon, 22 Apr 2013 22:18:25 +0000 (15:18 -0700)]
am
b0ec4e15: am
3030f344: Merge "Fixed the wrong timestamps issue about camera recording"
* commit '
b0ec4e15704b77847c1d24e611029b6311d67dfe':
Fixed the wrong timestamps issue about camera recording
Marco Nelissen [Mon, 22 Apr 2013 22:16:31 +0000 (15:16 -0700)]
am
3030f344: Merge "Fixed the wrong timestamps issue about camera recording"
* commit '
3030f344e77d14cf688c34f79c83a045c888825d':
Fixed the wrong timestamps issue about camera recording
Marco Nelissen [Mon, 22 Apr 2013 21:11:22 +0000 (21:11 +0000)]
Merge "Fixed the wrong timestamps issue about camera recording"
Andreas Huber [Mon, 22 Apr 2013 16:21:28 +0000 (09:21 -0700)]
am
a93686a4: am
4613b7e3: Merge "3rd time\'s the charm, right? Fix another instance where MediaCodec would" into jb-mr2-dev
* commit '
a93686a4ace1e38eb6fa5da8fc97e97a19f4ac5c':
3rd time's the charm, right? Fix another instance where MediaCodec would
Igor Murashkin [Mon, 22 Apr 2013 16:21:28 +0000 (09:21 -0700)]
am
b9258b57: am
d090054d: Merge "Fix ProCameraTests to pass on Wolfie, disabling failing tests" into jb-mr2-dev
* commit '
b9258b57aa0c86e4741e2c24474bb9d766d17e8e':
Fix ProCameraTests to pass on Wolfie, disabling failing tests
Andreas Huber [Mon, 22 Apr 2013 16:21:27 +0000 (09:21 -0700)]
am
45f1f86e: am
f0fba380: Merge "A flush of a video decoder connected to a native window must reclaim" into jb-mr2-dev
* commit '
45f1f86eb97356b73811fc4d70af437c55a86dd7':
A flush of a video decoder connected to a native window must reclaim
Andreas Huber [Mon, 22 Apr 2013 16:19:26 +0000 (09:19 -0700)]
am
4613b7e3: Merge "3rd time\'s the charm, right? Fix another instance where MediaCodec would" into jb-mr2-dev
* commit '
4613b7e38b1830535cbf00e962afdfa5fe1308ba':
3rd time's the charm, right? Fix another instance where MediaCodec would
Igor Murashkin [Mon, 22 Apr 2013 16:19:25 +0000 (09:19 -0700)]
am
d090054d: Merge "Fix ProCameraTests to pass on Wolfie, disabling failing tests" into jb-mr2-dev
* commit '
d090054d5087b02a6a410633c4109d5901c524ba':
Fix ProCameraTests to pass on Wolfie, disabling failing tests
Andreas Huber [Mon, 22 Apr 2013 16:19:25 +0000 (09:19 -0700)]
am
f0fba380: Merge "A flush of a video decoder connected to a native window must reclaim" into jb-mr2-dev
* commit '
f0fba38005f16b94b89a512fde0e01511d97e304':
A flush of a video decoder connected to a native window must reclaim
Andreas Huber [Mon, 22 Apr 2013 16:15:51 +0000 (16:15 +0000)]
Merge "3rd time's the charm, right? Fix another instance where MediaCodec would" into jb-mr2-dev