Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
NotesChapter
ijkplayer
提交
edf70bdc
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,发现更多精彩内容 >>
提交
edf70bdc
编写于
6月 27, 2013
作者:
Z
Zhang Rui
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
ijkutil: add mallocz and freep
上级
d557c702
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
31 addition
and
18 deletion
+31
-18
ijkmediaplayer/jni/ijksdl/android/android_audiotrack.c
ijkmediaplayer/jni/ijksdl/android/android_audiotrack.c
+1
-2
ijkmediaplayer/jni/ijksdl/ijksdl_aout_internal.h
ijkmediaplayer/jni/ijksdl/ijksdl_aout_internal.h
+5
-6
ijkmediaplayer/jni/ijksdl/ijksdl_mutex.c
ijkmediaplayer/jni/ijksdl/ijksdl_mutex.c
+3
-2
ijkmediaplayer/jni/ijksdl/ijksdl_vout_internal.h
ijkmediaplayer/jni/ijksdl/ijksdl_vout_internal.h
+4
-8
ijkmediaplayer/jni/ijkutil/ijkutil.h
ijkmediaplayer/jni/ijkutil/ijkutil.h
+18
-0
未找到文件。
ijkmediaplayer/jni/ijksdl/android/android_audiotrack.c
浏览文件 @
edf70bdc
...
...
@@ -231,13 +231,12 @@ SDL_AndroidAudioTrack *sdl_audiotrack_new_from_spec(JNIEnv *env, SDL_AndroidAudi
return
NULL
;
}
SDL_AndroidAudioTrack
*
atrack
=
(
SDL_AndroidAudioTrack
*
)
malloc
(
sizeof
(
SDL_AndroidAudioTrack
));
SDL_AndroidAudioTrack
*
atrack
=
(
SDL_AndroidAudioTrack
*
)
malloc
z
(
sizeof
(
SDL_AndroidAudioTrack
));
if
(
!
atrack
)
{
(
*
env
)
->
CallVoidMethod
(
env
,
g_clazz
.
clazz
,
atrack
->
thiz
,
g_clazz
.
release
);
(
*
env
)
->
DeleteLocalRef
(
env
,
thiz
);
return
NULL
;
}
memset
(
atrack
,
0
,
sizeof
(
SDL_AndroidAudioTrack
));
atrack
->
spec
=
*
spec
;
atrack
->
min_buffer_size
=
min_buffer_size
;
...
...
ijkmediaplayer/jni/ijksdl/ijksdl_aout_internal.h
浏览文件 @
edf70bdc
...
...
@@ -29,22 +29,21 @@
inline
static
SDL_Aout
*
SDL_Aout_CreateInternal
(
size_t
opaque_size
)
{
SDL_Aout
*
aout
=
(
SDL_Aout
*
)
malloc
(
sizeof
(
SDL_Aout
));
// FIXME: mallocz;
SDL_Aout
*
aout
=
(
SDL_Aout
*
)
mallocz
(
sizeof
(
SDL_Aout
));
if
(
!
aout
)
return
NULL
;
memset
(
aout
,
0
,
sizeof
(
SDL_Aout
));
aout
->
opaque
=
malloc
(
opaque_size
);
aout
->
opaque
=
malloc
z
(
opaque_size
);
if
(
!
aout
->
opaque
)
{
free
(
aout
);
return
NULL
;
}
memset
(
aout
->
opaque
,
0
,
sizeof
(
aout
->
opaque
));
aout
->
mutex
=
SDL_CreateMutex
();
if
(
aout
->
mutex
==
NULL
)
{
free
(
aout
->
opaque
);
free
(
aout
);
free
p
(
aout
->
opaque
);
free
p
(
aout
);
return
NULL
;
}
...
...
ijkmediaplayer/jni/ijksdl/ijksdl_mutex.c
浏览文件 @
edf70bdc
...
...
@@ -24,11 +24,12 @@
#include "ijksdl_mutex.h"
#include <errno.h>
#include <assert.h>
#include "ijksdl_inc_internal.h"
SDL_mutex
*
SDL_CreateMutex
(
void
)
{
SDL_mutex
*
mutex
;
mutex
=
(
SDL_mutex
*
)
malloc
(
sizeof
(
SDL_mutex
));
mutex
=
(
SDL_mutex
*
)
malloc
z
(
sizeof
(
SDL_mutex
));
if
(
!
mutex
)
return
NULL
;
...
...
@@ -68,7 +69,7 @@ int SDL_UnlockMutex(SDL_mutex *mutex)
SDL_cond
*
SDL_CreateCond
(
void
)
{
SDL_cond
*
cond
;
cond
=
(
SDL_cond
*
)
malloc
(
sizeof
(
SDL_cond
));
cond
=
(
SDL_cond
*
)
malloc
z
(
sizeof
(
SDL_cond
));
if
(
!
cond
)
return
NULL
;
...
...
ijkmediaplayer/jni/ijksdl/ijksdl_vout_internal.h
浏览文件 @
edf70bdc
...
...
@@ -28,17 +28,15 @@
inline
static
SDL_Vout
*
SDL_Vout_CreateInternal
(
size_t
opaque_size
)
{
SDL_Vout
*
vout
=
(
SDL_Vout
*
)
malloc
(
sizeof
(
SDL_Vout
));
SDL_Vout
*
vout
=
(
SDL_Vout
*
)
malloc
z
(
sizeof
(
SDL_Vout
));
if
(
!
vout
)
return
NULL
;
memset
(
vout
,
0
,
sizeof
(
SDL_Vout
));
vout
->
opaque
=
malloc
(
opaque_size
);
vout
->
opaque
=
malloc
z
(
opaque_size
);
if
(
!
vout
->
opaque
)
{
free
(
vout
);
return
NULL
;
}
memset
(
vout
->
opaque
,
0
,
opaque_size
);
vout
->
mutex
=
SDL_CreateMutex
();
if
(
vout
->
mutex
==
NULL
)
{
...
...
@@ -66,17 +64,15 @@ inline static void SDL_Vout_FreeInternal(SDL_Vout *vout)
inline
static
SDL_VoutOverlay
*
SDL_VoutOverlay_CreateInternal
(
size_t
opaque_size
)
{
SDL_VoutOverlay
*
overlay
=
(
SDL_VoutOverlay
*
)
malloc
(
sizeof
(
SDL_VoutOverlay
));
SDL_VoutOverlay
*
overlay
=
(
SDL_VoutOverlay
*
)
malloc
z
(
sizeof
(
SDL_VoutOverlay
));
if
(
!
overlay
)
return
NULL
;
memset
(
overlay
,
0
,
sizeof
(
SDL_VoutOverlay
));
overlay
->
opaque
=
malloc
(
opaque_size
);
overlay
->
opaque
=
malloc
z
(
opaque_size
);
if
(
!
overlay
->
opaque
)
{
free
(
overlay
);
return
NULL
;
}
memset
(
overlay
->
opaque
,
0
,
opaque_size
);
return
overlay
;
}
...
...
ijkmediaplayer/jni/ijkutil/ijkutil.h
浏览文件 @
edf70bdc
...
...
@@ -44,4 +44,22 @@
return (retval__); \
}
inline
void
*
mallocz
(
size_t
size
)
{
void
*
mem
=
malloc
(
size
);
if
(
!
mem
)
return
mem
;
memset
(
mem
,
0
,
size
);
return
mem
;
}
inline
void
freep
(
void
**
mem
)
{
if
(
mem
&&
*
mem
)
{
free
(
*
mem
);
*
mem
=
NULL
;
}
}
#endif
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录