Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 538b00f6: Merge "Frameworks/base: Wall Werror in media/mca"

Browse Source 
* commit '538b00f6e583dfd38f6e329ef6715fb72f924160':
  Frameworks/base: Wall Werror in media/mca
This commit is contained in:
Andreas Gampe
2014-11-11 02:20:54 +00:00
committed by Android Git Automerger
parent 7188903963 538b00f6e5
commit 390854c490
9 changed files with 27 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
media/mca/filterfw/jni/Android.mk
View File

@@ -38,8 +38,8 @@ include $(LOCAL_PATH)/../native/libfilterfw.mk
# Also need the JNI headers. # Also need the JNI headers.
LOCAL_C_INCLUDES += \ LOCAL_C_INCLUDES += \
$(JNI_H_INCLUDE) \ $(JNI_H_INCLUDE) \
$(LOCAL_PATH)/.. $(LOCAL_PATH)/..
# Don't prelink this library. For more efficient code, you may want # Don't prelink this library. For more efficient code, you may want
# to add this library to the prelink map and set this to true. However, # to add this library to the prelink map and set this to true. However,
@@ -47,5 +47,7 @@ LOCAL_C_INCLUDES += \
# part of a system image. # part of a system image.
LOCAL_PRELINK_MODULE := false LOCAL_PRELINK_MODULE := false
LOCAL_CFLAGS += -Wall -Werror -Wunused -Wunreachable-code
include $(BUILD_STATIC_LIBRARY) include $(BUILD_STATIC_LIBRARY)

6
media/mca/filterfw/jni/jni_gl_environment.cpp
View File

@@ -20,8 +20,8 @@
#include "jni/jni_gl_environment.h" #include "jni/jni_gl_environment.h"
#include "jni/jni_util.h" #include "jni/jni_util.h"
#include <media/mediarecorder.h>
#include "native/core/gl_env.h" #include "native/core/gl_env.h"
#include <media/mediarecorder.h>
#include <gui/IGraphicBufferProducer.h> #include <gui/IGraphicBufferProducer.h>
#include <gui/Surface.h> #include <gui/Surface.h>
@@ -92,8 +92,8 @@ jboolean Java_android_filterfw_core_GLEnvironment_nativeIsContextActive(JNIEnv*
return gl_env ? ToJBool(gl_env->IsContextActive()) : JNI_FALSE; return gl_env ? ToJBool(gl_env->IsContextActive()) : JNI_FALSE;
} }
jboolean Java_android_filterfw_core_GLEnvironment_nativeIsAnyContextActive(JNIEnv* env, jboolean Java_android_filterfw_core_GLEnvironment_nativeIsAnyContextActive(JNIEnv* /* env */,
jclass clazz) { jclass /* clazz */) {
return ToJBool(GLEnv::IsAnyContextActive()); return ToJBool(GLEnv::IsAnyContextActive());
} }

2
media/mca/filterfw/jni/jni_init.cpp
View File

@@ -27,7 +27,7 @@ using namespace android::filterfw;
JavaVM* g_current_java_vm_ = NULL; JavaVM* g_current_java_vm_ = NULL;
jint JNI_OnLoad(JavaVM* vm, void* reserved) { jint JNI_OnLoad(JavaVM* vm, void* /* reserved */) {
// Set the current vm pointer // Set the current vm pointer
g_current_java_vm_ = vm; g_current_java_vm_ = vm;

2
media/mca/filterfw/native/Android.mk
View File

@@ -39,6 +39,8 @@ include $(LOCAL_PATH)/libfilterfw.mk
# gcc should always be placed at the end. # gcc should always be placed at the end.
LOCAL_EXPORT_LDLIBS := -llog -lgcc LOCAL_EXPORT_LDLIBS := -llog -lgcc
LOCAL_CFLAGS += -Wall -Werror -Wunused -Wunreachable-code
# TODO: Build a shared library as well? # TODO: Build a shared library as well?
include $(BUILD_STATIC_LIBRARY) include $(BUILD_STATIC_LIBRARY)

8
media/mca/filterfw/native/core/shader_program.cpp
View File

@@ -318,15 +318,15 @@ GLuint ShaderProgram::CompileShader(GLenum shader_type, const char* source) {
ALOGE("Problem compiling shader! Source:"); ALOGE("Problem compiling shader! Source:");
ALOGE("%s", source); ALOGE("%s", source);
std::string src(source); std::string src(source);
unsigned int cur_pos = 0; size_t cur_pos = 0;
unsigned int next_pos = 0; size_t next_pos = 0;
int line_number = 1; size_t line_number = 1;
while ( (next_pos = src.find_first_of('\n', cur_pos)) != std::string::npos) { while ( (next_pos = src.find_first_of('\n', cur_pos)) != std::string::npos) {
ALOGE("%03d : %s", line_number, src.substr(cur_pos, next_pos-cur_pos).c_str()); ALOGE("%03d : %s", line_number, src.substr(cur_pos, next_pos-cur_pos).c_str());
cur_pos = next_pos + 1; cur_pos = next_pos + 1;
line_number++; line_number++;
} }
ALOGE("%03d : %s", line_number, src.substr(cur_pos, next_pos-cur_pos).c_str()); ALOGE("%03zu : %s", line_number, src.substr(cur_pos, next_pos-cur_pos).c_str());
GLint log_length = 0; GLint log_length = 0;
glGetShaderiv(shader, GL_INFO_LOG_LENGTH, &log_length); glGetShaderiv(shader, GL_INFO_LOG_LENGTH, &log_length);

4
media/mca/filterfw/native/core/vertex_frame.cpp
View File

@@ -25,10 +25,6 @@
namespace android { namespace android {
namespace filterfw { namespace filterfw {
// GL Extensions that are dynamically looked up at runtime
static PFNGLMAPBUFFEROESPROC GLMapBufferOES = NULL;
static PFNGLUNMAPBUFFEROESPROC GLUnmapBufferOES = NULL;
VertexFrame::VertexFrame(int size) VertexFrame::VertexFrame(int size)
: vbo_(0), : vbo_(0),
size_(size) { size_(size) {

4
media/mca/filterpacks/Android.mk
View File

@@ -28,6 +28,8 @@ LOCAL_SRC_FILES := native/base/geometry.cpp \
LOCAL_CFLAGS := -DANDROID LOCAL_CFLAGS := -DANDROID
LOCAL_CFLAGS += -Wall -Werror -Wunused -Wunreachable-code
include external/stlport/libstlport.mk include external/stlport/libstlport.mk
include $(BUILD_STATIC_LIBRARY) include $(BUILD_STATIC_LIBRARY)
@@ -50,4 +52,6 @@ LOCAL_SHARED_LIBRARIES := liblog libutils libfilterfw
LOCAL_PRELINK_MODULE := false LOCAL_PRELINK_MODULE := false
LOCAL_CFLAGS += -Wall -Werror -Wunused -Wunreachable-code
include $(BUILD_SHARED_LIBRARY) include $(BUILD_SHARED_LIBRARY)

4
media/mca/filterpacks/native/imageproc/invert.c
View File

@@ -16,12 +16,14 @@
#include <android/log.h> #include <android/log.h>
#define ATTRIBUTE_UNUSED __attribute__((unused))
int invert_process(const char** inputs, int invert_process(const char** inputs,
const int* input_sizes, const int* input_sizes,
int input_count, int input_count,
char* output, char* output,
int output_size, int output_size,
void* user_data) { void* user_data ATTRIBUTE_UNUSED) {
// Make sure we have exactly one input // Make sure we have exactly one input
if (input_count != 1) if (input_count != 1)
return 0; return 0;

10
media/mca/filterpacks/native/imageproc/to_rgba.c
View File

@@ -16,12 +16,14 @@
#include <stdlib.h> #include <stdlib.h>
#define ATTRIBUTE_UNUSED __attribute__((unused))
int gray_to_rgb_process(const char** inputs, int gray_to_rgb_process(const char** inputs,
const int* input_sizes, const int* input_sizes,
int input_count, int input_count,
char* output, char* output,
int output_size, int output_size,
void* user_data) { void* user_data ATTRIBUTE_UNUSED) {
// Make sure we have exactly one input // Make sure we have exactly one input
if (input_count != 1) if (input_count != 1)
return 0; return 0;
@@ -52,7 +54,7 @@ int rgba_to_rgb_process(const char** inputs,
int input_count, int input_count,
char* output, char* output,
int output_size, int output_size,
void* user_data) { void* user_data ATTRIBUTE_UNUSED) {
// Make sure we have exactly one input // Make sure we have exactly one input
if (input_count != 1) if (input_count != 1)
return 0; return 0;
@@ -84,7 +86,7 @@ int gray_to_rgba_process(const char** inputs,
int input_count, int input_count,
char* output, char* output,
int output_size, int output_size,
void* user_data) { void* user_data ATTRIBUTE_UNUSED) {
// Make sure we have exactly one input // Make sure we have exactly one input
if (input_count != 1) if (input_count != 1)
return 0; return 0;
@@ -116,7 +118,7 @@ int rgb_to_rgba_process(const char** inputs,
int input_count, int input_count,
char* output, char* output,
int output_size, int output_size,
void* user_data) { void* user_data ATTRIBUTE_UNUSED) {
// Make sure we have exactly one input // Make sure we have exactly one input
if (input_count != 1) if (input_count != 1)
return 0; return 0;