Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
qq_25606643
ijkplayer
提交
f56122ac
I
ijkplayer
项目概览
qq_25606643
/
ijkplayer
与 Fork 源项目一致
从无法访问的项目Fork
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
I
ijkplayer
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
提交
f56122ac
编写于
1月 13, 2016
作者:
Z
Zhang Rui
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
ios/glview: fix padding calculation
上级
1825a99b
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
34 addition
and
30 deletion
+34
-30
ios/IJKMediaPlayer/IJKMediaPlayer/ijkmedia/ijksdl/ios/IJKSDLGLView.m
...aPlayer/IJKMediaPlayer/ijkmedia/ijksdl/ios/IJKSDLGLView.m
+34
-30
未找到文件。
ios/IJKMediaPlayer/IJKMediaPlayer/ijkmedia/ijksdl/ios/IJKSDLGLView.m
浏览文件 @
f56122ac
...
...
@@ -176,6 +176,7 @@ static void mat4f_LoadOrtho(float left, float right, float bottom, float top, fl
BOOL
_didSetContentMode
;
BOOL
_didRelayoutSubViews
;
BOOL
_didVerticesChanged
;
BOOL
_didPaddingChanged
;
int
_tryLockErrorCount
;
...
...
@@ -435,10 +436,18 @@ static int g_ijk_gles_queue_spec_key;
-
(
void
)
layoutOnDisplayThread
{
int
backingWidth
=
0
;
int
backingHeight
=
0
;
glBindRenderbuffer
(
GL_RENDERBUFFER
,
_renderbuffer
);
[
_context
renderbufferStorage
:
GL_RENDERBUFFER
fromDrawable
:(
CAEAGLLayer
*
)
self
.
layer
];
glGetRenderbufferParameteriv
(
GL_RENDERBUFFER
,
GL_RENDERBUFFER_WIDTH
,
&
_backingWidth
);
glGetRenderbufferParameteriv
(
GL_RENDERBUFFER
,
GL_RENDERBUFFER_HEIGHT
,
&
_backingHeight
);
glGetRenderbufferParameteriv
(
GL_RENDERBUFFER
,
GL_RENDERBUFFER_WIDTH
,
&
backingWidth
);
glGetRenderbufferParameteriv
(
GL_RENDERBUFFER
,
GL_RENDERBUFFER_HEIGHT
,
&
backingHeight
);
if
(
_backingWidth
!=
backingWidth
||
_backingHeight
!=
backingHeight
)
{
_backingWidth
=
backingWidth
;
_backingHeight
=
backingHeight
;
_didVerticesChanged
=
YES
;
}
GLenum
status
=
glCheckFramebufferStatus
(
GL_FRAMEBUFFER
);
if
(
status
!=
GL_FRAMEBUFFER_COMPLETE
)
{
...
...
@@ -449,16 +458,12 @@ static int g_ijk_gles_queue_spec_key;
NSLog
(
@"OK setup GL framebuffer %d:%d"
,
_backingWidth
,
_backingHeight
);
}
[
self
updateVertices
];
// FIXME: trigger a redisplay on display thread
// [self display: nil];
}
-
(
void
)
setContentMode
:(
UIViewContentMode
)
contentMode
{
_didSetContentMode
=
YES
;
[
super
setContentMode
:
contentMode
];
_didSetContentMode
=
YES
;
if
(
self
->
_useRenderQueue
&&
self
->
_renderQueue
)
{
dispatch_async
(
self
->
_renderQueue
,
^
(){
[
self
display
:
nil
];
...
...
@@ -502,15 +507,26 @@ static int g_ijk_gles_queue_spec_key;
}
}
if
(
overlay
&&
(
_frameWidth
!=
overlay
->
w
||
_frameHeight
!=
overlay
->
h
||
_frameSarNum
!=
overlay
->
sar_num
||
_frameSarDen
!=
overlay
->
sar_den
))
{
_frameWidth
=
overlay
->
w
;
_frameHeight
=
overlay
->
h
;
_frameSarNum
=
overlay
->
sar_num
;
_frameSarDen
=
overlay
->
sar_den
;
[
self
updateVertices
];
if
(
overlay
)
{
if
(
_frameWidth
!=
overlay
->
w
||
_frameHeight
!=
overlay
->
h
||
_frameSarNum
!=
overlay
->
sar_num
||
_frameSarDen
!=
overlay
->
sar_den
)
{
_frameWidth
=
overlay
->
w
;
_frameHeight
=
overlay
->
h
;
_frameSarNum
=
overlay
->
sar_num
;
_frameSarDen
=
overlay
->
sar_den
;
_didVerticesChanged
=
YES
;
}
if
(
!
overlay
->
is_private
&&
overlay
->
pitches
&&
_frameWidth
>
0
)
{
int
frameBufferWidth
=
overlay
->
pitches
[
0
]
/
_bytesPerPixel
;
int
rightPaddingPixels
=
frameBufferWidth
-
_frameWidth
;
if
(
rightPaddingPixels
!=
_rightPaddingPixels
)
{
_rightPaddingPixels
=
rightPaddingPixels
;
_rightPadding
=
((
GLfloat
)
_rightPaddingPixels
)
/
frameBufferWidth
;
}
}
}
return
YES
;
...
...
@@ -665,19 +681,14 @@ exit:
return
;
}
if
(
overlay
&&
!
overlay
->
is_private
&&
overlay
->
pitches
[
0
]
/
_bytesPerPixel
>
_frameWidth
)
{
_rightPaddingPixels
=
overlay
->
pitches
[
0
]
/
_bytesPerPixel
-
_frameWidth
;
_didPaddingChanged
=
YES
;
}
if
(
_didRelayoutSubViews
)
{
_didRelayoutSubViews
=
NO
;
[
self
layoutOnDisplayThread
];
}
if
(
_didSetContentMode
||
_did
Padding
Changed
)
{
if
(
_didSetContentMode
||
_did
Vertices
Changed
)
{
_didSetContentMode
=
NO
;
_did
Padding
Changed
=
NO
;
_did
Vertices
Changed
=
NO
;
[
self
updateVertices
];
}
...
...
@@ -688,17 +699,10 @@ exit:
glUseProgram
(
_program
);
if
(
overlay
)
{
_frameWidth
=
overlay
->
w
;
_frameHeight
=
overlay
->
h
;
_frameSarNum
=
overlay
->
sar_num
;
_frameSarDen
=
overlay
->
sar_den
;
[
_renderer
render
:
overlay
];
}
if
([
_renderer
prepareDisplay
])
{
if
(
_frameWidth
>
0
)
_rightPadding
=
((
GLfloat
)
_rightPaddingPixels
)
/
_frameWidth
;
_texCoords
[
0
]
=
0
.
0
f
;
_texCoords
[
1
]
=
1
.
0
f
;
_texCoords
[
2
]
=
1
.
0
f
-
_rightPadding
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录