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

Feature/rtmp stream screen #79

Open
wants to merge 13 commits into
base: dev
Choose a base branch
from
Open

Feature/rtmp stream screen #79

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
69dc92b
Stream full screen to RTMP
omouren May 30, 2021
799bd59
Better overlay toggle
omouren May 30, 2021
3f7d9a5
Add internal audio streaming + Mute audio button
omouren Jun 1, 2021
8d252d5
Move connect checker rtmp to local var + handle mute button hiding
omouren Jun 1, 2021
f69a27e
Add bitrate stat, add RTMP errors in Toast
omouren Jun 1, 2021
2692be0
Handle RTMP basic auth
omouren Jun 1, 2021
0357c33
Handle RTMP basic auth
omouren Jun 1, 2021
75fa77f
New live icon
omouren Jun 1, 2021
c87fce6
New stream preferences
omouren Jun 2, 2021
7e35534
Use FAB animation instead of manual fade animation
omouren Jun 3, 2021
73081e8
Add stream rotate to force portrait mode
omouren Jun 6, 2021
7dd52cb
Fix autohide buttons
omouren Jun 7, 2021
a42fd8c
Merge branch 'hotfix/french-content' into feature/rtmp-stream-screen
omouren Jun 7, 2021
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
7 changes: 7 additions & 0 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,12 @@ android {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}

allprojects {
repositories {
maven { url 'https://jitpack.io' }
}
}
}

dependencies {
Expand All @@ -71,6 +77,7 @@ dependencies {
implementation 'com.google.android.exoplayer:exoplayer:2.13.3'
implementation 'io.sentry:sentry-android:4.3.0'
implementation 'androidx.preference:preference:1.1.1'
implementation 'com.github.pedroSG94.rtmp-rtsp-stream-client-java:rtplibrary:2.0.2'

testImplementation 'junit:junit:4.+'
androidTestImplementation 'androidx.test.ext:junit:1.1.2'
Expand Down
37 changes: 26 additions & 11 deletions app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,29 +4,32 @@
package="com.fpvout.digiview">

<uses-feature android:name="android.hardware.usb.host" />

<uses-permission android:name="android.permission.WAKE_LOCK" />
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.RECORD_AUDIO" />
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />

<application
android:allowBackup="false"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/Theme.Digiview"
>
android:theme="@style/Theme.Digiview">
<activity
android:name=".DataCollectionAgreementPopupActivity"
android:label="@string/title_activity_data_collection"
android:theme="@style/Theme.AppCompat.Dialog"></activity>
android:theme="@style/Theme.AppCompat.Dialog" />
<activity
android:name=".SettingsActivity"
android:label="@string/title_activity_settings"></activity>
android:label="@string/title_activity_settings" />

<activity
android:launchMode="singleTask"
android:name="com.fpvout.digiview.MainActivity"
android:screenOrientation="sensorLandscape"
android:configChanges="orientation|keyboardHidden">
android:configChanges="orientation|keyboardHidden"
android:launchMode="singleTask"
android:screenOrientation="sensorLandscape">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

Expand All @@ -38,14 +41,26 @@
<action android:name="android.hardware.usb.action.USB_DEVICE_DETACHED" />
</intent-filter>

<meta-data android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED"
<meta-data
android:name="android.hardware.usb.action.USB_DEVICE_ATTACHED"
android:resource="@xml/device_filter" />

<meta-data android:name="android.hardware.usb.action.USB_DEVICE_DETACHED"
<meta-data
android:name="android.hardware.usb.action.USB_DEVICE_DETACHED"
android:resource="@xml/device_filter" />
</activity>
<meta-data android:name="io.sentry.dsn" android:value="https://df6168678f2e4107abe5abb40cf3e648@o660067.ingest.sentry.io/5764247" />
<meta-data android:name="io.sentry.auto-init" android:value="false" />

<service
android:name=".streaming.StreamingService"
android:foregroundServiceType="mediaProjection" />

<meta-data
android:name="io.sentry.dsn"
android:value="https://df6168678f2e4107abe5abb40cf3e648@o660067.ingest.sentry.io/5764247" />
<meta-data
android:name="io.sentry.auto-init"
android:value="false" />

<provider
android:name="io.sentry.android.core.SentryInitProvider"
android:authorities="com.fpvout.digiview.SentryInitProvider"
Expand Down
Loading