merge of experimental branch

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))

AndroidManifest.xml

@@ -25,7 +25,7 @@
         </activity>
 
     </application>
-    <uses-sdk android:minSdkVersion="3" />
+    <uses-sdk android:minSdkVersion="4" />
     <uses-permission android:name="android.permission.WAKE_LOCK"/>
 	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
 </manifest> 

Application.mk

@@ -0,0 +1,13 @@
+# This file is automatically generated by Android Tools.
+# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
+# 
+# This file must be checked in Version Control Systems.
+# 
+# To customize properties used by the Ant build system use,
+# "build.properties", and override values to adapt the script to your
+# project structure.
+
+# Project target.
+target=android-4
+# Indicates whether an apk should be generated for each density.
+split.density=false

default.properties

@@ -0,0 +1,87 @@
+/*
+ * Copyright (C) 2007 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef ANDROID_ERRORS_H
+#define ANDROID_ERRORS_H
+
+#include <sys/types.h>
+#include <errno.h>
+
+namespace android {
+
+// use this type to return error codes
+#ifdef HAVE_MS_C_RUNTIME
+typedef int         status_t;
+#else
+typedef int32_t     status_t;
+#endif
+
+/* the MS C runtime lacks a few error codes */
+
+/*
+ * Error codes. 
+ * All error codes are negative values.
+ */
+
+// Win32 #defines NO_ERROR as well.  It has the same value, so there's no
+// real conflict, though it's a bit awkward.
+#ifdef _WIN32
+# undef NO_ERROR
+#endif
+ 
+enum {
+    OK                = 0,    // Everything's swell.
+    NO_ERROR          = 0,    // No errors.
+    
+    UNKNOWN_ERROR       = 0x80000000,
+
+    NO_MEMORY           = -ENOMEM,
+    INVALID_OPERATION   = -ENOSYS,
+    BAD_VALUE           = -EINVAL,
+    BAD_TYPE            = 0x80000001,
+    NAME_NOT_FOUND      = -ENOENT,
+    PERMISSION_DENIED   = -EPERM,
+    NO_INIT             = -ENODEV,
+    ALREADY_EXISTS      = -EEXIST,
+    DEAD_OBJECT         = -EPIPE,
+    FAILED_TRANSACTION  = 0x80000002,
+    JPARKS_BROKE_IT     = -EPIPE,
+#if !defined(HAVE_MS_C_RUNTIME)
+    BAD_INDEX           = -EOVERFLOW,
+    NOT_ENOUGH_DATA     = -ENODATA,
+    WOULD_BLOCK         = -EWOULDBLOCK, 
+    TIMED_OUT           = -ETIMEDOUT,
+    UNKNOWN_TRANSACTION = -EBADMSG,
+#else    
+    BAD_INDEX           = -E2BIG,
+    NOT_ENOUGH_DATA     = 0x80000003,
+    WOULD_BLOCK         = 0x80000004,
+    TIMED_OUT           = 0x80000005,
+    UNKNOWN_TRANSACTION = 0x80000006,
+#endif    
+};
+
+// Restore define; enumeration is in "android" namespace, so the value defined
+// there won't work for Win32 code in a different namespace.
+#ifdef _WIN32
+# define NO_ERROR 0L
+#endif
+
+}; // namespace android
+    
+// ---------------------------------------------------------------------------
+    
+#endif // ANDROID_ERRORS_H

jni/Android.mk

@@ -93,8 +93,7 @@ int AndroidAudioTrack_register();
 int AndroidAudioTrack_set(int streamType,
 						  uint32_t sampleRate,
 						  int format,
-						  int channels,
-						  int buffSizeInBytes);
+						  int channels);
 
 int AndroidAudioTrack_start();
 

jni/include/android/Errors.h

@@ -1,4 +1,5 @@
 /*
+ * Copyright (C) 2011 Petr Havlena  [email protected]
  * Copyright (C) 2009 The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -20,13 +21,13 @@
 #include <stdint.h>
 #include <jni.h>
 
-#define ANDROID_SURFACE_RESULT_SUCCESS						 0
-#define ANDROID_SURFACE_RESULT_NOT_VALID					-1
-#define ANDROID_SURFACE_RESULT_COULDNT_LOCK					-2
-#define ANDROID_SURFACE_RESULT_COULDNT_UNLOCK_AND_POST		-3
-#define ANDROID_SURFACE_RESULT_COULDNT_INIT_BITMAP_SURFACE	-4
-#define ANDROID_SURFACE_RESULT_COULDNT_INIT_BITMAP_CLIENT	-5
-#define ANDROID_SURFACE_RESULT_JNI_EXCEPTION				-6
+#define ANDROID_SURFACE_RESULT_SUCCESS                          0
+#define ANDROID_SURFACE_RESULT_NOT_VALID                        -1
+#define ANDROID_SURFACE_RESULT_COULDNT_LOCK                     -2
+#define ANDROID_SURFACE_RESULT_COULDNT_UNLOCK_AND_POST          -3
+#define ANDROID_SURFACE_RESULT_COULDNT_INIT_BITMAP_SURFACE      -4
+#define ANDROID_SURFACE_RESULT_COULDNT_INIT_BITMAP_CLIENT       -5
+#define ANDROID_SURFACE_RESULT_JNI_EXCEPTION                    -6
 
 #ifdef __cplusplus
 extern "C" {
@@ -36,7 +37,7 @@ int AndroidSurface_register(JNIEnv* env, jobject jsurface);
 
 int AndroidSurface_getPixels(int width, int height, void** pixels);
 
-int AndroidSurface_updateSurface();
+int AndroidSurface_updateSurface(bool autoscale = true);
 
 int AndroidSurface_unregister();
 

jni/include/android/audiotrack.h

@@ -1,42 +1,46 @@
 LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 
+IN_NDK := true
+
 LOCAL_CFLAGS := -D__STDC_CONSTANT_MACROS
 
 WITH_CONVERTOR := true
+WITH_PLAYER := true
 
-#ifeq ($(WITH_PLAYER),true)
+ifeq ($(WITH_PLAYER),true)
 LOCAL_CFLAGS += -DBUILD_WITH_PLAYER
-#endif
+endif
 
 ifeq ($(WITH_CONVERTOR),true)
 LOCAL_CFLAGS += -DBUILD_WITH_CONVERTOR
 endif
 
 LOCAL_C_INCLUDES += \
-	$(LOCAL_PATH)/../libffmpeg \
-	$(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)
+ifeq ($(WITH_PLAYER),true)
 LOCAL_SRC_FILES += \
-	com_media_ffmpeg_android_FFMpegPlayerAndroid.cpp
-#endif
+    com_media_ffmpeg_FFMpegPlayer.cpp
+#com_media_ffmpeg_android_FFMpegPlayerAndroid.cpp
+endif
 
 ifeq ($(IN_NDK),true)	
 LOCAL_LDLIBS := -llog
@@ -46,8 +50,7 @@ LOCAL_SHARED_LIBRARIES := liblog
 endif
 
 LOCAL_SHARED_LIBRARIES := libjniaudio libjnivideo
-
-LOCAL_STATIC_LIBRARIES := libavcodec libavformat libavutil libpostproc libswscale
+LOCAL_STATIC_LIBRARIES := libavcodec libavformat libavutil libpostproc libswscale libmediaplayer
 
 LOCAL_MODULE := libffmpeg_jni