generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix OpenGL rendering of WebRTCDemo by accounting for stride != width.

Browse Source 
BUG=998

Review URL: https://webrtc-codereview.appspot.com/936021

git-svn-id: http://webrtc.googlecode.com/svn/trunk@3079 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
fischman@webrtc.org 2012-11-12 16:39:25 +00:00
parent af49062a35
commit b900721472
1 changed files with 32 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
webrtc/modules/video_render/android/video_render_opengles20.cc
View File

@ -383,33 +383,46 @@ void VideoRenderOpenGles20::SetupTextures(const I420VideoFrame& frameToRender) {
_textureHeight = height; _textureHeight = height;
} }
// Uploads a plane of pixel data, accounting for stride != width*bpp.
static void GlTexSubImage2D(GLsizei width, GLsizei height, int stride,
const uint8_t* plane) {
if (stride == width) {
// Yay! We can upload the entire plane in a single GL call.
glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, width, height, GL_LUMINANCE,
GL_UNSIGNED_BYTE,
static_cast<const GLvoid*>(plane));
} else {
// Boo! Since GLES2 doesn't have GL_UNPACK_ROW_LENGTH and Android doesn't
// have GL_EXT_unpack_subimage we have to upload a row at a time. Ick.
for (int row = 0; row < height; ++row) {
glTexSubImage2D(GL_TEXTURE_2D, 0, 0, row, width, 1, GL_LUMINANCE,
GL_UNSIGNED_BYTE,
static_cast<const GLvoid*>(plane + (row * stride)));
}
}
}
void VideoRenderOpenGles20::UpdateTextures(const void VideoRenderOpenGles20::UpdateTextures(const
I420VideoFrame& frameToRender) { I420VideoFrame& frameToRender) {
const GLsizei width = frameToRender.width(); const GLsizei width = frameToRender.width();
const GLsizei height = frameToRender.height(); const GLsizei height = frameToRender.height();
GLuint currentTextureId = _textureIds[0]; // Y glActiveTexture(GL_TEXTURE0);
glActiveTexture( GL_TEXTURE0); glBindTexture(GL_TEXTURE_2D, _textureIds[0]);
glBindTexture(GL_TEXTURE_2D, currentTextureId); GlTexSubImage2D(width, height, frameToRender.stride(kYPlane),
glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, width, height, GL_LUMINANCE, frameToRender.buffer(kYPlane));
GL_UNSIGNED_BYTE,
(const GLvoid*) frameToRender.buffer(kYPlane));
currentTextureId = _textureIds[1]; // U glActiveTexture(GL_TEXTURE1);
glActiveTexture( GL_TEXTURE1); glBindTexture(GL_TEXTURE_2D, _textureIds[1]);
glBindTexture(GL_TEXTURE_2D, currentTextureId); GlTexSubImage2D(width / 2, height / 2, frameToRender.stride(kUPlane),
const WebRtc_UWord8* uComponent = frameToRender.buffer(kUPlane); frameToRender.buffer(kUPlane));
glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, width / 2, height / 2,
GL_LUMINANCE, GL_UNSIGNED_BYTE, (const GLvoid*) uComponent); glActiveTexture(GL_TEXTURE2);
glBindTexture(GL_TEXTURE_2D, _textureIds[2]);
GlTexSubImage2D(width / 2, height / 2, frameToRender.stride(kVPlane),
frameToRender.buffer(kVPlane));
currentTextureId = _textureIds[2]; // V
glActiveTexture( GL_TEXTURE2);
glBindTexture(GL_TEXTURE_2D, currentTextureId);
const WebRtc_UWord8* vComponent = frameToRender.buffer(kVPlane);
glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, width / 2, height / 2,
GL_LUMINANCE, GL_UNSIGNED_BYTE, (const GLvoid*) vComponent);
checkGlError("UpdateTextures"); checkGlError("UpdateTextures");
} }
} // namespace webrtc } // namespace webrtc