Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
qq_25606643
ijkplayer
提交
37d05f80
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,发现更多精彩内容 >>
提交
37d05f80
编写于
6月 16, 2013
作者:
Z
Zhang Rui
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
ijksdl: add SDL_VoutDisplayYUVOverlay
上级
36d5f414
变更
4
显示空白变更内容
内联
并排
Showing
4 changed file
with
17 addition
and
11 deletion
+17
-11
ijkmediaplayer/jni/ijkplayer/ff_ffplay.c
ijkmediaplayer/jni/ijkplayer/ff_ffplay.c
+1
-1
ijkmediaplayer/jni/ijksdl/ijksdl_vout.c
ijkmediaplayer/jni/ijksdl/ijksdl_vout.c
+7
-8
ijkmediaplayer/jni/ijksdl/ijksdl_vout.h
ijkmediaplayer/jni/ijksdl/ijksdl_vout.h
+2
-2
ijkmediaplayer/jni/ijksdl/ijksdl_vout_android.c
ijkmediaplayer/jni/ijksdl/ijksdl_vout_android.c
+7
-0
未找到文件。
ijkmediaplayer/jni/ijkplayer/ff_ffplay.c
浏览文件 @
37d05f80
...
...
@@ -448,7 +448,7 @@ static void video_image_display(FFPlayer *ffp)
is
->
last_display_rect
=
rect
;
}
#else
SDL_VoutDisplayYUVOverlay
(
vp
->
bmp
);
SDL_VoutDisplayYUVOverlay
(
ffp
->
vout
,
vp
->
bmp
);
#endif
}
}
...
...
ijkmediaplayer/jni/ijksdl/ijksdl_vout.c
浏览文件 @
37d05f80
...
...
@@ -44,6 +44,13 @@ SDL_VoutSurface *SDL_VoutSetVideoMode(SDL_Vout *vout, int w, int h, int bpp, Uin
return
vout
->
set_video_mode
(
vout
,
w
,
h
,
bpp
,
flags
);
}
int
SDL_VoutDisplayYUVOverlay
(
SDL_Vout
*
vout
,
SDL_VoutOverlay
*
overlay
)
{
if
(
vout
&&
overlay
&&
vout
->
display_overlay
)
return
vout
->
display_overlay
(
vout
,
overlay
);
return
-
1
;
}
int
SDL_VoutLockYUVOverlay
(
SDL_VoutOverlay
*
overlay
)
{
if
(
overlay
&&
overlay
->
lock
)
...
...
@@ -60,14 +67,6 @@ int SDL_VoutUnlockYUVOverlay(SDL_VoutOverlay *overlay)
return
-
1
;
}
int
SDL_VoutDisplayYUVOverlay
(
SDL_VoutOverlay
*
overlay
)
{
if
(
overlay
&&
overlay
->
display
)
return
overlay
->
display
(
overlay
);
return
-
1
;
}
void
SDL_VoutFreeYUVOverlay
(
SDL_VoutOverlay
*
overlay
)
{
if
(
!
overlay
)
...
...
ijkmediaplayer/jni/ijksdl/ijksdl_vout.h
浏览文件 @
37d05f80
...
...
@@ -45,7 +45,6 @@ typedef struct SDL_VoutOverlay {
void
(
*
free_l
)(
SDL_VoutOverlay
*
overlay
);
int
(
*
lock
)(
SDL_VoutOverlay
*
overlay
);
int
(
*
unlock
)(
SDL_VoutOverlay
*
overlay
);
int
(
*
display
)(
SDL_VoutOverlay
*
overlay
);
}
SDL_VoutOverlay
;
typedef
struct
SDL_VoutSurface_Opaque
SDL_VoutSurface_Opaque
;
...
...
@@ -66,14 +65,15 @@ typedef struct SDL_Vout {
SDL_Vout_Opaque
*
opaque
;
void
(
*
free_l
)(
SDL_Vout
*
vout
);
SDL_VoutSurface
*
(
*
set_video_mode
)(
SDL_Vout
*
vout
,
int
w
,
int
h
,
int
bpp
,
Uint32
flags
);
int
(
*
display_overlay
)(
SDL_Vout
*
vout
,
SDL_VoutOverlay
*
overlay
);
}
SDL_Vout
;
void
SDL_VoutFree
(
SDL_Vout
*
vout
);
SDL_VoutSurface
*
SDL_VoutSetVideoMode
(
SDL_Vout
*
vout
,
int
w
,
int
h
,
int
bpp
,
Uint32
flags
);
int
SDL_VoutDisplayYUVOverlay
(
SDL_Vout
*
vout
,
SDL_VoutOverlay
*
overlay
);
int
SDL_VoutLockYUVOverlay
(
SDL_VoutOverlay
*
overlay
);
int
SDL_VoutUnlockYUVOverlay
(
SDL_VoutOverlay
*
overlay
);
int
SDL_VoutDisplayYUVOverlay
(
SDL_VoutOverlay
*
overlay
);
void
SDL_VoutFreeYUVOverlay
(
SDL_VoutOverlay
*
overlay
);
#endif
ijkmediaplayer/jni/ijksdl/ijksdl_vout_android.c
浏览文件 @
37d05f80
...
...
@@ -96,6 +96,12 @@ static SDL_VoutSurface *vout_set_video_mode(SDL_Vout *vout, int w, int h, int bp
return
surface
;
}
static
int
voud_display_overlay
(
SDL_Vout
*
vout
,
SDL_VoutOverlay
*
overlay
)
{
// FIXME: implement
return
-
1
;
}
SDL_Vout
*
SDL_VoutAndroid_CreateForANativeWindow
()
{
SDL_Vout
*
vout
=
SDL_Vout_CreateInternal
();
...
...
@@ -117,6 +123,7 @@ SDL_Vout *SDL_VoutAndroid_CreateForANativeWindow()
vout
->
opaque
=
opaque
;
vout
->
free_l
=
vout_free
;
vout
->
set_video_mode
=
vout_set_video_mode
;
vout
->
display_overlay
=
voud_display_overlay
;
return
vout
;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录