Display and control your Android device
Generate mipmaps for all YV12 planes
Romain Vimont562999e9f08a
diff --git a/app/src/texture.c b/app/src/texture.cindex 45c639bd..2672f073 100644--- a/app/src/texture.c+++ b/app/src/texture.c@@ -130,28 +130,42 @@ sc_texture_create_frame_texture(struct sc_texture *tex,return NULL;}+ // A YV12 texture is backed by one OpenGL texture per plane+ static const char *const opengl_keys[3] = {+ SDL_PROP_TEXTURE_OPENGL_TEXTURE_NUMBER,+ SDL_PROP_TEXTURE_OPENGL_TEXTURE_U_NUMBER,+ SDL_PROP_TEXTURE_OPENGL_TEXTURE_V_NUMBER,+ };+ static const char *const opengles2_keys[3] = {+ SDL_PROP_TEXTURE_OPENGLES2_TEXTURE_NUMBER,+ SDL_PROP_TEXTURE_OPENGLES2_TEXTURE_U_NUMBER,+ SDL_PROP_TEXTURE_OPENGLES2_TEXTURE_V_NUMBER,+ };+const char *renderer_name = SDL_GetRendererName(tex->renderer);- const char *key = !renderer_name || !strcmp(renderer_name, "opengl")- ? SDL_PROP_TEXTURE_OPENGL_TEXTURE_NUMBER- : SDL_PROP_TEXTURE_OPENGLES2_TEXTURE_NUMBER;-- int64_t texture_id = SDL_GetNumberProperty(props, key, 0);- if (!texture_id) {- LOGE("Could not get texture id: %s", SDL_GetError());- SDL_DestroyTexture(texture);- return NULL;- }+ const char *const *keys = !renderer_name+ || !strcmp(renderer_name, "opengl")+ ? opengl_keys : opengles2_keys;++ for (unsigned i = 0; i < 3; ++i) {+ int64_t texture_id = SDL_GetNumberProperty(props, keys[i], 0);+ if (!texture_id) {+ LOGE("Could not get texture id: %s", SDL_GetError());+ SDL_DestroyTexture(texture);+ return NULL;+ }- assert(!(texture_id & ~0xFFFFFFFF)); // fits in uint32_t- tex->texture_id = texture_id;- gl->BindTexture(GL_TEXTURE_2D, tex->texture_id);+ assert(!(texture_id & ~0xFFFFFFFF)); // fits in uint32_t+ tex->texture_ids[i] = texture_id;+ gl->BindTexture(GL_TEXTURE_2D, tex->texture_ids[i]);- // Enable trilinear filtering for downscaling- gl->TexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER,- GL_LINEAR_MIPMAP_LINEAR);- gl->TexParameterf(GL_TEXTURE_2D, GL_TEXTURE_LOD_BIAS, -1.f);+ // Enable trilinear filtering for downscaling+ gl->TexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER,+ GL_LINEAR_MIPMAP_LINEAR);+ gl->TexParameterf(GL_TEXTURE_2D, GL_TEXTURE_LOD_BIAS, -1.f);- gl->BindTexture(GL_TEXTURE_2D, 0);+ gl->BindTexture(GL_TEXTURE_2D, 0);+ }}return texture;@@ -200,11 +214,13 @@ sc_texture_set_from_frame(struct sc_texture *tex, const AVFrame *frame) {}if (tex->mipmaps) {- assert(tex->texture_id);struct sc_opengl *gl = &tex->gl;- gl->BindTexture(GL_TEXTURE_2D, tex->texture_id);- gl->GenerateMipmap(GL_TEXTURE_2D);+ for (unsigned i = 0; i < 3; ++i) {+ assert(tex->texture_ids[i]);+ gl->BindTexture(GL_TEXTURE_2D, tex->texture_ids[i]);+ gl->GenerateMipmap(GL_TEXTURE_2D);+ }gl->BindTexture(GL_TEXTURE_2D, 0);}diff --git a/app/src/texture.h b/app/src/texture.hindex 8c0c0c71..8c8355c9 100644--- a/app/src/texture.h+++ b/app/src/texture.h@@ -26,7 +26,7 @@ struct sc_texture {struct sc_opengl gl;bool mipmaps;- uint32_t texture_id; // only set if mipmaps is enabled+ uint32_t texture_ids[3]; // only set if mipmaps is enabled};bool