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

Support HDR #206

Draft
wants to merge 7 commits into
base: main
Choose a base branch
from
Draft

Support HDR #206

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4231864
WIP
muukii Nov 26, 2023
71a1a7a
Merge branch 'main' into muukii/support-hdr
muukii Jun 7, 2024
6860e79
Merge branch 'main' into muukii/support-hdr
muukii Jun 10, 2024
1f77ca9
Merge remote-tracking branch 'origin/main' into muukii/support-hdr
muukii Jun 10, 2024
04422b5
Update
muukii Jun 10, 2024
b1aad66
Update
muukii Jun 10, 2024
09dbfab
Merge branch 'main' into muukii/support-hdr
muukii Jun 10, 2024
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
38 changes: 38 additions & 0 deletions Dev/Brightroom.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,15 @@
4B36195126105E3900877B21 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 4B600B29216B7C9E001E1456 /* Assets.xcassets */; };
4B36195626107ADB00877B21 /* path-data in Resources */ = {isa = PBXBuildFile; fileRef = 4B36195526107ADB00877B21 /* path-data */; };
4B3957C92C16D9ED000BD249 /* DemoFilterView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B3957C82C16D9ED000BD249 /* DemoFilterView.swift */; };
4B3957D12C16DAC3000BD249 /* sun-hdr-rec2020-avif.avif in Resources */ = {isa = PBXBuildFile; fileRef = 4B3957CB2C16DABA000BD249 /* sun-hdr-rec2020-avif.avif */; };
4B3957D22C16DAC3000BD249 /* sun-hdr-p3-avif.avif in Resources */ = {isa = PBXBuildFile; fileRef = 4B3957CA2C16DABA000BD249 /* sun-hdr-p3-avif.avif */; };
4B3957D32C16DAC3000BD249 /* sun-hdr-srgb-avif.avif in Resources */ = {isa = PBXBuildFile; fileRef = 4B3957CC2C16DABA000BD249 /* sun-hdr-srgb-avif.avif */; };
4B3957D42C16DAC4000BD249 /* sun-hdr-rec2020-avif.avif in Resources */ = {isa = PBXBuildFile; fileRef = 4B3957CB2C16DABA000BD249 /* sun-hdr-rec2020-avif.avif */; };
4B3957D52C16DAC4000BD249 /* sun-hdr-p3-avif.avif in Resources */ = {isa = PBXBuildFile; fileRef = 4B3957CA2C16DABA000BD249 /* sun-hdr-p3-avif.avif */; };
4B3957D62C16DAC4000BD249 /* sun-hdr-srgb-avif.avif in Resources */ = {isa = PBXBuildFile; fileRef = 4B3957CC2C16DABA000BD249 /* sun-hdr-srgb-avif.avif */; };
4B3957DA2C16DD42000BD249 /* sun-hdr-rec2020-heic.heic in Resources */ = {isa = PBXBuildFile; fileRef = 4B3957D72C16DD42000BD249 /* sun-hdr-rec2020-heic.heic */; };
4B3957DB2C16DD42000BD249 /* sun-hdr-srgb-heic.heic in Resources */ = {isa = PBXBuildFile; fileRef = 4B3957D82C16DD42000BD249 /* sun-hdr-srgb-heic.heic */; };
4B3957DC2C16DD42000BD249 /* sun-hdr-p3-heic.heic in Resources */ = {isa = PBXBuildFile; fileRef = 4B3957D92C16DD42000BD249 /* sun-hdr-p3-heic.heic */; };
4B4103582611EAA80061A218 /* ImitationTinderViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B4103572611EAA80061A218 /* ImitationTinderViewController.swift */; };
4B4103602611EAB20061A218 /* DemoImitationsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B41035F2611EAB20061A218 /* DemoImitationsViewController.swift */; };
4B46E71B2B762E20003179C2 /* MondrianLayout in Frameworks */ = {isa = PBXBuildFile; productRef = 4B46E71A2B762E20003179C2 /* MondrianLayout */; };
Expand Down Expand Up @@ -600,6 +609,12 @@
4B36194B26105BEB00877B21 /* RendererTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RendererTests.swift; sourceTree = "<group>"; };
4B36195526107ADB00877B21 /* path-data */ = {isa = PBXFileReference; lastKnownFileType = file.bplist; path = "path-data"; sourceTree = "<group>"; };
4B3957C82C16D9ED000BD249 /* DemoFilterView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DemoFilterView.swift; sourceTree = "<group>"; };
4B3957CA2C16DABA000BD249 /* sun-hdr-p3-avif.avif */ = {isa = PBXFileReference; lastKnownFileType = file; path = "sun-hdr-p3-avif.avif"; sourceTree = "<group>"; };
4B3957CB2C16DABA000BD249 /* sun-hdr-rec2020-avif.avif */ = {isa = PBXFileReference; lastKnownFileType = file; path = "sun-hdr-rec2020-avif.avif"; sourceTree = "<group>"; };
4B3957CC2C16DABA000BD249 /* sun-hdr-srgb-avif.avif */ = {isa = PBXFileReference; lastKnownFileType = file; path = "sun-hdr-srgb-avif.avif"; sourceTree = "<group>"; };
4B3957D72C16DD42000BD249 /* sun-hdr-rec2020-heic.heic */ = {isa = PBXFileReference; lastKnownFileType = file; path = "sun-hdr-rec2020-heic.heic"; sourceTree = "<group>"; };
4B3957D82C16DD42000BD249 /* sun-hdr-srgb-heic.heic */ = {isa = PBXFileReference; lastKnownFileType = file; path = "sun-hdr-srgb-heic.heic"; sourceTree = "<group>"; };
4B3957D92C16DD42000BD249 /* sun-hdr-p3-heic.heic */ = {isa = PBXFileReference; lastKnownFileType = file; path = "sun-hdr-p3-heic.heic"; sourceTree = "<group>"; };
4B4103572611EAA80061A218 /* ImitationTinderViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImitationTinderViewController.swift; sourceTree = "<group>"; };
4B41035F2611EAB20061A218 /* DemoImitationsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DemoImitationsViewController.swift; sourceTree = "<group>"; };
4B524FE229B8F6A600C1A416 /* Brightroom */ = {isa = PBXFileReference; lastKnownFileType = folder; name = Brightroom; path = ..; sourceTree = "<group>"; };
Expand Down Expand Up @@ -1143,6 +1158,19 @@
path = Library;
sourceTree = "<group>";
};
4B3957CD2C16DABA000BD249 /* hdr-images */ = {
isa = PBXGroup;
children = (
4B3957D92C16DD42000BD249 /* sun-hdr-p3-heic.heic */,
4B3957D72C16DD42000BD249 /* sun-hdr-rec2020-heic.heic */,
4B3957D82C16DD42000BD249 /* sun-hdr-srgb-heic.heic */,
4B3957CA2C16DABA000BD249 /* sun-hdr-p3-avif.avif */,
4B3957CB2C16DABA000BD249 /* sun-hdr-rec2020-avif.avif */,
4B3957CC2C16DABA000BD249 /* sun-hdr-srgb-avif.avif */,
);
path = "hdr-images";
sourceTree = "<group>";
};
4B4103562611EA8C0061A218 /* Imitations */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -1332,6 +1360,7 @@
4BE9B3D1260BA72D000A3D09 /* Bundle */ = {
isa = PBXGroup;
children = (
4B3957CD2C16DABA000BD249 /* hdr-images */,
4B2A10F9266B7AF800B0C885 /* image-test-suite */,
4BE9B3D0260BA720000A3D09 /* Images */,
4B1E95292176F52100E9DFB8 /* LUTs */,
Expand Down Expand Up @@ -1923,6 +1952,9 @@
4BA41C86260CE817005E6FA7 /* orientation_down.HEIC in Resources */,
4BA41C85260CE817005E6FA7 /* orientation_left.HEIC in Resources */,
4BA41C84260CE817005E6FA7 /* orientation_left_mirrored.HEIC in Resources */,
4B3957D42C16DAC4000BD249 /* sun-hdr-rec2020-avif.avif in Resources */,
4B3957D52C16DAC4000BD249 /* sun-hdr-p3-avif.avif in Resources */,
4B3957D62C16DAC4000BD249 /* sun-hdr-srgb-avif.avif in Resources */,
4BA41C82260CE817005E6FA7 /* orientation_up_mirrored.HEIC in Resources */,
4BB7B9CC277A452A0014B62A /* LUT_64_Gloss.png in Resources */,
4B600B2A216B7C9E001E1456 /* Assets.xcassets in Resources */,
Expand All @@ -1948,9 +1980,15 @@
4BA41C90260CE817005E6FA7 /* orientation_left.HEIC in Resources */,
4BED4A0A261CA5B00011A98F /* LUT_64_1.jpg in Resources */,
4BA41C8E260CE817005E6FA7 /* orientation_right_mirrored.HEIC in Resources */,
4B3957DC2C16DD42000BD249 /* sun-hdr-p3-heic.heic in Resources */,
4BA41C92260CE817005E6FA7 /* orientation_right.HEIC in Resources */,
4BA41C93260CE817005E6FA7 /* orientation_up.HEIC in Resources */,
4B3957DB2C16DD42000BD249 /* sun-hdr-srgb-heic.heic in Resources */,
4B3957DA2C16DD42000BD249 /* sun-hdr-rec2020-heic.heic in Resources */,
4BA41C94260CE817005E6FA7 /* orientation_down_mirrored.HEIC in Resources */,
4B3957D12C16DAC3000BD249 /* sun-hdr-rec2020-avif.avif in Resources */,
4B3957D22C16DAC3000BD249 /* sun-hdr-p3-avif.avif in Resources */,
4B3957D32C16DAC3000BD249 /* sun-hdr-srgb-avif.avif in Resources */,
4BA41C8D260CE817005E6FA7 /* orientation_up_mirrored.HEIC in Resources */,
4BB7B9CD277A452A0014B62A /* LUT_64_Gloss.png in Resources */,
4BA41C8F260CE817005E6FA7 /* orientation_left_mirrored.HEIC in Resources */,
Expand Down
2 changes: 1 addition & 1 deletion Dev/Brightroom.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@
"location" : "https://github.com/FluidGroup/TextureSwiftSupport",
"state" : {
"branch" : "main",
"revision" : "5bae50cab3798dccb8b98c3ffbc70320ae66b45a"
"revision" : "3042c19dc5d67005222b7b422494805bcf2d7f18"
}
},
{
Expand Down
0 Dev/Bundle/hdr-images/sun-hdr-p3.avif → Dev/Bundle/hdr-images/sun-hdr-p3-avif.avif
View file
Open in desktop
File renamed without changes.
Binary file added Dev/Bundle/hdr-images/sun-hdr-p3-heic.heic
View file
Open in desktop
Binary file not shown.
0 Dev/Bundle/hdr-images/sun-hdr-rec2020.avif → ...ndle/hdr-images/sun-hdr-rec2020-avif.avif
View file
Open in desktop
File renamed without changes.
Binary file added Dev/Bundle/hdr-images/sun-hdr-rec2020-heic.heic
View file
Open in desktop
Binary file not shown.
0 Dev/Bundle/hdr-images/sun-hdr-srgb.avif → Dev/Bundle/hdr-images/sun-hdr-srgb-avif.avif
View file
Open in desktop
File renamed without changes.
Binary file added Dev/Bundle/hdr-images/sun-hdr-srgb-heic.heic
View file
Open in desktop
Binary file not shown.
4 changes: 4 additions & 0 deletions Dev/Sources/SharedForDemo/Mocks.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,10 @@ enum Mocks {
UIImage(named: "orientation_left.HEIC")!
}

static func hdrImage() -> UIImage {
UIImage(named: "sun-hdr-p3-avif.avif")!
}

static func makeEditingStack(image: UIImage) -> EditingStack {
.init(
imageProvider: .init(image: image)
Expand Down
17 changes: 17 additions & 0 deletions Dev/Sources/SwiftUIDemo/ContentView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,23 @@ struct ContentView: View {
})
}

Section("HDR") {
Button("AVIF") {
fullScreenView = .init {
DemoCropView(
editingStack: { Mocks.makeEditingStack(image: UIImage(named: "sun-hdr-p3-avif.avif")!) }
)
}
}
Button("HEIC") {
fullScreenView = .init {
DemoCropView(
editingStack: { Mocks.makeEditingStack(image: UIImage(named: "sun-hdr-p3-heic.heic")!) }
)
}
}
}

Section("Restoration Horizontal") {
Button("Crop") {
fullScreenView = .init {
Expand Down
6 changes: 5 additions & 1 deletion Sources/BrightroomEngine/DataSource/ImageSource.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,11 @@ public final class ImageSource: Equatable {
)!
},
makeCIImage: {
CIImage(image: image)!
if #available(iOS 17.0, *) {
CIImage(image: image, options: [.expandToHDR : true])!
} else {
CIImage(image: image, options: [:])!
}
}
)
}
Expand Down
6 changes: 6 additions & 0 deletions Sources/BrightroomUI/Shared/Components/ImageViews/MetalImageView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,12 @@ open class MetalImageView: MTKView, CIImageDisplaying, MTKViewDelegate {
clearColor = .init(red: 0, green: 0, blue: 0, alpha: 0)
clearsContextBeforeDrawing = true

if #available(iOS 17.0, *) {
layer.wantsExtendedDynamicRangeContent = true
} else {
// Fallback on earlier versions
}

#if targetEnvironment(simulator)
#else
/// For supporting wide-color - extended sRGB
Expand Down
1 change: 1 addition & 0 deletions Sources/BrightroomUI/Shared/Components/ImageViews/_ImageView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ final class _ImageView: UIImageView, CIImageDisplaying {
init() {
super.init(frame: .zero)
layer.drawsAsynchronously = true
preferredImageDynamicRange = .high
}

required init?(coder: NSCoder) {
Expand Down
Loading