requests,
- final CameraCaptureSession.CaptureCallback listener,
- final Handler handler) {
- mCameraHandler.post(new Runnable() {
- public void run() {
- try {
- mCameraSession.setRepeatingBurst(requests, listener, handler);
- } catch (CameraAccessException e) {
- String errorMessage = mErrorDisplayer.getErrorString(e);
- mErrorDisplayer.showErrorDialog(errorMessage);
- }
- }
- });
- }
-
- /**
- * Configure the camera session.
- */
- private void startCameraSession() {
- // Wait until both the camera device is open and the SurfaceView is ready
- if (mCameraDevice == null || mSurfaces == null) return;
-
- try {
- mCameraDevice.createCaptureSession(
- mSurfaces, mCameraSessionListener, mCameraHandler);
- } catch (CameraAccessException e) {
- String errorMessage = mErrorDisplayer.getErrorString(e);
- mErrorDisplayer.showErrorDialog(errorMessage);
- mCameraDevice.close();
- mCameraDevice = null;
- }
- }
-
- /**
- * Main listener for camera session events
- * Invoked on mCameraThread
- */
- private CameraCaptureSession.StateCallback mCameraSessionListener =
- new CameraCaptureSession.StateCallback() {
-
- @Override
- public void onConfigured(CameraCaptureSession session) {
- mCameraSession = session;
- mReadyHandler.post(new Runnable() {
- public void run() {
- // This can happen when the screen is turned off and turned back on.
- if (null == mCameraDevice) {
- return;
- }
-
- mReadyListener.onCameraReady();
- }
- });
-
- }
-
- @Override
- public void onConfigureFailed(CameraCaptureSession session) {
- mErrorDisplayer.showErrorDialog("Unable to configure the capture session");
- mCameraDevice.close();
- mCameraDevice = null;
- }
- };
-
- /**
- * Main listener for camera device events.
- * Invoked on mCameraThread
- */
- private CameraDevice.StateCallback mCameraDeviceListener = new CameraDevice.StateCallback() {
-
- @Override
- public void onOpened(CameraDevice camera) {
- mCameraDevice = camera;
- startCameraSession();
- }
-
- @Override
- public void onClosed(CameraDevice camera) {
- mCloseWaiter.open();
- }
-
- @Override
- public void onDisconnected(CameraDevice camera) {
- mErrorDisplayer.showErrorDialog("The camera device has been disconnected.");
- camera.close();
- mCameraDevice = null;
- }
-
- @Override
- public void onError(CameraDevice camera, int error) {
- mErrorDisplayer.showErrorDialog("The camera encountered an error:" + error);
- camera.close();
- mCameraDevice = null;
- }
-
- };
-
- /**
- * Simple listener for main code to know the camera is ready for requests, or failed to
- * start.
- */
- public interface CameraReadyListener {
- public void onCameraReady();
- }
-
- /**
- * Simple listener for displaying error messages
- */
- public interface ErrorDisplayer {
- public void showErrorDialog(String errorMessage);
-
- public String getErrorString(CameraAccessException e);
- }
-
-}
diff --git a/samples/browseable/HdrViewfinder/src/com.example.android.hdrviewfinder/FixedAspectSurfaceView.java b/samples/browseable/HdrViewfinder/src/com.example.android.hdrviewfinder/FixedAspectSurfaceView.java
deleted file mode 100644
index 48d842b19..000000000
--- a/samples/browseable/HdrViewfinder/src/com.example.android.hdrviewfinder/FixedAspectSurfaceView.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/*
- * Copyright (C) 2014 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.example.android.hdrviewfinder;
-
-import android.content.Context;
-import android.content.res.TypedArray;
-import android.util.AttributeSet;
-import android.util.Log;
-import android.view.GestureDetector;
-import android.view.MotionEvent;
-import android.view.SurfaceView;
-import android.view.View;
-import android.view.ViewGroup.LayoutParams;
-
-/**
- * A SurfaceView that maintains its aspect ratio to be a desired target value.
- *
- * Depending on the layout, the FixedAspectSurfaceView may not be able to maintain the
- * requested aspect ratio. This can happen if both the width and the height are exactly
- * determined by the layout. To avoid this, ensure that either the height or the width is
- * adjustable by the view; for example, by setting the layout parameters to be WRAP_CONTENT for
- * the dimension that is best adjusted to maintain the aspect ratio.
- */
-public class FixedAspectSurfaceView extends SurfaceView {
-
- /**
- * Desired width/height ratio
- */
- private float mAspectRatio;
-
- private GestureDetector mGestureDetector;
-
- public FixedAspectSurfaceView(Context context, AttributeSet attrs) {
- super(context, attrs);
-
- // Get initial aspect ratio from custom attributes
- TypedArray a =
- context.getTheme().obtainStyledAttributes(attrs,
- R.styleable.FixedAspectSurfaceView, 0, 0);
- setAspectRatio(a.getFloat(
- R.styleable.FixedAspectSurfaceView_aspectRatio, 1.f));
- a.recycle();
- }
-
- /**
- * Set the desired aspect ratio for this view.
- *
- * @param aspect the desired width/height ratio in the current UI orientation. Must be a
- * positive value.
- */
- public void setAspectRatio(float aspect) {
- if (aspect <= 0) {
- throw new IllegalArgumentException("Aspect ratio must be positive");
- }
- mAspectRatio = aspect;
- requestLayout();
- }
-
- /**
- * Set a gesture listener to listen for touch events
- */
- public void setGestureListener(Context context, GestureDetector.OnGestureListener listener) {
- if (listener == null) {
- mGestureDetector = null;
- } else {
- mGestureDetector = new GestureDetector(context, listener);
- }
- }
-
- @Override
- protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
-
- int widthMode = MeasureSpec.getMode(widthMeasureSpec);
- int heightMode = MeasureSpec.getMode(heightMeasureSpec);
- int width = MeasureSpec.getSize(widthMeasureSpec);
- int height = MeasureSpec.getSize(heightMeasureSpec);
-
- // General goal: Adjust dimensions to maintain the requested aspect ratio as much
- // as possible. Depending on the measure specs handed down, this may not be possible
-
- // Only set one of these to true
- boolean scaleWidth = false;
- boolean scaleHeight = false;
-
- // Sort out which dimension to scale, if either can be. There are 9 combinations of
- // possible measure specs; a few cases below handle multiple combinations
- if (widthMode == MeasureSpec.EXACTLY && heightMode == MeasureSpec.EXACTLY) {
- // Can't adjust sizes at all, do nothing
- } else if (widthMode == MeasureSpec.EXACTLY) {
- // Width is fixed, heightMode either AT_MOST or UNSPECIFIED, so adjust height
- scaleHeight = true;
- } else if (heightMode == MeasureSpec.EXACTLY) {
- // Height is fixed, widthMode either AT_MOST or UNSPECIFIED, so adjust width
- scaleWidth = true;
- } else if (widthMode == MeasureSpec.AT_MOST && heightMode == MeasureSpec.AT_MOST) {
- // Need to fit into box <= [width, height] in size.
- // Maximize the View's area while maintaining aspect ratio
- // This means keeping one dimension as large as possible and shrinking the other
- float boxAspectRatio = width / (float) height;
- if (boxAspectRatio > mAspectRatio) {
- // Box is wider than requested aspect; pillarbox
- scaleWidth = true;
- } else {
- // Box is narrower than requested aspect; letterbox
- scaleHeight = true;
- }
- } else if (widthMode == MeasureSpec.AT_MOST) {
- // Maximize width, heightSpec is UNSPECIFIED
- scaleHeight = true;
- } else if (heightMode == MeasureSpec.AT_MOST) {
- // Maximize height, widthSpec is UNSPECIFIED
- scaleWidth = true;
- } else {
- // Both MeasureSpecs are UNSPECIFIED. This is probably a pathological layout,
- // with width == height == 0
- // but arbitrarily scale height anyway
- scaleHeight = true;
- }
-
- // Do the scaling
- if (scaleWidth) {
- width = (int) (height * mAspectRatio);
- } else if (scaleHeight) {
- height = (int) (width / mAspectRatio);
- }
-
- // Override width/height if needed for EXACTLY and AT_MOST specs
- width = View.resolveSizeAndState(width, widthMeasureSpec, 0);
- height = View.resolveSizeAndState(height, heightMeasureSpec, 0);
-
- // Finally set the calculated dimensions
- setMeasuredDimension(width, height);
- }
-
- @Override
- public boolean onTouchEvent(MotionEvent event) {
- if (mGestureDetector != null) {
- return mGestureDetector.onTouchEvent(event);
- }
- return false;
- }
-}
diff --git a/samples/browseable/HdrViewfinder/src/com.example.android.hdrviewfinder/HdrViewfinderActivity.java b/samples/browseable/HdrViewfinder/src/com.example.android.hdrviewfinder/HdrViewfinderActivity.java
deleted file mode 100644
index ca49ea0ba..000000000
--- a/samples/browseable/HdrViewfinder/src/com.example.android.hdrviewfinder/HdrViewfinderActivity.java
+++ /dev/null
@@ -1,667 +0,0 @@
-/*
- * Copyright (C) 2014 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.example.android.hdrviewfinder;
-
-import android.Manifest;
-import android.content.Intent;
-import android.content.pm.PackageManager;
-import android.hardware.camera2.CameraAccessException;
-import android.hardware.camera2.CameraCaptureSession;
-import android.hardware.camera2.CameraCharacteristics;
-import android.hardware.camera2.CameraDevice;
-import android.hardware.camera2.CameraManager;
-import android.hardware.camera2.CaptureRequest;
-import android.hardware.camera2.CaptureResult;
-import android.hardware.camera2.TotalCaptureResult;
-import android.hardware.camera2.params.StreamConfigurationMap;
-import android.net.Uri;
-import android.os.Bundle;
-import android.os.Handler;
-import android.os.Looper;
-import android.provider.Settings;
-import android.renderscript.RenderScript;
-import android.support.annotation.NonNull;
-import android.support.design.widget.Snackbar;
-import android.support.v4.app.ActivityCompat;
-import android.support.v7.app.AppCompatActivity;
-import android.util.Log;
-import android.util.Size;
-import android.view.GestureDetector;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.MotionEvent;
-import android.view.Surface;
-import android.view.SurfaceHolder;
-import android.view.View;
-import android.widget.Button;
-import android.widget.TextView;
-
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * A small demo of advanced camera functionality with the Android camera2 API.
- *
- * This demo implements a real-time high-dynamic-range camera viewfinder,
- * by alternating the sensor's exposure time between two exposure values on even and odd
- * frames, and then compositing together the latest two frames whenever a new frame is
- * captured.
- *
- * The demo has three modes: Regular auto-exposure viewfinder, split-screen manual exposure,
- * and the fused HDR viewfinder. The latter two use manual exposure controlled by the user,
- * by swiping up/down on the right and left halves of the viewfinder. The left half controls
- * the exposure time of even frames, and the right half controls the exposure time of odd frames.
- *
- *
- * In split-screen mode, the even frames are shown on the left and the odd frames on the right,
- * so the user can see two different exposures of the scene simultaneously. In fused HDR mode,
- * the even/odd frames are merged together into a single image. By selecting different exposure
- * values for the even/odd frames, the fused image has a higher dynamic range than the regular
- * viewfinder.
- *
- * The HDR fusion and the split-screen viewfinder processing is done with RenderScript; as is the
- * necessary YUV->RGB conversion. The camera subsystem outputs YUV images naturally, while the GPU
- * and display subsystems generally only accept RGB data. Therefore, after the images are
- * fused/composited, a standard YUV->RGB color transform is applied before the the data is written
- * to the output Allocation. The HDR fusion algorithm is very simple, and tends to result in
- * lower-contrast scenes, but has very few artifacts and can run very fast.
- *
- * Data is passed between the subsystems (camera, RenderScript, and display) using the
- * Android {@link android.view.Surface} class, which allows for zero-copy transport of large
- * buffers between processes and subsystems.
- */
-public class HdrViewfinderActivity extends AppCompatActivity implements
- SurfaceHolder.Callback, CameraOps.ErrorDisplayer, CameraOps.CameraReadyListener {
-
- private static final String TAG = "HdrViewfinderDemo";
-
- private static final String FRAGMENT_DIALOG = "dialog";
-
- private static final int REQUEST_PERMISSIONS_REQUEST_CODE = 34;
-
- /**
- * View for the camera preview.
- */
- private FixedAspectSurfaceView mPreviewView;
-
- /**
- * Root view of this activity.
- */
- private View rootView;
-
- /**
- * This shows the current mode of the app.
- */
- private TextView mModeText;
-
- // These show lengths of exposure for even frames, exposure for odd frames, and auto exposure.
- private TextView mEvenExposureText, mOddExposureText, mAutoExposureText;
-
- private Handler mUiHandler;
-
- private CameraCharacteristics mCameraInfo;
-
- private Surface mPreviewSurface;
- private Surface mProcessingHdrSurface;
- private Surface mProcessingNormalSurface;
- CaptureRequest.Builder mHdrBuilder;
- ArrayList mHdrRequests = new ArrayList(2);
-
- CaptureRequest mPreviewRequest;
-
- RenderScript mRS;
- ViewfinderProcessor mProcessor;
- CameraManager mCameraManager;
- CameraOps mCameraOps;
-
- private int mRenderMode = ViewfinderProcessor.MODE_NORMAL;
-
- // Durations in nanoseconds
- private static final long MICRO_SECOND = 1000;
- private static final long MILLI_SECOND = MICRO_SECOND * 1000;
- private static final long ONE_SECOND = MILLI_SECOND * 1000;
-
- private long mOddExposure = ONE_SECOND / 33;
- private long mEvenExposure = ONE_SECOND / 33;
-
- private Object mOddExposureTag = new Object();
- private Object mEvenExposureTag = new Object();
- private Object mAutoExposureTag = new Object();
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.main);
-
- rootView = findViewById(R.id.panels);
-
- mPreviewView = (FixedAspectSurfaceView) findViewById(R.id.preview);
- mPreviewView.getHolder().addCallback(this);
- mPreviewView.setGestureListener(this, mViewListener);
-
- Button helpButton = (Button) findViewById(R.id.help_button);
- helpButton.setOnClickListener(mHelpButtonListener);
-
- mModeText = (TextView) findViewById(R.id.mode_label);
- mEvenExposureText = (TextView) findViewById(R.id.even_exposure);
- mOddExposureText = (TextView) findViewById(R.id.odd_exposure);
- mAutoExposureText = (TextView) findViewById(R.id.auto_exposure);
-
- mUiHandler = new Handler(Looper.getMainLooper());
-
- mRS = RenderScript.create(this);
-
- // When permissions are revoked the app is restarted so onCreate is sufficient to check for
- // permissions core to the Activity's functionality.
- if (!checkCameraPermissions()) {
- requestCameraPermissions();
- } else {
- findAndOpenCamera();
- }
- }
-
- @Override
- protected void onResume() {
- super.onResume();
- }
-
- @Override
- protected void onPause() {
- super.onPause();
-
- // Wait until camera is closed to ensure the next application can open it
- if (mCameraOps != null) {
- mCameraOps.closeCameraAndWait();
- mCameraOps = null;
- }
- }
-
- @Override
- public boolean onCreateOptionsMenu(Menu menu) {
- getMenuInflater().inflate(R.menu.main, menu);
- return super.onCreateOptionsMenu(menu);
- }
-
- @Override
- public boolean onOptionsItemSelected(MenuItem item) {
- switch (item.getItemId()) {
- case R.id.info: {
- MessageDialogFragment.newInstance(R.string.intro_message)
- .show(getFragmentManager(), FRAGMENT_DIALOG);
- break;
- }
- }
- return super.onOptionsItemSelected(item);
- }
-
- private GestureDetector.OnGestureListener mViewListener
- = new GestureDetector.SimpleOnGestureListener() {
-
- @Override
- public boolean onDown(MotionEvent e) {
- return true;
- }
-
- @Override
- public boolean onSingleTapUp(MotionEvent e) {
- switchRenderMode(1);
- return true;
- }
-
- @Override
- public boolean onScroll(MotionEvent e1, MotionEvent e2, float distanceX, float distanceY) {
- if (mRenderMode == ViewfinderProcessor.MODE_NORMAL) return false;
-
- float xPosition = e1.getAxisValue(MotionEvent.AXIS_X);
- float width = mPreviewView.getWidth();
- float height = mPreviewView.getHeight();
-
- float xPosNorm = xPosition / width;
- float yDistNorm = distanceY / height;
-
- final float ACCELERATION_FACTOR = 8;
- double scaleFactor = Math.pow(2.f, yDistNorm * ACCELERATION_FACTOR);
-
- // Even on left, odd on right
- if (xPosNorm > 0.5) {
- mOddExposure *= scaleFactor;
- } else {
- mEvenExposure *= scaleFactor;
- }
-
- setHdrBurst();
-
- return true;
- }
- };
-
- /**
- * Show help dialogs.
- */
- private View.OnClickListener mHelpButtonListener = new View.OnClickListener() {
- public void onClick(View v) {
- MessageDialogFragment.newInstance(R.string.help_text)
- .show(getFragmentManager(), FRAGMENT_DIALOG);
- }
- };
-
- /**
- * Return the current state of the camera permissions.
- */
- private boolean checkCameraPermissions() {
- int permissionState = ActivityCompat.checkSelfPermission(this, Manifest.permission.CAMERA);
-
- // Check if the Camera permission is already available.
- if (permissionState != PackageManager.PERMISSION_GRANTED) {
- // Camera permission has not been granted.
- Log.i(TAG, "CAMERA permission has NOT been granted.");
- return false;
- } else {
- // Camera permissions are available.
- Log.i(TAG, "CAMERA permission has already been granted.");
- return true;
- }
- }
-
- /**
- * Attempt to initialize the camera.
- */
- private void initializeCamera() {
- mCameraManager = (CameraManager) getSystemService(CAMERA_SERVICE);
- if (mCameraManager != null) {
- mCameraOps = new CameraOps(mCameraManager,
- /*errorDisplayer*/ this,
- /*readyListener*/ this,
- /*readyHandler*/ mUiHandler);
-
- mHdrRequests.add(null);
- mHdrRequests.add(null);
- } else {
- Log.e(TAG, "Couldn't initialize the camera");
- }
- }
-
- private void requestCameraPermissions() {
- boolean shouldProvideRationale =
- ActivityCompat.shouldShowRequestPermissionRationale(this,
- Manifest.permission.CAMERA);
-
- // Provide an additional rationale to the user. This would happen if the user denied the
- // request previously, but didn't check the "Don't ask again" checkbox.
- if (shouldProvideRationale) {
- Log.i(TAG, "Displaying camera permission rationale to provide additional context.");
- Snackbar.make(rootView, R.string.camera_permission_rationale, Snackbar
- .LENGTH_INDEFINITE)
- .setAction(R.string.ok, new View.OnClickListener() {
- @Override
- public void onClick(View view) {
- // Request Camera permission
- ActivityCompat.requestPermissions(HdrViewfinderActivity.this,
- new String[]{Manifest.permission.CAMERA},
- REQUEST_PERMISSIONS_REQUEST_CODE);
- }
- })
- .show();
- } else {
- Log.i(TAG, "Requesting camera permission");
- // Request Camera permission. It's possible this can be auto answered if device policy
- // sets the permission in a given state or the user denied the permission
- // previously and checked "Never ask again".
- ActivityCompat.requestPermissions(HdrViewfinderActivity.this,
- new String[]{Manifest.permission.CAMERA},
- REQUEST_PERMISSIONS_REQUEST_CODE);
- }
- }
-
- /**
- * Callback received when a permissions request has been completed.
- */
- @Override
- public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions,
- @NonNull int[] grantResults) {
- Log.i(TAG, "onRequestPermissionResult");
- if (requestCode == REQUEST_PERMISSIONS_REQUEST_CODE) {
- if (grantResults.length <= 0) {
- // If user interaction was interrupted, the permission request is cancelled and you
- // receive empty arrays.
- Log.i(TAG, "User interaction was cancelled.");
- } else if (grantResults[0] == PackageManager.PERMISSION_GRANTED) {
- // Permission was granted.
- findAndOpenCamera();
- } else {
- // Permission denied.
-
- // In this Activity we've chosen to notify the user that they
- // have rejected a core permission for the app since it makes the Activity useless.
- // We're communicating this message in a Snackbar since this is a sample app, but
- // core permissions would typically be best requested during a welcome-screen flow.
-
- // Additionally, it is important to remember that a permission might have been
- // rejected without asking the user for permission (device policy or "Never ask
- // again" prompts). Therefore, a user interface affordance is typically implemented
- // when permissions are denied. Otherwise, your app could appear unresponsive to
- // touches or interactions which have required permissions.
- Snackbar.make(rootView, R.string.camera_permission_denied_explanation, Snackbar
- .LENGTH_INDEFINITE)
- .setAction(R.string.settings, new View.OnClickListener() {
- @Override
- public void onClick(View view) {
- // Build intent that displays the App settings screen.
- Intent intent = new Intent();
- intent.setAction(Settings.ACTION_APPLICATION_DETAILS_SETTINGS);
- Uri uri = Uri.fromParts("package", BuildConfig.APPLICATION_ID, null);
- intent.setData(uri);
- intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
- startActivity(intent);
- }
- })
- .show();
- }
- }
- }
-
- private void findAndOpenCamera() {
- boolean cameraPermissions = checkCameraPermissions();
- if (cameraPermissions) {
- String errorMessage = "Unknown error";
- boolean foundCamera = false;
- initializeCamera();
- if (cameraPermissions && mCameraOps != null) {
- try {
- // Find first back-facing camera that has necessary capability.
- String[] cameraIds = mCameraManager.getCameraIdList();
- for (String id : cameraIds) {
- CameraCharacteristics info = mCameraManager.getCameraCharacteristics(id);
- int facing = info.get(CameraCharacteristics.LENS_FACING);
-
- int level = info.get(CameraCharacteristics.INFO_SUPPORTED_HARDWARE_LEVEL);
- boolean hasFullLevel
- = (level
- == CameraCharacteristics.INFO_SUPPORTED_HARDWARE_LEVEL_FULL);
-
- int[] capabilities = info
- .get(CameraCharacteristics.REQUEST_AVAILABLE_CAPABILITIES);
- int syncLatency = info.get(CameraCharacteristics.SYNC_MAX_LATENCY);
- boolean hasManualControl = hasCapability(capabilities,
- CameraCharacteristics.REQUEST_AVAILABLE_CAPABILITIES_MANUAL_SENSOR);
- boolean hasEnoughCapability = hasManualControl &&
- syncLatency
- == CameraCharacteristics.SYNC_MAX_LATENCY_PER_FRAME_CONTROL;
-
- // All these are guaranteed by
- // CameraCharacteristics.INFO_SUPPORTED_HARDWARE_LEVEL_FULL, but checking
- // for only the things we care about expands range of devices we can run on.
- // We want:
- // - Back-facing camera
- // - Manual sensor control
- // - Per-frame synchronization (so that exposure can be changed every frame)
- if (facing == CameraCharacteristics.LENS_FACING_BACK &&
- (hasFullLevel || hasEnoughCapability)) {
- // Found suitable camera - get info, open, and set up outputs
- mCameraInfo = info;
- mCameraOps.openCamera(id);
- configureSurfaces();
- foundCamera = true;
- break;
- }
- }
- if (!foundCamera) {
- errorMessage = getString(R.string.camera_no_good);
- }
- } catch (CameraAccessException e) {
- errorMessage = getErrorString(e);
- }
- if (!foundCamera) {
- showErrorDialog(errorMessage);
- }
- }
- }
- }
-
- private boolean hasCapability(int[] capabilities, int capability) {
- for (int c : capabilities) {
- if (c == capability) return true;
- }
- return false;
- }
-
- private void switchRenderMode(int direction) {
- if (mCameraOps != null) {
- mRenderMode = (mRenderMode + direction) % 3;
-
- mModeText.setText(getResources().getStringArray(R.array.mode_label_array)[mRenderMode]);
-
- if (mProcessor != null) {
- mProcessor.setRenderMode(mRenderMode);
- }
- if (mRenderMode == ViewfinderProcessor.MODE_NORMAL) {
- mCameraOps.setRepeatingRequest(mPreviewRequest,
- mCaptureCallback, mUiHandler);
- } else {
- setHdrBurst();
- }
- }
- }
-
- /**
- * Configure the surfaceview and RS processing.
- */
- private void configureSurfaces() {
- // Find a good size for output - largest 16:9 aspect ratio that's less than 720p
- final int MAX_WIDTH = 1280;
- final float TARGET_ASPECT = 16.f / 9.f;
- final float ASPECT_TOLERANCE = 0.1f;
-
- StreamConfigurationMap configs =
- mCameraInfo.get(CameraCharacteristics.SCALER_STREAM_CONFIGURATION_MAP);
-
- Size[] outputSizes = configs.getOutputSizes(SurfaceHolder.class);
-
- Size outputSize = outputSizes[0];
- float outputAspect = (float) outputSize.getWidth() / outputSize.getHeight();
- for (Size candidateSize : outputSizes) {
- if (candidateSize.getWidth() > MAX_WIDTH) continue;
- float candidateAspect = (float) candidateSize.getWidth() / candidateSize.getHeight();
- boolean goodCandidateAspect =
- Math.abs(candidateAspect - TARGET_ASPECT) < ASPECT_TOLERANCE;
- boolean goodOutputAspect =
- Math.abs(outputAspect - TARGET_ASPECT) < ASPECT_TOLERANCE;
- if ((goodCandidateAspect && !goodOutputAspect) ||
- candidateSize.getWidth() > outputSize.getWidth()) {
- outputSize = candidateSize;
- outputAspect = candidateAspect;
- }
- }
- Log.i(TAG, "Resolution chosen: " + outputSize);
-
- // Configure processing
- mProcessor = new ViewfinderProcessor(mRS, outputSize);
- setupProcessor();
-
- // Configure the output view - this will fire surfaceChanged
- mPreviewView.setAspectRatio(outputAspect);
- mPreviewView.getHolder().setFixedSize(outputSize.getWidth(), outputSize.getHeight());
- }
-
- /**
- * Once camera is open and output surfaces are ready, configure the RS processing
- * and the camera device inputs/outputs.
- */
- private void setupProcessor() {
- if (mProcessor == null || mPreviewSurface == null) return;
-
- mProcessor.setOutputSurface(mPreviewSurface);
- mProcessingHdrSurface = mProcessor.getInputHdrSurface();
- mProcessingNormalSurface = mProcessor.getInputNormalSurface();
-
- List cameraOutputSurfaces = new ArrayList();
- cameraOutputSurfaces.add(mProcessingHdrSurface);
- cameraOutputSurfaces.add(mProcessingNormalSurface);
-
- mCameraOps.setSurfaces(cameraOutputSurfaces);
- }
-
- /**
- * Start running an HDR burst on a configured camera session
- */
- public void setHdrBurst() {
-
- mHdrBuilder.set(CaptureRequest.SENSOR_SENSITIVITY, 1600);
- mHdrBuilder.set(CaptureRequest.SENSOR_FRAME_DURATION, ONE_SECOND / 30);
-
- mHdrBuilder.set(CaptureRequest.SENSOR_EXPOSURE_TIME, mEvenExposure);
- mHdrBuilder.setTag(mEvenExposureTag);
- mHdrRequests.set(0, mHdrBuilder.build());
-
- mHdrBuilder.set(CaptureRequest.SENSOR_EXPOSURE_TIME, mOddExposure);
- mHdrBuilder.setTag(mOddExposureTag);
- mHdrRequests.set(1, mHdrBuilder.build());
-
- mCameraOps.setRepeatingBurst(mHdrRequests, mCaptureCallback, mUiHandler);
- }
-
- /**
- * Listener for completed captures
- * Invoked on UI thread
- */
- private CameraCaptureSession.CaptureCallback mCaptureCallback
- = new CameraCaptureSession.CaptureCallback() {
-
- public void onCaptureCompleted(CameraCaptureSession session, CaptureRequest request,
- TotalCaptureResult result) {
-
- // Only update UI every so many frames
- // Use an odd number here to ensure both even and odd exposures get an occasional update
- long frameNumber = result.getFrameNumber();
- if (frameNumber % 3 != 0) return;
-
- long exposureTime = result.get(CaptureResult.SENSOR_EXPOSURE_TIME);
-
- // Format exposure time nicely
- String exposureText;
- if (exposureTime > ONE_SECOND) {
- exposureText = String.format("%.2f s", exposureTime / 1e9);
- } else if (exposureTime > MILLI_SECOND) {
- exposureText = String.format("%.2f ms", exposureTime / 1e6);
- } else if (exposureTime > MICRO_SECOND) {
- exposureText = String.format("%.2f us", exposureTime / 1e3);
- } else {
- exposureText = String.format("%d ns", exposureTime);
- }
-
- Object tag = request.getTag();
- Log.i(TAG, "Exposure: " + exposureText);
-
- if (tag == mEvenExposureTag) {
- mEvenExposureText.setText(exposureText);
-
- mEvenExposureText.setEnabled(true);
- mOddExposureText.setEnabled(true);
- mAutoExposureText.setEnabled(false);
- } else if (tag == mOddExposureTag) {
- mOddExposureText.setText(exposureText);
-
- mEvenExposureText.setEnabled(true);
- mOddExposureText.setEnabled(true);
- mAutoExposureText.setEnabled(false);
- } else {
- mAutoExposureText.setText(exposureText);
-
- mEvenExposureText.setEnabled(false);
- mOddExposureText.setEnabled(false);
- mAutoExposureText.setEnabled(true);
- }
- }
- };
-
- /**
- * Callbacks for the FixedAspectSurfaceView
- */
-
- @Override
- public void surfaceChanged(SurfaceHolder holder, int format, int width, int height) {
- mPreviewSurface = holder.getSurface();
-
- setupProcessor();
- }
-
- @Override
- public void surfaceCreated(SurfaceHolder holder) {
- // ignored
- }
-
- @Override
- public void surfaceDestroyed(SurfaceHolder holder) {
- mPreviewSurface = null;
- }
-
- /**
- * Callbacks for CameraOps
- */
- @Override
- public void onCameraReady() {
- // Ready to send requests in, so set them up
- try {
- CaptureRequest.Builder previewBuilder =
- mCameraOps.createCaptureRequest(CameraDevice.TEMPLATE_PREVIEW);
- previewBuilder.addTarget(mProcessingNormalSurface);
- previewBuilder.setTag(mAutoExposureTag);
- mPreviewRequest = previewBuilder.build();
-
- mHdrBuilder =
- mCameraOps.createCaptureRequest(CameraDevice.TEMPLATE_PREVIEW);
- mHdrBuilder.set(CaptureRequest.CONTROL_AE_MODE,
- CaptureRequest.CONTROL_AE_MODE_OFF);
- mHdrBuilder.addTarget(mProcessingHdrSurface);
-
- switchRenderMode(0);
-
- } catch (CameraAccessException e) {
- String errorMessage = getErrorString(e);
- showErrorDialog(errorMessage);
- }
- }
-
- /**
- * Utility methods
- */
- @Override
- public void showErrorDialog(String errorMessage) {
- MessageDialogFragment.newInstance(errorMessage).show(getFragmentManager(), FRAGMENT_DIALOG);
- }
-
- @Override
- public String getErrorString(CameraAccessException e) {
- String errorMessage;
- switch (e.getReason()) {
- case CameraAccessException.CAMERA_DISABLED:
- errorMessage = getString(R.string.camera_disabled);
- break;
- case CameraAccessException.CAMERA_DISCONNECTED:
- errorMessage = getString(R.string.camera_disconnected);
- break;
- case CameraAccessException.CAMERA_ERROR:
- errorMessage = getString(R.string.camera_error);
- break;
- default:
- errorMessage = getString(R.string.camera_unknown, e.getReason());
- break;
- }
- return errorMessage;
- }
-
-}
diff --git a/samples/browseable/HdrViewfinder/src/com.example.android.hdrviewfinder/MessageDialogFragment.java b/samples/browseable/HdrViewfinder/src/com.example.android.hdrviewfinder/MessageDialogFragment.java
deleted file mode 100644
index b1bdf9e00..000000000
--- a/samples/browseable/HdrViewfinder/src/com.example.android.hdrviewfinder/MessageDialogFragment.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright (C) 2014 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.example.android.hdrviewfinder;
-
-import android.app.AlertDialog;
-import android.app.Dialog;
-import android.app.DialogFragment;
-import android.os.Bundle;
-
-public class MessageDialogFragment extends DialogFragment {
-
- private static final String ARG_MESSAGE_INT = "message_int";
- private static final String ARG_MESSAGE_STRING = "message_string";
-
- public static MessageDialogFragment newInstance(int message) {
- MessageDialogFragment fragment = new MessageDialogFragment();
- Bundle args = new Bundle();
- args.putInt(ARG_MESSAGE_INT, message);
- fragment.setArguments(args);
- return fragment;
- }
-
- public static MessageDialogFragment newInstance(String message) {
- MessageDialogFragment fragment = new MessageDialogFragment();
- Bundle args = new Bundle();
- args.putString(ARG_MESSAGE_STRING, message);
- fragment.setArguments(args);
- return fragment;
- }
-
- @Override
- public Dialog onCreateDialog(Bundle savedInstanceState) {
- AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
- builder.setPositiveButton(android.R.string.ok, null);
- Bundle args = getArguments();
- if (args.containsKey(ARG_MESSAGE_INT)) {
- builder.setMessage(args.getInt(ARG_MESSAGE_INT));
- } else if (args.containsKey(ARG_MESSAGE_STRING)) {
- builder.setMessage(args.getString(ARG_MESSAGE_STRING));
- }
- return builder.create();
- }
-
-}
diff --git a/samples/browseable/HdrViewfinder/src/com.example.android.hdrviewfinder/ViewfinderProcessor.java b/samples/browseable/HdrViewfinder/src/com.example.android.hdrviewfinder/ViewfinderProcessor.java
deleted file mode 100644
index f51dfaa89..000000000
--- a/samples/browseable/HdrViewfinder/src/com.example.android.hdrviewfinder/ViewfinderProcessor.java
+++ /dev/null
@@ -1,165 +0,0 @@
-/*
- * Copyright (C) 2014 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.example.android.hdrviewfinder;
-
-import android.graphics.ImageFormat;
-import android.os.Handler;
-import android.os.HandlerThread;
-import android.renderscript.Allocation;
-import android.renderscript.Element;
-import android.renderscript.RenderScript;
-import android.renderscript.Type;
-import android.util.Size;
-import android.view.Surface;
-
-/**
- * Renderscript-based merger for an HDR viewfinder
- */
-public class ViewfinderProcessor {
-
- private Allocation mInputHdrAllocation;
- private Allocation mInputNormalAllocation;
- private Allocation mPrevAllocation;
- private Allocation mOutputAllocation;
-
- private Surface mOutputSurface;
- private HandlerThread mProcessingThread;
- private Handler mProcessingHandler;
- private ScriptC_hdr_merge mHdrMergeScript;
-
- public ProcessingTask mHdrTask;
- public ProcessingTask mNormalTask;
-
- private Size mSize;
-
- private int mMode;
-
- public final static int MODE_NORMAL = 0;
- public final static int MODE_SIDE_BY_SIDE = 1;
- public final static int MODE_HDR = 2;
-
- public ViewfinderProcessor(RenderScript rs, Size dimensions) {
- mSize = dimensions;
-
- Type.Builder yuvTypeBuilder = new Type.Builder(rs, Element.YUV(rs));
- yuvTypeBuilder.setX(dimensions.getWidth());
- yuvTypeBuilder.setY(dimensions.getHeight());
- yuvTypeBuilder.setYuvFormat(ImageFormat.YUV_420_888);
- mInputHdrAllocation = Allocation.createTyped(rs, yuvTypeBuilder.create(),
- Allocation.USAGE_IO_INPUT | Allocation.USAGE_SCRIPT);
- mInputNormalAllocation = Allocation.createTyped(rs, yuvTypeBuilder.create(),
- Allocation.USAGE_IO_INPUT | Allocation.USAGE_SCRIPT);
-
- Type.Builder rgbTypeBuilder = new Type.Builder(rs, Element.RGBA_8888(rs));
- rgbTypeBuilder.setX(dimensions.getWidth());
- rgbTypeBuilder.setY(dimensions.getHeight());
- mPrevAllocation = Allocation.createTyped(rs, rgbTypeBuilder.create(),
- Allocation.USAGE_SCRIPT);
- mOutputAllocation = Allocation.createTyped(rs, rgbTypeBuilder.create(),
- Allocation.USAGE_IO_OUTPUT | Allocation.USAGE_SCRIPT);
-
- mProcessingThread = new HandlerThread("ViewfinderProcessor");
- mProcessingThread.start();
- mProcessingHandler = new Handler(mProcessingThread.getLooper());
-
- mHdrMergeScript = new ScriptC_hdr_merge(rs);
-
- mHdrMergeScript.set_gPrevFrame(mPrevAllocation);
-
- mHdrTask = new ProcessingTask(mInputHdrAllocation, dimensions.getWidth()/2, true);
- mNormalTask = new ProcessingTask(mInputNormalAllocation, 0, false);
-
- setRenderMode(MODE_NORMAL);
- }
-
- public Surface getInputHdrSurface() {
- return mInputHdrAllocation.getSurface();
- }
-
- public Surface getInputNormalSurface() {
- return mInputNormalAllocation.getSurface();
- }
-
- public void setOutputSurface(Surface output) {
- mOutputAllocation.setSurface(output);
- }
-
- public void setRenderMode(int mode) {
- mMode = mode;
- }
-
- /**
- * Simple class to keep track of incoming frame count,
- * and to process the newest one in the processing thread
- */
- class ProcessingTask implements Runnable, Allocation.OnBufferAvailableListener {
- private int mPendingFrames = 0;
- private int mFrameCounter = 0;
- private int mCutPointX;
- private boolean mCheckMerge;
-
- private Allocation mInputAllocation;
-
- public ProcessingTask(Allocation input, int cutPointX, boolean checkMerge) {
- mInputAllocation = input;
- mInputAllocation.setOnBufferAvailableListener(this);
- mCutPointX = cutPointX;
- mCheckMerge = checkMerge;
- }
-
- @Override
- public void onBufferAvailable(Allocation a) {
- synchronized(this) {
- mPendingFrames++;
- mProcessingHandler.post(this);
- }
- }
-
- @Override
- public void run() {
-
- // Find out how many frames have arrived
- int pendingFrames;
- synchronized(this) {
- pendingFrames = mPendingFrames;
- mPendingFrames = 0;
-
- // Discard extra messages in case processing is slower than frame rate
- mProcessingHandler.removeCallbacks(this);
- }
-
- // Get to newest input
- for (int i = 0; i < pendingFrames; i++) {
- mInputAllocation.ioReceive();
- }
-
- mHdrMergeScript.set_gFrameCounter(mFrameCounter++);
- mHdrMergeScript.set_gCurrentFrame(mInputAllocation);
- mHdrMergeScript.set_gCutPointX(mCutPointX);
- if (mCheckMerge && mMode == MODE_HDR) {
- mHdrMergeScript.set_gDoMerge(1);
- } else {
- mHdrMergeScript.set_gDoMerge(0);
- }
-
- // Run processing pass
- mHdrMergeScript.forEach_mergeHdrFrames(mPrevAllocation, mOutputAllocation);
- mOutputAllocation.ioSend();
- }
- }
-
-}
diff --git a/samples/browseable/HdrViewfinder/src/rs/hdr_merge.rscript b/samples/browseable/HdrViewfinder/src/rs/hdr_merge.rscript
deleted file mode 100644
index f176fd71f..000000000
--- a/samples/browseable/HdrViewfinder/src/rs/hdr_merge.rscript
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright (C) 2014 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-#pragma version(1)
-#pragma rs java_package_name(com.example.android.hdrviewfinder)
-#pragma rs_fp_relaxed
-
-rs_allocation gCurrentFrame;
-rs_allocation gPrevFrame;
-
-int gCutPointX = 0;
-int gDoMerge = 0;
-int gFrameCounter = 0;
-
-uchar4 __attribute__((kernel)) mergeHdrFrames(uchar4 prevPixel, uint32_t x, uint32_t y) {
-
- // Read in pixel values from latest frame - YUV color space
-
- uchar4 curPixel;
- curPixel.r = rsGetElementAtYuv_uchar_Y(gCurrentFrame, x, y);
- curPixel.g = rsGetElementAtYuv_uchar_U(gCurrentFrame, x, y);
- curPixel.b = rsGetElementAtYuv_uchar_V(gCurrentFrame, x, y);
- curPixel.a = 255;
-
- uchar4 mergedPixel;
- if (gDoMerge == 1) {
- // Complex HDR fusion technique
- mergedPixel = curPixel / 2 + prevPixel / 2;
-
- /* Experimental color saturation boosting merge
- mergedPixel.r = curPixel.r / 2 + prevPixel.r / 2;
-
- uchar saturationCurrent = abs(curPixel.g - 128) + abs(curPixel.b - 128);
- uchar saturationPrev = abs(prevPixel.g - 128) + abs(prevPixel.b - 128);
- mergedPixel.g = saturationCurrent > saturationPrev ? curPixel.g : prevPixel.g;
- mergedPixel.b = saturationCurrent > saturationPrev ? curPixel.b : prevPixel.b;
- */
- } else if (gCutPointX > 0) {
- // Composite side by side
- mergedPixel = ((x < gCutPointX) ^ (gFrameCounter & 0x1)) ?
- curPixel : prevPixel;
- } else {
- // Straight passthrough
- mergedPixel = curPixel;
- }
-
- // Convert YUV to RGB, JFIF transform with fixed-point math
- // R = Y + 1.402 * (V - 128)
- // G = Y - 0.34414 * (U - 128) - 0.71414 * (V - 128)
- // B = Y + 1.772 * (U - 128)
-
- int4 rgb;
- rgb.r = mergedPixel.r +
- mergedPixel.b * 1436 / 1024 - 179;
- rgb.g = mergedPixel.r -
- mergedPixel.g * 46549 / 131072 + 44 -
- mergedPixel.b * 93604 / 131072 + 91;
- rgb.b = mergedPixel.r +
- mergedPixel.g * 1814 / 1024 - 227;
- rgb.a = 255;
-
- // Store current pixel for next frame
- rsSetElementAt_uchar4(gPrevFrame, curPixel, x, y);
-
- // Write out merged HDR result
- uchar4 out = convert_uchar4(clamp(rgb, 0, 255));
-
- return out;
-}