Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
NotesChapter
ijkplayer
提交
db25a410
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,发现更多精彩内容 >>
提交
db25a410
编写于
6月 21, 2013
作者:
Z
Zhang Rui
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
jni: simplify xx_free
上级
3f9f6d07
变更
12
显示空白变更内容
内联
并排
Showing
12 changed file
with
89 addition
and
39 deletion
+89
-39
ijkmediaplayer/jni/ffplay/ff_ffplay.c
ijkmediaplayer/jni/ffplay/ff_ffplay.c
+13
-7
ijkmediaplayer/jni/ffplay/ff_ffplay.h
ijkmediaplayer/jni/ffplay/ff_ffplay.h
+3
-2
ijkmediaplayer/jni/ijkplayer/android/ijkplayer_android.c
ijkmediaplayer/jni/ijkplayer/android/ijkplayer_android.c
+28
-23
ijkmediaplayer/jni/ijksdl/android/ijksdl_android_jni.c
ijkmediaplayer/jni/ijksdl/android/ijksdl_android_jni.c
+2
-2
ijkmediaplayer/jni/ijksdl/android/ijksdl_android_jni.h
ijkmediaplayer/jni/ijksdl/android/ijksdl_android_jni.h
+3
-1
ijkmediaplayer/jni/ijksdl/android/ijksdl_aout_android_audiotrack.c
...layer/jni/ijksdl/android/ijksdl_aout_android_audiotrack.c
+2
-2
ijkmediaplayer/jni/ijksdl/android/ijksdl_vout_android_surface.c
...iaplayer/jni/ijksdl/android/ijksdl_vout_android_surface.c
+17
-1
ijkmediaplayer/jni/ijksdl/android/ijksdl_vout_android_surface.h
...iaplayer/jni/ijksdl/android/ijksdl_vout_android_surface.h
+1
-1
ijkmediaplayer/jni/ijksdl/ijksdl_aout.c
ijkmediaplayer/jni/ijksdl/ijksdl_aout.c
+9
-0
ijkmediaplayer/jni/ijksdl/ijksdl_aout.h
ijkmediaplayer/jni/ijksdl/ijksdl_aout.h
+1
-0
ijkmediaplayer/jni/ijksdl/ijksdl_vout.c
ijkmediaplayer/jni/ijksdl/ijksdl_vout.c
+9
-0
ijkmediaplayer/jni/ijksdl/ijksdl_vout.h
ijkmediaplayer/jni/ijksdl/ijksdl_vout.h
+1
-0
未找到文件。
ijkmediaplayer/jni/ffplay/ff_ffplay.c
浏览文件 @
db25a410
...
...
@@ -2047,7 +2047,7 @@ void ffp_global_uninit()
g_ffmpeg_global_inited
=
false
;
}
FFPlayer
*
ffp_create
_ffplayer
()
FFPlayer
*
ffp_create
()
{
FFPlayer
*
ffp
=
(
FFPlayer
*
)
malloc
(
sizeof
(
ffp
));
if
(
!
ffp
)
...
...
@@ -2060,12 +2060,11 @@ FFPlayer *ffp_create_ffplayer()
return
ffp
;
}
void
ffp_destroy
_ffplayer
(
FFPlayer
**
p
ffp
)
void
ffp_destroy
(
FFPlayer
*
ffp
)
{
if
(
!
pffp
||
!*
p
ffp
)
if
(
!
ffp
)
return
;
FFPlayer
*
ffp
=
*
pffp
;
if
(
ffp
&&
ffp
->
is
)
{
av_log
(
NULL
,
AV_LOG_WARNING
,
"ffp_destroy_ffplayer: force stream_close()"
);
stream_close
(
ffp
);
...
...
@@ -2075,13 +2074,20 @@ void ffp_destroy_ffplayer(FFPlayer **pffp)
ffp_reset_internal
(
ffp
);
msg_queue_destroy
(
&
ffp
->
msg_queue
);
SDL_VoutFreeP
(
&
ffp
->
vout
);
SDL_AoutFreeP
(
&
ffp
->
aout
);
free
(
ffp
);
*
pffp
=
NULL
;
}
void
ffp_
reset
(
FFPlayer
*
ffp
)
void
ffp_
destroy_p
(
FFPlayer
**
p
ffp
)
{
ffp_reset_internal
(
ffp
);
if
(
!
pffp
)
return
;
ffp_destroy
(
*
pffp
);
*
pffp
=
NULL
;
}
int
ffp_prepare_async_l
(
FFPlayer
*
ffp
,
const
char
*
file_name
)
...
...
ijkmediaplayer/jni/ffplay/ff_ffplay.h
浏览文件 @
db25a410
...
...
@@ -31,8 +31,9 @@
void
ffp_global_init
();
void
ffp_global_uninit
();
FFPlayer
*
ffp_create_ffplayer
();
void
ffp_destroy_ffplayer
(
FFPlayer
**
pffp
);
FFPlayer
*
ffp_create
();
void
ffp_destroy
(
FFPlayer
*
ffp
);
void
ffp_destroy_p
(
FFPlayer
*
ffp
);
void
ffp_reset
(
FFPlayer
*
ffp
);
int
ffp_prepare_async_l
(
FFPlayer
*
ffp
,
const
char
*
file_name
);
...
...
ijkmediaplayer/jni/ijkplayer/android/ijkplayer_android.c
浏览文件 @
db25a410
...
...
@@ -43,27 +43,26 @@ typedef struct IjkMediaPlayer {
char
*
data_source
;
}
IjkMediaPlayer
;
inline
static
void
destroy_mp
(
IjkMediaPlayer
**
p
mp
)
inline
static
void
ijkmp_destroy
(
IjkMediaPlayer
*
mp
)
{
if
(
!
pmp
)
return
;
IjkMediaPlayer
*
mp
=
*
pmp
;
if
(
!
mp
)
return
;
FFPlayer
*
ffp
=
mp
->
ffplayer
;
if
(
ffp
)
{
SDL_AoutFree
(
ffp
->
aout
);
SDL_VoutFree
(
ffp
->
vout
);
ffp_destroy_ffplayer
(
&
mp
->
ffplayer
);
}
ffp_destroy_p
(
&
mp
->
ffplayer
);
pthread_mutex_destroy
(
&
mp
->
mutex
);
FFP_SAFE_FREE
(
mp
->
data_source
);
memset
(
mp
,
0
,
sizeof
(
IjkMediaPlayer
));
FFP_SAFE_FREE
(
mp
);
}
inline
static
void
ijkmp_destroy_p
(
IjkMediaPlayer
**
pmp
)
{
if
(
!
pmp
)
return
;
ijkmp_destroy
(
*
pmp
);
*
pmp
=
NULL
;
}
...
...
@@ -79,25 +78,31 @@ void ijkmp_global_uninit()
IjkMediaPlayer
*
ijkmp_create
()
{
FFPlayer
*
ffp
;
IjkMediaPlayer
*
mp
=
(
IjkMediaPlayer
*
)
malloc
(
sizeof
(
IjkMediaPlayer
));
if
(
!
mp
)
{
return
NULL
;
}
if
(
!
mp
)
goto
fail
;
memset
(
mp
,
0
,
sizeof
(
IjkMediaPlayer
));
FFPlayer
*
ffp
=
ffp_create_ffplayer
();
if
(
!
mp
)
{
FFP_SAFE_FREE
(
mp
);
return
NULL
;
}
pthread_mutex_init
(
&
mp
->
mutex
,
NULL
);
mp
->
ffplayer
=
ffp_create
();
if
(
!
mp
)
goto
fail
;
ijkmp_inc_ref
(
mp
);
mp
->
ffplayer
->
vout
=
SDL_VoutAndroid_CreateForAndroidSurface
();
if
(
!
mp
->
ffplayer
->
vout
)
goto
fail
;
mp
->
ffplayer
=
ffp
;
mp
->
ffplayer
->
aout
=
SDL_AoutAndroid_CreateForAudioTrack
();
if
(
!
mp
->
ffplayer
->
vout
)
goto
fail
;
pthread_mutex_init
(
&
mp
->
mutex
,
NULL
);
ijkmp_inc_ref
(
mp
);
return
mp
;
fail:
ijkmp_destroy_p
(
&
mp
);
return
NULL
;
}
void
ijkmp_shutdown_l
(
IjkMediaPlayer
*
mp
)
...
...
ijkmediaplayer/jni/ijksdl/android/ijksdl_android_jni.c
浏览文件 @
db25a410
...
...
@@ -32,7 +32,7 @@ JavaVM *SDL_AndroidJni_GetJvm()
return
g_jvm
;
}
jint
SDL_AndroidJni_AttachCurrentThread
(
JNIEnv
**
p_env
,
void
*
thr_args
)
jint
SDL_AndroidJni_AttachCurrentThread
(
JNIEnv
**
p_env
)
{
JavaVM
*
jvm
=
g_jvm
;
if
(
!
jvm
)
{
...
...
@@ -40,7 +40,7 @@ jint SDL_AndroidJni_AttachCurrentThread(JNIEnv **p_env, void *thr_args)
return
-
1
;
}
return
(
*
jvm
)
->
AttachCurrentThread
(
jvm
,
p_env
,
thr_args
);
return
(
*
jvm
)
->
AttachCurrentThread
(
jvm
,
p_env
,
NULL
);
}
jint
SDL_AndroidJni_DetachCurrentThread
()
...
...
ijkmediaplayer/jni/ijksdl/android/ijksdl_android_jni.h
浏览文件 @
db25a410
...
...
@@ -28,6 +28,8 @@
JavaVM
*
SDL_AndroidJni_GetJvm
();
jint
SDL_AndroidJni_AttachCurrentThread
(
JNIEnv
**
p_env
,
void
*
thr_args
);
jint
SDL_AndroidJni_AttachCurrentThread
(
JNIEnv
**
p_env
);
jint
SDL_AndroidJni_DetachCurrentThread
();
#endif
ijkmediaplayer/jni/ijksdl/android/ijksdl_aout_android_audiotrack.c
浏览文件 @
db25a410
...
...
@@ -87,7 +87,7 @@ int aout_thread(void *arg)
SDL_Aout_Opaque
*
opaque
=
aout
->
opaque
;
JNIEnv
*
env
=
NULL
;
if
(
!
SDL_AndroidJni_AttachCurrentThread
(
&
env
,
NULL
))
{
if
(
JNI_OK
!=
SDL_AndroidJni_AttachCurrentThread
(
&
env
,
NULL
))
{
ALOGE
(
"aout_thread: AttachCurrentThread: failed"
);
return
-
1
;
}
...
...
@@ -130,7 +130,7 @@ int aout_open_audio(SDL_Aout *aout, SDL_AudioSpec *desired, SDL_AudioSpec *obtai
{
SDL_Aout_Opaque
*
opaque
=
aout
->
opaque
;
JNIEnv
*
env
=
NULL
;
if
(
!
SDL_AndroidJni_AttachCurrentThread
(
&
env
,
NULL
))
{
if
(
JNI_OK
!=
SDL_AndroidJni_AttachCurrentThread
(
&
env
,
NULL
))
{
ALOGE
(
"aout_open_audio: AttachCurrentThread: failed"
);
return
-
1
;
}
...
...
ijkmediaplayer/jni/ijksdl/android/ijksdl_vout_android_surface.c
浏览文件 @
db25a410
...
...
@@ -31,7 +31,7 @@ SDL_Vout *SDL_VoutAndroid_CreateForAndroidSurface()
return
SDL_VoutAndroid_CreateForANativeWindow
();
}
void
SDL_VoutAndroid_SetAndroidSurface
(
SDL_Vout
*
vout
,
JNIEnv
*
env
,
jobject
android_surface
)
static
void
SDL_VoutAndroid_SetAndroidSurface_n
(
JNIEnv
*
env
,
SDL_Vout
*
vout
,
jobject
android_surface
)
{
if
(
!
android_surface
)
return
;
...
...
@@ -43,3 +43,19 @@ void SDL_VoutAndroid_SetAndroidSurface(SDL_Vout *vout, JNIEnv *env, jobject andr
SDL_VoutAndroid_SetNativeWindow
(
vout
,
native_window
);
ANativeWindow_release
(
native_window
);
}
void
SDL_VoutAndroid_SetAndroidSurface
(
SDL_Vout
*
vout
,
jobject
android_surface
)
{
if
(
!
android_surface
)
return
;
JNIEnv
*
env
=
NULL
;
if
(
JNI_OK
!=
SDL_AndroidJni_AttachCurrentThread
(
&
env
,
NULL
))
{
ALOGE
(
"SDL_VoutAndroid_SetAndroidSurface: AttachCurrentThread: failed"
);
return
;
}
SDL_VoutAndroid_SetAndroidSurface_n
(
env
,
vout
,
android_surface
);
SDL_AndroidJni_DetachCurrentThread
();
}
ijkmediaplayer/jni/ijksdl/android/ijksdl_vout_android_surface.h
浏览文件 @
db25a410
...
...
@@ -29,6 +29,6 @@
#include "../ijksdl_vout.h"
SDL_Vout
*
SDL_VoutAndroid_CreateForAndroidSurface
();
void
SDL_VoutAndroid_SetAndroidSurface
(
SDL_Vout
*
vout
,
JNIEnv
*
env
,
jobject
android_surface
);
void
SDL_VoutAndroid_SetAndroidSurface
(
SDL_Vout
*
vout
,
jobject
android_surface
);
#endif
ijkmediaplayer/jni/ijksdl/ijksdl_aout.c
浏览文件 @
db25a410
...
...
@@ -53,3 +53,12 @@ void SDL_AoutFree(SDL_Aout *aout)
else
free
(
aout
);
}
void
SDL_AoutFreeP
(
SDL_Aout
**
paout
)
{
if
(
!
paout
)
return
;
SDL_AoutFree
(
*
paout
);
*
paout
=
NULL
;
}
ijkmediaplayer/jni/ijksdl/ijksdl_aout.h
浏览文件 @
db25a410
...
...
@@ -43,5 +43,6 @@ int SDL_AoutOpenAudio(SDL_Aout *aout, SDL_AudioSpec *desired, SDL_AudioSpec *obt
void
SDL_AoutPauseAudio
(
SDL_Aout
*
aout
,
int
pause_on
);
void
SDL_AoutCloseAudio
(
SDL_Aout
*
aout
);
void
SDL_AoutFree
(
SDL_Aout
*
aout
);
void
SDL_AoutFreeP
(
SDL_Aout
**
paout
);
#endif
ijkmediaplayer/jni/ijksdl/ijksdl_vout.c
浏览文件 @
db25a410
...
...
@@ -38,6 +38,15 @@ void SDL_VoutFree(SDL_Vout *vout)
}
}
void
SDL_VoutFreeP
(
SDL_Vout
**
pvout
)
{
if
(
!
pvout
)
return
;
SDL_VoutFree
(
*
pvout
);
*
pvout
=
NULL
;
}
int
SDL_VoutDisplayYUVOverlay
(
SDL_Vout
*
vout
,
SDL_VoutOverlay
*
overlay
)
{
if
(
vout
&&
overlay
&&
vout
->
display_overlay
)
...
...
ijkmediaplayer/jni/ijksdl/ijksdl_vout.h
浏览文件 @
db25a410
...
...
@@ -55,6 +55,7 @@ typedef struct SDL_Vout {
}
SDL_Vout
;
void
SDL_VoutFree
(
SDL_Vout
*
vout
);
void
SDL_VoutFreeP
(
SDL_Vout
**
pvout
)
int
SDL_VoutDisplayYUVOverlay
(
SDL_Vout
*
vout
,
SDL_VoutOverlay
*
overlay
);
int
SDL_VoutLockYUVOverlay
(
SDL_VoutOverlay
*
overlay
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录