diff --git a/ijkmedia/ijkplayer/ijkplayer.c b/ijkmedia/ijkplayer/ijkplayer.c index 7749fecdf4826132729b8dd5b66c8e1e603a8b52..f4cda6dee530d4cfbd0d26387dc070be4815836f 100644 --- a/ijkmedia/ijkplayer/ijkplayer.c +++ b/ijkmedia/ijkplayer/ijkplayer.c @@ -81,14 +81,6 @@ IjkMediaPlayer *ijkmp_create(void *(*msg_loop)(void*)) if (!mp) goto fail; - mp->ffplayer->vout = SDL_VoutAndroid_CreateForAndroidSurface(); - if (!mp->ffplayer->vout) - goto fail; - - mp->ffplayer->aout = SDL_AoutAndroid_CreateForAudioTrack(); - if (!mp->ffplayer->vout) - goto fail; - mp->msg_loop = msg_loop; ijkmp_inc_ref(mp); @@ -464,25 +456,6 @@ long ijkmp_get_duration(IjkMediaPlayer *mp) return retval; } -void ijkmp_set_android_surface_l(JNIEnv *env, IjkMediaPlayer *mp, jobject android_surface) -{ - assert(mp); - assert(mp->ffplayer); - assert(mp->ffplayer->vout); - - SDL_VoutAndroid_SetAndroidSurface(env, mp->ffplayer->vout, android_surface); -} - -void ijkmp_set_android_surface(JNIEnv *env, IjkMediaPlayer *mp, jobject android_surface) -{ - assert(mp); - MPTRACE("ijkmp_set_android_surface(surface=%p)", (void*)android_surface); - pthread_mutex_lock(&mp->mutex); - ijkmp_set_android_surface_l(env, mp, android_surface); - pthread_mutex_unlock(&mp->mutex); - MPTRACE("ijkmp_set_android_surface(surface=%p)=void", (void*)android_surface); -} - void *ijkmp_set_weak_thiz(IjkMediaPlayer *mp, void *weak_thiz) { void *prev_weak_thiz = mp->weak_thiz; diff --git a/ijkmedia/ijkplayer/ijkplayer_internal.h b/ijkmedia/ijkplayer/ijkplayer_internal.h index a28a899c6ad5ef3366d7e34ff05364ea3707739e..a77afb4c0d5082d06dd754807e0b2cea6b394772 100644 --- a/ijkmedia/ijkplayer/ijkplayer_internal.h +++ b/ijkmedia/ijkplayer/ijkplayer_internal.h @@ -24,7 +24,7 @@ #define IJKPLAYER_ANDROID__IJKPLAYER_INTERNAL_H #include -#include "ijksdl/android/ijksdl_android.h" +#include "ijksdl/ijksdl.h" #include "ff_fferror.h" #include "ff_ffplay.h" #include "ijkplayer.h" diff --git a/ios/IJKMediaPlayer/IJKMediaPlayer/ijkmedia/ijksdl/ios/ijksdl_ios.h b/ios/IJKMediaPlayer/IJKMediaPlayer/ijkmedia/ijksdl/ios/ijksdl_ios.h new file mode 100644 index 0000000000000000000000000000000000000000..82d130a5db4236279163d670f41c56c550f40cd8 --- /dev/null +++ b/ios/IJKMediaPlayer/IJKMediaPlayer/ijkmedia/ijksdl/ios/ijksdl_ios.h @@ -0,0 +1,14 @@ +// +// ijksdl_ios.h +// IJKMediaPlayer +// +// Created by ZhangRui on 13-9-23. +// Copyright (c) 2013年 bilibili. All rights reserved. +// + +#ifndef IJKMediaPlayer_ijksdl_ios_h +#define IJKMediaPlayer_ijksdl_ios_h + + + +#endif