aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Input/DASHReceiver.cpp2
-rw-r--r--Input/ICNConnectionConsumerApi.cpp3
-rw-r--r--Input/ICNConnectionConsumerApi.h1
-rw-r--r--MPD/AdaptationSetHelper.h1
-rw-r--r--README.md1
-rw-r--r--UI/DASHPlayer.cpp4
-rw-r--r--UI/DASHPlayer.h1
-rw-r--r--android/AndroidManifest.xml4
-rw-r--r--android/build.gradle76
-rw-r--r--android/gradle.properties4
-rwxr-xr-xandroid/gradle/wrapper/gradle-wrapper.properties~6
-rwxr-xr-xandroid/src/org/player/viper/ViperActivity.java2
-rw-r--r--android/viper.keystorebin0 -> 2236 bytes
-rw-r--r--viper.pro14
14 files changed, 97 insertions, 22 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 <QMessageLogger>
#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 <QMessageLogger>
namespace libdash
{
diff --git a/README.md b/README.md
index 4933c577..f71e1be1 100644
--- a/README.md
+++ b/README.md
@@ -46,7 +46,6 @@ For building the player, from the root folder of the project:
```
-
Build the player
-----------------
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 <QMessageLogger>
#include <qimage.h>
#include<map>
#include<tuple>
diff --git a/android/AndroidManifest.xml b/android/AndroidManifest.xml
index f954847c..9090f9c0 100644
--- a/android/AndroidManifest.xml
+++ b/android/AndroidManifest.xml
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<manifest package="org.qtav.qmlplayer" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.0" android:versionCode="7" android:installLocation="auto">
- <application android:hardwareAccelerated="true" android:name="org.qtproject.qt5.android.bindings.QtApplication" android:label="QtPlayer" android:icon="@drawable/icon">
- <activity android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|locale|fontScale|keyboard|keyboardHidden|navigation" android:name="org.qtav.qmlplayer.QMLPlayerActivity" android:label="QtPlayer" android:screenOrientation="unspecified" android:launchMode="singleTop">
+ <application android:hardwareAccelerated="true" android:name="org.qtproject.qt5.android.bindings.QtApplication" android:label="Viper" android:icon="@drawable/icon">
+ <activity android:configChanges="orientation|uiMode|screenLayout|screenSize|smallestScreenSize|locale|fontScale|keyboard|keyboardHidden|navigation" android:name="org.player.viper.ViperActivity" android:label="Viper" android:screenOrientation="unspecified" android:launchMode="singleTop">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.LAUNCHER"/>
diff --git a/android/build.gradle b/android/build.gradle
new file mode 100644
index 00000000..d76f0e9d
--- /dev/null
+++ b/android/build.gradle
@@ -0,0 +1,76 @@
+buildscript {
+ repositories {
+ jcenter()
+ }
+
+ dependencies {
+ classpath 'com.android.tools.build:gradle:1.1.0'
+ }
+}
+
+allprojects {
+ repositories {
+ jcenter()
+ }
+}
+
+apply plugin: 'com.android.application'
+
+dependencies {
+ compile fileTree(dir: 'libs', include: ['*.jar'])
+}
+
+android {
+ buildTypes {
+ release {
+ minifyEnabled false
+ proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+ /*applicationVariants.all { variant ->
+ variant.outputs.each { output ->
+ project.ext { appName = 'viper' }
+ def newName = output.outputFile.name
+ newName = newName.replace("android", "$project.ext.appName")
+ output.outputFile = new File(output.outputFile.parent, newName)
+ }
+ }*/
+ }
+ debug {
+ minifyEnabled false
+ debuggable true
+ jniDebuggable true
+ }
+ }
+ /*******************************************************
+ * The following variables:
+ * - androidBuildToolsVersion,
+ * - androidCompileSdkVersion
+ * - qt5AndroidDir - holds the path to qt android files
+ * needed to build any Qt application
+ * on Android.
+ *
+ * are defined in gradle.properties file. This file is
+ * updated by QtCreator and androiddeployqt tools.
+ * Changing them manually might break the compilation!
+ *******************************************************/
+
+ compileSdkVersion androidCompileSdkVersion.toInteger()
+
+ buildToolsVersion androidBuildToolsVersion
+
+ sourceSets {
+ main {
+ manifest.srcFile 'AndroidManifest.xml'
+ java.srcDirs = [qt5AndroidDir + '/src', 'src', 'java']
+ aidl.srcDirs = [qt5AndroidDir + '/src', 'src', 'aidl']
+ res.srcDirs = [qt5AndroidDir + '/res', 'res']
+ resources.srcDirs = ['src']
+ renderscript.srcDirs = ['src']
+ assets.srcDirs = ['assets']
+ jniLibs.srcDirs = ['libs']
+ }
+ }
+
+ lintOptions {
+ abortOnError false
+ }
+}
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/gradle/wrapper/gradle-wrapper.properties~ b/android/gradle/wrapper/gradle-wrapper.properties~
new file mode 100755
index 00000000..1e61d1fd
--- /dev/null
+++ b/android/gradle/wrapper/gradle-wrapper.properties~
@@ -0,0 +1,6 @@
+#Wed Apr 10 15:27:10 PDT 2013
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-all.zip
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/android/viper.keystore b/android/viper.keystore
new file mode 100644
index 00000000..aa293c07
--- /dev/null
+++ b/android/viper.keystore
Binary files differ
diff --git a/viper.pro b/viper.pro
index 217e5586..c1c95df9 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 {
@@ -296,10 +296,10 @@ android {
android/gradle/wrapper/gradle-wrapper.properties \
android/gradlew \
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
+ ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android
+ INCLUDEPATH += $$(QT_HOME)/5.7/android_armv7/include
+ INCLUDEPATH += $$(QT_HOME)/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
}