From 6dc10f6d3e410544b1068de2565cab2b9b8aa3ec Mon Sep 17 00:00:00 2001 From: "Angelo Mantellini (manangel)" Date: Mon, 24 Apr 2017 18:43:57 +0200 Subject: corrections Change-Id: I07d00ea0d02b044d543a83bca10f8e73a281f90b Signed-off-by: Angelo Mantellini (manangel) --- Input/DASHReceiver.cpp | 2 +- Input/ICNConnectionConsumerApi.cpp | 3 --- Input/ICNConnectionConsumerApi.h | 1 - MPD/AdaptationSetHelper.h | 1 - UI/DASHPlayer.cpp | 4 ++-- UI/DASHPlayer.h | 1 - android/AndroidManifest.xml | 2 +- android/gradle.properties | 4 ++-- android/src/org/player/viper/ViperActivity.java | 2 +- viper.pro | 11 ++++++----- 10 files changed, 13 insertions(+), 18 deletions(-) diff --git a/Input/DASHReceiver.cpp b/Input/DASHReceiver.cpp index df9d019b..e7a5c5c2 100644 --- a/Input/DASHReceiver.cpp +++ b/Input/DASHReceiver.cpp @@ -133,7 +133,7 @@ MediaObject* DASHReceiver::GetNextSegment () if(this->segmentNumber >= this->representationStream->getSize()) { - qDebug("looping? : %s\n", this->isLooping ? "YES" : "NO"); + //qDebug("looping? : %s\n", this->isLooping ? "YES" : "NO"); if(this->isLooping) { this->segmentNumber = 0; diff --git a/Input/ICNConnectionConsumerApi.cpp b/Input/ICNConnectionConsumerApi.cpp index 9de82908..d38642e4 100644 --- a/Input/ICNConnectionConsumerApi.cpp +++ b/Input/ICNConnectionConsumerApi.cpp @@ -68,7 +68,6 @@ ICNConnectionConsumerApi::ICNConnectionConsumerApi(double alpha, float beta, flo } if(!configFile) { - qDebug("beta %f, drop %f", this->beta, this->drop); this->myConsumer->setSocketOption(RaaqmTransportOptions::BETA_VALUE, this->beta); this->myConsumer->setSocketOption(RaaqmTransportOptions::DROP_FACTOR, this->drop); } @@ -111,8 +110,6 @@ void ICNConnectionConsumerApi::Init(IChunk *chunk) { memset(this->deezData, 0, this->deezDataSize); } - qDebug("ICN_Connection:\tINTIATED_to_name %s\n", m_name.c_str()); - qDebug("ICN_Connection:\tSTARTING DOWNLOAD %s\n", m_name.c_str()); } void ICNConnectionConsumerApi::InitForMPD(const std::string& url) diff --git a/Input/ICNConnectionConsumerApi.h b/Input/ICNConnectionConsumerApi.h index a0343443..a62f6b01 100644 --- a/Input/ICNConnectionConsumerApi.h +++ b/Input/ICNConnectionConsumerApi.h @@ -16,7 +16,6 @@ #ifndef QTPLAYER_INPUT_ICNCONNECTIONCONSUMERAPI_H_ #define QTPLAYER_INPUT_ICNCONNECTIONCONSUMERAPI_H_ -#include #include "../Portable/Networking.h" #include "IICNConnection.h" #include "../debug.h" diff --git a/MPD/AdaptationSetHelper.h b/MPD/AdaptationSetHelper.h index 683d0f0c..41724413 100644 --- a/MPD/AdaptationSetHelper.h +++ b/MPD/AdaptationSetHelper.h @@ -13,7 +13,6 @@ #define LIBDASH_FRAMEWORK_MPD_ADAPTATIONSETHELPER_H_ #include "IMPD.h" -#include namespace libdash { diff --git a/UI/DASHPlayer.cpp b/UI/DASHPlayer.cpp index b87dde74..52b45b0b 100644 --- a/UI/DASHPlayer.cpp +++ b/UI/DASHPlayer.cpp @@ -371,7 +371,7 @@ void DASHPlayer::onStopped() } } else { - qDebug("wrong position"); + //qDebug("wrong position"); } } else @@ -915,7 +915,7 @@ void DASHPlayer::setRateEstimator(int rateEstimator) void DASHPlayer::error(const QtAV::AVError &e) { - qDebug("error in the player!"); + //qDebug("error in the player!"); seekVideo(0); } diff --git a/UI/DASHPlayer.h b/UI/DASHPlayer.h index 8913a843..f63dfbb5 100644 --- a/UI/DASHPlayer.h +++ b/UI/DASHPlayer.h @@ -23,7 +23,6 @@ #include "../Buffer/IBufferObserver.h" #include "../MPD/AdaptationSetHelper.h" #include "../Common/Config.h" -#include #include #include #include diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml index f954847c..23a544f6 100644 --- a/android/AndroidManifest.xml +++ b/android/AndroidManifest.xml @@ -1,7 +1,7 @@ - + diff --git a/android/gradle.properties b/android/gradle.properties index 8b01d077..a694f3fa 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -3,7 +3,7 @@ # This file must *NOT* be checked into Version Control Systems, # as it contains information specific to your local configuration. -androidBuildToolsVersion=25.0.2 -androidCompileSdkVersion=25 +androidBuildToolsVersion=23.0.2 +androidCompileSdkVersion=23 buildDir=.build qt5AndroidDir=/Users/angelomantellini/Qt/5.7/android_armv7/src/android/java diff --git a/android/src/org/player/viper/ViperActivity.java b/android/src/org/player/viper/ViperActivity.java index a29025e4..e046d125 100755 --- a/android/src/org/player/viper/ViperActivity.java +++ b/android/src/org/player/viper/ViperActivity.java @@ -27,7 +27,7 @@ public class ViperActivity extends QtActivity { private final static String TAG = "ViperPlayer"; private static String m_request_url; - private static QMLPlayerActivity m_instance; + private static ViperActivity m_instance; public ViperActivity() { m_instance = this; } diff --git a/viper.pro b/viper.pro index 217e5586..28b26597 100644 --- a/viper.pro +++ b/viper.pro @@ -18,8 +18,7 @@ android { QT += androidextras } -CONFIG -= release -CONFIG += debug +CONFIG += release CONFIG += c++11 @@ -280,10 +279,11 @@ unix:!macx:!android { } macx:!ios { + #SOURCE is ok INCLUDEPATH += /usr/local/include INCLUDEPATH += /usr/local/include/libdash - LIBS += -L"/usr/local/lib" -framework CoreServices -ldash -lavformat -lavutil -lavcodec -lboost_system -lboost_regex -lswscale -licnet -lssl -lcrypto + LIBS += -framework CoreServices -L"/usr/local/lib" -ldash -lavformat -lavutil -lavcodec -lboost_system -lboost_regex -lswscale -licnet -lssl -lcrypto } SOURCES *= main.cpp android { @@ -298,8 +298,9 @@ android { android/gradlew.bat ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android - - LIBS += -lconsumer-producer -ldash -lavcodec -lavutil -lavformat -lboost_system # -lccnx_api_control -lccnx_api_notify -lccnx_api_portal -lccnx_common -lccnx_transport_rta #-lparc -lcrypto #-llongbow-textplain -llongbow-ansiterm -llongbow + INCLUDEPATH += $$(QT_HOME)/Qt/5.7/android_armv7/include + INCLUDEPATH += $$(QT_HOME)/Qt/5.7/android_armv7/include/libdash + LIBS += -lstdc++ -licnet -lgnustl_shared -ldash -lavcodec -lavutil -lavformat -lboost_system # -lccnx_api_control -lccnx_api_notify -lccnx_api_portal -lccnx_common -lccnx_transport_rta #-lparc -lcrypto #-llongbow-textplain -llongbow-ansiterm -llongbow #user can put fonts in android/assets/fonts } -- cgit 1.2.3-korg