From 6f86a40a657ec175f72b8dda58e105351cad84e3 Mon Sep 17 00:00:00 2001 From: PacketVideo CM Date: Tue, 26 Jan 2010 14:07:42 -0800 Subject: [PATCH] RIO-8427: Fix compiler warnings in android folder --- android/Android.mk | 8 ++++++++ android/android_surface_output.cpp | 2 +- android/android_surface_output.h | 2 +- android/author/Android.mk | 8 ++++++++ android/author/authordriver.cpp | 4 ++-- android/autodetect.cpp | 2 +- android/mediascanner.cpp | 2 +- engines/2way/src/pv_2way_sdkinfo.h | 2 +- engines/author/src/pv_author_sdkinfo.h | 2 +- engines/player/src/pv_player_sdkinfo.h | 2 +- 10 files changed, 25 insertions(+), 9 deletions(-) diff --git a/android/Android.mk b/android/Android.mk index 9ee9c01f..9cb7dd60 100644 --- a/android/Android.mk +++ b/android/Android.mk @@ -15,6 +15,14 @@ LOCAL_SRC_FILES := \ extension_handler_registry.cpp \ PVPlayerExtHandler.cpp +ifeq ($(PLATFORM_VERSION),1.5) +else ifeq ($(PLATFORM_VERSION),1.6) +else + ifeq ($(PV_WERROR),1) + LOCAL_CFLAGS := -Wno-psabi + endif +endif + LOCAL_C_INCLUDES := $(PV_INCLUDES) \ $(PV_TOP)/engines/common/include \ $(PV_TOP)/fileformats/mp4/parser/include \ diff --git a/android/android_surface_output.cpp b/android/android_surface_output.cpp index 529b8cbe..7b329709 100755 --- a/android/android_surface_output.cpp +++ b/android/android_surface_output.cpp @@ -105,7 +105,7 @@ bool AndroidSurfaceOutput::checkVideoParameterFlags() * playback, we hold the last frame which is used by SurfaceFlinger * to composite the final output. */ -void AndroidSurfaceOutput::processWriteResponseQueue(int numFramesToHold) +void AndroidSurfaceOutput::processWriteResponseQueue(uint32 numFramesToHold) { LOGV("processWriteResponseQueue: queued = %d, numFramesToHold = %d", iWriteResponseQueue.size(), numFramesToHold); diff --git a/android/android_surface_output.h b/android/android_surface_output.h index 6b55cfee..952ec1d1 100644 --- a/android/android_surface_output.h +++ b/android/android_surface_output.h @@ -124,7 +124,7 @@ class AndroidSurfaceOutput : public OsclTimerObject void deleteMediaTransfer(PvmiMIOSession& aSession, PvmiMediaTransfer* media_transfer); - void processWriteResponseQueue(int numFramesToHold); + void processWriteResponseQueue(uint32 numFramesToHold); PVMFCommandId Init(const OsclAny* aContext = NULL); diff --git a/android/author/Android.mk b/android/author/Android.mk index 05914dc4..b0b0a1cb 100644 --- a/android/author/Android.mk +++ b/android/author/Android.mk @@ -9,6 +9,14 @@ LOCAL_SRC_FILES := \ android_audio_input_threadsafe_callbacks.cpp \ ../thread_init.cpp \ +ifeq ($(PLATFORM_VERSION),1.5) +else ifeq ($(PLATFORM_VERSION),1.6) +else + ifeq ($(PV_WERROR),1) + LOCAL_CFLAGS := -Wno-psabi + endif +endif + LOCAL_C_INCLUDES := $(PV_INCLUDES) \ $(PV_TOP)/engines/common/include \ $(PV_TOP)/codecs_v2/omx/omx_common/include \ diff --git a/android/author/authordriver.cpp b/android/author/authordriver.cpp index cd1c2dd6..b2c1bb01 100644 --- a/android/author/authordriver.cpp +++ b/android/author/authordriver.cpp @@ -653,13 +653,13 @@ void AuthorDriver::handleSetOutputFile(set_output_file_command *ac) PvmfFileOutputNodeConfigInterface *config = OSCL_DYNAMIC_CAST(PvmfFileOutputNodeConfigInterface*, mComposerConfig); if (!config) goto exit; - ret = config->SetOutputFileDescriptor(&OsclFileHandle(ifpOutput)); + ret = config->SetOutputFileDescriptor((OsclFileHandle *) ifpOutput); } else if((OUTPUT_FORMAT_THREE_GPP == mOutputFormat) || (OUTPUT_FORMAT_MPEG_4 == mOutputFormat)){ PVMp4FFCNClipConfigInterface *config = OSCL_DYNAMIC_CAST(PVMp4FFCNClipConfigInterface*, mComposerConfig); if (!config) goto exit; config->SetPresentationTimescale(1000); - ret = config->SetOutputFileDescriptor(&OsclFileHandle(ifpOutput)); + ret = config->SetOutputFileDescriptor((OsclFileHandle *) ifpOutput); } diff --git a/android/autodetect.cpp b/android/autodetect.cpp index 53b812a8..bb616616 100644 --- a/android/autodetect.cpp +++ b/android/autodetect.cpp @@ -16,7 +16,7 @@ #include "autodetect.h" -typedef struct CharRange { +struct CharRange { uint16_t first; uint16_t last; }; diff --git a/android/mediascanner.cpp b/android/mediascanner.cpp index d812a426..5ab4cee4 100644 --- a/android/mediascanner.cpp +++ b/android/mediascanner.cpp @@ -552,7 +552,7 @@ static PVMFStatus parseASF(const char *filename, MediaScannerClient& client) status_t MediaScanner::processFile(const char *path, const char* mimeType, MediaScannerClient& client) { - status_t result; + status_t result = PVMFSuccess; int error = 0; InitializeForThread(); diff --git a/engines/2way/src/pv_2way_sdkinfo.h b/engines/2way/src/pv_2way_sdkinfo.h index 323f702c..9bce84f2 100644 --- a/engines/2way/src/pv_2way_sdkinfo.h +++ b/engines/2way/src/pv_2way_sdkinfo.h @@ -21,7 +21,7 @@ // This header file is automatically generated at build-time // *** OFFICIAL RELEASE INFO -- Will not auto update -#define PV2WAY_ENGINE_SDKINFO_LABEL "1178647" +#define PV2WAY_ENGINE_SDKINFO_LABEL "1179493" #define PV2WAY_ENGINE_SDKINFO_DATE 0x20100113 #endif //PV_2WAY_SDKINFO_H_INCLUDED diff --git a/engines/author/src/pv_author_sdkinfo.h b/engines/author/src/pv_author_sdkinfo.h index 64812529..c1e4aa3f 100644 --- a/engines/author/src/pv_author_sdkinfo.h +++ b/engines/author/src/pv_author_sdkinfo.h @@ -21,7 +21,7 @@ // This header file is automatically generated at build-time // *** OFFICIAL RELEASE INFO -- Will not auto update -#define PVAUTHOR_ENGINE_SDKINFO_LABEL "1178647" +#define PVAUTHOR_ENGINE_SDKINFO_LABEL "1179493" #define PVAUTHOR_ENGINE_SDKINFO_DATE 0x20100113 #endif //PV_AUTHOR_SDKINFO_H_INCLUDED diff --git a/engines/player/src/pv_player_sdkinfo.h b/engines/player/src/pv_player_sdkinfo.h index 8505c69c..030a640a 100644 --- a/engines/player/src/pv_player_sdkinfo.h +++ b/engines/player/src/pv_player_sdkinfo.h @@ -21,7 +21,7 @@ // This header file is automatically generated at build-time // *** OFFICIAL RELEASE INFO -- Will not auto update -#define PVPLAYER_ENGINE_SDKINFO_LABEL "1178647" +#define PVPLAYER_ENGINE_SDKINFO_LABEL "1179493" #define PVPLAYER_ENGINE_SDKINFO_DATE 0x20100113 #endif //PV_PLAYER_SDKINFO_H_INCLUDED -- 2.11.0