Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
qq_25606643
ijkplayer
提交
8189163c
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,发现更多精彩内容 >>
提交
8189163c
编写于
6月 17, 2013
作者:
Z
Zhang Rui
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
ijkplayer: add ijkmp_reset
上级
99ba69d1
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
65 addition
and
14 deletion
+65
-14
ijkmediaplayer/jni/ijkplayer/ff_ffplay.c
ijkmediaplayer/jni/ijkplayer/ff_ffplay.c
+15
-0
ijkmediaplayer/jni/ijkplayer/ff_ffplay.h
ijkmediaplayer/jni/ijkplayer/ff_ffplay.h
+1
-0
ijkmediaplayer/jni/ijkplayer/ff_ffplay_def.h
ijkmediaplayer/jni/ijkplayer/ff_ffplay_def.h
+2
-1
ijkmediaplayer/jni/ijkplayer/ijkplayer.c
ijkmediaplayer/jni/ijkplayer/ijkplayer.c
+47
-12
ijkmediaplayer/jni/ijkplayer/ijkplayer_jni.c
ijkmediaplayer/jni/ijkplayer/ijkplayer_jni.c
+0
-1
未找到文件。
ijkmediaplayer/jni/ijkplayer/ff_ffplay.c
浏览文件 @
8189163c
...
@@ -2550,6 +2550,21 @@ int ijkff_wait_stop(FFPlayer *ffp)
...
@@ -2550,6 +2550,21 @@ int ijkff_wait_stop(FFPlayer *ffp)
return
0
;
return
0
;
}
}
int
ijkff_seek_to_l
(
FFPlayer
*
ffp
,
long
msec
)
{
assert
(
ffp
);
VideoState
*
is
=
ffp
->
is
;
if
(
!
is
)
return
EIJK_NULL_IS_PTR
;
// FIXME: thread-safe
// FIXME: seek by bytes
// FIXME: seek out of range
// FIXME: seekable
stream_seek
(
ffp
,
milliseconds_to_fftime
(
msec
),
0
,
0
);
return
0
;
}
long
ijkff_get_current_position_l
(
FFPlayer
*
ffp
)
long
ijkff_get_current_position_l
(
FFPlayer
*
ffp
)
{
{
assert
(
ffp
);
assert
(
ffp
);
...
...
ijkmediaplayer/jni/ijkplayer/ff_ffplay.h
浏览文件 @
8189163c
...
@@ -38,6 +38,7 @@ int ijkff_stop_l(FFPlayer *ffp);
...
@@ -38,6 +38,7 @@ int ijkff_stop_l(FFPlayer *ffp);
int
ijkff_wait_stop
(
FFPlayer
*
ffp
);
int
ijkff_wait_stop
(
FFPlayer
*
ffp
);
/* all in milliseconds */
/* all in milliseconds */
int
ijkff_seek_to_l
(
IjkMediaPlayer
*
mp
,
long
msec
);
long
ijkff_get_current_position_l
(
FFPlayer
*
ffp
);
long
ijkff_get_current_position_l
(
FFPlayer
*
ffp
);
long
ijkff_get_duration_l
(
FFPlayer
*
ffp
);
long
ijkff_get_duration_l
(
FFPlayer
*
ffp
);
...
...
ijkmediaplayer/jni/ijkplayer/ff_ffplay_def.h
浏览文件 @
8189163c
...
@@ -406,7 +406,8 @@ typedef struct FFPlayer {
...
@@ -406,7 +406,8 @@ typedef struct FFPlayer {
#define IJKFF_MSG_SEEK_COMPLETED 6
#define IJKFF_MSG_SEEK_COMPLETED 6
#define IJKFF_SAFE_FREE(p) do {free(p); p = NULL;} while(0)
#define IJKFF_SAFE_FREE(p) do {free(p); p = NULL;} while(0)
#define fftime_to_milliseconds(t) (t / (AV_TIME_BASE / 1000))
#define fftime_to_milliseconds(ts) (ts / (AV_TIME_BASE / 1000))
#define milliseconds_to_fftime(ms) (ms * (AV_TIME_BASE / 1000))
inline
static
void
ijkff_reset
(
FFPlayer
*
ffp
)
inline
static
void
ijkff_reset
(
FFPlayer
*
ffp
)
{
{
...
...
ijkmediaplayer/jni/ijkplayer/ijkplayer.c
浏览文件 @
8189163c
...
@@ -99,7 +99,20 @@ IjkMediaPlayer *ijkmp_create()
...
@@ -99,7 +99,20 @@ IjkMediaPlayer *ijkmp_create()
void
ijkmp_shutdown
(
IjkMediaPlayer
*
mp
)
void
ijkmp_shutdown
(
IjkMediaPlayer
*
mp
)
{
{
assert
(
mp
);
assert
(
mp
);
// FIXME: implement
// FIXME: implement
}
void
ijkmp_reset
(
IjkMediaPlayer
*
mp
)
{
assert
(
mp
);
ijkmp_stop
(
mp
);
ijkff_reset
(
mp
->
ffplayer
);
free
(
mp
->
data_source
);
mp
->
data_source
=
NULL
;
mp
->
mp_state
=
MP_STATE_IDLE
;
}
}
void
ijkmp_inc_ref
(
IjkMediaPlayer
*
mp
)
void
ijkmp_inc_ref
(
IjkMediaPlayer
*
mp
)
...
@@ -304,12 +317,6 @@ int ijkmp_stop(IjkMediaPlayer *mp)
...
@@ -304,12 +317,6 @@ int ijkmp_stop(IjkMediaPlayer *mp)
return
retval
;
return
retval
;
}
}
int
ijkmp_seek_to
(
IjkMediaPlayer
*
mp
,
long
msec
)
{
// FIXME: implement
return
0
;
}
bool
ijkmp_is_playing
(
IjkMediaPlayer
*
mp
)
bool
ijkmp_is_playing
(
IjkMediaPlayer
*
mp
)
{
{
assert
(
mp
);
assert
(
mp
);
...
@@ -321,6 +328,39 @@ bool ijkmp_is_playing(IjkMediaPlayer *mp)
...
@@ -321,6 +328,39 @@ bool ijkmp_is_playing(IjkMediaPlayer *mp)
return
false
;
return
false
;
}
}
int
ijkmp_seek_to_l
(
IjkMediaPlayer
*
mp
,
long
msec
)
{
assert
(
mp
);
MPST_CHECK_NOT_RET
(
mp
->
mp_state
,
MP_STATE_IDLE
);
MPST_CHECK_NOT_RET
(
mp
->
mp_state
,
MP_STATE_INITIALIZED
);
// MPST_CHECK_NOT_RET(mp->mp_state, MP_STATE_ASYNC_PREPARING);
// MPST_CHECK_NOT_RET(mp->mp_state, MP_STATE_PREPARED);
// MPST_CHECK_NOT_RET(mp->mp_state, MP_STATE_STARTED);
// MPST_CHECK_NOT_RET(mp->mp_state, MP_STATE_PAUSED);
// MPST_CHECK_NOT_RET(mp->mp_state, MP_STATE_COMPLETED);
MPST_CHECK_NOT_RET
(
mp
->
mp_state
,
MP_STATE_STOPPED
);
MPST_CHECK_NOT_RET
(
mp
->
mp_state
,
MP_STATE_ERROR
);
MPST_CHECK_NOT_RET
(
mp
->
mp_state
,
MP_STATE_END
);
int
retval
=
ijkmp_seek_to_l
(
mp
->
ffplayer
,
msec
);
if
(
retval
<
0
)
{
return
retval
;
}
return
0
;
}
int
ijkmp_seek_to
(
IjkMediaPlayer
*
mp
,
long
msec
)
{
assert
(
mp
);
pthread_mutex_lock
(
&
mp
->
mutex
);
int
retval
=
ijkmp_seek_to
(
mp
,
msec
);
pthread_mutex_unlock
(
&
mp
->
mutex
);
return
retval
;
}
static
long
ijkmp_get_current_position_l
(
IjkMediaPlayer
*
mp
)
static
long
ijkmp_get_current_position_l
(
IjkMediaPlayer
*
mp
)
{
{
return
ijkff_get_current_position_l
(
mp
->
ffplayer
);
return
ijkff_get_current_position_l
(
mp
->
ffplayer
);
...
@@ -349,11 +389,6 @@ long ijkmp_get_duration(IjkMediaPlayer *mp)
...
@@ -349,11 +389,6 @@ long ijkmp_get_duration(IjkMediaPlayer *mp)
return
retval
;
return
retval
;
}
}
void
ijkmp_reset
(
IjkMediaPlayer
*
mp
)
{
// FIXME: implement
}
void
ijkmp_set_vout
(
IjkMediaPlayer
*
mp
,
SDL_Vout
*
vout
)
void
ijkmp_set_vout
(
IjkMediaPlayer
*
mp
,
SDL_Vout
*
vout
)
{
{
mp
->
ffplayer
->
vout
=
vout
;
mp
->
ffplayer
->
vout
=
vout
;
...
...
ijkmediaplayer/jni/ijkplayer/ijkplayer_jni.c
浏览文件 @
8189163c
...
@@ -251,7 +251,6 @@ IjkMediaPlayer_release(JNIEnv *env, jobject thiz)
...
@@ -251,7 +251,6 @@ IjkMediaPlayer_release(JNIEnv *env, jobject thiz)
static
void
static
void
IjkMediaPlayer_reset
(
JNIEnv
*
env
,
jobject
thiz
)
IjkMediaPlayer_reset
(
JNIEnv
*
env
,
jobject
thiz
)
{
{
// FIXME: consider create new MediaPlayer
IjkMediaPlayer
*
mp
=
jni_get_media_player
(
env
,
thiz
);
IjkMediaPlayer
*
mp
=
jni_get_media_player
(
env
,
thiz
);
JNI_CHECK_GOTO
(
mp
,
env
,
NULL
,
"mpjni: reset: null mp"
,
LABEL_RETURN
);
JNI_CHECK_GOTO
(
mp
,
env
,
NULL
,
"mpjni: reset: null mp"
,
LABEL_RETURN
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录