From 20f24d78d8b596341ec4ac5ca83eaea6ab3a08f7 Mon Sep 17 00:00:00 2001 From: PacketVideo CM Date: Fri, 4 Dec 2009 11:48:48 -0800 Subject: [PATCH] RIO-8101: Cleanup in the android folder (logging, whitespace, etc) --- android/author/android_audio_input.cpp | 2 +- android/author/android_camera_input.cpp | 8 ++++---- android/author/authordriver.cpp | 1 + android/author/authordriver.h | 2 +- android/playerdriver.cpp | 14 ++++++++------ android/playerdriver.h | 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 +- 9 files changed, 19 insertions(+), 16 deletions(-) diff --git a/android/author/android_audio_input.cpp b/android/author/android_audio_input.cpp index 25ee8706..dc192f66 100644 --- a/android/author/android_audio_input.cpp +++ b/android/author/android_audio_input.cpp @@ -662,7 +662,7 @@ OSCL_EXPORT_REF PVMFStatus AndroidAudioInput::getParametersSync(PvmiMIOSession s return status; } - //////////////////////////////////////////////////////////////////////////// +//////////////////////////////////////////////////////////////////////////// OSCL_EXPORT_REF PVMFStatus AndroidAudioInput::releaseParameters(PvmiMIOSession session, PvmiKvp* parameters, int num_elements) diff --git a/android/author/android_camera_input.cpp b/android/author/android_camera_input.cpp index 79505e0f..9800f527 100644 --- a/android/author/android_camera_input.cpp +++ b/android/author/android_camera_input.cpp @@ -1246,12 +1246,12 @@ PVMFStatus AndroidCameraInput::postWriteAsync(nsecs_t timestamp, const spSetDataSourceFormatType((const char*)PVMF_MIME_FORMAT_UNKNOWN); // Let PV figure it out delete mLocalContextData; mLocalContextData = NULL; - mLocalContextData = new PVMFSourceContextData(); - mLocalContextData->EnableCommonSourceContext(); const char* ext = strrchr(url, '.'); if (ext && ( strcasecmp(ext, ".sdp") == 0) ) { // For SDP files, currently there is no recognizer. So, to play from such files, // there is a need to set the format type. mDataSource->SetDataSourceFormatType((const char*)PVMF_MIME_DATA_SOURCE_SDP_FILE); } + mLocalContextData = new PVMFSourceContextData(); + mLocalContextData->EnableCommonSourceContext(); mDataSource->SetDataSourceContextData((OsclAny*)mLocalContextData); } OSCL_TRY(error, mPlayer->AddDataSource(*mDataSource, command)); @@ -1008,6 +1008,7 @@ int PlayerDriver::playerThread() OsclScheduler::Cleanup(); LOGV("OsclScheduler::Cleanup"); + LOGV("OMX_MasterDeinit"); OMX_MasterDeinit(); UninitializeForThread(); return 0; @@ -1028,7 +1029,7 @@ void PlayerDriver::handleCheckLiveStreamingComplete(PlayerCheckLiveStreaming* cm const char* substr = oscl_strstr((char*)(mCheckLiveValue[0].key), _STRLIT_CHAR("pause-denied;valtype=bool")); if (substr!=NULL) { if ( mCheckLiveValue[0].value.bool_value == true ) { - LOGI("Live Streaming ..."); + LOGI("Live Streaming..."); mIsLiveStreaming = true; } } @@ -1117,7 +1118,7 @@ void PlayerDriver::CommandCompleted(const PVCmdResponse& aResponse) case PlayerCommand::PLAYER_CHECK_LIVE_STREAMING: handleCheckLiveStreamingComplete(static_cast(command)); - break; + break; case PlayerCommand::PLAYER_PAUSE: LOGV("pause complete"); @@ -1471,7 +1472,8 @@ void PVPlayer::check_for_live_streaming(status_t s, void *cookie, bool cancelled if (s == NO_ERROR && !cancelled) { PVPlayer *p = (PVPlayer*)cookie; if ( (p->mPlayerDriver->getFormatType() == PVMF_MIME_DATA_SOURCE_RTSP_URL) || - (p->mPlayerDriver->getFormatType() == PVMF_MIME_DATA_SOURCE_MS_HTTP_STREAMING_URL) ) { + (p->mPlayerDriver->getFormatType() == PVMF_MIME_DATA_SOURCE_MS_HTTP_STREAMING_URL) ) { + LOGV("check_for_live_streaming enQ PlayerCheckLiveStreaming command"); p->mPlayerDriver->enqueueCommand(new PlayerCheckLiveStreaming( do_nothing, NULL)); } } diff --git a/android/playerdriver.h b/android/playerdriver.h index a471d62e..2968a811 100644 --- a/android/playerdriver.h +++ b/android/playerdriver.h @@ -392,8 +392,8 @@ class PlayerDriver : void handleGetPosition(PlayerGetPosition* command); void handleGetDuration(PlayerGetDuration* command); void handleGetStatus(PlayerGetStatus* command); - void handleExtensionCommand(PlayerExtensionCommand* command); void handleCheckLiveStreaming(PlayerCheckLiveStreaming* cmd); + void handleExtensionCommand(PlayerExtensionCommand* command); PVMFFormatType getFormatType(); void CommandCompleted(const PVCmdResponse& aResponse); diff --git a/engines/2way/src/pv_2way_sdkinfo.h b/engines/2way/src/pv_2way_sdkinfo.h index 78d6bd2e..6c2b6d79 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 "1108761" +#define PV2WAY_ENGINE_SDKINFO_LABEL "1109175" #define PV2WAY_ENGINE_SDKINFO_DATE 0x20091125 #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 cb9dbaa2..7ceab0c6 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 "1108761" +#define PVAUTHOR_ENGINE_SDKINFO_LABEL "1109175" #define PVAUTHOR_ENGINE_SDKINFO_DATE 0x20091125 #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 fd55ca09..d70cd7ce 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 "1108761" +#define PVPLAYER_ENGINE_SDKINFO_LABEL "1109175" #define PVPLAYER_ENGINE_SDKINFO_DATE 0x20091125 #endif //PV_PLAYER_SDKINFO_H_INCLUDED -- 2.11.0