Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
qq_25606643
ijkplayer
提交
7c80c058
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,发现更多精彩内容 >>
提交
7c80c058
编写于
6月 17, 2013
作者:
Z
Zhang Rui
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
ijkplayer: time based function use long instead of int
上级
13f42920
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
32 addition
and
22 deletion
+32
-22
ijkmediaplayer/jni/ijkplayer/ijkplayer.c
ijkmediaplayer/jni/ijkplayer/ijkplayer.c
+16
-6
ijkmediaplayer/jni/ijkplayer/ijkplayer.h
ijkmediaplayer/jni/ijkplayer/ijkplayer.h
+3
-3
ijkmediaplayer/jni/ijkplayer/ijkplayer_jni.c
ijkmediaplayer/jni/ijkplayer/ijkplayer_jni.c
+3
-3
ijkmediaplayer/src/tv/danmaku/ijk/media/player/AbstractMediaPlayer.java
.../src/tv/danmaku/ijk/media/player/AbstractMediaPlayer.java
+3
-3
ijkmediaplayer/src/tv/danmaku/ijk/media/player/AndroidMediaPlayer.java
...r/src/tv/danmaku/ijk/media/player/AndroidMediaPlayer.java
+4
-4
ijkmediaplayer/src/tv/danmaku/ijk/media/player/IjkMediaPlayer.java
...layer/src/tv/danmaku/ijk/media/player/IjkMediaPlayer.java
+3
-3
未找到文件。
ijkmediaplayer/jni/ijkplayer/ijkplayer.c
浏览文件 @
7c80c058
...
...
@@ -304,9 +304,10 @@ int ijkmp_stop(IjkMediaPlayer *mp)
return
retval
;
}
void
ijkmp_seek_to
(
IjkMediaPlayer
*
mp
,
int
msec
)
int
ijkmp_seek_to
(
IjkMediaPlayer
*
mp
,
long
msec
)
{
// FIXME: implement
// FIXME: implement
return
0
;
}
bool
ijkmp_is_playing
(
IjkMediaPlayer
*
mp
)
...
...
@@ -320,27 +321,36 @@ bool ijkmp_is_playing(IjkMediaPlayer *mp)
return
false
;
}
static
int
ijkmp_get_current_position_l
(
IjkMediaPlayer
*
mp
)
static
long
ijkmp_get_current_position_l
(
IjkMediaPlayer
*
mp
)
{
// FIXME: implement
return
0
;
}
int
ijkmp_get_current_position
(
IjkMediaPlayer
*
mp
)
long
ijkmp_get_current_position
(
IjkMediaPlayer
*
mp
)
{
assert
(
mp
);
pthread_mutex_lock
(
&
mp
->
mutex
);
int
retval
=
ijkmp_stop_l
(
mp
);
long
retval
=
ijkmp_stop_l
(
mp
);
pthread_mutex_unlock
(
&
mp
->
mutex
);
return
retval
;
}
int
ijkmp_get_duration
(
IjkMediaPlayer
*
mp
)
static
long
ijkmp_get_duration_l
(
IjkMediaPlayer
*
mp
)
{
// FIXME: implement
return
0
;
}
long
ijkmp_get_duration
(
IjkMediaPlayer
*
mp
)
{
assert
(
mp
);
pthread_mutex_lock
(
&
mp
->
mutex
);
int
retval
=
ijkmp_get_duration_l
(
mp
);
pthread_mutex_unlock
(
&
mp
->
mutex
);
return
retval
;
}
void
ijkmp_reset
(
IjkMediaPlayer
*
mp
)
{
// FIXME: implement
...
...
ijkmediaplayer/jni/ijkplayer/ijkplayer.h
浏览文件 @
7c80c058
...
...
@@ -154,10 +154,10 @@ int ijkmp_prepare_async(IjkMediaPlayer *mp);
int
ijkmp_start
(
IjkMediaPlayer
*
mp
);
int
ijkmp_pause
(
IjkMediaPlayer
*
mp
);
int
ijkmp_stop
(
IjkMediaPlayer
*
mp
);
void
ijkmp_seek_to
(
IjkMediaPlayer
*
mp
,
int
msec
);
int
ijkmp_seek_to
(
IjkMediaPlayer
*
mp
,
long
msec
);
bool
ijkmp_is_playing
(
IjkMediaPlayer
*
mp
);
int
ijkmp_get_current_position
(
IjkMediaPlayer
*
mp
);
int
ijkmp_get_duration
(
IjkMediaPlayer
*
mp
);
long
ijkmp_get_current_position
(
IjkMediaPlayer
*
mp
);
long
ijkmp_get_duration
(
IjkMediaPlayer
*
mp
);
void
ijkmp_reset
(
IjkMediaPlayer
*
mp
);
void
ijkmp_set_vout
(
IjkMediaPlayer
*
mp
,
SDL_Vout
*
vout
);
...
...
ijkmediaplayer/jni/ijkplayer/ijkplayer_jni.c
浏览文件 @
7c80c058
...
...
@@ -312,11 +312,11 @@ static JNINativeMethod g_methods[] = {
{
"prepareAsync"
,
"()V"
,
(
void
*
)
IjkMediaPlayer_prepareAsync
},
{
"_start"
,
"()V"
,
(
void
*
)
IjkMediaPlayer_start
},
{
"_stop"
,
"()V"
,
(
void
*
)
IjkMediaPlayer_stop
},
{
"seekTo"
,
"(
I
)V"
,
(
void
*
)
IjkMediaPlayer_seekTo
},
{
"seekTo"
,
"(
J
)V"
,
(
void
*
)
IjkMediaPlayer_seekTo
},
{
"_pause"
,
"()V"
,
(
void
*
)
IjkMediaPlayer_pause
},
{
"isPlaying"
,
"()Z"
,
(
void
*
)
IjkMediaPlayer_isPlaying
},
{
"getCurrentPosition"
,
"()
I
"
,
(
void
*
)
IjkMediaPlayer_getCurrentPosition
},
{
"getDuration"
,
"()
I
"
,
(
void
*
)
IjkMediaPlayer_getDuration
},
{
"getCurrentPosition"
,
"()
J
"
,
(
void
*
)
IjkMediaPlayer_getCurrentPosition
},
{
"getDuration"
,
"()
J
"
,
(
void
*
)
IjkMediaPlayer_getDuration
},
{
"_release"
,
"()V"
,
(
void
*
)
IjkMediaPlayer_release
},
{
"_reset"
,
"()V"
,
(
void
*
)
IjkMediaPlayer_reset
},
{
"native_init"
,
"()V"
,
(
void
*
)
IjkMediaPlayer_native_init
},
...
...
ijkmediaplayer/src/tv/danmaku/ijk/media/player/AbstractMediaPlayer.java
浏览文件 @
7c80c058
...
...
@@ -81,11 +81,11 @@ public abstract class AbstractMediaPlayer {
public
abstract
boolean
isPlaying
();
public
abstract
void
seekTo
(
int
msec
)
throws
IllegalStateException
;
public
abstract
void
seekTo
(
long
msec
)
throws
IllegalStateException
;
public
abstract
int
getCurrentPosition
();
public
abstract
long
getCurrentPosition
();
public
abstract
int
getDuration
();
public
abstract
long
getDuration
();
public
abstract
void
release
();
...
...
ijkmediaplayer/src/tv/danmaku/ijk/media/player/AndroidMediaPlayer.java
浏览文件 @
7c80c058
...
...
@@ -97,17 +97,17 @@ public final class AndroidMediaPlayer extends AbstractMediaPlayer {
}
@Override
public
void
seekTo
(
int
msec
)
throws
IllegalStateException
{
mInternalMediaPlayer
.
seekTo
(
msec
);
public
void
seekTo
(
long
msec
)
throws
IllegalStateException
{
mInternalMediaPlayer
.
seekTo
(
(
int
)
msec
);
}
@Override
public
int
getCurrentPosition
()
{
public
long
getCurrentPosition
()
{
return
mInternalMediaPlayer
.
getCurrentPosition
();
}
@Override
public
int
getDuration
()
{
public
long
getDuration
()
{
return
mInternalMediaPlayer
.
getDuration
();
}
...
...
ijkmediaplayer/src/tv/danmaku/ijk/media/player/IjkMediaPlayer.java
浏览文件 @
7c80c058
...
...
@@ -271,13 +271,13 @@ public final class IjkMediaPlayer extends AbstractMediaPlayer {
public
native
boolean
isPlaying
();
@Override
public
native
void
seekTo
(
int
msec
)
throws
IllegalStateException
;
public
native
void
seekTo
(
long
msec
)
throws
IllegalStateException
;
@Override
public
native
int
getCurrentPosition
();
public
native
long
getCurrentPosition
();
@Override
public
native
int
getDuration
();
public
native
long
getDuration
();
/**
* Releases resources associated with this IjkMediaPlayer object. It is
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录