summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | Merge "Fix camera app still opens the camera in lock screen sometimes." into ↵Wu-cheng Li2011-10-261-3/+14
|\ \ \ \ | | | | | | | | | | | | | | | ics-mr1
| * | | | Fix camera app still opens the camera in lock screen sometimes.Wu-cheng Li2011-10-261-3/+14
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Suppose camera app is in the foreground. If users turn off and turn on the screen very fast, camera app can still have the focus when the lock screen shows up. Now the camera app will not open the camera as long as screen is locked. bug:5491362 Change-Id: Idf2a1b160c94abb889729e0525c9903b62f12dd0
* | | | Merge "Fix 5489985: Handle the exception when the external volume has not ↵Chih-Chung Chang2011-10-261-4/+10
|\ \ \ \ | |_|/ / |/| | | | | | | been added to MediaProvider." into ics-mr1
| * | | Fix 5489985: Handle the exception when the external volume has not been ↵Chih-Chung Chang2011-10-261-4/+10
| |/ / | | | | | | | | | | | | | | | added to MediaProvider. Change-Id: I5bb9e59d5b1dae4c3980f624d38194fbb514d7fa
* | | Add portrait support to effects pipeline in VideoCamera.Eino-Ville Talvala2011-10-262-1/+23
|/ / | | | | | | | | | | | | | | Needed to enable app to switch to portrait for startup speed. Still supports landscape for landscape-native devices. Bug: 5446617 Change-Id: I9853ff50d9fcd8cf53cc6e65d6c16319c1b27f76
* | Merge remote branch 'goog/ics-mr0' into ics-mr1Ed Heyl2011-10-254-26/+60
|\ \ | |/
| * Merge "Add missing state check in EffectsRecorder startup path." into ics-mr0Eino-Ville Talvala2011-10-241-2/+13
| |\
| | * Add missing state check in EffectsRecorder startup path.Eino-Ville Talvala2011-10-241-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When starting up, the EffectsRecorder gets a callback when the effect filter graph provides an input SurfaceTexture. This callback was not checking the EffectsRecorder state correctly, and if stopPreview was called on the EffectsRecorder between startup and before the callback fires, the callback would improperly reset the recorder state, resulting in NPEs down the line. Bug: 5493458 Change-Id: If552b7c0ea82e1506f0b22eb5fa0447c1ca4adf8
| * | Merge "Fix video thumbnail is not displayed when intent passes the fd." into ↵Wei Huang2011-10-242-22/+45
| |\ \ | | | | | | | | | | | | ics-mr0
| | * | Fix video thumbnail is not displayed when intent passes the fd.Wu-cheng Li2011-10-242-22/+45
| | |/ | | | | | | | | | | | | bug:5494625 Change-Id: I2bc482c05b9ca47bb566e351746a6e4dccdd6111
| * | Fix startFaceDetection RuntimeException.Wu-cheng Li2011-10-241-2/+2
| |/ | | | | | | | | | | | | | | | | | | | | | | | | Sometimes startFaceDetection is called twice and exception is thrown. Reproduction steps: 1. Set screen lock to none. 2. Start camera app and press power key to turn off screen immediately. 3. Start camera app. bug:5497940 Change-Id: I3337d70e473943f5306cb459ce79c0faa45b77af
* | am 048edf2e: Fix focus area in front camera.Chih-yu Huang2011-10-214-27/+44
|\ \ | |/ | | | | | | * commit '048edf2ef22607b85bc4b062e2af71804f5b3530': Fix focus area in front camera.
| * Fix focus area in front camera.Chih-yu Huang2011-10-214-27/+44
| | | | | | | | | | | | | | | | | | | | Front camera preview is mirrored. Change to use matrix to calculate the focus area. So the focus area will be correct in all orientations in front or back camera. bug:5446617 bug:5461028 Change-Id: I2d39a22cd9f034c5028843ca3d4abe0f9962f18a
* | am 7d9eadd0: Fix 5491362: don\'t open the camera in onResume in lockscreen.Jim Miller2011-10-215-15/+62
|\ \ | |/ | | | | | | * commit '7d9eadd0c6c38b3761b7e8d3fa3658d194810d60': Fix 5491362: don't open the camera in onResume in lockscreen.
| * Fix 5491362: don't open the camera in onResume in lockscreen.Jim Miller2011-10-215-15/+62
| | | | | | | | Change-Id: I678dd23f1603647e801c339a557fc08b53dbfa38
* | am cfc9bcc6: Fix race condition in preview startup.Eino-Ville Talvala2011-10-201-8/+20
|\ \ | |/ | | | | | | * commit 'cfc9bcc6dc56135d905ffdaaf1b9838cf12a1558': Fix race condition in preview startup.
| * Fix race condition in preview startup.Eino-Ville Talvala2011-10-201-8/+20
| | | | | | | | | | | | | | | | | | | | A small window of time exists between starting preview and the graph getting fully configured, in which stop preview calls would be incorrectly ignored. Add a new state to effectsrecorder to reflect reality a little better. Bug: 5493458 Change-Id: I76542b6970186c288ec908f3bb558217fd7d00e8
* | am 74ec1a36: Merge "Effects: shut down camera preview when unexpected graph ↵Eino-Ville Talvala2011-10-201-4/+17
|\ \ | |/ | | | | | | | | | | closures occur." into ics-mr0 * commit '74ec1a362dc1ddc7835fcfb2a578e3d8f58e6355': Effects: shut down camera preview when unexpected graph closures occur.
| * Effects: shut down camera preview when unexpected graph closures occur.Eino-Ville Talvala2011-10-201-4/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | If the graph runner needs to shut down a graph due to an error, previously the surface texture connecting the camera to the processing graph would get released before camera was told to shut down preview. This led to various abandoned surfacetexture errors in the camera HAL, sometimes including native crashes. Now properly uses the SurfaceTextureSource callback to detect unexpected graph shutdown to clean up the camera before the SurfaceTexture is released. Bug: 5451833 Change-Id: Id130c1e5deb27cffab335affaa1ed55f04c260a5
* | am 7b9a10fe: Merge "Fix effects orientation handling." into ics-mr0Eino-Ville Talvala2011-10-202-10/+9
|\ \ | |/ | | | | | | * commit '7b9a10fef160cd452f7905ee52f7b9ac2262faf5': Fix effects orientation handling.
| * Merge "Fix effects orientation handling." into ics-mr0Eino-Ville Talvala2011-10-202-10/+9
| |\
| | * Fix effects orientation handling.Eino-Ville Talvala2011-10-202-10/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Effects orientation was incorrectly using the CameraInfo.orientation field to adjust for true down for face detection, background replacement, and effects recording video orientation. The input surfacetexture from the camera already takes the orientation into account in its transform matrix, resulting in incorrect rotation amounts. Bug: 5488310 Change-Id: I4c4105c44d361ca245874a47e4ff7b93cbd3bb06
* | | am 71d40934: Merge "Fix camera app crash when failed open the camera." into ↵Wu-cheng Li2011-10-201-2/+4
|\ \ \ | |/ / | | | | | | | | | | | | | | | ics-mr0 * commit '71d40934176ee23be9a91ca0aa33656e1cce8ce6': Fix camera app crash when failed open the camera.
| * | Merge "Fix camera app crash when failed open the camera." into ics-mr0Wu-cheng Li2011-10-201-2/+4
| |\ \
| | * | Fix camera app crash when failed open the camera.Angus Kong2011-10-201-2/+4
| | | | | | | | | | | | | | | | | | | | bug:5488657 Change-Id: If22aca555b3f83ea754a67018feea69d6e97031b
* | | | am cf2f19fb: Merge "Fix AE and AWB lock were incorrectly unlocked during ↵Wu-cheng Li2011-10-202-38/+60
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | autofocus." into ics-mr0 * commit 'cf2f19fb053bfe7f39c552b67ffdfc72119ab2d1': Fix AE and AWB lock were incorrectly unlocked during autofocus.
| * | | Merge "Fix AE and AWB lock were incorrectly unlocked during autofocus." into ↵Wu-cheng Li2011-10-202-38/+60
| |\ \ \ | | | | | | | | | | | | | | | ics-mr0
| | * | | Fix AE and AWB lock were incorrectly unlocked during autofocus.Wu-cheng Li2011-10-202-38/+60
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The only actual difference of this patch is not to unlock AE and AWB when the state is STATE_FOCUSING_SNAP_ON_FINISH. bug:5483130 Change-Id: If5108ef3c3677ebed96a291a505408ebfdc4668e
* | | | am 27c97af5: Reduct latency by starting face detection after preview is ↵Wu-cheng Li2011-10-201-1/+5
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | displayed. * commit '27c97af52157672f6201215d2e07497ff6361a8e': Reduct latency by starting face detection after preview is displayed.
| * | | Reduct latency by starting face detection after preview is displayed.Wu-cheng Li2011-10-201-1/+5
| |/ / | | | | | | | | | | | | | | | bug:5446617 Change-Id: I3ddbf269ab882360206fecb59f67ff894b950422
* | | am e0b66a87: Merge "Support for max duration recording with effect" into ics-mr0Pannag Sanketi2011-10-192-0/+20
|\ \ \ | |/ / | | | | | | | | | * commit 'e0b66a87432f452bf4a10ef5e0d835113a8ab69d': Support for max duration recording with effect
| * | Merge "Support for max duration recording with effect" into ics-mr0Pannag Sanketi2011-10-192-0/+20
| |\ \
| | * | Support for max duration recording with effectPannag Sanketi2011-10-192-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | Related to Bug: 5472397 Change-Id: I3634b1c9248da24eb82ff825fe52f4262e59d0e7
* | | | am 0c1ec7e8: Fix the resolver activity shows the apps that cannot play the ↵Wu-cheng Li2011-10-191-7/+19
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | video. * commit '0c1ec7e8cd43de1a4b4cb650b759dd0cbe123eaa': Fix the resolver activity shows the apps that cannot play the video.
| * | | Fix the resolver activity shows the apps that cannot play the video.Wu-cheng Li2011-10-201-7/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Camcorder apps needs to set the mime type to play the captured video in video capture intent mode. bug:5471592 Change-Id: I104baa4ff789fa8bb3136254105bc7284f391723
* | | | am eeeea93f: Reset the video effect when camcorder application starts.Wu-cheng Li2011-10-192-29/+46
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'eeeea93f90ff788a3d86e1e3bb2bb4725adff9ee': Reset the video effect when camcorder application starts.
| * | | Reset the video effect when camcorder application starts.Wu-cheng Li2011-10-202-29/+46
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On video recording, if a Background effect is applied, it is strange to see the popup window the next time the camera app is opened. bug:5477191 To reproduce: -Open camera; -Select Video recorder; -Select settings>Effects>Background; -Activate a background effect; -The pop-up ("Place your device...") comes out; -Effect is active; -Press Home; -Select the Camera app again; -The pop-up is triggered again. The app is in background effect mode. Change-Id: Iea44d7ef2243df5dec961e5ecf67e85b5e971dcb
* | | am f9f24d4c: bugfix 5479807 Video preview displaced to right when ↵Mark Wagner2011-10-191-35/+8
|\ \ \ | |/ / | | | | | | | | | | | | | | | orientation changed * commit 'f9f24d4c578a01cb09a7e5c4c66b75595d3669ee': bugfix 5479807 Video preview displaced to right when orientation changed
| * | bugfix 5479807 Video preview displaced to right when orientation changedMark Wagner2011-10-191-35/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Three changes: (1) center the play button over the thumbnail (2) leverage the existing mechanism for scaling the image for video thumbnails which want to be 4/3 (3) use center_crop for video previews so that they properly align in the ui. Not doing so means we were getting black bars at the top and bottom which was wrong. Change-Id: Ifc416455d03136a393239487db07493dc27f151e
* | | am 7b52266b: Merge "Add hysteresis to orientation rounding." into ics-mr0Eino-Ville Talvala2011-10-194-14/+21
|\ \ \ | |/ / | | | | | | | | | * commit '7b52266b6f9af570f1fdb200a1d0fa7947344e1a': Add hysteresis to orientation rounding.
| * | Merge "Add hysteresis to orientation rounding." into ics-mr0Eino-Ville Talvala2011-10-194-14/+21
| |\ \ | | |/ | |/|
| | * Add hysteresis to orientation rounding.Eino-Ville Talvala2011-10-194-14/+21
| | | | | | | | | | | | | | | | | | | | | | | | This prevents fast flickering between two orientation states, which can result in ugly UI issues, especially with the preview thumbnail. Bug: 5477483 Change-Id: I9513547207ae1918066c1a19947c974eaad72e24
* | | am 53d86908: Merge "Use video capture intent quality when recording with ↵Eino-Ville Talvala2011-10-191-2/+4
|\ \ \ | |/ / | | | | | | | | | | | | | | | effects." into ics-mr0 * commit '53d86908dc3e1cb54add568aa6bc325485e3efe5': Use video capture intent quality when recording with effects.
| * | Merge "Use video capture intent quality when recording with effects." into ↵Eino-Ville Talvala2011-10-191-2/+4
| |\ \ | | | | | | | | | | | | ics-mr0
| | * | Use video capture intent quality when recording with effects.Eino-Ville Talvala2011-10-181-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, effects always used 480p quality. When used for messaging, the intent requests a lower quality, and it needs to be used instead. Bug: 5465146 Change-Id: Ib2ae772de35ad84b8c19f961c71fd9ae43dd4426
* | | | am 55efc325: Fix 5480562: Set indicator orientation after video recording is ↵Chih-Chung Chang2011-10-191-0/+3
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | stopped. * commit '55efc325fc17b911ed1d2a252ea82d995eca2360': Fix 5480562: Set indicator orientation after video recording is stopped.
| * | | Fix 5480562: Set indicator orientation after video recording is stopped.Chih-Chung Chang2011-10-191-0/+3
| |/ / | | | | | | | | | Change-Id: Ic7bd5fe93d38bbe1c291dc9eee82a5aefcfa7c3a
* | | am 967d36c0: Merge "Add timelapse recording support to effects mode." into ↵Pannag Sanketi2011-10-182-4/+52
|\ \ \ | |/ / | | | | | | | | | | | | | | | ics-mr0 * commit '967d36c02eca4ae3af6dcd93ac9c7ffd6401aea5': Add timelapse recording support to effects mode.
| * | Merge "Add timelapse recording support to effects mode." into ics-mr0Pannag Sanketi2011-10-182-4/+52
| |\ \
| | * | Add timelapse recording support to effects mode.Eino-Ville Talvala2011-10-182-4/+52
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 5452088 Change-Id: I87c69e715ccdd6c48f18ecaa1fb4f362e2a9d567