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

ijksdl: move android implement into android dir

上级 8a70d703
...@@ -29,8 +29,8 @@ LOCAL_C_INCLUDES += $(MY_APP_JNI_ROOT) ...@@ -29,8 +29,8 @@ LOCAL_C_INCLUDES += $(MY_APP_JNI_ROOT)
LOCAL_SRC_FILES += ff_cmdutils.c LOCAL_SRC_FILES += ff_cmdutils.c
LOCAL_SRC_FILES += ff_ffplay.c LOCAL_SRC_FILES += ff_ffplay.c
LOCAL_SRC_FILES += ijkplayer.c LOCAL_SRC_FILES += android/ijkplayer.c
LOCAL_SRC_FILES += ijkplayer_jni.c LOCAL_SRC_FILES += android/ijkplayer_jni.c
LOCAL_STATIC_LIBRARIES := ijksdl LOCAL_STATIC_LIBRARIES := ijksdl
LOCAL_SHARED_LIBRARIES := ffmpeg ijkutil LOCAL_SHARED_LIBRARIES := ffmpeg ijkutil
......
/* /*
* ijkplayer.c * ijkplayer_android.c
* *
* Copyright (c) 2013 Zhang Rui <bbcallen@gmail.com> * Copyright (c) 2013 Zhang Rui <bbcallen@gmail.com>
* *
...@@ -20,11 +20,11 @@ ...@@ -20,11 +20,11 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#include "ijkplayer.h" #include "ijkplayer_android.h"
#include <assert.h> #include <assert.h>
#include "ijkerror.h" #include "../ijkerror.h"
#include "ff_ffplay.h" #include "../ff_ffplay.h"
#define MPST_CHECK_NOT_RET_INT(real, expected, errcode) \ #define MPST_CHECK_NOT_RET_INT(real, expected, errcode) \
do { \ do { \
......
/* /*
* ijkplayer.h * ijkplayer_android.h
* *
* Copyright (c) 2013 Zhang Rui <bbcallen@gmail.com> * Copyright (c) 2013 Zhang Rui <bbcallen@gmail.com>
* *
...@@ -20,8 +20,8 @@ ...@@ -20,8 +20,8 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#ifndef IJKPLAYER__IJKPLAYER_H #ifndef IJKPLAYER__IJKPLAYER_ANDROID_H
#define IJKPLAYER__IJKPLAYER_H #define IJKPLAYER__IJKPLAYER_ANDROID_H
#include <stdbool.h> #include <stdbool.h>
......
...@@ -26,8 +26,8 @@ ...@@ -26,8 +26,8 @@
#include <jni.h> #include <jni.h>
#include "ijksdl/ijksdl.h" #include "ijksdl/ijksdl.h"
#include "ijkutil/ijkutil.h" #include "ijkutil/ijkutil.h"
#include "ijkplayer.h" #include "../ijkerror.h"
#include "ijkerror.h" #include "ijkplayer_android.h"
#define JNI_MODULE_PACKAGE "tv/danmaku/ijk/media/player" #define JNI_MODULE_PACKAGE "tv/danmaku/ijk/media/player"
#define JNI_CLASS_IJKPLAYER "tv/danmaku/ijk/media/player/IjkMediaPlayer" #define JNI_CLASS_IJKPLAYER "tv/danmaku/ijk/media/player/IjkMediaPlayer"
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册