Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
NotesChapter
ijkplayer
提交
40aef0d7
I
ijkplayer
项目概览
NotesChapter
/
ijkplayer
与 Fork 源项目一致
从无法访问的项目Fork
通知
5
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,发现更多精彩内容 >>
提交
40aef0d7
编写于
6月 26, 2013
作者:
Z
Zhang Rui
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
ijksdl: fix dimension check
上级
0cd4b6df
变更
1
隐藏空白更改
内联
并排
Showing
1 changed file
with
10 addition
and
8 deletion
+10
-8
ijkmediaplayer/jni/ijksdl/android/ijksdl_vout_android_nativewindow.c
...yer/jni/ijksdl/android/ijksdl_vout_android_nativewindow.c
+10
-8
未找到文件。
ijkmediaplayer/jni/ijksdl/android/ijksdl_vout_android_nativewindow.c
浏览文件 @
40aef0d7
...
@@ -179,8 +179,8 @@ static int voud_display_overlay_l(SDL_Vout *vout, SDL_VoutOverlay *overlay)
...
@@ -179,8 +179,8 @@ static int voud_display_overlay_l(SDL_Vout *vout, SDL_VoutOverlay *overlay)
// correct w, h, format
// correct w, h, format
ALOGI
(
"vout_set_video_mode_l (w:%d, h:%d, fmt:'%.4s'0x%x) => (w:%d, h:%d, fmt:'%.4s'0x%x)"
,
ALOGI
(
"vout_set_video_mode_l (w:%d, h:%d, fmt:'%.4s'0x%x) => (w:%d, h:%d, fmt:'%.4s'0x%x)"
,
curr_w
,
curr_h
,
&
curr_format
,
curr_format
,
curr_w
,
curr_h
,
(
char
*
)
&
curr_format
,
curr_format
,
buf_w
,
buf_h
,
&
overlay
->
format
,
overlay
->
format
);
buf_w
,
buf_h
,
(
char
*
)
&
overlay
->
format
,
overlay
->
format
);
retval
=
ANativeWindow_setBuffersGeometry
(
native_window
,
buf_w
,
buf_h
,
overlay
->
format
);
retval
=
ANativeWindow_setBuffersGeometry
(
native_window
,
buf_w
,
buf_h
,
overlay
->
format
);
if
(
retval
)
{
if
(
retval
)
{
ALOGE
(
"ANativeWindow_setBuffersGeometry failed %d"
,
retval
);
ALOGE
(
"ANativeWindow_setBuffersGeometry failed %d"
,
retval
);
...
@@ -194,8 +194,8 @@ static int voud_display_overlay_l(SDL_Vout *vout, SDL_VoutOverlay *overlay)
...
@@ -194,8 +194,8 @@ static int voud_display_overlay_l(SDL_Vout *vout, SDL_VoutOverlay *overlay)
curr_h
!=
buf_h
||
curr_h
!=
buf_h
||
curr_format
!=
overlay
->
format
)
{
curr_format
!=
overlay
->
format
)
{
ALOGE
(
"unexpected native window (w:%d, h:%d, fmt:'%.4s'0x%x), expecting (w:%d, h:%d, fmt:'%.4s'0x%x)"
,
ALOGE
(
"unexpected native window (w:%d, h:%d, fmt:'%.4s'0x%x), expecting (w:%d, h:%d, fmt:'%.4s'0x%x)"
,
curr_w
,
curr_h
,
&
curr_format
,
curr_format
,
curr_w
,
curr_h
,
(
char
*
)
&
curr_format
,
curr_format
,
buf_w
,
buf_h
,
&
overlay
->
format
,
overlay
->
format
);
buf_w
,
buf_h
,
(
char
*
)
&
overlay
->
format
,
overlay
->
format
);
return
-
1
;
return
-
1
;
}
}
}
}
...
@@ -207,10 +207,12 @@ static int voud_display_overlay_l(SDL_Vout *vout, SDL_VoutOverlay *overlay)
...
@@ -207,10 +207,12 @@ static int voud_display_overlay_l(SDL_Vout *vout, SDL_VoutOverlay *overlay)
return
retval
;
return
retval
;
}
}
if
(
out_buffer
.
width
!=
buf_w
||
out_buffer
.
height
!=
buf_w
)
{
if
(
out_buffer
.
width
!=
buf_w
||
out_buffer
.
height
!=
buf_h
)
{
ALOGE
(
"unexpected native window buffer (w:%d, h:%d, fmt:%d), expecting (w:%d, h:%d, fmt:%d)"
,
ALOGE
(
"unexpected native window buffer (w:%d, h:%d, fmt:'%.4s'0x%x), expecting (w:%d, h:%d, fmt:'%.4s'0x%x)"
,
out_buffer
.
width
,
out_buffer
.
height
,
out_buffer
.
format
,
out_buffer
.
width
,
out_buffer
.
height
,
(
char
*
)
&
out_buffer
.
format
,
out_buffer
.
format
,
buf_w
,
buf_h
,
overlay
->
format
);
buf_w
,
buf_h
,
(
char
*
)
&
overlay
->
format
,
overlay
->
format
);
// FIXME: 9 set all black
ANativeWindow_unlockAndPost
(
native_window
);
return
-
1
;
return
-
1
;
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录