NativePreviewer.diff

the patch - fabien Chevalley, 2011-05-21 09:30 pm

Download (2.3 kB)

 
opencv/android/android-opencv/src/com/opencv/camera/NativePreviewer.java (working copy)
156 156
		
157 157
		// this is available in 8+
158 158
		// parameters.setExposureCompensation(0);
159
		if (parameters.getSupportedWhiteBalance().contains(whitebalance_mode)) {
160
			parameters.setWhiteBalance(whitebalance_mode);
161
		}
162
//		if (parameters.getSupportedAntibanding().contains(
163
//				Camera.Parameters.ANTIBANDING_OFF)) {
164
//			parameters.setAntibanding(Camera.Parameters.ANTIBANDING_OFF);
165
//		}
159
		if (parameters.getSupportedWhiteBalance() != null  
160
			&& parameters.getSupportedWhiteBalance().contains(whitebalance_mode)) { 
161
			   parameters.setWhiteBalance(whitebalance_mode); 
162
		} 
166 163

  
164
		if (parameters.getSupportedAntibanding() != null  
165
			&& parameters.getSupportedAntibanding().contains(Camera.Parameters.ANTIBANDING_OFF)) { 
166
			   parameters.setAntibanding(Camera.Parameters.ANTIBANDING_OFF); 
167
		} 
168

  
167 169
		List<String> fmodes = mCamera.getParameters().getSupportedFocusModes();
168 170
		// for(String x: fmodes){
169 171

  
170 172
		// }
171 173
		
172 174
	
173

  
174 175
		if (parameters.get("meter-mode") != null)
175 176
			parameters.set("meter-mode", "meter-average");
176
		int idx = fmodes.indexOf(Camera.Parameters.FOCUS_MODE_INFINITY);
177
		if (idx != -1) {
178
			parameters.setFocusMode(Camera.Parameters.FOCUS_MODE_INFINITY);
179
		} else if (fmodes.indexOf(Camera.Parameters.FOCUS_MODE_FIXED) != -1) {
180
			parameters.setFocusMode(Camera.Parameters.FOCUS_MODE_FIXED);
181
		}
177
		
178
		if(fmodes != null){
179
			int idx = fmodes.indexOf(Camera.Parameters.FOCUS_MODE_INFINITY);
180
			if (idx != -1) {
181
				parameters.setFocusMode(Camera.Parameters.FOCUS_MODE_INFINITY);
182
			} else if (fmodes.indexOf(Camera.Parameters.FOCUS_MODE_FIXED) != -1) {
183
				parameters.setFocusMode(Camera.Parameters.FOCUS_MODE_FIXED);
184
			}
182 185

  
183
		if (fmodes.indexOf(Camera.Parameters.FOCUS_MODE_AUTO) != -1) {
184
			hasAutoFocus = true;
186
			if (fmodes.indexOf(Camera.Parameters.FOCUS_MODE_AUTO) != -1) {
187
				hasAutoFocus = true;
188
			}
185 189
		}
186

  
187 190
		List<String> scenemodes = mCamera.getParameters()
188 191
				.getSupportedSceneModes();
189 192
		if (scenemodes != null)