Skip to content

adapt colorspace #2439

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

Open
wants to merge 2 commits into
base: release/6.5
Choose a base branch
from
Open

adapt colorspace #2439

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
17577fc
feat: adapt colorspace for iOS and macOS
ZGaopeng Sep 28, 2025
21b6a1d
feat: adapt colorspace for Android
ZGaopeng Sep 28, 2025
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
116 changes: 105 additions & 11 deletions android/src/main/cpp/iris_rtc_rendering_android.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
#include <jni.h>
#include <memory>
#include <vector>
#include <cstring>

namespace agora {
namespace iris {
Expand Down Expand Up @@ -508,6 +509,10 @@ class YUVRendering final : public RenderingOp {
uTextureLoc_ = glGetUniformLocation(program, "uTexture");
vTextureLoc_ = glGetUniformLocation(program, "vTexture");

// Get locations for ColorSpace uniforms
colorMatrixLoc_ = glGetUniformLocation(program, "uColorMatrix");
rangeLoc_ = glGetUniformLocation(program, "uRange");

glGenTextures(3, texs_);
CHECK_GL_ERROR()
}
Expand Down Expand Up @@ -618,12 +623,88 @@ class YUVRendering final : public RenderingOp {
GL_LUMINANCE, GL_UNSIGNED_BYTE, vBuffer);
CHECK_GL_ERROR()

if (colorMatrixLoc_ != -1) {
// BT.601 Full Range
float bt601_full[9] = {
1.0f, 1.0f, 1.0f,
0.0f, -0.344136f, 1.772f,
1.402f, -0.714136f, 0.0f
};

// BT.601 Limited Range
float bt601_limit[9] = {
1.164384f, 1.164384f, 1.164384f,
0.0f, -0.391762f, 2.017232f,
1.596027f, -0.812968f, 0.0f
};

// BT.709 Full Range
float bt709_full[9] = {
1.0f, 1.0f, 1.0f,
0.0f, -0.187324f, 1.8556f,
1.5748f, -0.468124f, 0.0f
};

// BT.709 Limited Range
float bt709_limit[9] = {
1.164384f, 1.164384f, 1.164384f,
0.0f, -0.213249f, 2.112402f,
1.792741f, -0.532909f, 0.0f
};

// BT.2020 Full Range
float bt2020_full[9] = {
1.0f, 1.0f, 1.0f,
0.0f, -0.164553f, 1.8814f,
1.4746f, -0.571353f, 0.0f
};

// BT.2020 Limited Range
float bt2020_limit[9] = {
1.167808f, 1.167808f, 1.167808f,
0.0f, -0.187877f, 2.148072f,
1.683611f, -0.652337f, 0.0f
};

float mat[9];
int matrixId = (int)video_frame->colorSpace.matrix;
int rangeId = (int)video_frame->colorSpace.range;

bool isFullRange = (rangeId == agora::media::base::ColorSpace::RANGEID_FULL);

// Select matrix based on colorSpace.matrix and range
switch (matrixId) {
case agora::media::base::ColorSpace::MATRIXID_SMPTE170M:
case agora::media::base::ColorSpace::MATRIXID_BT470BG:
memcpy(mat, isFullRange ? bt601_full : bt601_limit, sizeof(mat));
break;
case agora::media::base::ColorSpace::MATRIXID_BT709:
memcpy(mat, isFullRange ? bt709_full : bt709_limit, sizeof(mat));
break;
case agora::media::base::ColorSpace::MATRIXID_BT2020_NCL:
case agora::media::base::ColorSpace::MATRIXID_BT2020_CL:
memcpy(mat, bt2020_full, sizeof(mat));
break;
default:
memcpy(mat, isFullRange ? bt709_full : bt709_limit, sizeof(mat));
break;
}
glUniformMatrix3fv(colorMatrixLoc_, 1, GL_FALSE, mat);
}

if (rangeLoc_ != -1) {
int rangeId = (int)video_frame->colorSpace.range;
bool isFullRange = (rangeId == agora::media::base::ColorSpace::RANGEID_FULL);
int rangeVal = isFullRange ? 1 : 0;
glUniform1i(rangeLoc_, rangeVal);

}

glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
CHECK_GL_ERROR()

gl_context_->Swap();

// Clean up
glDisableVertexAttribArray(aPositionLoc_);
CHECK_GL_ERROR()
glDisableVertexAttribArray(texCoordLoc_);
Expand All @@ -642,8 +723,8 @@ class YUVRendering final : public RenderingOp {
"attribute vec2 aTextCoord;\n"
"varying vec2 vTextCoord;\n"
"void main() {\n"
" vTextCoord = vec2(aTextCoord.x, 1.0 - aTextCoord.y);\n"
" gl_Position = aPosition;\n"
" gl_Position = aPosition;\n"
" vTextCoord = aTextCoord;\n"
"}\n";

const char *frag_shader_yuv_ =
Expand All @@ -652,15 +733,26 @@ class YUVRendering final : public RenderingOp {
"uniform sampler2D yTexture;\n"
"uniform sampler2D uTexture;\n"
"uniform sampler2D vTexture;\n"
"uniform mat3 uColorMatrix;\n"
"uniform int uRange;\n"
"\n"
"void main() {\n"
" vec3 yuv;\n"
" vec3 rgb;\n"
" yuv.r = texture2D(yTexture, vTextCoord).r;\n"
" yuv.g = texture2D(uTexture, vTextCoord).r - 0.5;\n"
" yuv.b = texture2D(vTexture, vTextCoord).r - 0.5;\n"
" rgb = mat3(1.0, 1.0, 1.0, 0.0, -0.39465, 2.03211, 1.13983, "
"-0.58060, 0.0) * yuv;\n"
" gl_FragColor = vec4(rgb, 1.0);\n"
" float y = texture2D(yTexture, vTextCoord).r;\n"
" float u = texture2D(uTexture, vTextCoord).r;\n"
" float v = texture2D(vTexture, vTextCoord).r;\n"
"\n"
" vec3 yuv;\n"
" if (uRange == 0) { // LIMITED: apply 0.0627 offset\n"
" yuv[0] = clamp(y, 0.0, 1.0) - 0.0627;\n"
" } else { // FULL: no offset\n"
" yuv[0] = clamp(y, 0.0, 1.0);\n"
" }\n"
" yuv[1] = clamp(u - 0.5, -0.5, 0.5);\n"
" yuv[2] = clamp(v - 0.5, -0.5, 0.5);\n"
"\n"
" vec3 rgb = uColorMatrix * yuv;\n"
"\n"
" gl_FragColor = vec4(clamp(rgb, 0.0, 1.0), 1.0);\n"
"}\n";

// clang-format off
Expand All @@ -680,6 +772,8 @@ class YUVRendering final : public RenderingOp {
GLint yTextureLoc_;
GLint uTextureLoc_;
GLint vTextureLoc_;
GLint colorMatrixLoc_ = -1;
GLint rangeLoc_ = -1;

std::unique_ptr<ScopedShader> shader_;
};
Expand Down
2 changes: 1 addition & 1 deletion example/android/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ android {
defaultConfig {
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
applicationId "io.agora.agora_rtc_ng_example"
minSdkVersion 21
minSdkVersion flutter.minSdkVersion
targetSdkVersion flutter.targetSdkVersion
versionCode flutterVersionCode.toInteger()
versionName flutterVersionName
Expand Down
Loading
Loading