Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

BebopDroneStreaming with old API #59

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open

BebopDroneStreaming with old API #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
509589f
Receive video streaming packets
hexcone Jun 12, 2015
bd728c5
Decode and display h264 frames in imageview (warning: lags badly)
hexcone Jun 25, 2015
69489ec
[ANDROID] Decode and display h264 stream (working)
hexcone Jun 26, 2015
698309f
[ANDROID] Moved to separate project
hexcone Jun 27, 2015
46481ef
Updated README.md
hexcone Jun 27, 2015
7e50a61
[ANDROID] Added BebopFlyingBanana with face detection capability
hexcone Jun 30, 2015
40b9a4a
Merge branch 'master' of https://github.com/hexcone/Samples
hexcone Jun 30, 2015
5c0ddb5
[ANDROID] Added BebopFlyingBanana with face detection capability
hexcone Jun 30, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions Android/BebopDroneStreaming/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
.gradle
/local.properties
/.idea/workspace.xml
/.idea/libraries
.DS_Store
/build
1 change: 1 addition & 0 deletions Android/BebopDroneStreaming/.idea/.name
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 22 additions & 0 deletions Android/BebopDroneStreaming/.idea/compiler.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions Android/BebopDroneStreaming/.idea/copyright/profiles_settings.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 18 additions & 0 deletions Android/BebopDroneStreaming/.idea/gradle.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 22 additions & 0 deletions Android/BebopDroneStreaming/.idea/misc.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions Android/BebopDroneStreaming/.idea/modules.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions Android/BebopDroneStreaming/.idea/vcs.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

19 changes: 19 additions & 0 deletions Android/BebopDroneStreaming/BebopDroneStreaming.iml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<module external.linked.project.id="BebopDroneStreaming" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="java-gradle" name="Java-Gradle">
<configuration>
<option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/build" />
<option name="BUILDABLE" value="false" />
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<excludeFolder url="file://$MODULE_DIR$/.gradle" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>
10 changes: 10 additions & 0 deletions Android/BebopDroneStreaming/README
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
==================
Purpose of BebopDroneStreaming
==================

This sample shows how to receive video stream from a Bebop Drone, decode it and display the decoded stream, as well as to send and receive commands to communicate with a Parrot Bebop drone on an Android device.

This example enables you to **discover** and **connect** to a Bebop and **display the video stream** and **send and receive commands** to pilot it and get its battery level.

These sample sources are an Android gradle project building for Android devices.

10 changes: 10 additions & 0 deletions Android/BebopDroneStreaming/README~
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
==================
Purpose of BebopDronePiloting
==================

This sample shows how to send and receive commands to communicate with a Parrot Bebop drone on an Android device.

This example enables you to **discover** and **connect** to a Bebop and **send and receive commands** to pilot it and get its battery level.

These sample sources are an Android gradle project building for Android devices.

1 change: 1 addition & 0 deletions Android/BebopDroneStreaming/app/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/build
37 changes: 37 additions & 0 deletions Android/BebopDroneStreaming/app/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.parrot.bebopdronestreaming" >

<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.BLUETOOTH"/>
<uses-permission android:name="android.permission.BLUETOOTH_ADMIN"/>
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />

<application
android:allowBackup="true"
android:icon="@drawable/ic_launcher"
android:label="@string/app_name"
android:theme="@style/AppTheme">
<activity
android:name="com.parrot.bebopdronestreaming.MainActivity"
android:label="@string/app_name"
android:screenOrientation="landscape">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>

<activity
android:name="com.parrot.bebopdronestreaming.PilotingActivity"
android:label="@string/app_name"
android:screenOrientation="landscape">
</activity>

<service android:name="com.parrot.arsdk.ardiscovery.ARDiscoveryService" />

</application>

</manifest>
37 changes: 37 additions & 0 deletions Android/BebopDroneStreaming/app/AndroidManifest.xml~
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.parrot.bebopdronepiloting" >

<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.BLUETOOTH"/>
<uses-permission android:name="android.permission.BLUETOOTH_ADMIN"/>
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />

<application
android:allowBackup="true"
android:icon="@drawable/ic_launcher"
android:label="@string/app_name"
android:theme="@style/AppTheme">
<activity
android:name="com.parrot.bebopdronestreaming.MainActivity"
android:label="@string/app_name"
android:screenOrientation="landscape">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>

<activity
android:name="com.parrot.bebopdronestreaming.PilotingActivity"
android:label="@string/app_name"
android:screenOrientation="landscape">
</activity>

<service android:name="com.parrot.arsdk.ardiscovery.ARDiscoveryService" />

</application>

</manifest>
115 changes: 115 additions & 0 deletions Android/BebopDroneStreaming/app/app.iml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,115 @@
<?xml version="1.0" encoding="UTF-8"?>
<module external.linked.project.id=":app" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="BebopDroneStreaming" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="android-gradle" name="Android-Gradle">
<configuration>
<option name="GRADLE_PROJECT_PATH" value=":app" />
</configuration>
</facet>
<facet type="android" name="Android">
<configuration>
<option name="SELECTED_BUILD_VARIANT" value="debug" />
<option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
<option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
<option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugTest" />
<option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugTestSources" />
<option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugTestSources" />
<option name="ALLOW_USER_CONFIGURATION" value="false" />
<option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
<option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
<option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res" />
<option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" inherit-compiler-output="false">
<output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/debug" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/test/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/test/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/test/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/test/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/test/debug" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/generated/test/debug" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/coverage-instrumented-classes" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/libs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/ndk" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/proguard" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
</content>
<orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" exported="" name="libdc1394-2.2.3-0.11" level="project" />
<orderEntry type="library" exported="" name="flycapture-2.7.3.19-0.11" level="project" />
<orderEntry type="library" exported="" name="libjson" level="project" />
<orderEntry type="library" exported="" name="javacv-0.11" level="project" />
<orderEntry type="library" exported="" name="jmdns" level="project" />
<orderEntry type="library" exported="" name="libARNetworkAL" level="project" />
<orderEntry type="library" exported="" name="javacpp-0.11" level="project" />
<orderEntry type="library" exported="" name="ffmpeg-2.6.1-0.11-android-x86" level="project" />
<orderEntry type="library" exported="" name="opencv-2.4.11-0.11-android-arm" level="project" />
<orderEntry type="library" exported="" name="libARStream" level="project" />
<orderEntry type="library" exported="" name="opencv-2.4.11-0.11" level="project" />
<orderEntry type="library" exported="" name="ffmpeg-2.6.1-0.11" level="project" />
<orderEntry type="library" exported="" name="support-v4-21.0.3" level="project" />
<orderEntry type="library" exported="" name="libARSAL" level="project" />
<orderEntry type="library" exported="" name="libARNetwork" level="project" />
<orderEntry type="library" exported="" name="libARCommands" level="project" />
<orderEntry type="library" exported="" name="appcompat-v7-21.0.3" level="project" />
<orderEntry type="library" exported="" name="artoolkitplus-2.3.1-0.11" level="project" />
<orderEntry type="library" exported="" name="support-annotations-21.0.3" level="project" />
<orderEntry type="library" exported="" name="libfreenect-0.5.2-0.11" level="project" />
<orderEntry type="library" exported="" name="libARDiscovery" level="project" />
<orderEntry type="library" exported="" name="videoinput-0.200-0.11" level="project" />
<orderEntry type="library" exported="" name="flandmark-1.07-0.11" level="project" />
<orderEntry type="library" exported="" name="opencv-2.4.11-0.11-android-x86" level="project" />
<orderEntry type="library" exported="" name="ffmpeg-2.6.1-0.11-android-arm" level="project" />
</component>
</module>
34 changes: 34 additions & 0 deletions Android/BebopDroneStreaming/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 21
buildToolsVersion "21.1.1"
defaultConfig {
applicationId 'com.parrot.bebopsample'
minSdkVersion 15
targetSdkVersion 21
versionCode 1
versionName "1.0"
}
buildTypes {
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}
productFlavors {
}
}

dependencies {
compile fileTree(include: ['*.jar'], dir: 'libs')
compile 'com.android.support:appcompat-v7:21.0.3'

compile group: 'org.bytedeco', name: 'javacv', version: '0.11'
compile group: 'org.bytedeco', name: 'javacpp', version: '0.11'
compile group: 'org.bytedeco.javacpp-presets', name: 'opencv', version: '2.4.11-0.11', classifier: 'android-arm'
compile group: 'org.bytedeco.javacpp-presets', name: 'opencv', version: '2.4.11-0.11', classifier: 'android-x86'
compile group: 'org.bytedeco.javacpp-presets', name: 'ffmpeg', version: '2.6.1-0.11', classifier: 'android-arm'
compile group: 'org.bytedeco.javacpp-presets', name: 'ffmpeg', version: '2.6.1-0.11', classifier: 'android-x86'

}
1 change: 1 addition & 0 deletions Android/BebopDroneStreaming/app/libs/jmdns.jar
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../../../ARSDKBuildUtils/Targets/Android/Install/jars/release/jmdns.jar
1 change: 1 addition & 0 deletions Android/BebopDroneStreaming/app/libs/libARCommands.jar
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../../../ARSDKBuildUtils/Targets/Android/Install/jars/release/libARCommands.jar
1 change: 1 addition & 0 deletions Android/BebopDroneStreaming/app/libs/libARDiscovery.jar
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../../../ARSDKBuildUtils/Targets/Android/Install/jars/release/libARDiscovery.jar
1 change: 1 addition & 0 deletions Android/BebopDroneStreaming/app/libs/libARNetwork.jar
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../../../ARSDKBuildUtils/Targets/Android/Install/jars/release/libARNetwork.jar
1 change: 1 addition & 0 deletions Android/BebopDroneStreaming/app/libs/libARNetworkAL.jar
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../../../ARSDKBuildUtils/Targets/Android/Install/jars/release/libARNetworkAL.jar
1 change: 1 addition & 0 deletions Android/BebopDroneStreaming/app/libs/libARSAL.jar
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../../../../ARSDKBuildUtils/Targets/Android/Install/jars/release/libARSAL.jar
Binary file added Android/BebopDroneStreaming/app/libs/libARStream.jar
View file
Open in desktop
Binary file not shown.
0 ...d/BebopDronePiloting/app/libs/libjson.jar → .../BebopDroneStreaming/app/libs/libjson.jar
View file
Open in desktop
File renamed without changes.
Loading