summaryrefslogtreecommitdiff
path: root/src/com/android/camera/VideoModule.java
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | Camcorder default video quality preference updated as per UI.Santhosh Kumar H E2013-11-251-4/+11
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Video quality preference was not initialized to the default value. But it was read as null and set to maximum available quality. So the actual value set to camera is different from the one user see in the settings list. This change will set the default quality to the preference if its supported. Change-Id: Ie219e0965a6ac06e62f32cc6c52fdf255a07adee CRs-Fixed: 565374
* | | Merge remote-tracking branch into merge_branchSanthosh Kumar H E2013-12-061-0/+1
|\ \ \ | |/ / |/| / | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Delay onResume tasks to speed up lockscreen onResume->onPause->onResume launch sequence. Import translations. DO NOT MERGE gcam: Clean up placeholders, and add deletion robustness. Fix issue of focus indicator staying on without being hidden Ensure view size gets updated after phone decors change. Show the 100% state of the progress at least one frame. Add parameters and deduplicate parameter changes Revert parallel opening camera in photo mode. Differentiate the InProgressData from the normal PhotoData. Close mode menus if another control is touched Start gcam module directly when handling capture intent. Import translations. DO NOT MERGE Add a null check to fix NPE Add logging to various actions Ensure mOpenCameraThread has been setup before dereferencing. Add logging to various actions Ensure mOpenCameraThread has been setup before dereferencing. Add GCam progress indicator. hide preview cover on arrival of new preview data if hidden Fix photo mode is getting stuck in a single CameraState. ... Conflicts: res/layout/photo_module.xml res/values/arrays.xml src/com/android/camera/CameraActivity.java src/com/android/camera/PhotoUI.java src/com/android/camera/Storage.java src/com/android/camera/WideAnglePanoramaModule.java src/com/android/camera/ui/FilmStripView.java Change-Id: Ic41b4e7e07b2b0ed7936b78a6c5f05270d05985f
| * Show a preview cover until real preview is readyDoris Liu2013-10-151-0/+1
| | | | | | | | | | Bug: 11211650 Change-Id: Ic4b26ef0f03eac0682e7be0d4bcb1c4632d85f39
* | Merge "Update preview as per aspect ratio on back key press."Linux Build Service Account2013-11-221-1/+2
|\ \
| * | Update preview as per aspect ratio on back key press.Santhosh Kumar H E2013-11-121-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If user is not in full screen camera preview mode, pressing back key will take user to full screen preview mode. During this all views on filstrip are reloaded and shifted to full screen preview. While reloading preview aspect ratio was not considered so user could see stretch preview in case of front camera. This change calls resize of preview as per aspect ratio after reload. Change-Id: I3dc8db3cc9917f9db33f5101f6c39cf38b950264 CRs-Fixed: 568855
* | | Reset scene mode to Auto in camcoder and panorama modes.Santhosh Kumar H E2013-11-121-0/+7
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Camcoder and panorama does not support scene modes. In the error case user has set scene mode to a value other than Auto in image camera mode. During initialization of video module camera parameters are obtained from AndroidCameraManagerImpl. Which maintains the local camera parameters object to avoid calling framework each time. The local parameter variable was set with a scene mode in image camera and hence it gets reflected in video module as well. This change will reset the scene mode to auto each time video or panorama modules are initialized. Change-Id: I3d620a9d163d4042cf8c09ed3c6ae8ee8ef2dc93 CRs-Fixed: 573573
* | Camera2: Adds support for longshot/burst modeAlok Kediya2013-11-071-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - The longshot/burst pipeline mode uses an optimized path for triggering 'takePicture()' on each shutter callback. This should improve the shot-2-shot time. In addition to this there is also support for jpeg callbacks that only contain a jpeg file path. The callback in this case will only move the file stored by the lower layers in the correct directory. - The longshot burst pipeline can be enabled via this property: "persist.camera.longshot.enable"<-"0/1" - This change will allow longshot mode to be triggered in non-zsl mode as well. (Cherry picked from: I693366a7d06d3b386a8d96f86ee9a0574749c50b) (Cherry picked from: Id630b2033f18d1c04a636597e910e695a8692ac8) Change-Id: Idda8d58fc6d889128c1812c9c5ddadca3993c246
* | Camera2: Fix compilation issuesManish Kumar2013-10-311-1/+0
| | | | | | | | | | | | | | | | Fix compilation issues Change-Id: I77317b64eb11663dadff6a0b46e08e49d9e8ab21 (cherry picked from commit 53fa3ae8cd74ce42810f6d638bb7efe15fd01ba4) (cherry picked from commit 4151656344e66f7f43f017ab33ff42a33e6df552)
* | Camera: Synchronising video functionality of errant usecase.Ashok Raj Deenadayalan2013-10-311-1/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When user switches to VideoModule and executes the capture, stops it immediately, after several such attempts the media recorder enters into illegal state, in such situation, if user still continues the same behaviour, app will be flooded with the onShutter events which will lead to ANR, and further similar trials will lead to crash. Here, we are synchronizing the behaviour(user events)by checking the entry/exit body of majorly hit functions so that app will not be flooded with user events. (cherrypicked from: I3e7768211855a31f1c573d0ed89abb5c6216cb1b) Change-Id: Ia65f39c24822ae09694b8247fa58ffb1770e74da CRs-fixed: 534762 (cherry picked from commit 615b8451f787aa8e34834847301fd151d7eb66d6) (cherry picked from commit cf6dfaf3aa65b46b74f3e54236b24638ad1249de)
* | Set params to camera in active preview on orientation change..Ashok Raj Deenadayalan2013-10-311-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | --On a race condition same surface texture is getting used in startPreview and onOrientationChanged by Handler Thread and CameraThread. Synchronised Lock object is going to wait state and that caused ANR. --Set orientation related parameters only in preview state (cherrypicked from: I8d149e839872c06efa696a10fa3ac19618791f41) Change-Id: Id2be51f58315d2d2effe62e22955b203187e5fd7 CRs-Fixed: 538723 Conflicts: src/com/android/camera/VideoModule.java Conflicts: src/com/android/camera/VideoModule.java (cherry picked from commit 194f1aea7d6f88de55d54b750c3be4c6957e0820) (cherry picked from commit 042c6222edf077251e3b0ef52a23d3b433bc804d)
* | Camera: Fix for stretched preview in camera and camcorder...Santhosh Kumar H E2013-10-311-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Stretched preview is observed in front camera due to sensor's mount angle. So resizing the preview by considering aspect ratio of the preview. (cherry picked from commit Ie8a9e062782aa6caaa80ddab705c937da6b0761e) Change-Id: I0bca9076a6dffa4c4972e6d5d0939c57569615bd Conflicts: src/com/android/camera/PhotoMenu.java src/com/android/camera/PhotoModule.java Conflicts: src/com/android/camera/PhotoMenu.java src/com/android/camera/PhotoModule.java (cherry picked from commit 2960ef94825458dc07a497d4414155b57ae620d7) (cherry picked from commit d2fbed622a486151a656261d0dd56c896f0cc700)
* | Camera: Add support for setting DISAlok Kediya2013-10-311-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - This patch allows the CamCorder client to configure DIS from the UI menu. Supported modes by the camera are parsed and dynamically filtered. (cherry picked from commit 24513b0af17e514aa24100c908432c115a1ddcda) Change-Id: I7aaacc883eec9d1b91f549d8e76d96f4a6940aed Conflicts: src/com/android/camera/CameraSettings.java (cherry picked from commit 1278c225500065e8448ad0ea2c6f50abefc5e884) (cherry picked from commit e093b0988c3c4b5ece6ea7ad5f79796705cd4b21)
* | Camera: Support stream based flipAlok Kediya2013-10-311-0/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Flip operation needs to be done per stream. App will read from system property about stream based flipping setting and set corresponding parameters to let camera hardware to apply flipping setting per stream. To keep app behavior persistent when flip and rotation are enabled, need to take case H/V flip when 90 or 270 rotation happens. Need to reverse H/V flip to acheive same output no matter device is in portait or landscape mode. (cherrypicked from commit b38b8246204871082dc7ac6f5e626d6162d2be70) Change-Id: Ia06060709162237dece1a05a3ae58429a0c99b06 Conflicts: src/com/android/camera/util/CameraUtil.java (cherry picked from commit b6aff328cdd99fb0db11c989a72f5eafd7d82324) (cherry picked from commit 29888be992b8955f88a2f89ffd407733d771c1e6)
* | Camera: Add support for raw snapshotAlok Kediya2013-10-311-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | Previously picture format only have option for jpeg and raw, but detailed raw image format is misssing from menu to choose. Also, changes to save raw image to coorect path are included. (cherrypicked from commit c0028f9dbe178c3fed1bcb4af96eb0db4d2e2973) Change-Id: Ifab7fd80e4a83370b2dc6932340005a06cc3552f (cherry picked from commit 27f9245f35d0284c17d8d2fdf5576ea3879e7d33) (cherry picked from commit 3c66703af119c06697f16303fadadbe956646cb3)
* | Camera: Video HDR Feature IntegrationAlok Kediya2013-10-311-0/+10
| | | | | | | | | | | | | | | | | | | | Add Video HDR support on UI. (cherrypicked from commit 423f0e277390cd4cbb87c89d063820ad0a953631) Change-Id: I14d2a7002fbaa4859ceb19317490e8843786ce35 (cherry picked from commit b2afb0f26563599e65564dea9605c7bc7d8aa29c) (cherry picked from commit a31228372a155dc1c02c7fb0669ea350c55c661d)
* | Camera : Enable camera and camcorder UI features..Alok Kediya2013-10-311-2/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added keys and APIs for enabling QC features from UI. (cherry picked from commit a0fdd6924374635711ea6a554f3a59a087cf4b21) Change-Id: Id50b7cebe2d33eaf7bb6a8e51fecded50ac6dcf8 Conflicts: src/com/android/camera/CameraSettings.java src/com/android/camera/PhotoMenu.java src/com/android/camera/PhotoModule.java src/com/android/camera/VideoModule.java Conflicts: src/com/android/camera/CameraSettings.java src/com/android/camera/VideoModule.java (cherry picked from commit 93cd1cdb59449ccb2b9594c9d8e3978a25d7f376) (cherry picked from commit af04f9d621183addee0f7cdd7c1a41c8d0e65cfe)
* | CameraApp: Updating zoom value from camera device parameters.Alok Kediya2013-10-311-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When user switches from one camera to other the zoom values were stored in a class variable. Due to which the application was using the same zoom value for different preview size cameras. And which was making the app to apply same zoom value for two different sizes while rendering. This change will enable the app to use different zoom values for different preview sizes. (cherry picked from commit cf97ea085c2258173f13c757d20eaffcafe23de9) Change-Id: I1cd0994b4b4ebc8eba931f4b05512871897bf8c6 (cherry picked from commit 6fa132eca1ff1872e3fee8e842b570d30c55c78e) (cherry picked from commit 8c4cdf02fd57f4a008f01ed0e97bcf4b3c8d88cd) (cherry picked from commit e2ddc26ba302add0d8e10121927bc8f35e89795b)
* | Camera: Propagate power mode selection from UI to lower layers.Alok Kediya2013-10-311-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | Send the power mode(low power/normal power mode) selection from the UI layer to lower layers, such that the camcorder topology is setup in accordance with the power mode selection. (cherry picked from commit 7243d4392808d32e7d729d6976078c8f6a82c8fa) Change-Id: Ia36e9c01a871ccd35f68f54d815f642792fd68b9 (cherry picked from commit 60ef6c5aadbb6a0b0717c2521cd51143da13679b) (cherry picked from commit e73a3ff6465bdbfd8edf62a8d259590bd94b7453) (cherry picked from commit 75551bc48481c6c5864645ef74b0059bb569e692)
* | Camcorder: Set audio code in profile based on hfr and time lapse settings.Alok Kediya2013-10-311-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | Set audio codec in media profile only when time lapse is not set and hfr is set to Off mode. (cherry picked from commit f0a631472983c59e0fe936bffacc2fde763517f6 ) Change-Id: Id4ce04793b0968a18ec9c3ee3c71f77c7d0a4d34 (cherry picked from commit 47eec26bb58c977dceb07497c590f7dabf0417e6) (cherry picked from commit aa4e7a3a4da9e46aee154a4152f2b93be888a9da) (cherry picked from commit b7667e7e853248f516bb2edbc01f8c5cb7e5a7ab)
* | Camera:Avoid recording for unsupported format in HFR.Alok Kediya2013-10-311-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | -There is no condition in Camera VideoModule.java to check if unsupported resolution or codec is set for HFR. -Check is added and displayed toast message for Unsupported resolution or codec. (cherrypicked from commit 299c6c7f4ad266509abb6031986849495bdf0830) Change-Id: I22a81e2be466353a8b141bb9b84bb95d063fa98b (cherry picked from commit 39a199b6fce45de26636b9161376c6af1dccc1bc) (cherry picked from commit 31d99e7881138f184c48e6305abbef141291ff6c) (cherry picked from commit 11563cb78844db0202b11e0aa36e14a48f8954ef)
* | Camera: Add initial QCom value add features.Alok Kediya2013-10-311-2/+134
|/ | | | | | | | | | | | | | | - Enhance the camera picture size table by adding more number of supported resolutions. - Enhance the camcorder menu by adding support for additional video and audio codecs. - Also provide option to select the duration of the recording clip. (cherry picked from commit 7a5402332f3b527767b85c1fc112880d02a47c0e) Change-Id: I553d4eb74337701bc57d069c8374646a7e15c2d5 (cherry picked from commit cdffd7510e1f9a236e43438f035bc5be9e3c0c17) (cherry picked from commit 93c32e9e069d7c48b71fbbe45cae59a54df443ec) (cherry picked from commit f6b24346ab9d28953a5697924d6815ed2c006cf3)
* Merge "NPE fix when we failed to open the camera" into gb-ub-photos-carlsbadztenghui2013-10-151-23/+9
|\
| * NPE fix when we failed to open the cameraztenghui2013-10-141-23/+9
| | | | | | | | | | | | | | | | | | | | | | | | At the same time, some error check code never get turned on. Remove those stale codes and make sure we check the CameraDevice for null correctly. We didn't intensively log the error here since they should be logged by the CameraOpenErrorCallback already. bug:11215576 Change-Id: Ib1e1b9011a169607b719c833d6d5eddbd9be8a9d
* | Set camera controls visibility based on whether the camera preview is centered.Erin Dahlgren2013-10-141-0/+5
| | | | | | | | | | Bug: 10861015 Change-Id: Ib0c4945e35cee16b73a4bba913e11d0f79a26176
* | Only delete the Uri coming from onMediaSavedztenghui2013-10-141-5/+5
|/ | | | | | | | | | The incoming Uri can be null, or a file Uri, which we don't want to delete. The Uri from onMediaSaved has been inserted to the MediaStore and pass null check. bug:11218007 Change-Id: Ie4b08cae94e22a8014ea2436f0a82eba2541a667
* Remove display change listener for mode switchDoris Liu2013-10-101-0/+2
| | | | | Bug: 10928549 Change-Id: I333e1a47e7f5c5cadca9b0b6cfd368f455fc3670
* Fix flash issueztenghui2013-10-091-0/+1
| | | | | | | | | | The flash light should show up at the same time as the control show up. Also, when we change the flash mode, we should update the flash on screen indicator. bug:11064667 Change-Id: I888d3ce76ac618a4c7b40a288ecce13555c89ab0
* Merge "Fix another potential issue related to video capture intent." into ↵ztenghui2013-10-091-3/+4
|\ | | | | | | gb-ub-photos-carlsbad
| * Fix another potential issue related to video capture intent.ztenghui2013-10-091-3/+4
| | | | | | | | | | | | | | | | | | We don't want to delete the Uri sent from the intent. When we are in review mode, the mCurrentVideoUri should be from the capture result. bug:11136978 Change-Id: I148135326e3516936f7d6463941c6b50dbc389db
* | Merge "Fix NPE in video intent." into gb-ub-photos-carlsbadztenghui2013-10-091-1/+6
|\|
| * Fix NPE in video intent.ztenghui2013-10-081-1/+6
| | | | | | | | | | | | bug:11136978 Change-Id: I6076581131e3dcdc456d8ac8865a5cc6f84e9da4
* | Do not allow navigation to filmstrip during video recordingDoris Liu2013-10-081-2/+2
|/ | | | | Bug: 11064867 Change-Id: I168136a193008578b3ad2642cba764650bcc2487
* Remove PopupManager to remove a memory leakSeth Raphael2013-09-261-3/+0
| | | | | | | | | PopupManager had been previously refactored out but vestiges remained. They were causing a memory leak of Activities in its hash map. Bug: 10728773 Change-Id: Ia6d98db1f0d30b4e879984033b471e8c802bc1c1
* Checks for low storage in wide-angle pano mode.Angus Kong2013-09-251-2/+2
| | | | | | | | | | 1. Storage.LOW_STORAGE_THRESHOLD -> Storage.LOW_STORAGE_THRESHOLD_BYTE. 2. Checks for low storage before start preview in wide-angle pano mode. 3. Add low storage warning message for debugging when in wide-angle pano mode. bug:10691367 Change-Id: Iffd96d322b33591c8f235fcf5680e86cf0f06571
* Clean up ApiHelper and remove unused code paths.Sascha Haeberling2013-09-181-60/+30
| | | | | | | | | Bug: 10821545 As we're targeting ICS there are a lot of checks and code paths that are no longer in use. This CL cleans them up. Change-Id: Ic3dd26628a94e134e25e2c496ccec1f1f957216d
* Merge "Delete the captured video if cancel in review." into ↵ztenghui2013-09-181-1/+4
|\ | | | | | | gb-ub-photos-carlsbad
| * Delete the captured video if cancel in review.ztenghui2013-09-171-1/+4
| | | | | | | | | | | | | | | | In capture intent case, video get inserted all the time before review. So if cancelled in review mode, the captured video should be deleted. bug:8897671 Change-Id: I01dd4b0707dd1b70480cda94b2a9b9c6ce9194c7
* | Show dialog when camera device is not connected.Angus Kong2013-09-171-9/+9
|/ | | | | | bug:10726516 Change-Id: I3d3433d0b2eced54027b19910473fd55135d0e1c
* Fix the flash mode transition in video modeztenghui2013-09-111-35/+39
| | | | | | | | | | onSwitchMode is wrongly overloaded, now is fixed. Basically, onCurrentDataChanged will handle the switching in and out of Camera. onDataFullScreenChange will handle full screen change on non-preview data. bug:10610967 Change-Id: I199a20d40d66b78302e90e0f96826d03076b0e39
* Update indicators at the right time to show the correct state.Sascha Haeberling2013-09-101-5/+11
| | | | | | Bug: 10620907 Change-Id: I19de5820aff4b99709326a625765f416d8a5a5f5
* Make sure we switch to preview view when resuming.Sascha Haeberling2013-09-091-1/+2
| | | | | | | | | | Bug: 10640328 But we need to make sure to not always switch in onResume, as some activities stared from us (like playing a video or editing) require the UI flow to stay in filmstrip. Change-Id: Id2911be4949de9fd9fc4cb3451dd34e3fae8becf
* Respect system auto-rotate setting.Angus Kong2013-09-051-0/+2
| | | | | | bug:10623244 Change-Id: I66757e50daf487680ac4f49d854c0f49d672b6ff
* Add rotate support in Film Stripztenghui2013-08-281-1/+1
| | | | | | | | | Move the exif related code under src.com.android.camera.exif. Refactor the member variables under LocalMediaData.java. Refactor the LocalData to make sure they are immutables for thread safety. bug:10367037 Change-Id: I0e84bcc0097925b2be749fe016984177a68e0a4d
* Fix video capture animation and video snapshot animationDoris Liu2013-08-211-456/+48
| | | | | | | | Also removed unused effects recording code Bug: 10326106 Bug: 10414112 Change-Id: I904a26a0b10c75fcce650dc0ec63d7c11746dc2e
* Fix video snapshot aspect ratioDoris Liu2013-08-201-2/+2
| | | | | Bug: 10312002 Change-Id: Ibe2037195b3936baa63628797ea2b742825ed701
* Enable switching cameras in video mode.Sascha Haeberling2013-08-191-0/+1
| | | | | | Bug: 10313018 Change-Id: I8e75341d7d37135ba7747d56a1a0e6d19ffb8eaa
* Fix camera preview stopped after onResume().Angus Kong2013-08-131-1/+0
| | | | | | | | | | | This fix is for the blank camera preview blank after onPause() -> onResume(). 1. Refined camera start up procedure by removing redundant camera startup thread. 2. Cleanup unused calls after aparted from gallery. bug:10189998 Change-Id: I13ffa24aff5069f0032cd4bc801548fccc63d0e7
* Don't take a snapshot if video recording is not in progress.Sascha Haeberling2013-08-131-3/+5
| | | | | | Bug:10312841 Change-Id: Ie6931d054089d0825e7a57206a8de129a79b741f
* Clean up unused code.Sascha Haeberling2013-08-131-13/+0
| | | | Change-Id: Ib7d05cd1bd908708ad96a8b215c79162950e0221
* Check for device support before taking video snapshotsDoris Liu2013-08-131-17/+24
| | | | | Bug: 9496097 Change-Id: I6f5d0489848b583fac3b1fd3b605351002be08ba
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-22 00:34:23 +0000