diff --git a/ijkmedia/ijksdl/gles2/renderer_rgb.c b/ijkmedia/ijksdl/gles2/renderer_rgb.c index bd42f17f54..0a2cbf606a 100644 --- a/ijkmedia/ijksdl/gles2/renderer_rgb.c +++ b/ijkmedia/ijksdl/gles2/renderer_rgb.c @@ -79,7 +79,7 @@ static GLboolean rgb565_uploadTexture(IJK_GLES2_Renderer *renderer, SDL_VoutOver glTexImage2D(GL_TEXTURE_2D, 0, - GL_RGB, + GL_RGB16F, widths[plane], heights[plane], 0, @@ -145,7 +145,7 @@ static GLboolean rgb888_uploadTexture(IJK_GLES2_Renderer *renderer, SDL_VoutOver glTexImage2D(GL_TEXTURE_2D, 0, - GL_RGB, + GL_RGB16F, widths[plane], heights[plane], 0, @@ -211,7 +211,7 @@ static GLboolean rgbx8888_uploadTexture(IJK_GLES2_Renderer *renderer, SDL_VoutOv glTexImage2D(GL_TEXTURE_2D, 0, - GL_RGBA, + GL_RGBA16F, widths[plane], heights[plane], 0, diff --git a/ijkmedia/ijksdl/gles2/renderer_yuv420sp.c b/ijkmedia/ijksdl/gles2/renderer_yuv420sp.c index f90b9b0c73..ae93cb990f 100644 --- a/ijkmedia/ijksdl/gles2/renderer_yuv420sp.c +++ b/ijkmedia/ijksdl/gles2/renderer_yuv420sp.c @@ -80,22 +80,22 @@ static GLboolean yuv420sp_uploadTexture(IJK_GLES2_Renderer *renderer, SDL_VoutOv glBindTexture(GL_TEXTURE_2D, renderer->plane_textures[0]); glTexImage2D(GL_TEXTURE_2D, 0, - GL_RED_EXT, + GL_LUMINANCE, widths[0], heights[0], 0, - GL_RED_EXT, + GL_LUMINANCE, GL_UNSIGNED_BYTE, pixels[0]); glBindTexture(GL_TEXTURE_2D, renderer->plane_textures[1]); glTexImage2D(GL_TEXTURE_2D, 0, - GL_RG_EXT, + GL_LUMINANCE_ALPHA, widths[1], heights[1], 0, - GL_RG_EXT, + GL_LUMINANCE_ALPHA, GL_UNSIGNED_BYTE, pixels[1]); diff --git a/ijkmedia/ijksdl/gles2/renderer_yuv420sp_vtb.m b/ijkmedia/ijksdl/gles2/renderer_yuv420sp_vtb.m index 62c34a3118..6502ebbabb 100644 --- a/ijkmedia/ijksdl/gles2/renderer_yuv420sp_vtb.m +++ b/ijkmedia/ijksdl/gles2/renderer_yuv420sp_vtb.m @@ -138,10 +138,10 @@ static GLboolean yuv420sp_vtb_uploadTexture(IJK_GLES2_Renderer *renderer, SDL_Vo pixel_buffer, NULL, GL_TEXTURE_2D, - GL_RED_EXT, + GL_LUMINANCE, (GLsizei)frame_width, (GLsizei)frame_height, - GL_RED_EXT, + GL_LUMINANCE, GL_UNSIGNED_BYTE, 0, &opaque->cv_texture[0]); @@ -158,10 +158,10 @@ static GLboolean yuv420sp_vtb_uploadTexture(IJK_GLES2_Renderer *renderer, SDL_Vo pixel_buffer, NULL, GL_TEXTURE_2D, - GL_RG_EXT, + GL_LUMINANCE_ALPHA, (GLsizei)frame_width / 2, (GLsizei)frame_height / 2, - GL_RG_EXT, + GL_LUMINANCE_ALPHA, GL_UNSIGNED_BYTE, 1, &opaque->cv_texture[1]); diff --git a/ijkmedia/ijksdl/ijksdl_gles2.h b/ijkmedia/ijksdl/ijksdl_gles2.h index 7c1fdd51c9..5699551fac 100644 --- a/ijkmedia/ijksdl/ijksdl_gles2.h +++ b/ijkmedia/ijksdl/ijksdl_gles2.h @@ -23,8 +23,8 @@ #define IJKSDL__IJKSDL_GLES2_H #ifdef __APPLE__ -#include -#include +#include +#include #else #include #include diff --git a/init-ios.sh b/init-ios.sh index 41a25dc1a5..6752c354f0 100755 --- a/init-ios.sh +++ b/init-ios.sh @@ -39,9 +39,9 @@ fi set -e TOOLS=tools -FF_ALL_ARCHS_IOS6_SDK="armv7 armv7s i386" -FF_ALL_ARCHS_IOS7_SDK="armv7 armv7s arm64 i386 x86_64" -FF_ALL_ARCHS_IOS8_SDK="armv7 arm64 i386 x86_64" +#FF_ALL_ARCHS_IOS6_SDK="armv7 armv7s i386" +#FF_ALL_ARCHS_IOS7_SDK="armv7 armv7s arm64 i386 x86_64" +FF_ALL_ARCHS_IOS8_SDK="arm64 i386 x86_64" FF_ALL_ARCHS=$FF_ALL_ARCHS_IOS8_SDK FF_TARGET=$1 diff --git a/ios/IJKMediaPlayer/IJKMediaPlayer/ijkmedia/ijksdl/ios/IJKSDLGLView.m b/ios/IJKMediaPlayer/IJKMediaPlayer/ijkmedia/ijksdl/ios/IJKSDLGLView.m index 2d7c66515e..c88fc13a71 100644 --- a/ios/IJKMediaPlayer/IJKMediaPlayer/ijkmedia/ijksdl/ios/IJKSDLGLView.m +++ b/ios/IJKMediaPlayer/IJKMediaPlayer/ijkmedia/ijksdl/ios/IJKSDLGLView.m @@ -163,7 +163,7 @@ - (BOOL)setupGL [eaglLayer setContentsScale:_scaleFactor]; - _context = [[EAGLContext alloc] initWithAPI:kEAGLRenderingAPIOpenGLES2]; + _context = [[EAGLContext alloc] initWithAPI:kEAGLRenderingAPIOpenGLES3]; if (_context == nil) { NSLog(@"failed to setup EAGLContext\n"); return NO;