diff --git a/app/build.gradle b/app/build.gradle index db7ceb8..f7ad949 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -17,17 +17,17 @@ android { } } } + compileSdk 33 - compileSdkVersion 31 - buildToolsVersion "30.0.3" + buildToolsVersion '34.0.0' defaultConfig { applicationId "com.fpvout.digiview" minSdkVersion 21 - targetSdkVersion 30 + targetSdkVersion 33 versionCode 3 versionName '1.0.0' - resConfigs "en", "de", "fr", "es", "zh", "pt" + resConfigs 'en', 'de', 'fr', 'es', 'zh', 'pt' testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } @@ -62,18 +62,19 @@ android { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 } + namespace 'com.fpvout.digiview' } dependencies { implementation 'androidx.appcompat:appcompat:1.4.0' - implementation 'com.google.android.material:material:1.4.0' - implementation 'androidx.constraintlayout:constraintlayout:2.1.2' - implementation 'com.google.android.exoplayer:exoplayer:2.16.1' + implementation 'com.google.android.material:material:1.9.0' + implementation 'androidx.constraintlayout:constraintlayout:2.1.4' + implementation 'com.google.android.exoplayer:exoplayer:2.19.1' implementation 'io.sentry:sentry-android:4.3.0' - implementation 'androidx.preference:preference:1.1.1' + implementation 'androidx.preference:preference:1.2.1' - testImplementation 'junit:junit:4.+' + testImplementation 'junit:junit:4.0' androidTestImplementation 'androidx.test.ext:junit:1.1.3' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' -} \ No newline at end of file + androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1' +} diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 7df7ca4..1d16938 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,7 +1,6 @@ + xmlns:tools="http://schemas.android.com/tools"> @@ -26,6 +25,7 @@ android:launchMode="singleTask" android:name="com.fpvout.digiview.MainActivity" android:screenOrientation="sensorLandscape" + android:exported="true" android:configChanges="orientation|keyboardHidden"> diff --git a/app/src/main/java/com/fpvout/digiview/MainActivity.java b/app/src/main/java/com/fpvout/digiview/MainActivity.java index 7e6bcfb..dfec281 100644 --- a/app/src/main/java/com/fpvout/digiview/MainActivity.java +++ b/app/src/main/java/com/fpvout/digiview/MainActivity.java @@ -195,7 +195,7 @@ protected void onCreate(Bundle savedInstanceState) { getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON); usbManager = (UsbManager) getSystemService(Context.USB_SERVICE); - permissionIntent = PendingIntent.getBroadcast(this, 0, new Intent(ACTION_USB_PERMISSION), 0); + permissionIntent = PendingIntent.getBroadcast(this, 0, new Intent(ACTION_USB_PERMISSION), PendingIntent.FLAG_IMMUTABLE); usbDeviceBroadcastReceiver = new UsbDeviceBroadcastReceiver(this); IntentFilter filter = new IntentFilter(ACTION_USB_PERMISSION); @@ -402,4 +402,4 @@ private void checkDataCollectionAgreement() { } } -} \ No newline at end of file +} diff --git a/build.gradle b/build.gradle index d80cf79..2ee2f89 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:4.2.1' + classpath 'com.android.tools.build:gradle:7.4.2' // NOTE: Do not place your application dependencies here; they belong @@ -22,4 +22,4 @@ allprojects { task clean(type: Delete) { delete rootProject.buildDir -} \ No newline at end of file +} diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index f6b961f..7454180 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a143d9b..8049c68 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,5 @@ -#Fri May 21 03:24:22 CEST 2021 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip diff --git a/gradlew b/gradlew index cccdd3d..1b6c787 100755 --- a/gradlew +++ b/gradlew @@ -1,78 +1,129 @@ -#!/usr/bin/env sh +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# ############################################################################## -## -## Gradle start up script for UN*X -## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## # Attempt to set APP_HOME + # Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` +APP_BASE_NAME=${0##*/} # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS="" +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + # Determine the Java command to use to start the JVM. if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -81,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" + JAVACMD=java which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the @@ -89,84 +140,95 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac fi -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) -# For Cygwin, switch paths to Windows format before running java -if $cygwin ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) fi - i=$((i+1)) + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg done - case $i in - (0) set -- ;; - (1) set -- "$args0" ;; - (2) set -- "$args0" "$args1" ;; - (3) set -- "$args0" "$args1" "$args2" ;; - (4) set -- "$args0" "$args1" "$args2" "$args3" ;; - (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=$(save "$@") - -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" - -# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong -if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then - cd "$(dirname "$0")" -fi +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat index e95643d..ac1b06f 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,3 +1,19 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + @if "%DEBUG%" == "" @echo off @rem ########################################################################## @rem @@ -13,15 +29,18 @@ if "%DIRNAME%" == "" set DIRNAME=. set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS= +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" @rem Find java.exe if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init +if "%ERRORLEVEL%" == "0" goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -35,7 +54,7 @@ goto fail set JAVA_HOME=%JAVA_HOME:"=% set JAVA_EXE=%JAVA_HOME%/bin/java.exe -if exist "%JAVA_EXE%" goto init +if exist "%JAVA_EXE%" goto execute echo. echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% @@ -45,28 +64,14 @@ echo location of your Java installation. goto fail -:init -@rem Get command-line arguments, handling Windows variants - -if not "%OS%" == "Windows_NT" goto win9xME_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* - :execute @rem Setup the command line set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* :end @rem End local scope for the variables with windows NT shell diff --git a/usb2sock/LICENSE.txt b/usb2sock/LICENSE.txt new file mode 100644 index 0000000..be3f7b2 --- /dev/null +++ b/usb2sock/LICENSE.txt @@ -0,0 +1,661 @@ + GNU AFFERO GENERAL PUBLIC LICENSE + Version 3, 19 November 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU Affero General Public License is a free, copyleft license for +software and other kinds of works, specifically designed to ensure +cooperation with the community in the case of network server software. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +our General Public Licenses are intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + Developers that use our General Public Licenses protect your rights +with two steps: (1) assert copyright on the software, and (2) offer +you this License which gives you legal permission to copy, distribute +and/or modify the software. + + A secondary benefit of defending all users' freedom is that +improvements made in alternate versions of the program, if they +receive widespread use, become available for other developers to +incorporate. Many developers of free software are heartened and +encouraged by the resulting cooperation. However, in the case of +software used on network servers, this result may fail to come about. +The GNU General Public License permits making a modified version and +letting the public access it on a server without ever releasing its +source code to the public. + + The GNU Affero General Public License is designed specifically to +ensure that, in such cases, the modified source code becomes available +to the community. It requires the operator of a network server to +provide the source code of the modified version running there to the +users of that server. Therefore, public use of a modified version, on +a publicly accessible server, gives the public access to the source +code of the modified version. + + An older license, called the Affero General Public License and +published by Affero, was designed to accomplish similar goals. This is +a different license, not a version of the Affero GPL, but Affero has +released a new version of the Affero GPL which permits relicensing under +this license. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU Affero General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Remote Network Interaction; Use with the GNU General Public License. + + Notwithstanding any other provision of this License, if you modify the +Program, your modified version must prominently offer all users +interacting with it remotely through a computer network (if your version +supports such interaction) an opportunity to receive the Corresponding +Source of your version by providing access to the Corresponding Source +from a network server at no charge, through some standard or customary +means of facilitating copying of software. This Corresponding Source +shall include the Corresponding Source for any work covered by version 3 +of the GNU General Public License that is incorporated pursuant to the +following paragraph. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the work with which it is combined will remain governed by version +3 of the GNU General Public License. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU Affero General Public License from time to time. Such new versions +will be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU Affero General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU Affero General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU Affero General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If your software can interact with users remotely through a computer +network, you should also make sure that it provides a way for users to +get its source. For example, if your program is a web application, its +interface could display a "Source" link that leads users to an archive +of the code. There are many ways you could offer source, and different +solutions will be better for different programs; see section 13 for the +specific requirements. + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU AGPL, see +. diff --git a/usb2sock/usb2sock.c b/usb2sock/usb2sock.c new file mode 100644 index 0000000..1da0e01 --- /dev/null +++ b/usb2sock/usb2sock.c @@ -0,0 +1,478 @@ +/** + * Copyright (c) David Hubbard 2024 + * Licensed under the GNU Affero General Public License, version 3 + * A copy of LICENSE.txt should have accompanied this file. + * + * How to use: + * 1. Download a copy of libusb-1.0.0.dylib + * Or clone https://github.com/libusb/libusb and build it with XCode + * The looooong path in the next step is due to where XCode keeps libusb-1.0.0.dylib + * + * 2. Compile usb2sock: */ +// gcc -o usb2sock -g -Wall usb2sock.o -c usb2sock.c \ +// -L$HOME/Library/Developer/Xcode/DerivedData/libusb*/Build/Products/Debug \ +// -Xlinker -rpath -Xlinker $HOME/Library/Developer/Xcode/DerivedData/libusb*/Build/Products/Debug \ +// -lusb-1.0.0 +/* + * 3. Run: ./usb2sock + * 4. It should prompt you: Please plug in goggles [0 tcp] + * 5. It also puts the VLC MRL in the terminal + * 6. Copy the VLC MRL and launch VLC + * 7. Open Network (or press Command-N) + * 8. Paste the MRL: tcp/h264://127.0.0.1:18080 + * 9. Click OK + * 10. Click the play button. The VLC seek bar should show an animation while it waits for bytes. + * 11. Power up the drone and the goggles + * 12. Wait for the goggles to connect to the drone + * (The goggles get confused if usb2sock talks to them before they are fully booted, + * you may end up in a loop between "Please plug in goggles [1 tcp]" and + * "video signal: OFF". Just unplug/replug the goggles if they are confused. + * 13. Plug in the goggles + * 14. usb2sock starts streaming: video [1 tcp] packet 1: 41K + * 15. vlc will display the video + * 16. You can unplug the goggles anytime, usb2sock will just wait for them to come back + * 17. Type Ctrl-C to shut down usb2sock, or close the terminal + * 18. Go fly some more + */ +#include "include/usb2sock.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "../../libusb/libusb/libusb.h" + +static void logcb(libusb_context * ctx, enum libusb_log_level level, const char * str) +{ + (void) ctx; + printf("<%d>%s", level, str); +} + +volatile int connected = 0; +static int set_connected_flag(libusb_context *ctx, + libusb_device *device, libusb_hotplug_event event, void *user_data) +{ + (void) user_data; + switch (event) { + case LIBUSB_HOTPLUG_EVENT_DEVICE_ARRIVED: + printf(" +hotplug\n"); + connected = 1; + break; + case LIBUSB_HOTPLUG_EVENT_DEVICE_LEFT: + printf(" -hotplug\n"); + connected = 0; + break; + } + return 0; +} + +enum { + GOGGLES_WANT_CFG = 1, + VENDOR_ID_DJI = 0x2ca3, + DEVICE_ID_GOGGLES = 0x001f, + WAIT_FOR_HOTPLUG = 0xca0, + TCP_SERVER_PORT = 18080, +}; + +int tune_io_timeout_ms = 250; +int sockfd = -1; +int clientlist[1024]; +unsigned clientlist_use = 0; +unsigned char buf[128*1024]; + +void close_client(unsigned i) +{ + close(clientlist[i]); + // shift down all entries in clientlist[] that are i or higher + clientlist_use--; + memmove(&clientlist[i], &clientlist[i + 1], clientlist_use - i); +} + +void accept_any_connection() +{ + struct sockaddr_in saddr; + socklen_t saddrlen = sizeof(saddr); + int clientfd = accept(sockfd, (struct sockaddr *) &saddr, &saddrlen); + if (clientfd < 0) { + int r = errno; + // sockfd is F_SETFL, O_NONBLOCK so accept will just return an error instead of blocking + if (r == EWOULDBLOCK || r == EAGAIN) return; + printf("accept tcp conn failed: %d %s\n", r, strerror(r)); + return; + } + + char clientaddr[INET6_ADDRSTRLEN + INET_ADDRSTRLEN]; + if (!inet_ntop(AF_INET, &(saddr.sin_addr), clientaddr, sizeof(clientaddr))) { + printf("inet_ntop client failed: %d %s\n", errno, strerror(errno)); + } + snprintf(clientaddr + strlen(clientaddr), sizeof(clientaddr) - 1 - strlen(clientaddr), + ":%u", (unsigned) ntohs(saddr.sin_port)); + clientaddr[sizeof(clientaddr) - 1] = 0; + if (saddrlen != sizeof(saddr)) { + printf("accepted \"%s\" wrong size: %d want %zu\n", clientaddr, (int) saddrlen, sizeof(saddr)); + return; + } + if (clientlist_use >= sizeof(clientlist) / sizeof(clientlist[0])) { + printf("client %s: too many clients\n", clientaddr); + close(clientfd); + return; + } + + if (fcntl(clientfd, F_SETFL, O_NONBLOCK)) { + printf("O_NONBLOCK client failed: %d %s\n", errno, strerror(errno)); + close(clientfd); + } + + printf(" client%u %s\n", clientlist_use, clientaddr); + clientlist[clientlist_use] = clientfd; + clientlist_use++; +} + +void recv_and_discard() +{ + char discard[256]; + for (unsigned i = 0; i < clientlist_use;) { + ssize_t n = read(clientlist[i], discard, sizeof(discard)); + if (n < 0) { + int r = errno; + if (r == EWOULDBLOCK || r == EAGAIN) { + // read buffers are empty, move to next client + i++; + continue; + } + // read failed, close socket + close_client(i); + continue; + } else if (n == 0) { + // client closed socket + close_client(i); + continue; + } + // keep receiving and discarding + } +} + +void send_to_socket(int buflen) +{ + // This is designed to be nonblocking, favoring usb which is *the* blocking i/o + // If tcp clients can receive data, it is shoved at them as fast as possible + // + // But if anything goes wrong, disconnect the client and get back to the usb stream + int ofs = 0; + for (unsigned i = 0; i < clientlist_use;) { + ssize_t n = write(clientlist[i], buf + ofs, buflen - ofs); + if (n < 0) { + int r = errno; + if (r != EWOULDBLOCK && r != EAGAIN) { + // write failed, close socket and move to next client + close_client(i); + ofs = 0; + continue; + } + // write buffer full, move to next client + } else if (n > 0) { + // keep writing until buf is sent or EAGAIN is received + ofs += n; + if (ofs < buflen) continue; + } + // move to next client + ofs = 0; + i++; + } +} + +libusb_hotplug_callback_handle hotplug; +int start_stream(libusb_context * ctx, libusb_device_handle * usbdev, + int inEndpoint, int outEndpoint) +{ + int dbg = 0; + + static unsigned char MAGIC_PACKET[] = "RMVT"; + + // Two cases: + // 1. New usb connection, goggles state is "waiting for MAGIC_PACKET" + // 2. Existing usb connection, so this program probably was restarted + // - goggles state is "streaming" and the MAGIC_PACKET gets ignored + // - sending the MAGIC_PACKET will time out but the goggles stream data + // happily, so just ignore the time out error + // - anyway, if the goggles really aren't streaming, then the best way + // to detect what's going on is a libusb_bulk_transfer(in). + int success = 0; + libusb_set_debug(ctx, LIBUSB_LOG_LEVEL_ERROR); // silence warning for this bulk transfer + int r = libusb_bulk_transfer(usbdev, outEndpoint, + MAGIC_PACKET, sizeof(MAGIC_PACKET) - 1, &success, 50); + libusb_set_debug(ctx, LIBUSB_LOG_LEVEL_WARNING); // unsilence warnings + if (r == LIBUSB_ERROR_TIMEOUT && success == 0) { + if (dbg) printf("send(magic): sent %d, %s, goggles already connected\n", + success, libusb_strerror(r)); + } else if (r == LIBUSB_ERROR_IO) { + printf(" send:io\n"); + return WAIT_FOR_HOTPLUG; + } else if (r) { + printf("send(magic): sent %d, %s\n", success, libusb_strerror(r)); + return r; // weird error + } else if (success != sizeof(MAGIC_PACKET) - 1) { + printf("send(magic): sent %d want %d\n", success, (int) sizeof(MAGIC_PACKET) - 1); + return LIBUSB_ERROR_TIMEOUT; + } + + // This is not really complicated. Mainly all the logic here is to make usb2sock + // resilient when macOS's charming usb subsystem returns random errors, or when + // the goggles are not ready yet. + // + // It just eternally asks the goggles for some data libusb_bulk_transfer() and + // if any data came, shove it out to anyone connected via tcp send_to_socket(). + uint32_t count = 0; + for (;; count++) { + accept_any_connection(); + recv_and_discard(); + success = 0; + r = libusb_bulk_transfer(usbdev, inEndpoint, buf, sizeof(buf), + &success, tune_io_timeout_ms); + if (r == LIBUSB_ERROR_TIMEOUT && success == 0) { + printf("\e[A\r\e[Kvideo signal: OFF"); + fflush(stdout); + usleep(500 * 1000); // 0.5s: go slowly until the signal returns + count = 0; + } else if (r == LIBUSB_ERROR_IO) { + printf(" wait:io\n"); + return WAIT_FOR_HOTPLUG; + } else if (r == LIBUSB_ERROR_NO_DEVICE) { + printf(" wait:no dev\n"); + return WAIT_FOR_HOTPLUG; + } else if (r == LIBUSB_ERROR_NOT_FOUND) { + printf(" wait:not found\n"); + return WAIT_FOR_HOTPLUG; + } else if (r != 0) { + printf("rx: got %d, %d %s\n", success, r, libusb_strerror(r)); + return r; // rx broke + } else { + fflush(stdout); + printf("\r\e[Kvideo [%u tcp] packet %6u: %dK", clientlist_use, count, success / 1024); + fflush(stdout); + // write data to anyone connected via tcp + send_to_socket(success); + } + } + // "return 0" never happens: this program eternally pumps data from usb + return 0; +} + +int start_with_a_device(libusb_context * ctx, libusb_device * dev) +{ + int dbg = 0; + + struct libusb_device_descriptor desc; + int r = libusb_get_device_descriptor(dev, &desc); + if (r != 0) { + printf("get_device_descriptor failed: %d %s\n", r, libusb_strerror(r)); + return r; + } + + if (desc.idVendor != VENDOR_ID_DJI || desc.idProduct != DEVICE_ID_GOGGLES) { + //printf("no: %04x:%04x\n", desc.idVendor, desc.idProduct); + return VENDOR_ID_DJI; + } + + libusb_device_handle * usbdev; + r = libusb_open(dev, &usbdev); + if (r) { + printf("libusb_open %04x:%04x failed: %d %s\n", + desc.idVendor, desc.idProduct, r, libusb_strerror(r)); + return WAIT_FOR_HOTPLUG; + } + int cfg = -1; + r = libusb_get_configuration(usbdev, &cfg); + if (r) { + printf("%04x:%04x get_configuration failed: %d %s\n", + desc.idVendor, desc.idProduct, r, libusb_strerror(r)); + } else if (cfg == 0) { + printf("%04x:%04x cfg = %d need to set cfg %d\n", + desc.idVendor, desc.idProduct, cfg, GOGGLES_WANT_CFG); + r = libusb_set_configuration(usbdev, GOGGLES_WANT_CFG); + if (r) { + printf("%04x:%04x set_configuration(%d) failed: %d %s\n", + desc.idVendor, desc.idProduct, GOGGLES_WANT_CFG, + r, libusb_strerror(r)); + return r; + } + } else { + if (dbg) printf("%04x:%04x cfg = %d\n", desc.idVendor, desc.idProduct, cfg); + } + struct libusb_config_descriptor * cdesc; + r = libusb_get_config_descriptor(dev, 0, &cdesc); + if (r) { + printf("%04x:%04x get_config_descriptor failed: %d %s\n", + desc.idVendor, desc.idProduct, r, libusb_strerror(r)); + return r; + } + int find_FF_43 = -1; + int inEndpoint = -1; + int outEndpoint = -1; + for (uint32_t i = 0; i < cdesc->bNumInterfaces; i++) { + const struct libusb_interface * iface = &cdesc->interface[i]; + if (iface->num_altsetting == 0) + printf("%04x:%04x iface %u no alt\n", desc.idVendor, desc.idProduct, i); + for (uint32_t j = 0; j < iface->num_altsetting; j++) { + if (dbg) printf("%04x:%04x iface %u alt %u\n", desc.idVendor, desc.idProduct, i, j); + const struct libusb_interface_descriptor * alt = &iface->altsetting[j]; + if (dbg) printf(" cls: %02x.%02x proto: %02x\n", + alt->bInterfaceClass, alt->bInterfaceSubClass, alt->bInterfaceProtocol); + int firstIn = -1; + int firstOut = -1; + for (uint32_t k = 0; k < alt->bNumEndpoints; k++) { + const struct libusb_endpoint_descriptor * dep = &alt->endpoint[k]; + if (dbg) printf(" ep[%u] addr=%02x | %s\n", k, + dep->bEndpointAddress & 0x0f, + (dep->bEndpointAddress & LIBUSB_ENDPOINT_IN) ? "in" : "out"); + if ((dep->bEndpointAddress & LIBUSB_ENDPOINT_IN) && firstIn == -1) { + firstIn = dep->bEndpointAddress; + } + if (!(dep->bEndpointAddress & LIBUSB_ENDPOINT_IN) && firstOut == -1) { + firstOut = dep->bEndpointAddress; + } + } + if (j == 0 && alt->bInterfaceClass == 0xff && alt->bInterfaceSubClass == 0x43) { + if (firstIn != -1 && firstOut != -1) { + find_FF_43 = i; + inEndpoint = firstIn; + outEndpoint = firstOut; + } + } else if (alt->bInterfaceClass == 0xff && alt->bInterfaceSubClass == 0x43) { + printf("%04x:%04x iface %u alt 0 ok, but nAlt = %02x unexpected, will keep going\n", + desc.idVendor, desc.idProduct, i, iface->num_altsetting); + } + } + } + + r = libusb_claim_interface(usbdev, find_FF_43); + if (r) { + printf("libusb_claim %04x:%04x failed: %d\n", desc.idVendor, desc.idProduct, r); + libusb_close(usbdev); + return r; + } + if (dbg) printf("%04x:%04x claimed %d ok\n", desc.idVendor, desc.idProduct, find_FF_43); + + // Because libusb runs in userspace, the get_configuration() value can change at any time up until + // libusb_claim_interface. This is just good hygiene to double check the value + cfg = -1; + r = libusb_get_configuration(usbdev, &cfg); + if (r) { + printf("libusb_get_configuration %04x:%04x failed: %d\n", desc.idVendor, desc.idProduct, r); + libusb_close(usbdev); + return r; + } + if (cfg != 1 || desc.bNumConfigurations != 1) { + printf("%04x:%04x cfg = %d nCfgs = %02x unexpected, will keep going\n", + desc.idVendor, desc.idProduct, cfg, desc.bNumConfigurations); + } + r = start_stream(ctx, usbdev, inEndpoint, outEndpoint); + libusb_close(usbdev); + return r; +} + +int start_usb2sock(void) +{ + struct libusb_init_option options[] = { + { + // user can override this with LIBUSB_DEBUG=NNN + .option = LIBUSB_OPTION_LOG_LEVEL, + //.value.ival = LIBUSB_LOG_LEVEL_DEBUG, + .value.ival = LIBUSB_LOG_LEVEL_WARNING, + } + }; + libusb_set_log_cb(/*ctx=*/ 0, logcb, LIBUSB_LOG_CB_GLOBAL); + libusb_context * ctx; + int r = libusb_init_context(&ctx, options, sizeof(options) / sizeof(options[0])); + if (r < 0) { + printf("libusb_init_context: %d %s\n", r, libusb_strerror(r)); + return r; + } + if (libusb_has_capability(LIBUSB_CAP_HAS_HOTPLUG)) { + // even though macOS can do hotplug notifications + // this program does just fine without them - here they are, for what it's worth + r = libusb_hotplug_register_callback(ctx, + LIBUSB_HOTPLUG_EVENT_DEVICE_ARRIVED | LIBUSB_HOTPLUG_EVENT_DEVICE_LEFT, + /*flags=*/ 0, VENDOR_ID_DJI, DEVICE_ID_GOGGLES, + /*dev_class=*/ LIBUSB_HOTPLUG_MATCH_ANY, + set_connected_flag, /*user_data=*/ 0, &hotplug); + } + + sockfd = socket(AF_INET, SOCK_STREAM, 0); + if (sockfd < 0) { + printf("socket(AF_INET) tcp socket failed: %d %s\n", errno, strerror(errno)); + return 1; + } + r = 1; // turn on SO_REUSEADDR + if (setsockopt(sockfd, SOL_SOCKET, SO_REUSEADDR, (const void *) &r, sizeof(r))) { + printf("SO_REUSEADDR: tcp socket failed: %d %s\n", errno, strerror(errno)); + return 1; + } + r = 1; // turn on SO_NOSIGPIPE + if (setsockopt(sockfd, SOL_SOCKET, SO_NOSIGPIPE, (const void *) &r, sizeof(r))) { + printf("SO_NOSIGPIPE: tcp socket failed: %d %s\n", errno, strerror(errno)); + return 1; + } + struct sockaddr_in saddr; + memset(&saddr, 0, sizeof(saddr)); + saddr.sin_family = AF_INET; + // When listening on a port, set the host ip address where there is an open port + if (0) saddr.sin_addr.s_addr = htonl(INADDR_ANY); // bind to all host ip addresses + else inet_pton(AF_INET, "127.0.0.1", &saddr.sin_addr); // bind to 127.0.0.1 + saddr.sin_port = htons(TCP_SERVER_PORT); + + if (bind(sockfd, (struct sockaddr *) &saddr, sizeof(saddr))) { + printf("bind tcp socket failed: %d %s\n", errno, strerror(errno)); + return 1; + } + + if (listen(sockfd, 5)) { + printf("listen tcp socket failed: %d %s\n", errno, strerror(errno)); + return 1; + } + + if (fcntl(sockfd, F_SETFL, O_NONBLOCK)) { + printf("O_NONBLOCK tcp socket failed: %d %s\n", errno, strerror(errno)); + return 1; + } + + for (;;) { + accept_any_connection(); + recv_and_discard(); + libusb_device ** devs; + ssize_t cnt = libusb_get_device_list(ctx, &devs); + r = 0; + if (cnt >= 0) { + for (ssize_t i = 0; devs[i] && i < cnt; i++) { + r = start_with_a_device(ctx, devs[i]); + if (r == VENDOR_ID_DJI) continue; // not the correct device + break; + } + libusb_free_device_list(devs, /*unref_devices=*/ 1); + if (r == 0) break; // something did a "return 0", time to exit + if (r != WAIT_FOR_HOTPLUG && r != VENDOR_ID_DJI) { + // something failed + break; + } + printf("\r\e[KPlease plug in goggles [%u tcp] \"tcp/h264://127.0.0.1:18080\"", + clientlist_use); + fflush(stdout); + // Wait for a hotplug event + usleep(500 * 1000); + } + } + + libusb_exit(ctx); + return r; +} + +int main(int argc, char ** argv) { + (void)argc; + (void)argv; + return start_usb2sock(); +}