summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Camera: Modified 8M resolution entry"Linux Build Service Account2014-08-281-2/+2
|\
| * Camera: Modified 8M resolution entrySusmitha Gummalla2014-08-261-2/+2
|/ | | | | | | | -Modified 8M resolution to 3840 x 2160 -Moved square mode entry to appropriate location CRs-fixed: 714811 Change-Id: If2e5bf4fa1d1aeaca98bde8c3225bf91f1a438cc
* Merge "SnapdragonCamera: Set default HDR mode to multi-frame based"Linux Build Service Account2014-08-251-1/+1
|\
| * SnapdragonCamera: Set default HDR mode to multi-frame basedSunid Wilson2014-08-241-1/+1
| | | | | | | | | | | | Multi-frame HDR needs to be set as default for HDR scenemode Change-Id: I0f8398900d796126ceb888c500810746cb21705c
* | Merge "SnapdragonCamera: Add H265 encoder"Linux Build Service Account2014-08-243-0/+4
|\ \ | |/ |/|
| * SnapdragonCamera: Add H265 encoderVladimir Petrov2014-08-223-0/+4
| | | | | | | | | | | | Add support for selecting the HEVC video encoder (H265). Change-Id: I3b7974eb333e0914047e9b5c96a0fb9d6f494b2a
* | Merge "SnapdragonCamera: Enable build of local jni libraries"Linux Build Service Account2014-08-233-13/+3
|\ \ | |/ |/|
| * SnapdragonCamera: Enable build of local jni librariesLeena Winterrowd2014-08-223-13/+3
|/ | | | | | | | | The app currently relies on having its required libraries in the current build. Enable building its local libraries so that these are always present. Also ensure that the camera tests are not built to avoid a naming conflict. Change-Id: If358db3fc7392f62aaaa84877baa19a949aea497
* Merge "SnapdragonCamera: Match video and preview sizes for all HFR modes"Linux Build Service Account2014-08-221-1/+1
|\
| * SnapdragonCamera: Match video and preview sizes for all HFR modesLeena Winterrowd2014-08-211-1/+1
| | | | | | | | | | | | | | | | HFR sets the video resolution as the preview resolution. Do the same when HSR is selected. CRs-Fixed: 679522, 687765 Change-Id: Ie08ce94193b8f0b53551b00808294eacc66ff6e4
* | Merge "SnapdragonCamera: Fix HFR string mismatch"Linux Build Service Account2014-08-221-3/+3
|\|
| * SnapdragonCamera: Fix HFR string mismatchLeena Winterrowd2014-08-211-3/+3
| | | | | | | | | | | | Enforce consistency between HFR strings at the app and HAL levels Change-Id: I10f1cce5f90c1a87c15dddf80d05c28c8eaff298
* | Merge "SnapdragonCamera: Fix improper call to disable HFR"Linux Build Service Account2014-08-222-35/+45
|\|
| * SnapdragonCamera: Fix improper call to disable HFRVladimir Petrov2014-08-212-35/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Remove the filter for unsupported HFR modes in camcorder (may re-introduce CR#510215) - Fix improperly hardcoded setting of HFR mode to "disable" instead of "off" - Revert code where string prefixes were added to HFR camera parameter This reverts commit 1ad1d65a88e350e6e5461828ab930638b778564d. This reverts commit 9804a5e9116c8e17ac11449fcd83f2e0af5d4f38. CRs-Fixed: 687765 Change-Id: I85eecca7f2fc9bd83e90e0610ab66f1102dedc02
* | Merge "SnapdragonCamera: Set video size for preview in HFR case"Linux Build Service Account2014-08-221-1/+57
|\|
| * SnapdragonCamera: Set video size for preview in HFR caseEmilian Peev2014-08-211-1/+57
| | | | | | | | | | | | | | | | | | Due to HW limitations, the preview size needs to match the video size in HFR use cases. Otherwise the framerate may be lower than expected. Change-Id: I09ce25befa781b683e167da1ab4c20b5214df59b CRs-Fixed: 656181
* | Merge "SnapdragonCamera: Change 13MP resolution to 4160x3120"Linux Build Service Account2014-08-221-1/+1
|\|
| * SnapdragonCamera: Change 13MP resolution to 4160x3120Ranjith Kagathi Ananda2014-08-211-1/+1
| | | | | | | | | | | | | | Change the resolution corresponding to 13 MP option in the app to choose 4160x3120 instead of 4208x3120. Change-Id: I6e74bed1bb8fe25d4a451349f38bacf334d94572
* | Merge "SnapdragonCamera: Add HDR mode menu selection"Linux Build Service Account2014-08-226-1/+62
|\|
| * SnapdragonCamera: Add HDR mode menu selectionIvan Evlogiev2014-08-216-1/+62
| | | | | | | | | | | | - HDR mode can be sensor (default) or multi-frame Change-Id: I4513c52e9050d66e25d70ed8f484637dc75c6196
* | Merge "SnapdragonCamera: Switch to SD card when internal storage is full"Linux Build Service Account2014-08-229-25/+86
|\|
| * SnapdragonCamera: Switch to SD card when internal storage is fullkaiyiz2014-08-219-25/+86
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When internal storage is full, switch to SD card for storage. Change the save path from internal storage to SD card when updateStorageSpace is called if: 1. Internal storage is the current save path and does not have enough space 2. SD card has enough space Display a toast message and update display of the save path menu item when the storage path is switched. CRs-Fixed: 687210 Change-Id: I6a9804e4f64e6d55c6aebd889ac2ce5e887cfa5a
* | Merge "SnapdragonCamera: Don't disable shutter button in longshot mode."Linux Build Service Account2014-08-221-2/+4
|\|
| * SnapdragonCamera: Don't disable shutter button in longshot mode.Sai Kumar Sanagavarapu2014-08-211-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | Problem scenario: If longshot gets turned off even before first capture is completed, there might be a possibility of shutter button getting disabled permanently. Fix: Shutter button need not be disabled in longshot usecase. Change-Id: I94cdb1e3f6d63a71699014cc59e5bc8438506c34
* | Merge "SnapdragonCamera: Make panorama frame size configurable"Linux Build Service Account2014-08-222-2/+14
|\|
| * SnapdragonCamera: Make panorama frame size configurableLikai Ding2014-08-212-2/+14
| | | | | | | | | | | | | | | | For low RAM devices, allow reduction of the panorama frame size to save memory via the 'panorama_frame_size_reduction' config option. Change-Id: I26b98699341d5eedfe2ebe8a6ed417fe62933bd5 CRs-Fixed: 669381
* | Merge "SnapdragonCamera: Fix jni library names"Linux Build Service Account2014-08-223-3/+3
|\|
| * SnapdragonCamera: Fix jni library namesLeena Winterrowd2014-08-213-3/+3
|/ | | | | | | | | Loading jni libraries currently fails as the library names have changed for SnapdragonCamera. This change fixes the jni library loading. Change-Id: I19adc166960ee2d9c4ddb223b1d2756eda00c00c
* SnapdragonCamera: Add support for adding square snapshot resolutionApurva Rajguru2014-08-182-0/+4
| | | | | | | Adding resolution corresponding to 1:1 aspect ratio in picture sizes. Change-Id: I8b86918b3777d47e54fa4517080b356d4bc327cc
* SnapdragonCamera: To enable 4kuhd on redfoxCherian Deepak2014-08-182-4/+8
| | | | | | | | On redfox 4kuhd was replaced by 2160p, so we need to add 2160p resolution to enable 4kuhd in UI Change-Id: Ib0b7acea65d60bd2e98b3aefc146e873ac351508
* SnapdragonCamera: To enable mirroring for 1080pCherian Deepak2014-08-181-1/+17
| | | | | | | This will enable output duplication from cpp for 1080p camcorder resolution Change-Id: I3a6a49d98bea8102f3a00963deaba968fdec96ce
* SnapdragonCamera: Fix static library name conflictLeena Winterrowd2014-08-162-5/+5
| | | | | | | | | A JNI lib is built for both the Camera2 app and SnapdragonCamera but is included in system/lib. Since this lib has been branched as well, rename it and explicitly bundle it with the app to avoid the library name conflict. Change-Id: I3177d0a99be06cef0b841d8e84e652b8974cadc6
* Rename module and package name to co-exist with AOSP appSachin Shah2014-08-1652-60/+61
| | | | | | | | Rename package from com.android.camera2 to org.codeaurora.snapcam, module name from Camera2 to SnapdragonCamera and app name from "Camera" to "Snapdragon Camera" Change-Id: I2800070e72631e119a15fe0132424d1047be9f0c
* Camera2: Enhance KK cameraapp for LChiou-Hao Hsu2014-08-164-8/+8
| | | | | | Enhance KK cameraapp for L. Change-Id: If708b253f34a131d7842f8921e54c008283e0056
* Merge "Camera2: Update 4M wide picture size to be 16:9"Linux Build Service Account2014-07-251-1/+1
|\
| * Camera2: Update 4M wide picture size to be 16:9Gjorgji Rosikopulos2014-07-231-1/+1
| | | | | | | | | | | | | | | | All defined resolution should be with correct aspect ratio (16:9, 4:3). This change makes sure 4M wide picture size is 16:9. Change-Id: If5e1a8c3a2a353d130b2977b0b211bf61ec555f1
* | Merge "Camera2: Fix show switcher after capture picture with HDR on in message"Linux Build Service Account2014-07-211-2/+1
|\ \
| * | Camera2: Fix show switcher after capture picture with HDR on in messagekaiyiz2014-07-091-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Switcher should not be shown when open camera use CAPTURE intent. Show switcher only when mIsImaegCaptureIntent not true. CRs-Fixed: 690941 Change-Id: I41c34288adfccf3cdad7b14f552f8dd67c3106c1
* | | Merge "Camera2: fix face still display after unmark the face detect option"Linux Build Service Account2014-07-212-1/+9
|\ \ \
| * | | Camera2: fix face still display after unmark the face detect optionkaiyiz2014-07-142-1/+9
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After unmark the face detect option, the value mFace in FaceView maybe reset value and draw all the time. The faces should not be draw after stopFaceDetection, so block draw the faces after stopFaceDetection and unblock after startFaceDetection. Change-Id: I2f8316e12ad8c7b157bc732800d9247c66a17572 CRs-Fixed: 692057
* | | Merge "Camera2: add UI resources"Linux Build Service Account2014-07-18138-0/+0
|\ \ \
| * | | Camera2: add UI resourcesLikai Ding2014-07-15138-0/+0
| | |/ | |/| | | | | | | | | | Icons for new UI design. Change-Id: I92a10414baf1bff8f6d55159b32a5426f85e600c
* | | Merge "Camera2: Fix some settings are English when system language is Chinese"Linux Build Service Account2014-07-182-2/+19
|\ \ \
| * | | Camera2: Fix some settings are English when system language is Chinesekaiyiz2014-07-092-2/+19
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | There is no matched Chinese resource for these settings. Add matched Chinese string resource for settings include AE-Bracket/ Advanced features/AUTO HDR. CRs-Fixed: 690387 Change-Id: Ia67d4ac7b1197d74409e7eaf98fc22f85280906b
* | | Merge "Camera2: optionally force count down sound"Linux Build Service Account2014-07-172-3/+8
|\ \ \
| * | | Camera2: optionally force count down soundLikai Ding2014-07-092-3/+8
| |/ / | | | | | | | | | | | | | | | | | | set count down sound as STREAM_SYSTEM_ENFORCED for carrier compliance Change-Id: Ie60bb4c7059ad8930be2c6650808107dcaaa22a2 CRs-Fixed: 684591
* | | Merge "Camera: Add HSR 60 and HSR 90 modes"Linux Build Service Account2014-07-164-68/+50
|\ \ \ | |/ / |/| |
| * | Camera: Add HSR 60 and HSR 90 modesVijay kumar Tumati2014-07-164-68/+50
|/ / | | | | | | | | | | | | | | | | | | | | | | | | Adding 2 more modes 60 and 90 to HSR feature. HSR - High speed recording where video is recorded at the same fps at which camera is pumping frames. CRs-Fixed: 629713 Change-Id: I31a13f8d5db8c94be7bafb7506bafe268b764362
* | Merge "Camera2: fix more settings menu use the same icon"Linux Build Service Account2014-07-085-5/+5
|\ \
| * | Camera2: fix more settings menu use the same iconkaiyiz2014-06-305-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is only one icon fit this menu. Add new icons for this menu item and use them in videomenu and photomenu. CRs-Fixed: 634284 Change-Id: I277bd01910fd27508e50b5b1793e9e5f58e0c70f
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-01 23:51:15 +0000