Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
NotesChapter
ijkplayer
提交
5f00a1b2
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,体验更适合开发者的 AI 搜索 >>
提交
5f00a1b2
编写于
6月 24, 2014
作者:
Z
Zhang Rui
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
android: fix mp.release() and mp.reset()
上级
730d8c5f
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
12 addition
and
32 deletion
+12
-32
ijkmedia/ijkplayer/android/ijkplayer_jni.c
ijkmedia/ijkplayer/android/ijkplayer_jni.c
+6
-5
ijkmedia/ijkplayer/ff_ffmsg_queue.h
ijkmedia/ijkplayer/ff_ffmsg_queue.h
+3
-2
ijkmedia/ijkplayer/ff_ffplay.c
ijkmedia/ijkplayer/ff_ffplay.c
+3
-2
ijkmedia/ijkplayer/ijkplayer.c
ijkmedia/ijkplayer/ijkplayer.c
+0
-22
ijkmedia/ijkplayer/ijkplayer.h
ijkmedia/ijkplayer/ijkplayer.h
+0
-1
未找到文件。
ijkmedia/ijkplayer/android/ijkplayer_jni.c
浏览文件 @
5f00a1b2
...
...
@@ -249,18 +249,19 @@ IjkMediaPlayer_release(JNIEnv *env, jobject thiz)
ijkmp_dec_ref_p
(
&
mp
);
}
static
void
IjkMediaPlayer_native_setup
(
JNIEnv
*
env
,
jobject
thiz
,
jobject
weak_this
);
static
void
IjkMediaPlayer_reset
(
JNIEnv
*
env
,
jobject
thiz
)
{
MPTRACE
(
"IjkMediaPlayer_reset"
);
IjkMediaPlayer
*
mp
=
jni_get_media_player
(
env
,
thiz
);
JNI_CHECK_GOTO
(
mp
,
env
,
NULL
,
"mpjni: reset: null mp"
,
LABEL_RETURN
);
if
(
!
mp
)
return
;
ijkmp_android_set_surface
(
env
,
mp
,
NULL
);
ijkmp_reset
(
mp
);
jobject
weak_thiz
=
(
jobject
)
ijkmp_set_weak_thiz
(
mp
,
NULL
);
LABEL_RETURN:
ijkmp_dec_ref_p
(
&
mp
);
IjkMediaPlayer_release
(
env
,
thiz
);
IjkMediaPlayer_native_setup
(
env
,
thiz
,
weak_thiz
);
}
static
void
...
...
ijkmedia/ijkplayer/ff_ffmsg_queue.h
浏览文件 @
5f00a1b2
...
...
@@ -165,8 +165,6 @@ inline static void msg_queue_flush(MessageQueue *q)
inline
static
void
msg_queue_destroy
(
MessageQueue
*
q
)
{
msg_queue_flush
(
q
);
SDL_DestroyMutex
(
q
->
mutex
);
SDL_DestroyCond
(
q
->
cond
);
SDL_LockMutex
(
q
->
mutex
);
while
(
q
->
recycle_msg
)
{
...
...
@@ -176,6 +174,9 @@ inline static void msg_queue_destroy(MessageQueue *q)
av_freep
(
&
msg
);
}
SDL_UnlockMutex
(
q
->
mutex
);
SDL_DestroyMutex
(
q
->
mutex
);
SDL_DestroyCond
(
q
->
cond
);
}
inline
static
void
msg_queue_abort
(
MessageQueue
*
q
)
...
...
ijkmedia/ijkplayer/ff_ffplay.c
浏览文件 @
5f00a1b2
...
...
@@ -166,8 +166,6 @@ static void packet_queue_flush(PacketQueue *q)
static
void
packet_queue_destroy
(
PacketQueue
*
q
)
{
packet_queue_flush
(
q
);
SDL_DestroyMutex
(
q
->
mutex
);
SDL_DestroyCond
(
q
->
cond
);
SDL_LockMutex
(
q
->
mutex
);
while
(
q
->
recycle_pkt
)
{
...
...
@@ -177,6 +175,9 @@ static void packet_queue_destroy(PacketQueue *q)
av_freep
(
&
pkt
);
}
SDL_UnlockMutex
(
q
->
mutex
);
SDL_DestroyMutex
(
q
->
mutex
);
SDL_DestroyCond
(
q
->
cond
);
}
static
void
packet_queue_abort
(
PacketQueue
*
q
)
...
...
ijkmedia/ijkplayer/ijkplayer.c
浏览文件 @
5f00a1b2
...
...
@@ -183,28 +183,6 @@ void ijkmp_shutdown(IjkMediaPlayer *mp)
return
ijkmp_shutdown_l
(
mp
);
}
void
ijkmp_reset_l
(
IjkMediaPlayer
*
mp
)
{
assert
(
mp
);
ijkmp_shutdown_l
(
mp
);
ffp_reset_internal
(
mp
->
ffplayer
);
av_freep
(
&
mp
->
data_source
);
ijkmp_change_state_l
(
mp
,
MP_STATE_IDLE
);
}
void
ijkmp_reset
(
IjkMediaPlayer
*
mp
)
{
assert
(
mp
);
MPTRACE
(
"ijkmp_reset()
\n
"
);
pthread_mutex_lock
(
&
mp
->
mutex
);
ijkmp_reset_l
(
mp
);
pthread_mutex_unlock
(
&
mp
->
mutex
);
MPTRACE
(
"ijkmp_reset()=void
\n
"
);
}
void
ijkmp_inc_ref
(
IjkMediaPlayer
*
mp
)
{
assert
(
mp
);
...
...
ijkmedia/ijkplayer/ijkplayer.h
浏览文件 @
5f00a1b2
...
...
@@ -173,7 +173,6 @@ int ijkmp_get_state(IjkMediaPlayer *mp);
bool
ijkmp_is_playing
(
IjkMediaPlayer
*
mp
);
long
ijkmp_get_current_position
(
IjkMediaPlayer
*
mp
);
long
ijkmp_get_duration
(
IjkMediaPlayer
*
mp
);
void
ijkmp_reset
(
IjkMediaPlayer
*
mp
);
void
*
ijkmp_set_weak_thiz
(
IjkMediaPlayer
*
mp
,
void
*
weak_thiz
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录