Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
qq_25606643
ijkplayer
提交
7038898e
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,发现更多精彩内容 >>
提交
7038898e
编写于
10月 12, 2013
作者:
B
bbcallen
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
ios: GLView: support scale mode switch
上级
d8de1b30
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
57 addition
and
15 deletion
+57
-15
ios/IJKMediaPlayer/IJKMediaPlayer/IJKFFMoviePlayerController.m
...JKMediaPlayer/IJKMediaPlayer/IJKFFMoviePlayerController.m
+23
-0
ios/IJKMediaPlayer/IJKMediaPlayer/ijkmedia/ijksdl/ios/IJKSDLGLView.m
...aPlayer/IJKMediaPlayer/ijkmedia/ijksdl/ios/IJKSDLGLView.m
+34
-15
未找到文件。
ios/IJKMediaPlayer/IJKMediaPlayer/IJKFFMoviePlayerController.m
浏览文件 @
7038898e
...
@@ -200,6 +200,29 @@
...
@@ -200,6 +200,29 @@
return
self
.
currentPlaybackTime
+
((
NSTimeInterval
)
_bufferingTime
)
/
1000
;
return
self
.
currentPlaybackTime
+
((
NSTimeInterval
)
_bufferingTime
)
/
1000
;
}
}
-
(
void
)
setScalingMode
:
(
MPMovieScalingMode
)
aScalingMode
{
MPMovieScalingMode
newScalingMode
=
aScalingMode
;
switch
(
aScalingMode
)
{
case
MPMovieScalingModeNone
:
[
_view
setContentMode
:
UIViewContentModeCenter
];
break
;
case
MPMovieScalingModeAspectFit
:
[
_view
setContentMode
:
UIViewContentModeScaleAspectFit
];
break
;
case
MPMovieScalingModeAspectFill
:
[
_view
setContentMode
:
UIViewContentModeScaleAspectFill
];
break
;
case
MPMovieScalingModeFill
:
[
_view
setContentMode
:
UIViewContentModeScaleToFill
];
break
;
default:
newScalingMode
=
_scalingMode
;
}
_scalingMode
=
newScalingMode
;
}
// deprecated, for MPMoviePlayerController compatiable
// deprecated, for MPMoviePlayerController compatiable
-
(
UIImage
*
)
thumbnailImageAtTime
:(
NSTimeInterval
)
playbackTime
timeOption
:(
MPMovieTimeOption
)
option
-
(
UIImage
*
)
thumbnailImageAtTime
:(
NSTimeInterval
)
playbackTime
timeOption
:(
MPMovieTimeOption
)
option
{
{
...
...
ios/IJKMediaPlayer/IJKMediaPlayer/ijkmedia/ijksdl/ios/IJKSDLGLView.m
浏览文件 @
7038898e
...
@@ -26,7 +26,7 @@
...
@@ -26,7 +26,7 @@
#import "IJKSDLGLShader.h"
#import "IJKSDLGLShader.h"
#import "IJKSDLGLRender.h"
#import "IJKSDLGLRender.h"
#import "IJKSDLGLRenderI420.h"
#import "IJKSDLGLRenderI420.h"
#import "IJKMediaModule.h"
#import "IJKMedia
Player/IJKMedia
Module.h"
static
NSString
*
const
g_vertexShaderString
=
IJK_SHADER_STRING
static
NSString
*
const
g_vertexShaderString
=
IJK_SHADER_STRING
(
(
...
@@ -374,23 +374,42 @@ exit:
...
@@ -374,23 +374,42 @@ exit:
-
(
void
)
updateVertices
-
(
void
)
updateVertices
{
{
const
BOOL
fit
=
(
self
.
contentMode
==
UIViewContentModeScaleAspectFit
);
const
float
width
=
_frameWidth
;
const
float
width
=
_frameWidth
;
const
float
height
=
_frameHeight
;
const
float
height
=
_frameHeight
;
const
float
dH
=
(
float
)
_backingHeight
/
height
;
const
float
dW
=
(
float
)
_backingWidth
/
width
;
const
float
dW
=
(
float
)
_backingWidth
/
width
;
const
float
dd
=
fit
?
MIN
(
dH
,
dW
)
:
MAX
(
dH
,
dW
);
const
float
dH
=
(
float
)
_backingHeight
/
height
;
const
float
h
=
(
height
*
dd
/
(
float
)
_backingHeight
);
float
dd
=
1
.
0
f
;
const
float
w
=
(
width
*
dd
/
(
float
)
_backingWidth
);
float
nW
=
1
.
0
f
;
float
nH
=
1
.
0
f
;
_vertices
[
0
]
=
-
w
;
_vertices
[
1
]
=
-
h
;
switch
(
self
.
contentMode
)
{
_vertices
[
2
]
=
w
;
case
UIViewContentModeScaleToFill
:
_vertices
[
3
]
=
-
h
;
break
;
_vertices
[
4
]
=
-
w
;
case
UIViewContentModeCenter
:
_vertices
[
5
]
=
h
;
nW
=
1
.
0
f
/
dW
/
[
UIScreen
mainScreen
].
scale
;
_vertices
[
6
]
=
w
;
nH
=
1
.
0
f
/
dH
/
[
UIScreen
mainScreen
].
scale
;
_vertices
[
7
]
=
h
;
break
;
case
UIViewContentModeScaleAspectFill
:
dd
=
MAX
(
dW
,
dH
);
nW
=
(
width
*
dd
/
(
float
)
_backingWidth
);
nH
=
(
height
*
dd
/
(
float
)
_backingHeight
);
break
;
case
UIViewContentModeScaleAspectFit
:
default:
dd
=
MIN
(
dW
,
dH
);
nW
=
(
width
*
dd
/
(
float
)
_backingWidth
);
nH
=
(
height
*
dd
/
(
float
)
_backingHeight
);
break
;
}
_vertices
[
0
]
=
-
nW
;
_vertices
[
1
]
=
-
nH
;
_vertices
[
2
]
=
nW
;
_vertices
[
3
]
=
-
nH
;
_vertices
[
4
]
=
-
nW
;
_vertices
[
5
]
=
nH
;
_vertices
[
6
]
=
nW
;
_vertices
[
7
]
=
nH
;
}
}
-
(
void
)
display
:
(
SDL_VoutOverlay
*
)
overlay
-
(
void
)
display
:
(
SDL_VoutOverlay
*
)
overlay
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录