提交 ea5ddab2 编写于 作者: Z Zhang Rui

ijkplayer: remove duplicate function from common implement

上级 be0fdbee
......@@ -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;
......
......@@ -24,7 +24,7 @@
#define IJKPLAYER_ANDROID__IJKPLAYER_INTERNAL_H
#include <assert.h>
#include "ijksdl/android/ijksdl_android.h"
#include "ijksdl/ijksdl.h"
#include "ff_fferror.h"
#include "ff_ffplay.h"
#include "ijkplayer.h"
......
//
// 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
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册