izackp/Apollo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Combine the separate HDR and SDR capture formats

Browse Source 
Since we support multi-encoding from a single display context, we have
to ensure our capture format allows for HDR color even if the initial
encoding session is SDR.
This commit is contained in:
Cameron Gutman
2023-04-04 22:19:02 -05:00
parent 290c9b3e20
commit f04d5e12de
4 changed files with 6 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/platform/windows/display.h
View File

@@ -172,9 +172,7 @@ namespace platf::dxgi {
virtual int virtual int
complete_img(img_t *img, bool dummy) = 0; complete_img(img_t *img, bool dummy) = 0;
virtual std::vector<DXGI_FORMAT> virtual std::vector<DXGI_FORMAT>
get_supported_sdr_capture_formats() = 0; get_supported_capture_formats() = 0;
virtual std::vector<DXGI_FORMAT>
get_supported_hdr_capture_formats() = 0;
}; };
class display_ram_t: public display_base_t { class display_ram_t: public display_base_t {
@@ -189,9 +187,7 @@ namespace platf::dxgi {
int int
complete_img(img_t *img, bool dummy) override; complete_img(img_t *img, bool dummy) override;
std::vector<DXGI_FORMAT> std::vector<DXGI_FORMAT>
get_supported_sdr_capture_formats() override; get_supported_capture_formats() override;
std::vector<DXGI_FORMAT>
get_supported_hdr_capture_formats() override;
int int
init(const ::video::config_t &config, const std::string &display_name); init(const ::video::config_t &config, const std::string &display_name);
@@ -213,9 +209,7 @@ namespace platf::dxgi {
int int
complete_img(img_t *img_base, bool dummy) override; complete_img(img_t *img_base, bool dummy) override;
std::vector<DXGI_FORMAT> std::vector<DXGI_FORMAT>
get_supported_sdr_capture_formats() override; get_supported_capture_formats() override;
std::vector<DXGI_FORMAT>
get_supported_hdr_capture_formats() override;
int int
init(const ::video::config_t &config, const std::string &display_name); init(const ::video::config_t &config, const std::string &display_name);

2
src/platform/windows/display_base.cpp
View File

@@ -517,7 +517,7 @@ namespace platf::dxgi {
status = output->QueryInterface(IID_IDXGIOutput5, (void **) &output5); status = output->QueryInterface(IID_IDXGIOutput5, (void **) &output5);
if (SUCCEEDED(status)) { if (SUCCEEDED(status)) {
// Ask the display implementation which formats it supports // Ask the display implementation which formats it supports
auto supported_formats = config.dynamicRange ? get_supported_hdr_capture_formats() : get_supported_sdr_capture_formats(); auto supported_formats = get_supported_capture_formats();
if (supported_formats.empty()) { if (supported_formats.empty()) {
BOOST_LOG(warning) << "No compatible capture formats for this encoder"sv; BOOST_LOG(warning) << "No compatible capture formats for this encoder"sv;
return -1; return -1;

8
src/platform/windows/display_ram.cpp
View File

@@ -358,16 +358,10 @@ namespace platf::dxgi {
} }
std::vector<DXGI_FORMAT> std::vector<DXGI_FORMAT>
display_ram_t::get_supported_sdr_capture_formats() { display_ram_t::get_supported_capture_formats() {
return { DXGI_FORMAT_B8G8R8A8_UNORM }; return { DXGI_FORMAT_B8G8R8A8_UNORM };
} }
std::vector<DXGI_FORMAT>
display_ram_t::get_supported_hdr_capture_formats() {
// HDR is unsupported
return {};
}
int int
display_ram_t::init(const ::video::config_t &config, const std::string &display_name) { display_ram_t::init(const ::video::config_t &config, const std::string &display_name) {
if (display_base_t::init(config, display_name)) { if (display_base_t::init(config, display_name)) {

7
src/platform/windows/display_vram.cpp
View File

@@ -1159,12 +1159,7 @@ namespace platf::dxgi {
} }
std::vector<DXGI_FORMAT> std::vector<DXGI_FORMAT>
display_vram_t::get_supported_sdr_capture_formats() { display_vram_t::get_supported_capture_formats() {
return { DXGI_FORMAT_B8G8R8A8_UNORM, DXGI_FORMAT_R8G8B8A8_UNORM };
}
std::vector<DXGI_FORMAT>
display_vram_t::get_supported_hdr_capture_formats() {
return { return {
// scRGB FP16 is the desired format for HDR content. This will also handle // scRGB FP16 is the desired format for HDR content. This will also handle
// 10-bit SDR displays with the increased precision of FP16 vs 8-bit UNORMs. // 10-bit SDR displays with the increased precision of FP16 vs 8-bit UNORMs.