[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
Update image in UltraHDR Sample to image taken from device
  • Loading branch information
@madebymozart
madebymozart committed Jul 11, 2023
commit 19f877ef786f85e3b4eec9d214ab57213414a648
Binary file removed samples/graphics/ultrahdr/src/main/assets/gainmaps/fountain_night.jpg
View file
Open in desktop
Binary file not shown.
Binary file added samples/graphics/ultrahdr/src/main/assets/gainmaps/office.jpg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 4 additions & 2 deletions ...trahdr/src/main/java/com/example/platform/graphics/ultrahdr/display/DisplayingUltraHDR.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,11 @@ import android.view.ViewGroup
import android.widget.RadioButton
import androidx.annotation.RequiresApi
import androidx.fragment.app.Fragment
import androidx.lifecycle.lifecycleScope
import com.example.platform.graphics.ultrahdr.databinding.DisplayingUltrahdrBinding
import com.google.android.catalog.framework.annotations.Sample
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch

@Sample(
name = "Displaying UltraHDR",
Expand Down Expand Up @@ -77,9 +80,8 @@ class DisplayingUltraHDR : Fragment() {
/**
* Updated the currently displayed UltraHDR image.
*/
private fun updateDisplayedImage(index: Int) {
private fun updateDisplayedImage(index: Int) = lifecycleScope.launch(Dispatchers.IO) {
ultraHDRImages[index]?.let {
binding.imageContainer.setImageResource(0)
val stream = context?.assets?.open(it)
val bitmap = BitmapFactory.decodeStream(stream)
binding.imageContainer.setImageBitmap(bitmap)
Expand Down
8 changes: 2 additions & 6 deletions .../main/java/com/example/platform/graphics/ultrahdr/display/VisualizingAnUltraHDRGainmap.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,10 +95,6 @@ class VisualizingAnUltraHDRGainmap : Fragment() {
* the gainmap as well as the result of the both of them displayed together.
*/
private fun updateDisplayedImage(type: Type) = lifecycleScope.launch(Dispatchers.Main) {
// Clear previous bitmap source.
val imageview = binding.imageContainer
imageview.setImageResource(0)

// Decode ultra hdr image into bitmap data.
val imageBitmap = getBitmapFromFile()

Expand All @@ -115,7 +111,7 @@ class VisualizingAnUltraHDRGainmap : Fragment() {
}

// Based on the type, setting the appropriate bitmap.
imageview.setImageBitmap(
binding.imageContainer.setImageBitmap(
when (type) {
// Intentionally drop the gainmap in order to display 8-bit jpeg sdr image. This
// demonstrates that even if the activity is in HDR mode, SDR images will
Expand Down Expand Up @@ -185,7 +181,7 @@ class VisualizingAnUltraHDRGainmap : Fragment() {
/**
* Default UltraHDR image path
*/
private const val ULTRA_HDR_IMAGE_FOUNTAIN = "gainmaps/fountain_night.jpg"
private const val ULTRA_HDR_IMAGE_FOUNTAIN = "gainmaps/office.jpg"

/**
* Location argument for if this fragment is pass with a bundle that contains the location
Expand Down