Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
54 commits
Select commit Hold shift + click to select a range
d10648b
Keep automatic Dolby Vision HDR10 recovery on a usable mode
CroqueMr Nov 18, 2026
52cbb0d
Reuse the locked GBM buffer during float output validation
CroqueMr Nov 18, 2026
6b7ed9f
Snapshot eligible HDR10 fallback timings on the display thread
CroqueMr Nov 18, 2026
2cae97c
Respect HDMI DTS capabilities reported by ALSA
CroqueMr Nov 18, 2026
e5036cc
Recover from an unsupported LLDV timing at file startup
CroqueMr Nov 18, 2026
7811d3d
Preserve native SDR BT.2020 on capable GBM HDMI outputs
CroqueMr Nov 18, 2026
f62f40f
Read the LLDV mode identifier from a protected resolution copy
CroqueMr Nov 18, 2026
7005e0d
Treat reserved ELD CTA revisions as unknown
CroqueMr Nov 18, 2026
715a692
Recover SDR gamut after output and CMS changes
CroqueMr Nov 18, 2026
335a797
Preserve translucent GUI colors in native SDR BT.2020
CroqueMr Nov 18, 2026
bd0f483
Keep display test fixtures aligned with timing snapshots
CroqueMr Nov 18, 2026
429be0c
Merge commit 'bd0f48303864b1efce9e563285a19ad85f57b471' into codex/bu…
CroqueMr Nov 18, 2026
ca0caa4
Track updated display test fixtures in the source lock
CroqueMr Nov 18, 2026
cfedb6f
Merge commit 'ca0caa40117bab015b445decb463785f2b0158a5' into codex/bu…
CroqueMr Nov 18, 2026
ed3060e
Model the retained GBM front buffer in supersession tests
CroqueMr Nov 18, 2026
ea3666b
Backport the mt7925 join ROC fix for MT7925 Wi-Fi
phycoforce Nov 18, 2026
b314fe1
Enable the MT7925U USB Wi-Fi driver
phycoforce Nov 18, 2026
a29e5b4
Restore active Alder Lake-P HDMI audio when its link is reconfigured
CroqueMr Nov 18, 2026
4e0639e
Retire unpairable base pictures while seeking the first FEL anchor
CroqueMr Nov 18, 2026
4bc9c40
Stage the FEL preroll fix in the LibreELEC package
CroqueMr Nov 18, 2026
8d11789
Refresh the source lock for the current public README
CroqueMr Nov 18, 2026
3bf4110
Refresh the source lock for the current public README
CroqueMr Nov 18, 2026
74c8906
Track the HDMI pin test and patch inventory
CroqueMr Nov 18, 2026
6d60b71
Qualify the Intel audio pin against the newly published ELD
CroqueMr Nov 18, 2026
a7bd810
Capture logical CB1 video before drawing overlays
CroqueMr Nov 18, 2026
4754060
Pin the updated Kodi patch inventory
CroqueMr Nov 18, 2026
5677165
Report a proven missing FEL enhancement in Kodi's normal log
CroqueMr Nov 18, 2026
e8608f1
Decline video-only screenshots after GUI has been composited
CroqueMr Nov 18, 2026
ed601ff
Decode queued FEL input while the base decoder renews
CroqueMr Nov 18, 2026
ae06054
Refresh staged engine manifest checksum
CroqueMr Nov 18, 2026
d77f3e6
Integrate refs/cb1/rc2/pr-236 for local follow-up testing
CroqueMr Nov 18, 2026
dc7c691
Integrate refs/cb1/rc2/pr-237 for local follow-up testing
CroqueMr Nov 18, 2026
efb9afd
Integrate refs/cb1/rc2/pr-238 for local follow-up testing
CroqueMr Nov 18, 2026
f0944e4
Integrate refs/cb1/rc2/pr-239 for local follow-up testing
CroqueMr Nov 18, 2026
6e66eb9
Integrate refs/cb1/rc2/pr-240 for local follow-up testing
CroqueMr Nov 18, 2026
a52b7b9
Integrate refs/cb1/rc2/pr-242 for local follow-up testing
CroqueMr Nov 18, 2026
2b0af39
Integrate refs/cb1/rc2/pr-244 for local follow-up testing
CroqueMr Nov 18, 2026
9c84e27
Integrate refs/cb1/rc2/pr-245 for local follow-up testing
CroqueMr Nov 18, 2026
2c6d240
Integrate refs/cb1/rc2/pr-246 for local follow-up testing
CroqueMr Nov 18, 2026
98fcd21
Integrate #247 for local RC2 validation
CroqueMr Nov 18, 2026
9e5907b
Pin the combined FEL sources for RC2 validation
CroqueMr Nov 18, 2026
369185b
Select the HDR10 recovery timing before falling back from LLDV
CroqueMr Nov 19, 2026
d6a86dd
Keep DV recovery mode selection and application on the GUI thread
CroqueMr Nov 19, 2026
c5ebf8e
Integrate d6a86dd2 for local follow-up testing
CroqueMr Nov 19, 2026
dfeca47
Limit logical video screenshots to source-encoded Master frames
Nov 19, 2026
29368cb
Integrate dfeca47688ef4fbe1ae2d6e3b0f9b89e934afd80 for local follow-u…
CroqueMr Nov 19, 2026
b01e65e
Track the MT7925 association that owns the channel grant
CroqueMr Nov 19, 2026
9a7369f
Integrate b01e65edb26c77ded5ed4ce412e10af33382df4e for local follow-u…
CroqueMr Nov 19, 2026
1934bc0
Reject known 8-bit HDR10 before scheduling the startup mode
CroqueMr Nov 19, 2026
c3550c2
Integrate 1934bc06f85e5866e44feb3a4fd8cd00061b9b4c for local follow-u…
CroqueMr Nov 19, 2026
6f52da8
Decline native video captures from unsupported DV carriers
Nov 19, 2026
032d615
Integrate 6f52da8d62d9a85cdd048996a4921002b187a84d for local follow-u…
CroqueMr Nov 19, 2026
bf687d0
Integrate d3dcd7a3 for local follow-up testing
CroqueMr Nov 19, 2026
22c88f0
Integrate the reviewed MT7925U follow-up into RC2
CroqueMr Nov 19, 2026
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
4 changes: 2 additions & 2 deletions CB1/config/owned-sources.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"src/dvbridge_fel.c": "7b291b3509f393a239a604b4e70c8d7323c725391e548264dd5dc8dc55859d0f",
"src/dvbridge_fel.c": "d3a129feffdd0a858ee15469c334aef51323e508b61337024c47c08bce4461ac",
"src/dvbridge_gl_pack.h": "2ccd974503fbcbb33678ee2eff076a7a086bcd1796efa97010a1eebb901143f5",
"src/dvbridge_gl_pack.c": "e872527f20d4e56c1da39a1d591c829bc54174ad8fb2fa94c61cfe2a0043d996",
"src/cb1_circuit.c": "b3dc96ad27a802680811858862f67c4921f595ce042e3df6cd19c286f8872e56",
Expand Down Expand Up @@ -63,7 +63,7 @@
"src/cb1_trim_math.h": "178b7ef0b567b61c7d73cea702971b10299a04931367c090be0a3c8561c8cfcc",
"src/cb1_transport_glsl.h": "1d775ef6306e76a831fc192ef9c7b7989fef97cb5c001903f2ab674e89445566",
"src/cb1_composite_glsl.h": "65e462c80246b0e44ecf31f5f957a53cc48dd9924009b3461cd008fbdc124916",
"src/dvbridge_fel.h": "2986af5b358c4692a9e804e6fccd13c05dfed88722b401e3f061b516f9cce517",
"src/dvbridge_fel.h": "fa744fa8e4b8f4a0ee1eb364351dfc56cde0b975074fd0e3f57635793b5b424f",
"src/cb1_master_ipt.c": "2793976a1a49187658ab0c6f3eb4c3cdce056b61497ac2939612c4bba49b5ea6",
"src/cb1_master_ipt.h": "3efb1f79bf2340c10ada773267b792b5d5e33256e7ae73055b19f80fdb5a3ae1",
"src/cb1_master_ipt_shader.h": "92e41f052f975a44bb3404a5ec8f44380729b070507af918c40f40d52f446e95",
Expand Down
23 changes: 17 additions & 6 deletions CB1/src/dvbridge_fel.c
Original file line number Diff line number Diff line change
Expand Up @@ -593,13 +593,23 @@ static bool submit(struct dvbridge_fel *f, const AVPacket *packet,
if (result == AVERROR(EAGAIN)) {
if (source && !received_enhancement && source->enhancement_pts != AV_NOPTS_VALUE)
goto fail;
if (!source && !received_enhancement)f->epoch_uncertain = true;
if (!source && !received_enhancement)
f->epoch_uncertain = true;
if (!source && f->synchronizing) {
/* All EL from this AU has been examined. Before the
* first accepted anchor these BL identities are preroll. */
f->num_times = 0;
if (++f->preroll_packets > 1024)
goto fail;
}
return true; /* Submit EL when a decoded BL requests its matching picture. */
}
goto fail;
}
const unsigned limit = f->mel_deferred ? MEL_PACKET_MAX : QUEUE_MAX;
if (f->mel_deferred && !f->el_started &&
/* A renewed base decoder may accept more input before returning a
* picture. Give queued EL a chance to decode before rejecting the AU. */
if ((!f->source_timed || (f->mel_deferred && !f->el_started)) &&
(f->num_packets >= limit || (size_t)copy->size > PACKET_BYTES_MAX - f->packet_bytes))
if (!pump(f)) {
av_packet_free(&copy);
Expand Down Expand Up @@ -670,9 +680,6 @@ static bool submit(struct dvbridge_fel *f, const AVPacket *packet,
* time. Never use this shortcut for a BL with reordered pictures. */
if (!common_key && !el_idr) {
av_packet_free(&copy);
f->num_times = 0;
if (++f->preroll_packets > 1024)
goto fail;
continue;
}
f->anchor_pts = packet->pts;
Expand All @@ -698,11 +705,15 @@ bool dvbridge_fel_submit_source(struct dvbridge_fel *f, const AVPacket *packet,
return source && submit(f, packet, source);
}

bool dvbridge_fel_drain(struct dvbridge_fel *f)
bool dvbridge_fel_drain(struct dvbridge_fel *f, const char **reason)
{
if (reason)
*reason = NULL;
if (!f)
return false;
if (f->synchronizing) {
if (reason && !f->failed && f->base_order.seen && !f->enhancement_order.seen)
*reason = "no enhancement video received before drain";
f->failed = true;
return false; /* EOF cannot supply the missing random-access picture. */
}
Expand Down
3 changes: 2 additions & 1 deletion CB1/src/dvbridge_fel.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@ struct dvbridge_fel_source {
};
bool dvbridge_fel_submit_source(struct dvbridge_fel *fel, const AVPacket *packet,
const struct dvbridge_fel_source *source);
bool dvbridge_fel_drain(struct dvbridge_fel *fel);
/* Optional reason is set only when the final drain identifies a specific fault. */
bool dvbridge_fel_drain(struct dvbridge_fel *fel, const char **reason);
/* 1: exact pair, 0: need input, 2: discard preroll, -1: missing pair / failure. */
int dvbridge_fel_take(struct dvbridge_fel *fel, int64_t pts, AVFrame **frame);
/* Disc playback may return 3 for a matched, validated RPU that needs no residual.
Expand Down
67 changes: 65 additions & 2 deletions CB1/tests/fel_queue.c
Original file line number Diff line number Diff line change
Expand Up @@ -184,14 +184,50 @@ int main(void)
assert(!dvbridge_fel_device(f, renewed));
assert(dvbridge_fel_device(f, device) && !dvbridge_fel_failed(f));
av_buffer_unref(&renewed);

/* A cut or seek can start with BL alone. Such pictures cannot be shown
* before the first usable EL anchor, even if the prefix spans the map. */
AVPacket *bare = av_packet_alloc();
assert(bare && av_new_packet(bare, sizeof(synthetic_base)) == 0);
memcpy(bare->data, synthetic_base, sizeof(synthetic_base));
for (int anchor = 0; anchor <= 1; ++anchor) {
dvbridge_fel_reset(f);
unsigned before = submissions;
for (int i = 0; i < 74; ++i) {
bare->pts = bare->dts = i * 41708;
assert(dvbridge_fel_submit(f, bare));
AVFrame *discarded = NULL;
assert(dvbridge_fel_take(f, bare->pts, &discarded) == 2 && !discarded);
}
assert(submissions == before);
if (anchor) {
p->pts = p->dts = 74 * 41708;
assert(dvbridge_fel_submit(f, p));
AVFrame *exact = NULL;
assert(dvbridge_fel_take(f, bare->pts, &exact) == 2 && !exact);
assert(dvbridge_fel_take(f, p->pts, &exact) == 1 && exact->pts == p->pts);
av_frame_free(&exact);
} else {
const char *reason = NULL;
assert(!dvbridge_fel_drain(f, &reason) && dvbridge_fel_failed(f));
assert(reason && !strcmp(reason, "no enhancement video received before drain"));
}
}
/* Missing EL cannot turn an unbounded input into endless preroll. */
dvbridge_fel_reset(f);
for (int i = 0; i <= 1024; ++i) {
bare->pts = bare->dts = i * 41708;
assert(dvbridge_fel_submit(f, bare) == (i < 1024));
}
av_packet_free(&bare);
dvbridge_fel_reset(f);
assert(frame->pts == 4 * 41708 && frame->buf[0]); /* downstream ref survives seek */
av_frame_free(&frame);
p->pts = p->dts = 0;
assert(dvbridge_fel_submit(f, p));
assert(dvbridge_fel_take(f, 0, &frame) == 1);
av_frame_free(&frame);
assert(dvbridge_fel_drain(f));
assert(dvbridge_fel_drain(f, NULL));
assert(dvbridge_fel_take(f, 1, &frame) == -1 && !frame);
assert(!dvbridge_fel_submit(f, p));
dvbridge_fel_reset(f);
Expand All @@ -201,7 +237,7 @@ int main(void)
assert(dvbridge_fel_submit(f, p));
}
assert(submissions == queued);
assert(dvbridge_fel_drain(f)); /* EOF must submit and retain all deferred pictures. */
assert(dvbridge_fel_drain(f, NULL)); /* EOF must submit and retain all deferred pictures. */
for (int i = 0; i < 3; ++i) {
assert(dvbridge_fel_take(f, i * 41708, &frame) == 1 && frame->pts == i * 41708);
av_frame_free(&frame);
Expand Down Expand Up @@ -246,6 +282,33 @@ int main(void)
avcodec_parameters_free(&parameters);
assert(f && dvbridge_fel_device(f, device));
assert(initialized_pool == 41); /* Fixed pools retain the existing 32+4 headroom. */
/* A renewed BL decoder can accept another input window before its next
* output. Decode compressed EL on pressure, then deliver every exact pair. */
p->pts = p->dts = 0;
assert(dvbridge_fel_submit(f, p));
assert(dvbridge_fel_take(f, 0, &frame) == 1);
av_frame_free(&frame);
before = submissions;
for (unsigned i = 1; i <= QUEUE_MAX; ++i) {
p->pts = p->dts = i * 41708;
assert(dvbridge_fel_submit(f, p));
}
assert(submissions == before);
p->pts = p->dts = (QUEUE_MAX + 1) * 41708;
assert(dvbridge_fel_submit(f, p));
for (unsigned i = 1; i <= QUEUE_MAX + 1; ++i) {
int64_t pts = i * 41708;
assert(dvbridge_fel_take(f, pts, &frame) == 1 && frame->pts == pts);
av_frame_free(&frame);
}
/* With both stages full and no base consumption, the bound still holds. */
dvbridge_fel_reset(f);
for (unsigned i = 0; i < 2 * QUEUE_MAX; ++i) {
p->pts = p->dts = i * 41708;
assert(dvbridge_fel_submit(f, p));
}
p->pts = p->dts = 2 * QUEUE_MAX * 41708;
assert(!dvbridge_fel_submit(f, p) && dvbridge_fel_failed(f));
dvbridge_fel_destroy(f);
parameters = avcodec_parameters_alloc();
parameters->codec_type = AVMEDIA_TYPE_VIDEO;
Expand Down
2 changes: 1 addition & 1 deletion CB1/tests/fel_source_time.c
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ int main(void)
assert(submit_source(f,packet,&tail));
assert(dvbridge_fel_take(f,5000,&frame)==1&&frame&&frame->pts==5000);
av_frame_free(&frame);
assert(dvbridge_fel_drain(f));
assert(dvbridge_fel_drain(f, NULL));
dvbridge_fel_reset(f);
// A genuinely decoded leading picture is exact despite a later RAP PTS.
f->source_timed=true;f->anchor_pts=100;f->num_times=1;
Expand Down
55 changes: 47 additions & 8 deletions CB1/tests/gui_coverage_alpha.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@
#endif
namespace Drawing {
struct CWinSystemBase {
bool m_guiCompositing=true;
bool m_guiCompositing=true,nativeSDR=false;
bool UsesNativeSDRBT2020() const {return nativeSDR;}
virtual bool IsHdrComposite()const{return m_guiCompositing;}
virtual bool UseGuiCoverageAlpha()const @@NATIVE_POLICY@@
};
Expand All @@ -23,12 +24,13 @@ enum class ShaderMethodGLES {SM_FONTS,SM_FONTS_SHADER_CLIP,SM_MULTI_111R_111R_BL
GLuint fontProgram,textureProgram,inputTexture;
struct RenderBase{virtual ~RenderBase()=default;};
struct CRenderSystemGLES:RenderBase {
std::array<float,3> colour{.8f,.8f,.8f};
bool ScissorsCanEffectClipping(){return true;} void ResetScissors(){}
void EnableGUIShader(ShaderMethodGLES method){
GLuint p=method==ShaderMethodGLES::SM_FONTS?fontProgram:textureProgram;
glUseProgram(p);glUniform1i(glGetUniformLocation(p,"m_samp0"),0);
glUniform4f(glGetUniformLocation(p,"test_colour"),.8,.8,.8,1);
glUniform4f(glGetUniformLocation(p,"m_unicol"),.8,.8,.8,1);
glUniform4f(glGetUniformLocation(p,"test_colour"),colour[0],colour[1],colour[2],1);
glUniform4f(glGetUniformLocation(p,"m_unicol"),colour[0],colour[1],colour[2],1);
}
} render;
struct Texture {
Expand Down Expand Up @@ -75,7 +77,8 @@ GLuint guiProgram(const std::string& fragment){
GLint linked;glGetProgramiv(p,GL_LINK_STATUS,&linked);assert(linked);return p;
}
std::string read(const std::string& path){std::ifstream f(path);std::stringstream s;s<<f.rdbuf();assert(f);return s.str();}
void draw(int x,bool font,float alpha){
void draw(int x,bool font,float alpha,const std::array<float,3>& colour={.8f,.8f,.8f}){
render.colour=colour;
glActiveTexture(GL_TEXTURE0);glBindTexture(GL_TEXTURE_2D,inputTexture);
const float pixel[]={1,1,1,alpha};glTexSubImage2D(GL_TEXTURE_2D,0,0,0,1,1,GL_RGBA,GL_FLOAT,pixel);
if(font){CGUIFontTTFGLES glyph;assert(glyph.FirstBegin());}
Expand Down Expand Up @@ -104,13 +107,13 @@ int main(int argc,char**argv){
GLuint target=texture(width,height,film.data());finalFramebuffer=framebuffer(target);
unsigned failures=0;
auto check=[&](bool pass,const char* reason){if(!pass){std::cerr<<reason<<'\n';++failures;}};
for(GLint format:{GL_RGBA32F,GL_RGBA8})for(bool font:{true,false})for(int mode=0;mode<8;mode++){
for(GLint format:{GL_RGBA32F,GL_RGBA8})for(bool font:{true,false})for(int mode=0;mode<9;mode++){
auto&w=Drawing::window;w.m_guiCompositing=mode!=4;w.m_dvState.captured=mode==1||mode==6||mode==7;
w.m_hdrConversion=mode==2||mode==3;w.m_dvContext=mode==5?&w:nullptr;
w.m_cb1RestoringPreferences=mode==6;w.m_dvOrdinaryFrame=mode==7;
bool coverage=mode==1||mode==2||mode==3||mode==4;
w.m_cb1RestoringPreferences=mode==6;w.m_dvOrdinaryFrame=mode==7;w.nativeSDR=mode==8;
bool coverage=mode==1||mode==2||mode==3||mode==4||w.nativeSDR;
#ifdef CB1_TEST_DISABLE_DV
coverage=mode==4;
coverage=mode==4||w.nativeSDR;
#endif
if(format==GL_RGBA8){
glGenTextures(1,&guiTexture);glBindTexture(GL_TEXTURE_2D,guiTexture);
Expand Down Expand Up @@ -165,6 +168,42 @@ int main(int argc,char**argv){
std::cout<<(font?"font":"texture")<<" format="<<(format==GL_RGBA8?8:32)<<" mode="<<mode
<<" panel="<<pixels[3]<<" glyph="<<pixels[7]<<" outside="<<pixels[11]<<" edge="<<pixels[15]
<<" cached_film_delta="<<leak<<std::endl;
if(w.nativeSDR){
glBindFramebuffer(GL_FRAMEBUFFER,guiFbo);glViewport(0,0,width,height);
glClearColor(0,0,0,0);glClear(GL_COLOR_BUFFER_BIT);
Drawing::draw(0,font,.5,{0,0,0});
Drawing::draw(1,font,.5,{1,1,1});
Drawing::draw(2,font,.5,{0,1,0});
Drawing::draw(3,font,.5,{0,1,0});Drawing::draw(3,font,.5,{0,1,0});

// Endpoints are used for straight black/white/green. Sampling the middle
// means the compositor mistakenly degammaed a premultiplied component.
const float nativeLut[]={0,0,0,1, .214041f,.214041f,.214041f,1, 1,1,1,1};
const GLuint previousLut=degammaTexture;
degammaTexture=texture(3,1,nativeLut);
for(unsigned i=0;i<width*height;i++)for(unsigned c=0;c<4;c++)
film[i*4+c]=c==3 || i==0 ? 1 : 0;
glBindTexture(GL_TEXTURE_2D,target);
glTexSubImage2D(GL_TEXTURE_2D,0,0,0,width,height,GL_RGBA,GL_FLOAT,film.data());
glBindFramebuffer(GL_FRAMEBUFFER,finalFramebuffer);glViewport(0,0,width,height);
CWinSystemGbmGLESContext composite;
composite.m_hdrConversion=false;
composite.m_compositeShader->m_ootfGamma=-2.4f;
composite.m_compositeShader->SetSDRBT2020(true,true);
composite.CompositeGui();
std::array<float,width*height*4> result{};
glReadPixels(0,0,width,height,GL_RGBA,GL_FLOAT,result.data());
const std::array<float,3> green={.3293f,.9195f,.0880f};
const float blendTolerance=std::max(shaderTolerance,1.5f/255);
for(unsigned c=0;c<3;c++){
check(std::abs(result[c]-.5f)<=blendTolerance,"50% black over white changed opacity");
check(std::abs(result[4+c]-.5f)<=blendTolerance,"50% white over black changed opacity");
const float expected=std::pow(green[c],1.f/2.4f);
check(std::abs(result[8+c]-.5f*expected)<=blendTolerance,"50% green was converted with premultiplied RGB");
check(std::abs(result[12+c]-.75f*expected)<=blendTolerance,"overlapping green lost accumulated coverage");
}
glDeleteTextures(1,&degammaTexture);degammaTexture=previousLut;
}
glDeleteFramebuffers(1,&guiFbo);glDeleteTextures(1,&guiTexture);
}
assert(glGetError()==GL_NO_ERROR);return failures?1:0;
Expand Down
5 changes: 3 additions & 2 deletions CB1/tests/gui_final_hdr10.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -58,12 +58,13 @@ struct GUIFramebuffer {
GLuint Texture()const{return guiTexture;}
};
struct CompositeShader {
const GLfloat* m_proj{};bool m_inputPQ{},m_sdrBT2020{};float m_outputScale=1,m_outputOffset=0,m_ootfGamma=0;
const GLfloat* m_proj{};bool m_inputPQ{},m_sdrBT2020{},m_unpremultiplyGui{};float m_outputScale=1,m_outputOffset=0,m_ootfGamma=0;
GLuint m_lutDegammaTexId=degammaTexture,m_lutTFTexId=pqTexture;
GLint m_hProj=glGetUniformLocation(nativeProgram,"u_proj");
GLint m_hOotfGamma=glGetUniformLocation(nativeProgram,"u_ootfGamma");
GLint m_hInputPQ=glGetUniformLocation(nativeProgram,"u_inputPQ");
GLint m_hSDRBT2020=glGetUniformLocation(nativeProgram,"u_sdrBT2020");
GLint m_hUnpremultiplyGui=glGetUniformLocation(nativeProgram,"u_unpremultiplyGui");
GLint m_hOutputRange=glGetUniformLocation(nativeProgram,"u_outputRange");
GLint m_hPlayerLedScale=glGetUniformLocation(nativeProgram,"u_playerLedScale");
GLint m_hPlayerLedGui=glGetUniformLocation(nativeProgram,"u_playerLedGui");
Expand All @@ -72,7 +73,7 @@ struct CompositeShader {
std::array<float,9> m_playerLedGui{},m_playerLedSubtitles{};
void SetProjection(const GLfloat* p){m_proj=p;}
void SetInputPQ(bool p){m_inputPQ=p;}
void SetSDRBT2020(bool wide){m_sdrBT2020=wide;}
void SetSDRBT2020(bool wide,bool premultiplied=false){m_sdrBT2020=wide;m_unpremultiplyGui=premultiplied;}
void SetOutputRange(float s,float o){m_outputScale=s;m_outputOffset=o;}
void SetPlayerLed(float peak=0,const std::array<float,9>& guiMatrix={},
const std::array<float,9>& subMatrix={})
Expand Down
Loading
Loading