Skip to content

Opengles2 to opengles3 #3

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 3 commits into
base: develop
Choose a base branch
from
Open

Opengles2 to opengles3 #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
487bfc2
Add record func
nhathm-fsoft Jul 2, 2019
929bc10
Upgrade OpenGL ES2 to OpenGL ES3
nhathm Jul 18, 2019
5c7884d
Remove unneeded change
nhathm Jul 18, 2019
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
6 changes: 3 additions & 3 deletions ijkmedia/ijksdl/gles2/renderer_rgb.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down
8 changes: 4 additions & 4 deletions ijkmedia/ijksdl/gles2/renderer_yuv420sp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]);

Expand Down
8 changes: 4 additions & 4 deletions ijkmedia/ijksdl/gles2/renderer_yuv420sp_vtb.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]);
Expand All @@ -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]);
Expand Down
4 changes: 2 additions & 2 deletions ijkmedia/ijksdl/ijksdl_gles2.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
#define IJKSDL__IJKSDL_GLES2_H

#ifdef __APPLE__
#include <OpenGLES/ES2/gl.h>
#include <OpenGLES/ES2/glext.h>
#include <OpenGLES/ES3/gl.h>
#include <OpenGLES/ES3/glext.h>
#else
#include <GLES2/gl2.h>
#include <GLES2/gl2ext.h>
Expand Down
6 changes: 3 additions & 3 deletions init-ios.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion ios/IJKMediaPlayer/IJKMediaPlayer/ijkmedia/ijksdl/ios/IJKSDLGLView.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down