[go: nahoru, domu]
Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Sample] [Camera2] - Implementation of "UltraHDR Image Capture" #56

Merged
merged 8 commits into from
Jul 11, 2023
Merged

[Sample] [Camera2] - Implementation of "UltraHDR Image Capture" #56

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a0e2f06
[Sample] [Camera2] - Implementation of "Camera2 - UltraHDR Image Capt…
madebymozart Jul 8, 2023
8b21145
[Sample] [Camera2] - Implementation of "Camera2 - UltraHDR Image Capt…
madebymozart Jul 8, 2023
fef05fd
Merge remote-tracking branch 'origin/ultrahdr-capture-camera2' into u…
madebymozart Jul 10, 2023
6658d81
Completed implementation of UltraHDR Image Capture Sample
madebymozart Jul 11, 2023
c7e2720
general cleanup
madebymozart Jul 11, 2023
15d67cf
Cosmetic updates
madebymozart Jul 11, 2023
70e4240
remove layout id on xml
madebymozart Jul 11, 2023
19f877e
Update image in UltraHDR Sample to image taken from device
madebymozart Jul 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Cosmetic updates
  • Loading branch information
@madebymozart
madebymozart committed Jul 11, 2023
commit 15d67cf6be0cf88ec706b91ea0175a52a241f468
6 changes: 3 additions & 3 deletions ...era/camera2/src/main/java/com/example/platform/camera/imagecapture/Camera2ImageCapture.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ import androidx.exifinterface.media.ExifInterface
import androidx.fragment.app.Fragment
import androidx.lifecycle.lifecycleScope
import com.example.platform.camera.common.*
import com.example.platform.camera.databinding.FragmentCamera2ImageCaptureBinding
import com.example.platform.camera.databinding.Camera2ImageCaptureBinding
import com.google.android.catalog.framework.annotations.Sample
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
Expand All @@ -65,7 +65,7 @@ class Camera2ImageCapture : Fragment() {
/**
* Android ViewBinding.
*/
private var _binding: FragmentCamera2ImageCaptureBinding? = null
private var _binding: Camera2ImageCaptureBinding? = null
private val binding get() = _binding!!

/**
Expand Down Expand Up @@ -161,7 +161,7 @@ class Camera2ImageCapture : Fragment() {
container: ViewGroup?,
savedInstanceState: Bundle?,
): View {
_binding = FragmentCamera2ImageCaptureBinding.inflate(inflater, container, false)
_binding = Camera2ImageCaptureBinding.inflate(inflater, container, false)
return binding.root
}

Expand Down
2 changes: 1 addition & 1 deletion .../camera2/src/main/java/com/example/platform/camera/imagecapture/Camera2UltraHDRCapture.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -382,7 +382,7 @@ class Camera2UltraHDRCapture : Fragment() {
*/
private fun initializeCamera() = lifecycleScope.launch(Dispatchers.Main) {
if (!canCaptureUltraHDR(characteristics)) {
showActionMessage("UltraHDR Capture is not supported by this device") {}
showActionMessage(resources.getString(R.string.ultrahdr_image_capture_not_supported)) {}
return@launch
}

Expand Down
6 changes: 3 additions & 3 deletions samples/camera/camera2/src/main/java/com/example/platform/camera/preview/Camera2Preview.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ import com.example.platform.camera.common.DirectExecutor
import com.example.platform.camera.common.OrientationLiveData
import com.example.platform.camera.common.SIZE_720P
import com.example.platform.camera.common.getPreviewOutputSize
import com.example.platform.camera.databinding.FragmentCamera2PreviewBinding
import com.example.platform.camera.databinding.Camera2PreviewBinding
import com.google.android.catalog.framework.annotations.Sample
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
Expand All @@ -63,7 +63,7 @@ class Camera2Preview : Fragment() {
/**
* Android ViewBinding.
*/
private var _binding: FragmentCamera2PreviewBinding? = null
private var _binding: Camera2PreviewBinding? = null
private val binding get() = _binding!!

/**
Expand Down Expand Up @@ -125,7 +125,7 @@ class Camera2Preview : Fragment() {
container: ViewGroup?,
savedInstanceState: Bundle?,
): View {
_binding = FragmentCamera2PreviewBinding.inflate(inflater, container, false)
_binding = Camera2PreviewBinding.inflate(inflater, container, false)
return binding.root
}

Expand Down
0 ...layout/fragment_camera2_image_capture.xml → ...main/res/layout/camera2_image_capture.xml
View file
Open in desktop
File renamed without changes.
0 ...n/res/layout/fragment_camera2_preview.xml → ...2/src/main/res/layout/camera2_preview.xml
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion samples/camera/camera2/src/main/res/layout/camera2_ultrahdr_capture.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
android:layout_margin="16dp"
android:contentDescription="@null"
android:scaleType="fitCenter"
android:text="@string/return_to_camera"
android:text="@string/ultrahdr_image_capture_return_to_camera"
android:visibility="gone" />

</FrameLayout>
6 changes: 5 additions & 1 deletion samples/camera/camera2/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,10 @@
-->
<resources>
<string name="capture">Capture</string>
<string name="return_to_camera">Return to Camera</string>

<!-- UltraHDR Image Capture Strings -->
<string name="ultrahdr_image_capture_return_to_camera">Return to Camera</string>
<string name="ultrahdr_image_capture_not_supported">UltraHDR Capture via Camera2 API is not supported on this device.</string>

</resources>

4 changes: 2 additions & 2 deletions samples/graphics/ultrahdr/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@
<string name="displaying_ultrahdr_option_title_canyon">Grand Canyon</string>
<string name="displaying_ultrahdr_option_title_train_station">Train Station</string>

<!-- Visualizing An UltraHDR Gainmap String -->
<!-- Visualizing An UltraHDR Gainmap Strings -->
<string name="visualizing_ultrahdr_gainmap_mode_title_jpeg">SDR JPEG</string>
<string name="visualizing_ultrahdr_gainmap_mode_title_gainmap">Gainmap</string>
<string name="visualizing_ultrahdr_gainmap_mode_title_no_gainmap">No Gainmap</string>
<string name="visualizing_ultrahdr_gainmap_mode_title_ultrahdr">UltraHDR</string>
<string name="visualizing_ultrahdr_gainmap_mode_title_no_ultrahdr">Not UltraHDR</string>

<!-- ColorModeControls String -->
<!-- ColorModeControls Strings -->
<string name="color_mode_sdr">SDR</string>
<string name="color_mode_hdr">HDR</string>
<string name="color_mode_hdr_with_ratio">HDR | SDR/HDR Ratio = %f</string>
Expand Down