add fps debugging flag

Author: havlenapetr

jni/jni/com_media_ffmpeg_FFMpegPlayer.cpp

@@ -340,14 +340,13 @@ com_media_ffmpeg_FFMpegPlayer_native_init(JNIEnv *env)
         jniThrowException(env, "java/lang/RuntimeException", "Can't find MediaPlayer.mNativeContext");
         return;
     }
-	/*
+
     fields.post_event = env->GetStaticMethodID(clazz, "postEventFromNative",
                                                    "(Ljava/lang/Object;IIILjava/lang/Object;)V");
     if (fields.post_event == NULL) {
         jniThrowException(env, "java/lang/RuntimeException", "Can't find FFMpegMediaPlayer.postEventFromNative");
         return;
     }
-	*/
 }
 
 static void

jni/jni/onLoad.cpp

@@ -52,10 +52,10 @@ int jniThrowException(JNIEnv* env, const char* className, const char* msg) {
 JNIEnv* getJNIEnv() {
     JNIEnv* env = NULL;
     if (sVm->GetEnv((void**) &env, JNI_VERSION_1_4) != JNI_OK) {
-	__android_log_print(ANDROID_LOG_ERROR,
-			    TAG,
-			    "Failed to obtain JNIEnv");
-        return NULL;
+    	__android_log_print(ANDROID_LOG_ERROR,
+							TAG,
+							"Failed to obtain JNIEnv");
+    	return NULL;
     }
     return env;
 }

jni/libmediaplayer/mediaplayer.cpp

@@ -25,6 +25,8 @@ extern "C" {
 #include "mediaplayer.h"
 #include "output.h"
 
+#define FPS_DEBUGGING false
+
 static MediaPlayer* sPlayer;
 
 MediaPlayer::MediaPlayer()
@@ -263,27 +265,25 @@ bool MediaPlayer::shouldCancel(PacketQueue* queue)
 			  && queue->size() == 0));
 }
 
-
-/*
-  timeval	    pTime;
-  int				frames = 0;
-    double			t1 = -1;
-    double			t2 = -1;
-
-        gettimeofday(&pTime, NULL);
-                t2=pTime.tv_sec+(pTime.tv_usec/1000000.0);
-                if(t1 == -1 || t2 > t1 + 1)
-                {
-                        __android_log_print(ANDROID_LOG_ERROR, TAG, "Video frame rate: %ifps", frames);
-                        t1=t2;
-                        frames = 0;
-                }
-                frames++;
-
-               */
-
 void MediaPlayer::decode(AVFrame* frame, double pts)
 {
+	if(FPS_DEBUGGING) {
+		timeval pTime;
+		static int frames = 0;
+		static double t1 = -1;
+		static double t2 = -1;
+
+		gettimeofday(&pTime, NULL);
+		t2 = pTime.tv_sec + (pTime.tv_usec / 1000000.0);
+		if (t1 == -1 || t2 > t1 + 1) {
+			__android_log_print(ANDROID_LOG_INFO, TAG, "Video fps:%i", frames);
+			//sPlayer->notify(MEDIA_INFO_FRAMERATE_VIDEO, frames, -1);
+			t1 = t2;
+			frames = 0;
+		}
+		frames++;
+	}
+
 	// Convert the image from its native format to RGB
 	sws_scale(sPlayer->mConvertCtx,
 		      frame->data,
@@ -298,6 +298,23 @@ void MediaPlayer::decode(AVFrame* frame, double pts)
 
 void MediaPlayer::decode(int16_t* buffer, int buffer_size)
 {
+	if(FPS_DEBUGGING) {
+		timeval pTime;
+		static int frames = 0;
+		static double t1 = -1;
+		static double t2 = -1;
+
+		gettimeofday(&pTime, NULL);
+		t2 = pTime.tv_sec + (pTime.tv_usec / 1000000.0);
+		if (t1 == -1 || t2 > t1 + 1) {
+			__android_log_print(ANDROID_LOG_INFO, TAG, "Audio fps:%i", frames);
+			//sPlayer->notify(MEDIA_INFO_FRAMERATE_AUDIO, frames, -1);
+			t1 = t2;
+			frames = 0;
+		}
+		frames++;
+	}
+
 	if(Output::AudioDriver_write(buffer, buffer_size) <= 0) {
 		__android_log_print(ANDROID_LOG_ERROR, TAG, "Couldn't write samples to audio track");
 	}
@@ -505,13 +522,13 @@ void MediaPlayer::ffmpegNotify(void* ptr, int level, const char* fmt, va_list vl
 
 void MediaPlayer::notify(int msg, int ext1, int ext2)
 {
-    __android_log_print(ANDROID_LOG_INFO, TAG, "message received msg=%d, ext1=%d, ext2=%d", msg, ext1, ext2);
+    //__android_log_print(ANDROID_LOG_INFO, TAG, "message received msg=%d, ext1=%d, ext2=%d", msg, ext1, ext2);
     bool send = true;
     bool locked = false;
 
     if ((mListener != 0) && send) {
-       __android_log_print(ANDROID_LOG_INFO, TAG, "callback application");
+       //__android_log_print(ANDROID_LOG_INFO, TAG, "callback application");
        mListener->notify(msg, ext1, ext2);
-       __android_log_print(ANDROID_LOG_INFO, TAG, "back from callback");
+       //__android_log_print(ANDROID_LOG_INFO, TAG, "back from callback");
 	}
 }

jni/libmediaplayer/mediaplayer.h

@@ -86,6 +86,9 @@ enum media_info_type {
     MEDIA_INFO_NOT_SEEKABLE = 801,
     // New media metadata is available.
     MEDIA_INFO_METADATA_UPDATE = 802,
+
+    MEDIA_INFO_FRAMERATE_VIDEO = 900,
+    MEDIA_INFO_FRAMERATE_AUDIO,
 };
 
 

src/com/media/ffmpeg/FFMpegPlayer.java

@@ -1,6 +1,7 @@
 package com.media.ffmpeg;
 
 import android.os.PowerManager;
+import android.util.Log;
 import android.view.Surface;
 import android.view.SurfaceHolder;
 import android.media.AudioManager;
@@ -66,6 +67,9 @@ public class FFMpegPlayer
      */
     public static final int MEDIA_INFO_METADATA_UPDATE = 802;
 
+    public static final int MEDIA_INFO_FRAMERATE_VIDEO = 900;
+    public static final int MEDIA_INFO_FRAMERATE_AUDIO = 901;
+    
     private final static String 		TAG = "MediaPlayer";
 
     private int 						mNativeContext; // accessed by native methods
@@ -96,7 +100,15 @@ public FFMpegPlayer() {
      */
     private static void postEventFromNative(Object mediaplayer_ref,
                                             int what, int arg1, int arg2, Object obj)
-    {	
+    {
+    	switch(what) {
+    	case MEDIA_INFO_FRAMERATE_VIDEO:
+    		Log.d(TAG, "Video fps:" + arg1);
+    		break;
+    	case MEDIA_INFO_FRAMERATE_AUDIO:
+    		Log.d(TAG, "Audio fps:" + arg1);
+    		break;
+    	}
     }
 
     /**
@@ -334,7 +346,7 @@ private void updateSurfaceScreenOn() {
 
 
 
-    private static native final void native_init();
+    private static native final void native_init() throws RuntimeException;
     private native final void native_setup(Object mediaplayer_this);
     private native final void native_finalize();