提交 7c80c058 编写于 作者: Z Zhang Rui

ijkplayer: time based function use long instead of int

上级 13f42920
......@@ -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
......
......@@ -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);
......
......@@ -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 },
......
......@@ -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();
......
......@@ -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();
}
......
......@@ -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.
先完成此消息的编辑!
想要评论请 注册