summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Camera: Add hotplug support (for fixed # of cameras)Igor Murashkin2013-03-264-15/+162
| | | | | | | * 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
* Merge "ICameraServiceListener.h: Add STATUS_ENUMERATING enum" into jb-mr2-devIgor Murashkin2013-03-221-2/+21
|\
| * ICameraServiceListener.h: Add STATUS_ENUMERATING enumIgor Murashkin2013-03-211-2/+21
| | | | | | | | Change-Id: I41a9f358f63a19e7b746a9ccf24722001e5e7475
* | Merge changes Ic92924ce,I53107a39 into jb-mr2-devIgor Murashkin2013-03-212-1/+3
|\ \ | | | | | | | | | | | | | | | * 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.
| * | Camera2: getSceneMode should return NULL when there are no supported scene modesIgor Murashkin2013-03-211-0/+2
| | | | | | | | | | | | | | | Bug: 8444806 Change-Id: Ic92924ceda3de738a7971605552baf00a4fc0546
| * | commandStartFaceDetectionL returned the wrong value when face detection is ↵Ziv Hendel2013-03-211-1/+1
| |/ | | | | | | | | | | | | | | | | 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>
* | Merge "Add the presentation rotation support" into jb-mr2-devztenghui2013-03-203-19/+58
|\ \
| * | Add the presentation rotation supportztenghui2013-03-153-19/+58
| | | | | | | | | | | | | | | | | | bug:7991013 Change-Id: I10cb034b432876c724baa4974efcb3d67b8a99b6
* | | Merge "Implementing MediaDrm APIs" into jb-mr2-devJeff Tinker2013-03-2015-0/+1854
|\ \ \ | |_|/ |/| |
| * | Implementing MediaDrm APIsJeff Tinker2013-03-1315-0/+1854
| | | | | | | | | | | | Change-Id: I9ff8eeb7d0c383b5c0c68cd54eb54ce7d2d22fe6
* | | Merge "Change ANetworkSession implementation to optionally attach ↵Andreas Huber2013-03-196-49/+135
|\ \ \ | | | | | | | | | | | | timestamps" into jb-mr2-dev
| * | | Change ANetworkSession implementation to optionally attach timestampsAndreas Huber2013-03-186-49/+135
| | | | | | | | | | | | | | | | | | | | | | | | | | | | to fragments of data to be transferred and to log statistics when data is finally submitted to the POSIX layer. Change-Id: Icbfcac203cdc5c9eac1634e84d34bb380b316a01
* | | | Merge "Allow for streaming of media files (without recompression)" into ↵Andreas Huber2013-03-197-35/+318
|\ \ \ \ | |/ / / | | | | | | | | jb-mr2-dev
| * | | Allow for streaming of media files (without recompression)Andreas Huber2013-03-187-35/+318
| | | | | | | | | | | | | | | | Change-Id: I1de356cc37506ba986822d12a1a59e7b64069e02
* | | | Merge "Fix valgrind error" into jb-mr2-devMarco Nelissen2013-03-191-0/+1
|\ \ \ \
| * | | | Fix valgrind errorMarco Nelissen2013-03-191-0/+1
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Merge "Camera: fix waitUntilDrained log message" into jb-mr2-devAlex Ray2013-03-181-1/+1
|\ \ \ \
| * | | | Camera: fix waitUntilDrained log messageAlex Ray2013-03-171-1/+1
| |/ / / | | | | | | | | | | | | Change-Id: Iab6197e0674752de7933dd812bff430a5c487c4b
* | | | Merge "ProCameraTests: Minor add grey/frame count debug-only print outs" ↵Igor Murashkin2013-03-181-0/+10
|\ \ \ \ | |/ / / |/| | | | | | | into jb-mr2-dev
| * | | ProCameraTests: Minor add grey/frame count debug-only print outsIgor Murashkin2013-03-181-0/+10
| | | | | | | | | | | | | | | | Change-Id: I0f7b7f3c083a644e9bb0c2302244a5ad434e96a8
* | | | am 59ac7b30: am 66abe3ae: Merge "Fix for crash if no content in DESCRIBE ↵Andreas Huber2013-03-151-0/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | response" * commit '59ac7b3056db57e5a8e851b7946a181c5fc34852': Fix for crash if no content in DESCRIBE response
| * \ \ \ am 66abe3ae: Merge "Fix for crash if no content in DESCRIBE response"Andreas Huber2013-03-151-0/+3
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit '66abe3ae38665256c8fe97770f046bf9c68625aa': Fix for crash if no content in DESCRIBE response
| | * \ \ \ Merge "Fix for crash if no content in DESCRIBE response"Andreas Huber2013-03-151-0/+3
| | |\ \ \ \
| | | * | | | Fix for crash if no content in DESCRIBE responseXuefei Chen2013-03-121-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | am c44a3ae2: am f0cea9f8: Merge "Prevent invalid frame durations"Glenn Kasten2013-03-151-0/+6
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | / / | |_|_|_|/ / |/| | | | | * commit 'c44a3ae2704af52c0f4ea006b5b02a53b6df6c46': Prevent invalid frame durations
| * | | | | am f0cea9f8: Merge "Prevent invalid frame durations"Glenn Kasten2013-03-151-0/+6
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit 'f0cea9f83cf0c8e5ecdd2b401ec2d56d0c717708': Prevent invalid frame durations
| | * | | | Merge "Prevent invalid frame durations"Glenn Kasten2013-03-151-0/+6
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | Prevent invalid frame durationsOla Andersson2013-03-121-0/+6
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent frame duration from being negative when exporting movie studio project Change-Id: I459fb243650c777c2b59d1094acc88c3a944bd81
* | | | | Merge "Make limitations of MPEG4Writer explicit" into jb-mr2-devTenghui Zhu2013-03-143-6/+55
|\ \ \ \ \
| * | | | | Make limitations of MPEG4Writer explicitJames Dong2013-03-143-6/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | Merge "Parse SBR extension sample rate" into jb-mr2-devMarco Nelissen2013-03-141-9/+22
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Parse SBR extension sample rateMarco Nelissen2013-03-141-9/+22
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib6f6994228a279ee10b389515fba04516c7c42ba
* | | | | | ProCamera: Fix rare deadlock when client destructs inside the connect callIgor Murashkin2013-03-131-77/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 8337737 Change-Id: Ia6fca4365fa20fdbfd6a1ec8d047639a002f2aba
* | | | | | Merge "Adds audio support to DirectRenderer." into jb-mr2-devAndreas Huber2013-03-133-169/+491
|\ \ \ \ \ \
| * | | | | | Adds audio support to DirectRenderer.Andreas Huber2013-03-133-169/+491
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ibf4df90aca29d638215e2da9b39e78bf3a2c4d08
* | | | | | | Merge "remove uses of Surface in favor or IGraphicBufferProducer" into ↵Mathias Agopian2013-03-1317-67/+24
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | jb-mr2-dev
| * | | | | | | remove uses of Surface in favor or IGraphicBufferProducerMathias Agopian2013-03-1217-67/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I13d7a9553aa335bca790a3a59d389d7533c83d57
* | | | | | | | Merge "remove CameraServiceTest which wasn't used" into jb-mr2-devMathias Agopian2013-03-134-1140/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | / / / / / / | |/ / / / / / |/| | | | | |
| * | | | | | remove CameraServiceTest which wasn't usedMathias Agopian2013-03-124-1140/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this test hasn't been compiled or run in a long long time and isn't up to date or relevant. Change-Id: I5a7f1190d4a783e088d44e3e6ef66231cf0cfb49
* | | | | | | Attempt to recover from network stalls by dropping frames on the source side.Andreas Huber2013-03-1311-5/+101
| |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | Change-Id: I5f9eb4f5acb624a9e5bc0087801fb5a4a9ade35c
* | | | | | Merge "Squashed commit of the following:" into jb-mr2-devAndreas Huber2013-03-1230-327/+802
|\ \ \ \ \ \
| * | | | | | Squashed commit of the following:Andreas Huber2013-03-1230-327/+802
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | Merge "GraphicBufferSource fixes" into jb-mr2-devAndy McFadden2013-03-123-56/+81
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | GraphicBufferSource fixesAndy McFadden2013-03-123-56/+81
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | Camera: Make ProCamera connect take the same paths as Camera connectIgor Murashkin2013-03-114-164/+130
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
* | | | | (Camera)ProCamera: Remove unused functions from binder interfaceIgor Murashkin2013-03-1112-199/+51
| | | | | | | | | | | | | | | | | | | | Change-Id: I0582268cef6e84b630bc87c8a03dcd69d54c440d
* | | | | (Camera)FrameProcessor: Refactor to share code with ProFrameProcessorIgor Murashkin2013-03-1111-203/+106
| | | | | | | | | | | | | | | | | | | | Change-Id: Ie8cd0df7caf83f9d0134f560ae31ab72f2f7d1fc
* | | | | CameraService: Refactor Camera2Client to share a base with ProCameraClientIgor Murashkin2013-03-1115-470/+583
| | | | | | | | | | | | | | | | | | | | Change-Id: I249e2a0fc47ae84f29c9d9c4a223fba13da3ee66
* | | | | Merge "Increase size of statistics buffer" into jb-mr2-devGlenn Kasten2013-03-111-1/+1
|\ \ \ \ \
| * | | | | Increase size of statistics bufferGlenn Kasten2013-03-111-1/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | Bug: 8354576 Change-Id: I327e9dc203e09df8abc21e589ce9056540618abd
generated by cgit v1.1 at 2024-06-25 23:17:34 +0000