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/ibc24 #11

Merged
merged 7 commits into from
Nov 5, 2024
Merged

Feature/ibc24 #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
889cd04
Add IBC config
dsilhavy Sep 5, 2024
60406bf
IP changes for IBC
dsilhavy Sep 6, 2024
fb3e824
Add files via upload (#10)
jordijoangimenez Sep 9, 2024
73b604d
Fix width for player view to not cut video on the sides
dsilhavy Sep 11, 2024
5b8631b
Add files via upload
jordijoangimenez Oct 25, 2024
07cb1be
Add files via upload
jordijoangimenez Oct 25, 2024
c17a3c7
Add files via upload
jordijoangimenez Oct 25, 2024
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
160 changes: 159 additions & 1 deletion app/src/main/assets/bootstrap.multipart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,165 @@ Content-Location: file:///envelope.xml
metadataURI="file:///TMGI-0x1009f165.m3u8"
validFrom="2021-10-12T10:59:43Z"
validUntil="2051-10-05T10:59:43Z"
version="1"/>
version="1"/>--++++++++++++++++++++++++Rohde&Schwarz-BSCC++++++++++++++++++++++++--
Content-Type: application/mbms-envelope+xml
Content-Transfer-Encoding: 7bit
Content-Location: file:///envelope.xml

<?xml version="1.0" encoding="utf-8"?>
<metadataEnvelope xmlns="urn:3gpp:metadata:2005:MBMS:envelope"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:3gpp:metadata:2005:MBMS:envelope MetadataEnvelope.xsd">
<item contentType="application/sdp"
metadataURI="file:///TMGI-0x1009f165.sdp"
validFrom="2021-10-12T10:59:43Z"
validUntil="2051-10-05T10:59:43Z"
version="1"/>
<item contentType="application/vnd.apple.mpegurl"
metadataURI="file:///TMGI-0x1009f165.m3u8"
validFrom="2021-10-12T10:59:43Z"
validUntil="2051-10-05T10:59:43Z"
version="1"/>
<item contentType="application/vnd.apple.mpegurl"
metadataURI="http://192.168.1.1:8080/streams.m3u8"
validFrom="2021-10-12T10:59:43Z"
validUntil="2051-10-05T10:59:43Z"
version="1"/>
<item contentType="application/mbms-user-service-description+xml"
metadataURI="file:///usdBundle.xml"
validFrom="2021-10-12T10:59:43Z"
validUntil="2051-10-05T10:59:43Z"
version="1"/>
<item contentType="application/mbms-schedule+xml"
metadataURI="file:///TMGI-0x1009f165schedule.xml"
validFrom="2021-10-12T10:59:43Z"
validUntil="2051-10-05T10:59:43Z"
version="1"/>
</metadataEnvelope>
--++++++++++++++++++++++++Rohde&Schwarz-BSCC++++++++++++++++++++++++--
Content-Type: application/sdp
Content-Transfer-Encoding: 7bit
Content-Location: file:///TMGI-0x1009f165.sdp

v=0
o=ROHDE-SCHWARZ-BSCC 269087077 1634036383 IN IP4 11.11.11.11
s=HLS Streaming Session 0x1009f165
i=File Download Session
t=3843025183 4789105183
a=mbms-mode:broadcast-mbsfn 269087077
c=IN IP4 239.11.4.10/127
b=AS:2000
m=application 5501 FLUTE/UDP 0
a=flute-tsi:0
a=flute-ch:1
a=3GPP-QoE-Metrics:metrics={Object_Loss};rate=null;resolution=10
a=3GPP-QoE-Metrics:metrics={Network_Resource};rate=null;resolution=10

--++++++++++++++++++++++++Rohde&Schwarz-BSCC++++++++++++++++++++++++--
Content-Type: application/vnd.apple.mpegurl
Content-Transfer-Encoding: 7bit
Content-Location: file:///TMGI-0x1009f165.m3u8

#EXTM3U
#EXT-X-VERSION:3

#EXT-X-STREAM-INF:CODECS="avc1.4D401E,mp4a.40.2",BANDWIDTH=1425427,FRAME-RATE=25.000,RESOLUTION=640x360
ch1/stream.m3u8

--++++++++++++++++++++++++Rohde&Schwarz-BSCC++++++++++++++++++++++++--
Content-Type: application/vnd.apple.mpegurl
Content-Transfer-Encoding: 7bit
Content-Location: http://192.168.1.1:8080/streams.m3u8

#EXTM3U
#EXT-X-VERSION:3
#EXT-X-STREAM-INF:BANDWIDTH=3845427,AVERAGE-BANDWIDTH=3845427,RESOLUTION=1280x720,FRAME-RATE=25.000,CODECS="avc1.64001F,mp4a.40.2"
ch1/stream.m3u8

--++++++++++++++++++++++++Rohde&Schwarz-BSCC++++++++++++++++++++++++--
Content-Type: application/mbms-user-service-description+xml
Content-Transfer-Encoding: 7bit
Content-Location: file:///usdBundle.xml

<?xml version="1.0" encoding="utf-8"?>
<bundleDescription xmlns="urn:3GPP:metadata:2005:MBMS:userServiceDescription"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:sv="urn:3gpp:metadata:2009:MBMS:schemaVersion"
xmlns:r7="urn:3GPP:metadata:2007:MBMS:userServiceDescription"
xmlns:r8="urn:3GPP:metadata:2008:MBMS:userServiceDescription"
xmlns:r9="urn:3GPP:metadata:2009:MBMS:userServiceDescription"
xmlns:r12="urn:3GPP:metadata:2013:MBMS:userServiceDescription"
xmlns:r14="urn:3GPP:metadata:2017:MBMS:userServiceDescription"
xmlns:r15="urn:3GPP:metadata:2018:r15:MBMS:userServiceDescription"
xsi:schemaLocation="urn:3GPP:metadata:2005:MBMS:userServiceDescription USD-schema-main.xsd">
<sv:schemaVersion>1</sv:schemaVersion>
<userServiceDescription serviceId="urn:3gpp:rsservice1"
r7:serviceClass="urn:oma:bcast:ext_bsc_3gpp:bscc:rsservice1"
r14:romService="true">
<name lang="EN-GB">BSCC Service1</name>
<name lang="DE-DE">BSCC Dienst1</name>
<serviceLanguage>EN-GB</serviceLanguage>
<serviceLanguage>DE-DE</serviceLanguage>
<requiredCapabilities>
<feature>23</feature>
<feature>27</feature>
</requiredCapabilities>
<deliveryMethod sessionDescriptionURI="file:///TMGI-0x1009f165.sdp">
<sv:delimiter>0</sv:delimiter>
<r12:broadcastAppService>
<r12:basePattern>file:///TMGI-0x1009f165.m3u8</r12:basePattern>
<r12:serviceArea>2</r12:serviceArea>
</r12:broadcastAppService>
<r12:unicastAppService>
<r12:basePattern>http://192.168.1.1:8080/streams.m3u8</r12:basePattern>
</r12:unicastAppService>
<sv:delimiter>0</sv:delimiter>
</deliveryMethod>
<r12:appService appServiceDescriptionURI="http://192.168.1.1:8080/streams.m3u8"
mimeType="application/vnd.apple.mpegurl">
<r12:alternativeContent>
<r12:basePattern>file:///TMGI-0x1009f165.m3u8</r12:basePattern>
</r12:alternativeContent>
<r12:identicalContent>
<r12:basePattern>file:///TMGI-0x1009f165.m3u8</r12:basePattern>
<r12:basePattern>http://192.168.1.1:8080/ch1/stream.m3u8</r12:basePattern>
</r12:identicalContent>
</r12:appService>
<r9:schedule>
<r9:scheduleDescriptionURI>file:///TMGI-0x1009f165schedule.xml</r9:scheduleDescriptionURI>
</r9:schedule>
<sv:delimiter>0</sv:delimiter>
<r9:availabilityInfo>
<r9:infoBinding>
<r9:serviceArea>2</r9:serviceArea>
</r9:infoBinding>
</r9:availabilityInfo>
</userServiceDescription>
</bundleDescription>
--++++++++++++++++++++++++Rohde&Schwarz-BSCC++++++++++++++++++++++++--
Content-Type: application/mbms-schedule+xml
Content-Transfer-Encoding: 7bit
Content-Location: file:///TMGI-0x1009f165schedule.xml

<?xml version="1.0" encoding="utf-8"?>
<scheduleDescription xmlns="urn:3gpp:metadata:2011:MBMS:scheduleDescription"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:sv="urn:3gpp:metadata:2009:MBMS:schemaVersion"
xsi:schemaLocation="urn:3gpp:metadata:2011:MBMS:scheduleDescription ScheduleDescription.xsd"
scheduleUpdate="2021-10-12T10:59:43Z">
<sv:schemaVersion>1</sv:schemaVersion>
<serviceSchedule>
<sessionSchedule>
<start>2021-10-12T10:59:43Z</start>
<stop>2051-10-05T10:59:43Z</stop>
<index>0</index>
<sv:delimiter>0</sv:delimiter>
<sv:delimiter>0</sv:delimiter>
</sessionSchedule>
</serviceSchedule>
</scheduleDescription>
--++++++++++++++++++++++++Rohde&Schwarz-BSCC++++++++++++++++++++++++--

<item contentType="application/vnd.apple.mpegurl"
metadataURI="http://192.168.1.1:8080/streams.m3u8"
validFrom="2021-10-12T10:59:43Z"
Expand Down
8 changes: 4 additions & 4 deletions app/src/main/assets/bootstrap.multipart.hls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Content-Location: file:///envelope.xml
validUntil="2051-10-05T10:59:43Z"
version="1"/>
<item contentType="application/vnd.apple.mpegurl"
metadataURI="http://192.168.2.2:3333/watchfolder/hls/manifest.m3u8"
metadataURI="http://192.168.0.101:3333/watchfolder/hls/manifest.m3u8"
validFrom="2021-10-12T10:59:43Z"
validUntil="2051-10-05T10:59:43Z"
version="1"/>
Expand Down Expand Up @@ -66,7 +66,7 @@ watchfolder/hls/stream_0.m3u8
--++++++++++++++++++++++++Rohde&Schwarz-BSCC++++++++++++++++++++++++--
Content-Type: application/vnd.apple.mpegurl
Content-Transfer-Encoding: 7bit
Content-Location: http://192.168.2.2:3333/watchfolder/hls/manifest.m3u8
Content-Location: http://192.168.0.101:3333/watchfolder/hls/manifest.m3u8

#EXTM3U
#EXT-X-VERSION:3
Expand Down Expand Up @@ -108,7 +108,7 @@ Content-Location: file:///usdBundle.xml
<r12:serviceArea>2</r12:serviceArea>
</r12:broadcastAppService>
<r12:unicastAppService>
<r12:basePattern>http://192.168.2.2:3333/watchfolder/hls/manifest.m3u8</r12:basePattern>
<r12:basePattern>http://192.168.0.101:3333/watchfolder/hls/manifest.m3u8</r12:basePattern>
</r12:unicastAppService>
<sv:delimiter>0</sv:delimiter>
</deliveryMethod>
Expand All @@ -119,7 +119,7 @@ Content-Location: file:///usdBundle.xml
</r12:alternativeContent>
<r12:identicalContent>
<r12:basePattern>file:///TMGI-0x1009f165.m3u8</r12:basePattern>
<r12:basePattern>http://192.168.2.2:3333/watchfolder/hls/stream_0.m3u8</r12:basePattern>
<r12:basePattern>http://192.168.0.101:3333/watchfolder/hls/stream_0.m3u8</r12:basePattern>
</r12:identicalContent>
</r12:appService>
<r9:schedule>
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/cpp/CacheItems.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,9 @@ namespace MBMS_RT {
std::string item_source_as_string() const {
switch (item_source()) {
case ItemSource::Broadcast:
return "5GBC";
return "Media from: 5G Broadcast";
case ItemSource::CDN:
return "CDN";
return "Media from: Unicast";
case ItemSource::Generated:
return "GEN";
case ItemSource::Unavailable:
Expand Down
Binary file added app/src/main/res/drawable/fivegmag_playr.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/res/drawable/logo_5g_mag_reference_tools.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 7 additions & 0 deletions app/src/main/res/font/poppins.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<font-family xmlns:app="http://schemas.android.com/apk/res-auto"
app:fontProviderAuthority="com.google.android.gms.fonts"
app:fontProviderPackage="com.google.android.gms"
app:fontProviderQuery="Poppins"
app:fontProviderCerts="@array/com_google_android_gms_fonts_certs">
</font-family>
103 changes: 75 additions & 28 deletions app/src/main/res/layout/activity_main.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,67 +4,114 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#ffffff"
android:background="#2B6CA3"
tools:context=".MainActivity">

<LinearLayout
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/linearLayout2"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:paddingLeft="20dp"
android:paddingRight="20dp">
android:paddingRight="20dp"
tools:layout_editor_absoluteX="0dp"
tools:layout_editor_absoluteY="0dp">

<ImageView
android:id="@+id/imageView"
android:layout_width="200dp"
android:layout_height="54dp"
android:layout_marginStart="24dp"
android:layout_marginTop="24dp"
android:contentDescription="@string/_5g_mag_logo_description"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@drawable/fivegmag_playr" />

<TextView
android:id="@+id/textView2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:paddingTop="50dp"
android:paddingBottom="30dp"
android:src="@drawable/fiveg_mag"></ImageView>
android:layout_marginTop="8dp"
android:layout_marginEnd="24dp"
android:autoLink="web"
android:fontFamily="@font/poppins"
android:text="@string/_5gmag_developer_link"
android:textColorLink="@color/white"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/imageView3" />

<ImageView
android:id="@+id/imageView3"
android:layout_width="168dp"
android:layout_height="50dp"
android:layout_marginTop="24dp"
android:layout_marginEnd="24dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/btnSettings"
app:srcCompat="@drawable/logo_5g_mag_reference_tools" />

<TextView
android:id="@+id/source_info_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginTop="16dp"
android:fontFamily="@font/poppins"
android:paddingRight="10dip"
android:text="CDN"
android:textColor="@color/black"
android:text="Media from: Unicast"
android:textAlignment="center"
android:textColor="@color/white"
android:textIsSelectable="false"
android:textSize="20sp" />
android:textSize="20sp"
app:layout_constraintStart_toStartOf="@+id/imageView"
app:layout_constraintTop_toBottomOf="@+id/imageView" />

<androidx.media3.ui.PlayerView
android:id="@+id/video_view1"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="2"
android:layout_width="0dp"
android:layout_height="200dp"
android:layout_marginTop="16dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/source_info_text"
app:use_controller="true" />

<Button
android:id="@+id/btnStartService"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:layout_width="300dp"
android:layout_height="40dp"
android:layout_marginTop="16dp"
android:background="#FFFFFF"
android:text="Start Middleware"
android:backgroundTint="@color/fivegmag_blue"
android:textColor="@color/white"/>
android:textColor="#FFFFFF"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/video_view1" />

<Button
android:id="@+id/btnStopService"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_width="300dp"
android:layout_height="40dp"
android:layout_marginTop="8dp"
android:background="#FFFFFF"
android:text="Stop Middleware"
android:backgroundTint="@color/fivegmag_blue"
android:textColor="@color/white"/>
android:textColor="#FFFFFF"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/btnStartService" />

<Button
android:id="@+id/btnSettings"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_width="300dp"
android:layout_height="40dp"
android:layout_marginTop="8dp"
android:background="#FFFFFF"
android:text="Settings &amp; Info"
android:backgroundTint="@color/fivegmag_blue"
android:textColor="@color/white"/>
android:textColor="#FFFFFF"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/btnStopService" />

</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

</androidx.constraintlayout.widget.ConstraintLayout>
Loading