App foundation: introducing CameraX #23
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,124 @@ | ||
| package com.automattic.photoeditor.camera | ||
|
|
||
| import android.annotation.SuppressLint | ||
| import android.os.Bundle | ||
| import android.util.Log | ||
| import androidx.camera.core.CameraX | ||
| import androidx.camera.core.Preview | ||
| import androidx.camera.core.PreviewConfig | ||
| import androidx.camera.core.VideoCapture | ||
| import androidx.camera.core.VideoCaptureConfig | ||
| import androidx.core.app.ActivityCompat | ||
| import com.automattic.photoeditor.R | ||
| import com.automattic.photoeditor.camera.interfaces.VideoRecorderFragment | ||
| import com.automattic.photoeditor.util.FileUtils | ||
| import com.automattic.photoeditor.util.PermissionUtils | ||
| import com.automattic.photoeditor.views.background.video.AutoFitTextureView | ||
| import java.io.File | ||
|
|
||
| class CameraXBasicHandling : VideoRecorderFragment(), | ||
| ActivityCompat.OnRequestPermissionsResultCallback { | ||
| private lateinit var videoCapture: VideoCapture | ||
|
|
||
| private var active: Boolean = false | ||
|
|
||
| override fun onCreate(savedInstanceState: Bundle?) { | ||
| super.onCreate(savedInstanceState) | ||
| retainInstance = true | ||
| } | ||
|
|
||
| override fun activate() { | ||
| active = true | ||
| startUp() | ||
| } | ||
|
|
||
| override fun deactivate() { | ||
| if (active) { | ||
| active = false | ||
| windDown() | ||
| } | ||
| } | ||
|
|
||
| private fun startUp() { | ||
| if (active) { | ||
| startCamera() | ||
| } | ||
| } | ||
|
|
||
| private fun windDown() { | ||
| if (CameraX.isBound(videoCapture)) { | ||
| CameraX.unbind(videoCapture) | ||
| } | ||
| } | ||
|
|
||
| override fun onRequestPermissionsResult( | ||
| requestCode: Int, | ||
| permissions: Array<String>, | ||
| grantResults: IntArray | ||
| ) { | ||
| if (!PermissionUtils.allRequiredPermissionsGranted(activity!!)) { | ||
|
There was a problem hiding this comment. We can remove the activity?.let { activity ->
...
}There was a problem hiding this comment. Ended up removing this entirely in bbcf4df, to match the same thing we did in e2fe8ee , related comment here: #22 (comment) |
||
| ErrorDialog.newInstance(getString(R.string.request_permissions)) | ||
| .show(childFragmentManager, | ||
| FRAGMENT_DIALOG | ||
| ) | ||
| } else { | ||
| super.onRequestPermissionsResult(requestCode, permissions, grantResults) | ||
| } | ||
| } | ||
|
|
||
| // TODO remove this RestrictedApi annotation once androidx.camera:camera moves out of alpha | ||
| @SuppressLint("RestrictedApi") | ||
| private fun startCamera() { | ||
| // Create configuration object for the preview use case | ||
| val previewConfig = PreviewConfig.Builder().build() | ||
| val preview = Preview(previewConfig) | ||
|
|
||
| // Create a configuration object for the video capture use case | ||
| val videoCaptureConfig = VideoCaptureConfig.Builder().apply { | ||
| setTargetRotation(textureView.display.rotation) | ||
| }.build() | ||
| videoCapture = VideoCapture(videoCaptureConfig) | ||
|
|
||
| preview.setOnPreviewOutputUpdateListener { | ||
| textureView.surfaceTexture = it.surfaceTexture | ||
| } | ||
|
|
||
| // Bind use cases to lifecycle | ||
| CameraX.bindToLifecycle(activity, preview, videoCapture) | ||
| } | ||
|
|
||
| @SuppressLint("RestrictedApi") | ||
| override fun startRecordingVideo() { | ||
| currentFile = FileUtils.getLoopFrameFile(true, "orig_") | ||
| currentFile?.createNewFile() | ||
|
|
||
| videoCapture.startRecording(currentFile, object : VideoCapture.OnVideoSavedListener { | ||
| override fun onVideoSaved(file: File?) { | ||
| Log.i(tag, "Video File : $file") | ||
| } | ||
| override fun onError(useCaseError: VideoCapture.UseCaseError?, message: String?, cause: Throwable?) { | ||
| Log.i(tag, "Video Error: $message") | ||
| } | ||
| }) | ||
| } | ||
|
|
||
| @SuppressLint("RestrictedApi") | ||
| override fun stopRecordingVideo() { | ||
| videoCapture.stopRecording() | ||
| } | ||
|
|
||
| companion object { | ||
| private val instance = CameraXBasicHandling() | ||
|
|
||
| private val FRAGMENT_DIALOG = "dialog" | ||
| /** | ||
| * Tag for the [Log]. | ||
| */ | ||
| private val TAG = "CameraXBasicHandling" | ||
|
|
||
| @JvmStatic fun getInstance(textureView: AutoFitTextureView): CameraXBasicHandling { | ||
| instance.textureView = textureView | ||
| return instance | ||
| } | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -26,10 +26,15 @@ import java.io.File | |
| import android.media.AudioManager | ||
| import android.media.MediaPlayer | ||
| import androidx.fragment.app.Fragment | ||
| import com.automattic.photoeditor.camera.interfaces.SurfaceFragmentHandler | ||
| import com.automattic.photoeditor.views.background.video.AutoFitTextureView | ||
| import java.io.FileInputStream | ||
| import java.io.IOException | ||
|
|
||
| class VideoPlayingBasicHandling : Fragment(), SurfaceFragmentHandler { | ||
| // holds the File handle to the current video file to be played | ||
| var currentFile: File? = null | ||
|
|
||
| /** | ||
| * [TextureView.SurfaceTextureListener] handles several lifecycle events on a | ||
| * [TextureView]. | ||
|
|
@@ -131,22 +136,26 @@ class VideoPlayingBasicHandling : Fragment(), SurfaceFragmentHandler { | |
| stopVideoPlay() | ||
| } | ||
|
|
||
| if (currentFile != null && currentFile!!.exists()) { | ||
|
There was a problem hiding this comment. We can Kotlinify this a bit and fix a nullability warning in the code (the call is actually safe but the IDE doesn't know that): currentFile?.takeIf { it.exists() }?.let { file ->
...
val inputStream = FileInputStream(file)
...
}There was a problem hiding this comment. nice! addressed in e0f25fa (plus removed some commented code) Also TIL:
|
||
| // val assetManager = context?.assets | ||
| // val descriptor = assetManager!!.openFd("small.mp4") | ||
| val inputStream = FileInputStream(currentFile) | ||
| mediaPlayer = MediaPlayer().apply { | ||
| setDataSource(inputStream.getFD()) | ||
|
There was a problem hiding this comment. (Kotlinification note, not a blocker) This can use property access syntax: |
||
| // setDataSource("http://techslides.com/demos/sample-videos/small.mp4") | ||
| // setDataSource(descriptor?.getFileDescriptor(), descriptor.getStartOffset(), descriptor.getLength()) | ||
| setSurface(s) | ||
| prepare() | ||
| // TODO check whether we want fine grained error handling by setting these listeners | ||
| // setOnBufferingUpdateListener(this) | ||
| // setOnCompletionListener(this) | ||
| // setOnPreparedListener(this) | ||
| // setOnVideoSizeChangedListener(this) | ||
| setAudioStreamType(AudioManager.STREAM_MUSIC) | ||
| start() | ||
| } | ||
| // descriptor?.close() | ||
| } | ||
| } catch (e: IllegalArgumentException) { | ||
| // TODO Auto-generated catch block | ||
| e.printStackTrace() | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
|
|
||
| package com.automattic.photoeditor.camera.interfaces | ||
|
|
||
| interface SurfaceFragmentHandler { | ||
| fun activate() | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
|
|
||
| package com.automattic.photoeditor.camera.interfaces | ||
|
|
||
| import androidx.fragment.app.Fragment | ||
| import com.automattic.photoeditor.views.background.video.AutoFitTextureView | ||
| import java.io.File | ||
|
|
||
| abstract class VideoRecorderFragment : Fragment(), VideoRecorderHandler, SurfaceFragmentHandler { | ||
| /** | ||
| * An [AutoFitTextureView] for camera preview. | ||
| */ | ||
| lateinit var textureView: AutoFitTextureView | ||
| var currentFile: File? = null | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
|
|
||
| package com.automattic.photoeditor.camera.interfaces | ||
|
|
||
| interface VideoRecorderHandler { | ||
| fun startRecordingVideo() | ||
| fun stopRecordingVideo() | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
All of this looks good, though I think we should take care of adding
gradle.propertiesto.gitignoresooner than later and add agradle.properties-examplefile. I'll open an issue to track that.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Opened: #27.