repair bulding process for everyone - you must build in ndkr5

Author: havlenapetr

Android.mk

@@ -1,4 +1,4 @@
-LOCAL_PATH:= $(TOP_LOCAL_PATH)
+LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := $(call all-subdir-java-files)
@@ -12,6 +12,6 @@ include $(BUILD_PACKAGE)
 # ============================================================
 
 # Also build all of the sub-targets under this one: the shared library.
-IN_NDK := false
+IN_NDK := true
 WITH_PLAYER := true
 include $(call all-makefiles-under,$(LOCAL_PATH))

Application.mk

@@ -1,6 +1,8 @@
 LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 
+IN_NDK := true
+
 LOCAL_CFLAGS := -D__STDC_CONSTANT_MACROS
 
 WITH_CONVERTOR := true
@@ -15,29 +17,28 @@ LOCAL_CFLAGS += -DBUILD_WITH_CONVERTOR
 endif
 
 LOCAL_C_INCLUDES += \
-	$(LOCAL_PATH)/../libffmpeg \
-	$(LOCAL_PATH)/../libmediaplayer \
-	$(LOCAL_PATH)/../include
+    $(LOCAL_PATH)/../libffmpeg \
+    $(LOCAL_PATH)/../libmediaplayer \
+    $(LOCAL_PATH)/../include
 
 LOCAL_SRC_FILES := \
-		onLoad.cpp \
-		com_media_ffmpeg_FFMpegAVFrame.cpp \
-		com_media_ffmpeg_FFMpegAVInputFormat.c \
-		com_media_ffmpeg_FFMpegAVRational.c \
-		com_media_ffmpeg_FFMpegAVFormatContext.c \
-		com_media_ffmpeg_FFMpegAVCodecContext.cpp \
-		com_media_ffmpeg_FFMpegUtils.cpp
-
+    onLoad.cpp \
+    com_media_ffmpeg_FFMpegAVFrame.cpp \
+    com_media_ffmpeg_FFMpegAVInputFormat.c \
+    com_media_ffmpeg_FFMpegAVRational.c \
+    com_media_ffmpeg_FFMpegAVFormatContext.c \
+    com_media_ffmpeg_FFMpegAVCodecContext.cpp \
+    com_media_ffmpeg_FFMpegUtils.cpp
 
 ifeq ($(WITH_CONVERTOR),true)
 LOCAL_SRC_FILES += \
-	com_media_ffmpeg_FFMpeg.c \
-	../libffmpeg/cmdutils.c
+    com_media_ffmpeg_FFMpeg.c \
+    ../libffmpeg/cmdutils.c
 endif
 
 ifeq ($(WITH_PLAYER),true)
 LOCAL_SRC_FILES += \
-	com_media_ffmpeg_FFMpegPlayer.cpp
+    com_media_ffmpeg_FFMpegPlayer.cpp
 #com_media_ffmpeg_android_FFMpegPlayerAndroid.cpp
 endif
 
@@ -49,7 +50,6 @@ LOCAL_SHARED_LIBRARIES := liblog
 endif
 
 LOCAL_SHARED_LIBRARIES := libjniaudio libjnivideo
-
 LOCAL_STATIC_LIBRARIES := libavcodec libavformat libavutil libpostproc libswscale libmediaplayer
 
 LOCAL_MODULE := libffmpeg_jni

jni/jni/Android.mk

@@ -4,21 +4,17 @@ include $(CLEAR_VARS)
 LOCAL_CFLAGS := -D__STDC_CONSTANT_MACROS
 
 LOCAL_C_INCLUDES += \
-	$(LOCAL_PATH)/../libffmpeg \
-	$(LOCAL_PATH)/../include
+    $(LOCAL_PATH)/../libffmpeg \
+    $(LOCAL_PATH)/../include
 
 LOCAL_SRC_FILES += \
-	packetqueue.cpp \
-	output.cpp \
-	mediaplayer.cpp \
-	decoder.cpp \
-	decoder_audio.cpp \
-	decoder_video.cpp \
-	thread.cpp
-
-LOCAL_LDLIBS := -llog
-
-LOCAL_SHARED_LIBRARIES := libjniaudio libjnivideo
+    packetqueue.cpp \
+    output.cpp \
+    mediaplayer.cpp \
+    decoder.cpp \
+    decoder_audio.cpp \
+    decoder_video.cpp \
+    thread.cpp
 
 LOCAL_STATIC_LIBRARIES := libavcodec libavformat libavutil libpostproc libswscale
 

jni/libmediaplayer/Android.mk

@@ -0,0 +1,11 @@
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := libjnivideo
+LOCAL_SRC_FILES := libjnivideo.so
+include $(PREBUILT_SHARED_LIBRARY)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := libjniaudio
+LOCAL_SRC_FILES := libjniaudio.so
+include $(PREBUILT_SHARED_LIBRARY)

jni/prebuilt/Android.mk

@@ -16,34 +16,33 @@
 public class FFMpegMovieViewAndroid extends SurfaceView {
 	private static final String 	TAG = "FFMpegMovieViewAndroid"; 
 
-	private Context					mContext;
 	private FFMpegPlayer			mPlayer;
-	private SurfaceHolder			mSurfaceHolder;
 	private MediaController			mMediaController;
 
 	public FFMpegMovieViewAndroid(Context context) {
         super(context);
-        initVideoView(context);
+        initVideoView();
     }
 
     public FFMpegMovieViewAndroid(Context context, AttributeSet attrs) {
         this(context, attrs, 0);
-        initVideoView(context);
+        initVideoView();
     }
 
     public FFMpegMovieViewAndroid(Context context, AttributeSet attrs, int defStyle) {
         super(context, attrs, defStyle);
-        initVideoView(context);
+        initVideoView();
     }
 
-    private void initVideoView(Context context) {
-    	mContext = context;
+    private void initVideoView() {
     	mPlayer = new FFMpegPlayer();
-    	getHolder().addCallback(mSHCallback);
+    	
+    	SurfaceHolder surfHolder = getHolder();
+    	surfHolder.addCallback(mSHCallback);
     }
 
     private void attachMediaController() {
-    	mMediaController = new MediaController(mContext);
+    	mMediaController = new MediaController(getContext());
         View anchorView = this.getParent() instanceof View ?
                     (View)this.getParent() : this;
         mMediaController.setMediaPlayer(mMediaPlayerControl);
@@ -58,9 +57,9 @@ public void setVideoPath(String filePath) throws IllegalArgumentException, Illeg
     /**
      * initzialize player
      */
-    private void openVideo() {
+    private void openVideo(SurfaceHolder surfHolder) {
     	try {
-    		mPlayer.setDisplay(mSurfaceHolder);
+    		mPlayer.setDisplay(surfHolder);
 			mPlayer.prepare();
 		} catch (IllegalStateException e) {
 			Log.e(TAG, "Couldn't prepare player: " + e.getMessage());
@@ -95,17 +94,14 @@ public void surfaceChanged(SurfaceHolder holder, int format, int w, int h) {
         }
 
         public void surfaceCreated(SurfaceHolder holder) {
-            mSurfaceHolder = holder;
-            openVideo();
+            openVideo(holder);
         }
 
         public void surfaceDestroyed(SurfaceHolder holder) {
 			release();
 			if(mMediaController.isShowing()) {
 				mMediaController.hide();
 			}
-			// after we return from this we can't use the surface any more
-            mSurfaceHolder = null;
         }
     };
 

libs/armeabi/libjniaudio.so renamed to jni/prebuilt/libjniaudio.so

@@ -7,16 +7,9 @@
 import com.media.ffmpeg.android.FFMpegMovieViewAndroid;
 
 import android.app.Activity;
-import android.content.Context;
 import android.content.Intent;
-import android.graphics.drawable.Drawable;
 import android.os.Bundle;
-import android.os.PowerManager;
-import android.os.PowerManager.WakeLock;
 import android.util.Log;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
 
 public class FFMpegPlayerActivity extends Activity {
 	private static final String 	TAG = "FFMpegPlayerActivity";
@@ -61,92 +54,4 @@ protected void onCreate(Bundle savedInstanceState) {
 			}
 		}
 	}
-	
-	/*
-	@Override
-	public boolean onCreateOptionsMenu(Menu menu) {
-		MenuInflater inflater = getMenuInflater();
-	    inflater.inflate(R.layout.ffmpeg_player_menu, menu);
-	    return true;
-	}
-	
-	@Override
-	public boolean onMenuOpened(int featureId, Menu menu) {
-		return mPlayer.pause();
-	}
-	
-	@Override
-	public void onOptionsMenuClosed(Menu menu) {
-		mPlayer.resume();
-	}
-	
-	@Override
-	public boolean onOptionsItemSelected(MenuItem item) {
-		switch (item.getItemId()) {
-		case R.id.player_menu_about:
-			FFMpegMessageBox.show(this, "About", "Developed by Havlena Petr\n" + LICENSE);
-			return true;
-			
-		case R.id.player_menu_decode_audio:
-			mPlayer.decodeAudio(!mPlayer.isDecodingAudio());
-			Drawable d = null;
-			if(mPlayer.isDecodingAudio()) {
-				d = getResources().getDrawable(R.drawable.ic_menu_block);
-			} else {
-				d = getResources().getDrawable(R.drawable.ic_menu_mark);
-			}
-			item.setIcon(d);
-			return true;
-		}
-		return super.onOptionsItemSelected(item);
-	}
-	
-	@Override
-    protected void onResume() {
-        //-- we will disable screen timeout, while scumm is running
-        if( mWakeLock != null ) {
-        	Log.d(TAG, "Resuming so acquiring wakeLock");
-        	mWakeLock.acquire();
-        }
-        super.onResume();
-    }
-    
-    @Override
-    protected void onPause() {
-        //-- we will enable screen timeout, while scumm is paused
-        if(mWakeLock != null ) {
-        	Log.d(TAG, "Pausing so releasing wakeLock");
-        	mWakeLock.release();
-        }
-        super.onPause();
-    }
-    
-    private void startFileExplorer() {
-    	Intent i = new Intent(this, FFMpegFileExplorer.class);
-    	startActivity(i);
-    }
-
-	private class FFMpegPlayerHandler implements IFFMpegPlayer {
-
-		public void onError(String msg, Exception e) {
-			Log.e(TAG, "ERROR: " + e.getMessage());
-			startFileExplorer();
-		}
-
-		public void onPlay() {
-			Log.d(TAG, "starts playing");
-		}
-
-		public void onRelease() {
-			Log.d(TAG, "released");
-			//startFileExplorer();
-		}
-
-		public void onStop() {
-			Log.d(TAG, "stopped");
-			FFMpegPlayerActivity.this.finish();
-		}
-		
-	}
-	*/
 }