diff --git a/demo/src/main/java/com/otaliastudios/cameraview/demo/PicturePreviewActivity.java b/demo/src/main/java/com/otaliastudios/cameraview/demo/PicturePreviewActivity.java index 2df4aaf1..bb43ba5f 100644 --- a/demo/src/main/java/com/otaliastudios/cameraview/demo/PicturePreviewActivity.java +++ b/demo/src/main/java/com/otaliastudios/cameraview/demo/PicturePreviewActivity.java @@ -13,30 +13,30 @@ import com.otaliastudios.cameraview.size.AspectRatio; import com.otaliastudios.cameraview.BitmapCallback; import com.otaliastudios.cameraview.PictureResult; -import java.lang.ref.WeakReference; - public class PicturePreviewActivity extends Activity { - private static WeakReference image; + private static PictureResult picture; - public static void setPictureResult(@Nullable PictureResult im) { - image = im != null ? new WeakReference<>(im) : null; + public static void setPictureResult(@Nullable PictureResult pictureResult) { + picture = pictureResult; } @Override protected void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_picture_preview); - final ImageView imageView = findViewById(R.id.image); - final MessageView captureResolution = findViewById(R.id.nativeCaptureResolution); - final MessageView captureLatency = findViewById(R.id.captureLatency); - final MessageView exifRotation = findViewById(R.id.exifRotation); - PictureResult result = image == null ? null : image.get(); + final PictureResult result = picture; if (result == null) { finish(); return; } + + final ImageView imageView = findViewById(R.id.image); + final MessageView captureResolution = findViewById(R.id.nativeCaptureResolution); + final MessageView captureLatency = findViewById(R.id.captureLatency); + final MessageView exifRotation = findViewById(R.id.exifRotation); + final long delay = getIntent().getLongExtra("delay", 0); AspectRatio ratio = AspectRatio.of(result.getSize()); captureLatency.setTitleAndMessage("Approx. latency", delay + " milliseconds"); diff --git a/demo/src/main/java/com/otaliastudios/cameraview/demo/VideoPreviewActivity.java b/demo/src/main/java/com/otaliastudios/cameraview/demo/VideoPreviewActivity.java index d7921671..1d26fcc9 100644 --- a/demo/src/main/java/com/otaliastudios/cameraview/demo/VideoPreviewActivity.java +++ b/demo/src/main/java/com/otaliastudios/cameraview/demo/VideoPreviewActivity.java @@ -13,23 +13,28 @@ import android.widget.MediaController; import android.widget.VideoView; import com.otaliastudios.cameraview.VideoResult; - -import java.lang.ref.WeakReference; +import com.otaliastudios.cameraview.size.AspectRatio; public class VideoPreviewActivity extends Activity { private VideoView videoView; - private static WeakReference videoResult; + private static VideoResult videoResult; public static void setVideoResult(@Nullable VideoResult result) { - videoResult = result != null ? new WeakReference<>(result) : null; + videoResult = result; } @Override protected void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_video_preview); + final VideoResult result = videoResult; + if (result == null) { + finish(); + return; + } + videoView = findViewById(R.id.video); videoView.setOnClickListener(new View.OnClickListener() { @Override @@ -46,13 +51,8 @@ public class VideoPreviewActivity extends Activity { final MessageView videoBitRate = findViewById(R.id.videoBitRate); final MessageView videoFrameRate = findViewById(R.id.videoFrameRate); - final VideoResult result = videoResult == null ? null : videoResult.get(); - if (result == null) { - finish(); - return; - } - - actualResolution.setTitleAndMessage("Size", result.getSize() + ""); + AspectRatio ratio = AspectRatio.of(result.getSize()); + actualResolution.setTitleAndMessage("Size", result.getSize() + " (" + ratio + ")"); isSnapshot.setTitleAndMessage("Snapshot", result.isSnapshot() + ""); rotation.setTitleAndMessage("Rotation", result.getRotation() + ""); audio.setTitleAndMessage("Audio", result.getAudio().name()); @@ -85,8 +85,9 @@ public class VideoPreviewActivity extends Activity { } void playVideo() { - if (videoView.isPlaying()) return; - videoView.start(); + if (!videoView.isPlaying()) { + videoView.start(); + } } @Override