FaSTTUBe/GST-Tensordecoder-ov_ep
35
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

vtdec: Use R/RG textures for NV12 when the context provides them

Browse Source 
Fixes playback to GL memory on iOS, where the colours are messed
up by passing Luminance/LuminanceAlpha textures where
color convert expects R/RG textures.

https://bugzilla.gnome.org/show_bug.cgi?id=754504
This commit is contained in:
Jan Schmidt 2015-09-12 00:51:52 +10:00
parent 0d7d7f6c92
commit 9f890c5935
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
sys/applemedia/corevideotexturecache.m
View File

@ -172,30 +172,40 @@ gl_mem_from_buffer (GstCoreVideoTextureCache * cache,
CVOpenGLESTextureGetName (texture), CVOpenGLESTextureGetTarget (texture), CVOpenGLESTextureGetName (texture), CVOpenGLESTextureGetTarget (texture),
&cache->input_info, 0, NULL, texture, (GDestroyNotify) CFRelease); &cache->input_info, 0, NULL, texture, (GDestroyNotify) CFRelease);
break; break;
case GST_VIDEO_FORMAT_NV12: case GST_VIDEO_FORMAT_NV12: {
GstVideoGLTextureType textype;
GLenum texfmt;
textype = gst_gl_texture_type_from_format (cache->ctx, GST_VIDEO_FORMAT_NV12, 0);
texfmt = gst_gl_format_from_gl_texture_type (textype);
/* vtdec does NV12 on iOS when doing GLMemory */ /* vtdec does NV12 on iOS when doing GLMemory */
if (CVOpenGLESTextureCacheCreateTextureFromImage (kCFAllocatorDefault, if (CVOpenGLESTextureCacheCreateTextureFromImage (kCFAllocatorDefault,
cache->cache, pixel_buf, NULL, GL_TEXTURE_2D, GL_LUMINANCE, cache->cache, pixel_buf, NULL, GL_TEXTURE_2D, texfmt,
GST_VIDEO_INFO_WIDTH (&cache->input_info), GST_VIDEO_INFO_WIDTH (&cache->input_info),
GST_VIDEO_INFO_HEIGHT (&cache->input_info), GST_VIDEO_INFO_HEIGHT (&cache->input_info),
GL_LUMINANCE, GL_UNSIGNED_BYTE, 0, &texture) != kCVReturnSuccess) texfmt, GL_UNSIGNED_BYTE, 0, &texture) != kCVReturnSuccess)
goto error; goto error;
*mem1 = (GstMemory *) gst_gl_memory_wrapped_texture (cache->ctx, *mem1 = (GstMemory *) gst_gl_memory_wrapped_texture (cache->ctx,
CVOpenGLESTextureGetName (texture), CVOpenGLESTextureGetTarget (texture), CVOpenGLESTextureGetName (texture), CVOpenGLESTextureGetTarget (texture),
&cache->input_info, 0, NULL, texture, (GDestroyNotify) CFRelease); &cache->input_info, 0, NULL, texture, (GDestroyNotify) CFRelease);
textype = gst_gl_texture_type_from_format (cache->ctx, GST_VIDEO_FORMAT_NV12, 1);
texfmt = gst_gl_format_from_gl_texture_type (textype);
if (CVOpenGLESTextureCacheCreateTextureFromImage (kCFAllocatorDefault, if (CVOpenGLESTextureCacheCreateTextureFromImage (kCFAllocatorDefault,
cache->cache, pixel_buf, NULL, GL_TEXTURE_2D, GL_LUMINANCE_ALPHA, cache->cache, pixel_buf, NULL, GL_TEXTURE_2D, texfmt,
GST_VIDEO_INFO_WIDTH (&cache->input_info) / 2, GST_VIDEO_INFO_WIDTH (&cache->input_info) / 2,
GST_VIDEO_INFO_HEIGHT (&cache->input_info) / 2, GST_VIDEO_INFO_HEIGHT (&cache->input_info) / 2,
GL_LUMINANCE_ALPHA, GL_UNSIGNED_BYTE, 1, &texture) != kCVReturnSuccess) texfmt, GL_UNSIGNED_BYTE, 1, &texture) != kCVReturnSuccess)
goto error; goto error;
*mem2 = (GstMemory *) gst_gl_memory_wrapped_texture (cache->ctx, *mem2 = (GstMemory *) gst_gl_memory_wrapped_texture (cache->ctx,
CVOpenGLESTextureGetName (texture), CVOpenGLESTextureGetTarget (texture), CVOpenGLESTextureGetName (texture), CVOpenGLESTextureGetTarget (texture),
&cache->input_info, 0, NULL, texture, (GDestroyNotify) CFRelease); &cache->input_info, 0, NULL, texture, (GDestroyNotify) CFRelease);
break; break;
}
#endif #endif
default: default:
g_warn_if_reached (); g_warn_if_reached ();