OSDN Git Service
Eino-Ville Talvala [Thu, 28 Mar 2013 16:07:16 +0000 (16:07 +0000)]
Merge "Camera: Add output side to camera3 HAL device" into jb-mr2-dev
Eino-Ville Talvala [Thu, 28 Mar 2013 16:06:21 +0000 (16:06 +0000)]
Merge "Camera: Add input side to camera3 HAL device" into jb-mr2-dev
Eino-Ville Talvala [Thu, 28 Mar 2013 16:06:11 +0000 (16:06 +0000)]
Merge "Camera: Add streams to camera3 HAL device" into jb-mr2-dev
Marco Nelissen [Thu, 28 Mar 2013 15:55:38 +0000 (15:55 +0000)]
Merge "Fix valgrind error." into jb-mr2-dev
Eric Laurent [Wed, 27 Mar 2013 19:05:40 +0000 (12:05 -0700)]
ToneGenerator: fix truncated tones
The first DTMF tone after a silent period is truncated.
This is because the phone app starts and stops the tone
when the user presses and releases the key.
This combined to the fact that the tones use the low latency path
and that when the output stream exists standby there is a period
of several milliseconds during which no audio is mixed until the
stream is "warmed up".
The result is that much less audio is generated than the actual
key press duration.
The fix consists in storing the tone start time and making sure that
the number of samples generated corresponds at least to the time difference
between the tone start and stop commands.
Bug
6607077
Change-Id: I070d20dd8600c25a9e5d5a60c1d3313b7917b00d
Eric Laurent [Thu, 28 Mar 2013 00:24:50 +0000 (00:24 +0000)]
Merge "ToneGenerator: fix stop/destroy concurrency" into jb-mr2-dev
Eino-Ville Talvala [Mon, 11 Mar 2013 21:13:50 +0000 (14:13 -0700)]
Camera: Add output side to camera3 HAL device
- Notifications
- Result queue and processing
Change-Id: Id6b4746708ce6c6dcc7262666b6ac3130fa3d225
Eino-Ville Talvala [Thu, 28 Feb 2013 02:02:26 +0000 (18:02 -0800)]
Camera: Add input side to camera3 HAL device
- Stream creation/deletion
- Request submission
- Request thread loop
- Add get() to CameraMetadata to allow HAL submission while retaining
ownership.
Change-Id: I271f72bcbe9557eded43cbcbfe789109857f8144
Eino-Ville Talvala [Thu, 7 Mar 2013 00:20:06 +0000 (16:20 -0800)]
Camera: Add streams to camera3 HAL device
- Generic stream interface
- Functional output stream
- Skeleton input/zsl stream
Change-Id: I143794eac1a2217031d62b51912662fc6d1db900
Igor Murashkin [Wed, 27 Mar 2013 22:43:14 +0000 (22:43 +0000)]
Merge "Camera: Add hotplug support (for fixed # of cameras)" into jb-mr2-dev
Marco Nelissen [Wed, 27 Mar 2013 20:48:36 +0000 (13:48 -0700)]
Fix valgrind error.
The constructor calls reset(), which in turn calls stop(), which then
accesses mCaptureTimeLapse before it has been initialized.
Change-Id: Ia94ac740b9bd1a0389c72647a5639dd25320d92c
Igor Murashkin [Wed, 27 Mar 2013 18:24:37 +0000 (18:24 +0000)]
Merge "ProCamera: Fix memory leak in consumeFrameMetadata" into jb-mr2-dev
Igor Murashkin [Wed, 27 Mar 2013 18:07:06 +0000 (11:07 -0700)]
ProCamera: Fix memory leak in consumeFrameMetadata
Bug:
8402301
Change-Id: I975990185f45bb8552712271b9ac457af08a170c
Igor Murashkin [Wed, 20 Mar 2013 22:56:31 +0000 (15:56 -0700)]
Camera: Add hotplug support (for fixed # of cameras)
* Minor: also change addListener to fire the current status upon subscription
* Minor: STATUS_AVAILABLE is now an alias for STATUS_PRESENT and deprecated
Change-Id: I254608a7332095e3ef201ffea64cff156cfc1b3e
Eric Laurent [Tue, 26 Mar 2013 23:37:19 +0000 (16:37 -0700)]
ToneGenerator: fix stop/destroy concurrency
There is a problem if the stopTone() method is called
from two different threads (for instance if the destructor is called
while stopTone() is waiting for the audio callback to finish).
In this case, the second call to stopTone() will not wait for the
condition to be signaled and call clearWaveGens() while the callback
can still be active, thus causing a crash.
There is a similar problem in case of concurrent calls to startTone()
and stopTone().
The fix consists in making sure that stopTone() always waits for call
back completion or timeout and exits before calling clearWaveGens()
if a concurrent start request is detected.
Bug
8163071
Change-Id: I9ddb4390407701dcad5bf83660fd9903f0d72268
Glenn Kasten [Tue, 26 Mar 2013 22:43:00 +0000 (22:43 +0000)]
Merge "media.log dump" into jb-mr2-dev
Glenn Kasten [Tue, 26 Mar 2013 22:09:04 +0000 (15:09 -0700)]
media.log dump
Bug:
8446008
Change-Id: Ia47b204f5c4c91b99591eec5420a25a3dc8e7631
Andreas Huber [Tue, 26 Mar 2013 21:57:28 +0000 (21:57 +0000)]
Merge "Adapt frame rate instead of keeping that constant and tweaking bitrate" into jb-mr2-dev
Andreas Huber [Tue, 26 Mar 2013 20:52:43 +0000 (13:52 -0700)]
Adapt frame rate instead of keeping that constant and tweaking bitrate
Change-Id: I889abbbe1237e1a8fdd7135cdc91a2e9728ff39b
Eric Laurent [Tue, 26 Mar 2013 19:25:30 +0000 (12:25 -0700)]
ToneGenerator: fix AudioTrack pointer init
The pointer to AudioTrack should be initialized before
early return from ToneGenerator constructor because
it is tested by the destructor.
Bug
8140963
Change-Id: I9a7dfb60ba162b75dfaa5630ab7fc9485afd0074
Andreas Huber [Tue, 26 Mar 2013 17:19:24 +0000 (10:19 -0700)]
Identify network servers and clients with a OS version related string
and put the logic to create that string in one location instead of many...
Change-Id: I1f729f2e7376cd3b45eea0e48f7bd10084b41b39
Andreas Huber [Tue, 26 Mar 2013 16:08:49 +0000 (16:08 +0000)]
Merge "In "special" mode we now establish a UDP RTCP channel in addition to the" into jb-mr2-dev
Eric Laurent [Tue, 26 Mar 2013 00:27:06 +0000 (00:27 +0000)]
Merge "ToneGenerator: optimize silent tone" into jb-mr2-dev
Andreas Huber [Mon, 25 Mar 2013 22:46:52 +0000 (15:46 -0700)]
In "special" mode we now establish a UDP RTCP channel in addition to the
TCP RTP channel and provide feedback on the latency of arriving packets from
the sink back to the source. This information is then used to throttle
video bitrate.
Change-Id: Ic589a3cb65e4893a3ff67de947da6063d32a1c6e
Andreas Huber [Mon, 25 Mar 2013 22:46:43 +0000 (22:46 +0000)]
Merge "Get rid of TunnelRenderer" into jb-mr2-dev
Eric Laurent [Mon, 25 Mar 2013 21:38:10 +0000 (14:38 -0700)]
ToneGenerator: optimize silent tone
Do not create an AudioTrack and start playback when a silent
tone is requested to ToneGenerator.
Bug
7946399
Change-Id: Ib9282871a56f7a862af7d1504ce3fbd7c18e34e2
Andreas Huber [Mon, 25 Mar 2013 21:15:24 +0000 (14:15 -0700)]
Get rid of TunnelRenderer
Change-Id: I40dc00e2e689d7a6b8717ce524016c2948229807
Andreas Huber [Mon, 25 Mar 2013 20:43:00 +0000 (20:43 +0000)]
Merge "Misc debugging support and handling of latency changes." into jb-mr2-dev
Andreas Huber [Mon, 25 Mar 2013 20:25:39 +0000 (13:25 -0700)]
Misc debugging support and handling of latency changes.
Change-Id: I682944f793690842219cf1adbae5e61e061b6b62
Jeff Tinker [Mon, 25 Mar 2013 20:18:02 +0000 (20:18 +0000)]
Merge "Load crypto plugins from additional shared libraries" into jb-mr2-dev
Andreas Huber [Mon, 25 Mar 2013 17:37:25 +0000 (17:37 +0000)]
Merge "Separate the mode of the RTP and RTCP channels." into jb-mr2-dev
Andreas Huber [Fri, 22 Mar 2013 16:56:29 +0000 (09:56 -0700)]
Separate the mode of the RTP and RTCP channels.
I now can use a TCP reliable data channel with a UDP back channel.
Change-Id: Ieb0f0970e3a6da4cff250e9547e181c0c961b9fb
Andreas Huber [Mon, 25 Mar 2013 17:24:23 +0000 (17:24 +0000)]
Merge "Ensure that the payload in each TS packet is an even multiple of 16 bytes long" into jb-mr2-dev
Jeff Tinker [Fri, 22 Mar 2013 22:26:39 +0000 (15:26 -0700)]
Load crypto plugins from additional shared libraries
Currently crypto plugins are expected to be in libdrmdecrypt.so.
When there are multiple plugins supporting different schemes,
this approach requires source code integration across
vendors which is unmanagable. Also, for integration with
MediaDrm where the crypto keys are obtained from a drm server,
the MediaCrypto plugin needs to interoperate with the MediaDrm
plugin. This change allows {MediaCrypto, MediaDrm} pairs that
are logically related to be implemented in a common shared
library.
Change-Id: I7f6638f29171f91609fc2d944396365568630b56
Igor Murashkin [Fri, 22 Mar 2013 00:45:55 +0000 (00:45 +0000)]
Merge "ICameraServiceListener.h: Add STATUS_ENUMERATING enum" into jb-mr2-dev
Igor Murashkin [Mon, 18 Mar 2013 20:36:48 +0000 (13:36 -0700)]
ICameraServiceListener.h: Add STATUS_ENUMERATING enum
Change-Id: I41a9f358f63a19e7b746a9ccf24722001e5e7475
Igor Murashkin [Thu, 21 Mar 2013 20:58:29 +0000 (20:58 +0000)]
Merge changes Ic92924ce,I53107a39 into jb-mr2-dev
* changes:
Camera2: getSceneMode should return NULL when there are no supported scene modes
commandStartFaceDetectionL returned the wrong value when face detection is not supported by the HAL. This caused the JNI function to fail since it expected a BAD_VALUE response in that case.
Andreas Huber [Thu, 21 Mar 2013 18:35:48 +0000 (11:35 -0700)]
Ensure that the payload in each TS packet is an even multiple of 16 bytes long
(except for the final TS packet) as specified by HDCP.
Change-Id: I45d49d347c06f5daae310f196d9a8484be0f3ca0
related-to-bug:
7549145
Igor Murashkin [Thu, 21 Mar 2013 18:19:00 +0000 (11:19 -0700)]
Camera2: getSceneMode should return NULL when there are no supported scene modes
Bug:
8444806
Change-Id: Ic92924ceda3de738a7971605552baf00a4fc0546
Ziv Hendel [Thu, 21 Mar 2013 01:25:32 +0000 (03:25 +0200)]
commandStartFaceDetectionL returned the wrong value when face detection is not supported by the HAL.
This caused the JNI function to fail since it expected a BAD_VALUE response in that case.
Change-Id: I53107a3958d541c25930b81eda638d4b6a394254
Signed-off-by: Igor Murashkin <iam@google.com>
ztenghui [Wed, 20 Mar 2013 17:00:50 +0000 (17:00 +0000)]
Merge "Add the presentation rotation support" into jb-mr2-dev
Jeff Tinker [Wed, 20 Mar 2013 16:48:54 +0000 (16:48 +0000)]
Merge "Implementing MediaDrm APIs" into jb-mr2-dev
Andreas Huber [Tue, 19 Mar 2013 21:29:51 +0000 (21:29 +0000)]
Merge "Change ANetworkSession implementation to optionally attach timestamps" into jb-mr2-dev
Andreas Huber [Tue, 19 Mar 2013 21:29:39 +0000 (21:29 +0000)]
Merge "Allow for streaming of media files (without recompression)" into jb-mr2-dev
Marco Nelissen [Tue, 19 Mar 2013 17:24:04 +0000 (17:24 +0000)]
Merge "Fix valgrind error" into jb-mr2-dev
Marco Nelissen [Tue, 19 Mar 2013 16:57:29 +0000 (09:57 -0700)]
Fix valgrind error
The volume member of the BundledEffectContext class was not being
initialized, resulting in uninitialized data being used for calculations
and control flow.
Change-Id: I84bf9fd478e5d0479e781323b21c7c03dea958c5
Andreas Huber [Mon, 18 Mar 2013 22:11:40 +0000 (15:11 -0700)]
Change ANetworkSession implementation to optionally attach timestamps
to fragments of data to be transferred and to log statistics when data
is finally submitted to the POSIX layer.
Change-Id: Icbfcac203cdc5c9eac1634e84d34bb380b316a01
Alex Ray [Mon, 18 Mar 2013 19:52:43 +0000 (19:52 +0000)]
Merge "Camera: fix waitUntilDrained log message" into jb-mr2-dev
Igor Murashkin [Mon, 18 Mar 2013 18:38:10 +0000 (18:38 +0000)]
Merge "ProCameraTests: Minor add grey/frame count debug-only print outs" into jb-mr2-dev
Igor Murashkin [Mon, 18 Mar 2013 18:10:48 +0000 (11:10 -0700)]
ProCameraTests: Minor add grey/frame count debug-only print outs
Change-Id: I0f7b7f3c083a644e9bb0c2302244a5ad434e96a8
Andreas Huber [Mon, 18 Mar 2013 18:09:22 +0000 (11:09 -0700)]
Allow for streaming of media files (without recompression)
Change-Id: I1de356cc37506ba986822d12a1a59e7b64069e02
Alex Ray [Sun, 17 Mar 2013 10:23:18 +0000 (03:23 -0700)]
Camera: fix waitUntilDrained log message
Change-Id: Iab6197e0674752de7933dd812bff430a5c487c4b
ztenghui [Tue, 12 Mar 2013 22:43:56 +0000 (15:43 -0700)]
Add the presentation rotation support
bug:
7991013
Change-Id: I10cb034b432876c724baa4974efcb3d67b8a99b6
Andreas Huber [Fri, 15 Mar 2013 15:59:39 +0000 (08:59 -0700)]
am
59ac7b30: am
66abe3ae: Merge "Fix for crash if no content in DESCRIBE response"
* commit '
59ac7b3056db57e5a8e851b7946a181c5fc34852':
Fix for crash if no content in DESCRIBE response
Glenn Kasten [Fri, 15 Mar 2013 15:59:38 +0000 (08:59 -0700)]
am
c44a3ae2: am
f0cea9f8: Merge "Prevent invalid frame durations"
* commit '
c44a3ae2704af52c0f4ea006b5b02a53b6df6c46':
Prevent invalid frame durations
Andreas Huber [Fri, 15 Mar 2013 15:57:10 +0000 (08:57 -0700)]
am
66abe3ae: Merge "Fix for crash if no content in DESCRIBE response"
* commit '
66abe3ae38665256c8fe97770f046bf9c68625aa':
Fix for crash if no content in DESCRIBE response
Glenn Kasten [Fri, 15 Mar 2013 15:57:10 +0000 (08:57 -0700)]
am
f0cea9f8: Merge "Prevent invalid frame durations"
* commit '
f0cea9f83cf0c8e5ecdd2b401ec2d56d0c717708':
Prevent invalid frame durations
Andreas Huber [Fri, 15 Mar 2013 15:33:00 +0000 (15:33 +0000)]
Merge "Fix for crash if no content in DESCRIBE response"
Glenn Kasten [Fri, 15 Mar 2013 15:11:27 +0000 (15:11 +0000)]
Merge "Prevent invalid frame durations"
Tenghui Zhu [Thu, 14 Mar 2013 22:42:44 +0000 (22:42 +0000)]
Merge "Make limitations of MPEG4Writer explicit" into jb-mr2-dev
Marco Nelissen [Thu, 14 Mar 2013 22:02:37 +0000 (22:02 +0000)]
Merge "Parse SBR extension sample rate" into jb-mr2-dev
Marco Nelissen [Thu, 14 Mar 2013 21:50:47 +0000 (14:50 -0700)]
Parse SBR extension sample rate
Change-Id: Ib6f6994228a279ee10b389515fba04516c7c42ba
James Dong [Tue, 12 Mar 2013 17:40:20 +0000 (10:40 -0700)]
Make limitations of MPEG4Writer explicit
o No more than 2 tracks will be supported
o No more than one video and/or one audio tracks will be supported
o Only take video and/or audio track (for instance, no text tracks)
o If there is no track before start() is called, bail out.
At the same time, make sure the errors from addSource() report to
addTrack(), not to start().
Bug:
7991013
Change-Id: I1ca35aaeb75b5448d75ed2c6c10dd12ecea720ab
Igor Murashkin [Thu, 14 Mar 2013 00:23:00 +0000 (17:23 -0700)]
ProCamera: Fix rare deadlock when client destructs inside the connect call
Bug:
8337737
Change-Id: Ia6fca4365fa20fdbfd6a1ec8d047639a002f2aba
Andreas Huber [Wed, 13 Mar 2013 21:44:47 +0000 (21:44 +0000)]
Merge "Adds audio support to DirectRenderer." into jb-mr2-dev
Mathias Agopian [Wed, 13 Mar 2013 21:42:14 +0000 (21:42 +0000)]
Merge "remove uses of Surface in favor or IGraphicBufferProducer" into jb-mr2-dev
Mathias Agopian [Wed, 13 Mar 2013 21:40:06 +0000 (21:40 +0000)]
Merge "remove CameraServiceTest which wasn't used" into jb-mr2-dev
Andreas Huber [Wed, 13 Mar 2013 17:22:46 +0000 (10:22 -0700)]
Adds audio support to DirectRenderer.
Change-Id: Ibf4df90aca29d638215e2da9b39e78bf3a2c4d08
Jeff Tinker [Fri, 8 Feb 2013 18:18:35 +0000 (10:18 -0800)]
Implementing MediaDrm APIs
Change-Id: I9ff8eeb7d0c383b5c0c68cd54eb54ce7d2d22fe6
Andreas Huber [Tue, 12 Mar 2013 22:55:43 +0000 (15:55 -0700)]
Attempt to recover from network stalls by dropping frames on the source side.
Change-Id: I5f9eb4f5acb624a9e5bc0087801fb5a4a9ade35c
Mathias Agopian [Wed, 13 Mar 2013 01:42:23 +0000 (18:42 -0700)]
remove uses of Surface in favor or IGraphicBufferProducer
Change-Id: I13d7a9553aa335bca790a3a59d389d7533c83d57
Mathias Agopian [Wed, 13 Mar 2013 00:40:55 +0000 (17:40 -0700)]
remove CameraServiceTest which wasn't used
this test hasn't been compiled or run in a long long time
and isn't up to date or relevant.
Change-Id: I5a7f1190d4a783e088d44e3e6ef66231cf0cfb49
Andreas Huber [Tue, 12 Mar 2013 20:57:57 +0000 (20:57 +0000)]
Merge "Squashed commit of the following:" into jb-mr2-dev
Andreas Huber [Tue, 12 Mar 2013 18:01:43 +0000 (11:01 -0700)]
Squashed commit of the following:
commit
f4edf442741886cdbe071e2d15f6e6247269f7c5
Author: Andreas Huber <andih@google.com>
Date: Tue Mar 12 09:09:18 2013 -0700
Pass additional flags to the sink, use TCP by default in wolfiecast mode.
Change-Id: I41e11a2375d4199656e45c4f149d8441d0016092
commit
6302602ed280a38287f507159abfb40a1da38c5a
Author: Andreas Huber <andih@google.com>
Date: Tue Mar 12 08:51:58 2013 -0700
tweaks
Change-Id: Ie29e422d7258be522f4bb1f6c5afcf74c937e547
commit
a38a860e4979ba563cadbaafa21b084439449d26
Author: Andreas Huber <andih@google.com>
Date: Mon Mar 11 16:57:43 2013 -0700
Report average lateness all the way from NuPlayerRenderer...
Change-Id: I2e7700703ae656515e44b9c25610d26c75778111
commit
a7d49b11675ea88be4029dd8451d1649db94571d
Author: Andreas Huber <andih@google.com>
Date: Mon Mar 11 14:54:19 2013 -0700
Make TimeSyncer smarter, enable TunnelRenderer
Change-Id: I27377a60cd8feb01589da456967fddd34532c20e
commit
0f214c8ef68179f7b61512c37040939554013151
Author: Andreas Huber <andih@google.com>
Date: Thu Mar 7 15:57:56 2013 -0800
convert source timestamps to sink timestamps, report lateness.
Change-Id: I051a60fbbceca2f7b508ae3dac6e01e402bae39e
commit
04a4f8e16bad09157b5615a5fa45310438955832
Author: Andreas Huber <andih@google.com>
Date: Thu Mar 7 09:00:28 2013 -0800
Sync time between sink and source.
Change-Id: Ie8b4d75c957aa48310e7c81d1279761b9f821efe
commit
aebe20e6184e3636a99082f8ece08e708015cb8d
Author: Andreas Huber <andih@google.com>
Date: Wed Mar 6 09:03:12 2013 -0800
play with back pressure
Change-Id: I51eb69257e6a79e76f5f9c75ff99d8adbd083947
Change-Id: Ifdf57228667fed7fc71c5090a2c3f7cea1037c5c
Andy McFadden [Tue, 12 Mar 2013 19:29:23 +0000 (19:29 +0000)]
Merge "GraphicBufferSource fixes" into jb-mr2-dev
Andy McFadden [Mon, 11 Mar 2013 22:09:32 +0000 (15:09 -0700)]
GraphicBufferSource fixes
Various fixes:
- Set the maximum number of BQ buffers we're allowed to
acquire equal to the actual number of codec buffers. That
way we keep the codec as full as possible, and never try to
acquire more than we're allowed from the BufferQueue.
- Actually use "end of stream sent" flag.
- Name the BufferQueue (for debug messages).
Bug
8359403
Change-Id: I3b8c1f679bbebf6a89e623e13ca029eda7f657ba
Ola Andersson [Wed, 5 Dec 2012 12:07:58 +0000 (13:07 +0100)]
Prevent invalid frame durations
Prevent frame duration from being negative when
exporting movie studio project
Change-Id: I459fb243650c777c2b59d1094acc88c3a944bd81
Xuefei Chen [Mon, 7 Jan 2013 08:43:13 +0000 (16:43 +0800)]
Fix for crash if no content in DESCRIBE response
If DESCRIBE response is received with status 200 but no content,
MyHandler will still set content data for session description
parsing. This will cause NULL Pointer crash.
This fix checks whether DESCRIBE response has content before
parsing session description.
Change-Id: I114ae6fd54ce804e61718f62618ca9008425a433
Igor Murashkin [Tue, 5 Mar 2013 01:25:57 +0000 (17:25 -0800)]
Camera: Make ProCamera connect take the same paths as Camera connect
* ProCamera uses the app ops manager
* Refactored connect calls to be as common as possible
* Removed some useless not implemented function calls in ProClient
Change-Id: I5dab30d20f0c202a494a07b2cfe4c1fa04a2a076
Igor Murashkin [Tue, 5 Mar 2013 00:14:23 +0000 (16:14 -0800)]
(Camera)ProCamera: Remove unused functions from binder interface
Change-Id: I0582268cef6e84b630bc87c8a03dcd69d54c440d
Igor Murashkin [Mon, 4 Mar 2013 22:53:08 +0000 (14:53 -0800)]
(Camera)FrameProcessor: Refactor to share code with ProFrameProcessor
Change-Id: Ie8cd0df7caf83f9d0134f560ae31ab72f2f7d1fc
Igor Murashkin [Sat, 2 Mar 2013 00:22:28 +0000 (16:22 -0800)]
CameraService: Refactor Camera2Client to share a base with ProCameraClient
Change-Id: I249e2a0fc47ae84f29c9d9c4a223fba13da3ee66
Glenn Kasten [Mon, 11 Mar 2013 22:55:17 +0000 (22:55 +0000)]
Merge "Increase size of statistics buffer" into jb-mr2-dev
Jean-Baptiste Queru [Mon, 11 Mar 2013 20:44:22 +0000 (13:44 -0700)]
am
c5604b08: am
0fe40641: am
72c7cf9d: am
a1b1e2de: (-s ours) am
56f387a4: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
c5604b081b6cac558ed94dce88dedf1a467185b7':
Jean-Baptiste Queru [Mon, 11 Mar 2013 20:13:28 +0000 (13:13 -0700)]
am
0fe40641: am
72c7cf9d: am
a1b1e2de: (-s ours) am
56f387a4: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
0fe40641db3759088edc1bc7f0182556d77bede6':
Jean-Baptiste Queru [Mon, 11 Mar 2013 20:00:27 +0000 (13:00 -0700)]
am
72c7cf9d: am
a1b1e2de: (-s ours) am
56f387a4: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
72c7cf9d13f5a51a71dccc6d94317727bd0feec3':
Jean-Baptiste Queru [Mon, 11 Mar 2013 19:41:47 +0000 (12:41 -0700)]
am
a1b1e2de: (-s ours) am
56f387a4: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
a1b1e2de67ed5ed3dfa8c8e9554bb0f0ab18a71c':
Jean-Baptiste Queru [Mon, 11 Mar 2013 19:23:04 +0000 (12:23 -0700)]
am
56f387a4: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
56f387a4a8f319f3e6080b5e5963a4b177053cbe':
Jean-Baptiste Queru [Mon, 11 Mar 2013 19:19:00 +0000 (12:19 -0700)]
Reconcile with jb-mr1-release - do not merge
Glenn Kasten [Mon, 11 Mar 2013 17:58:50 +0000 (10:58 -0700)]
Increase size of statistics buffer
Bug:
8354576
Change-Id: I327e9dc203e09df8abc21e589ce9056540618abd
ztenghui [Fri, 8 Mar 2013 23:13:07 +0000 (23:13 +0000)]
Merge "Clean up the native code to match Java update" into jb-mr2-dev
ztenghui [Fri, 22 Feb 2013 22:32:59 +0000 (14:32 -0800)]
Clean up the native code to match Java update
1. Add flags to match the java side change.
2. Update the interface.
bug:
7991013
Change-Id: I8ffe84c466b2a68e2e1e48b35b78db9e44640265
Andreas Huber [Thu, 7 Mar 2013 23:56:17 +0000 (23:56 +0000)]
Merge "Disable our fancy logic to respect both sink and source's native formats" into jb-mr2-dev
Alex Ray [Thu, 7 Mar 2013 22:02:51 +0000 (22:02 +0000)]
Merge "Camera: Log warning on out-of-range face detect scores" into jb-mr2-dev
Andreas Huber [Thu, 7 Mar 2013 18:57:07 +0000 (10:57 -0800)]
Disable our fancy logic to respect both sink and source's native formats
since it isn't actually supported by anything in the field.
Change-Id: I9cd038d7631105de26303312ca87c472d67034d4
Andreas Huber [Thu, 7 Mar 2013 18:33:20 +0000 (10:33 -0800)]
The transport stream HDCP descriptor belongs in the program_info section
instead of being included in the per-stream descriptors
Change-Id: If5251c0c02456646e2fdbb5e62acf66c356cf13e
Alex Ray [Thu, 7 Mar 2013 07:28:51 +0000 (23:28 -0800)]
Camera: Log warning on out-of-range face detect scores
Bug:
7368364
Change-Id: I7b1e995dd15e87c816b89ccf9968a222fd66d140
Andy McFadden [Wed, 6 Mar 2013 17:42:23 +0000 (17:42 +0000)]
Merge "Correct MediaCodec + Surface behavior" into jb-mr2-dev
Andy McFadden [Tue, 5 Mar 2013 22:31:02 +0000 (14:31 -0800)]
Correct MediaCodec + Surface behavior
Assorted tweaks:
- Allow signalEndOfInputStream() before ACodec is in Executing
state (added message to two more states).
- Return an error if signalEndOfInputStream() is called a second
time on the same stream.
- Require AndroidOpaque color format in createInputSurface().
- Disallow dequeueInputBuffer() after an input surface has been
created (boolean flag in MediaCodec tracks it).
- Discard input surface when encoder is re-configure()ed (drop
OMXNodeInstance's ref when we go back to Loaded).
Bug
7991062
Change-Id: Iff30f3036e14eb5a2f6536910dcf11aba33031ee
Glenn Kasten [Wed, 6 Mar 2013 00:18:04 +0000 (00:18 +0000)]
Merge "Add template class SingleStateQueue" into jb-mr2-dev