-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/development'
- Loading branch information
Showing
11 changed files
with
355 additions
and
34 deletions.
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
42 changes: 42 additions & 0 deletions
42
app/src/main/java/com/fivegmag/a5gmscommonlibrary/consumptionReporting/ConsumptionReport.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,42 @@ | ||
/* | ||
License: 5G-MAG Public License (v1.0) | ||
Author: Daniel Silhavy | ||
Copyright: (C) 2023 Fraunhofer FOKUS | ||
For full license terms please see the LICENSE file distributed with this | ||
program. If this file is missing then the license can be retrieved from | ||
https://drive.google.com/file/d/1cinCiA778IErENZ3JN52VFW-1ffHpx7Z/view | ||
*/ | ||
|
||
package com.fivegmag.a5gmscommonlibrary.consumptionReporting | ||
|
||
import android.os.Parcelable | ||
import com.fasterxml.jackson.annotation.JsonFilter | ||
import com.fasterxml.jackson.annotation.JsonIgnore | ||
import com.fasterxml.jackson.annotation.JsonIgnoreProperties | ||
import com.fivegmag.a5gmscommonlibrary.models.EndpointAddress | ||
import com.fivegmag.a5gmscommonlibrary.models.TypedLocation | ||
import kotlinx.parcelize.Parcelize | ||
|
||
@Parcelize | ||
@JsonIgnoreProperties(ignoreUnknown = true) | ||
data class ConsumptionReport( | ||
val mediaPlayerEntry: String, | ||
val reportingClientId: String, | ||
val consumptionReportingUnits: ArrayList<ConsumptionReportingUnit> | ||
) : Parcelable | ||
|
||
@Parcelize | ||
@JsonIgnoreProperties(ignoreUnknown = true) | ||
@JsonFilter("consumptionReportingUnitFilter") | ||
data class ConsumptionReportingUnit( | ||
val mediaConsumed: String, | ||
var clientEndpointAddress: EndpointAddress? = null, | ||
var serverEndpointAddress: EndpointAddress? = null, | ||
val startTime: String, | ||
var duration: Int, | ||
var locations: ArrayList<TypedLocation>? = ArrayList(), | ||
@JsonIgnore | ||
var mimeType: String? = null, | ||
@JsonIgnore | ||
var finished: Boolean = false | ||
) : Parcelable |
24 changes: 23 additions & 1 deletion
24
...src/main/java/com/fivegmag/a5gmscommonlibrary/eventbus/MediaStreamHandlerMessageEvents.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,26 @@ | ||
package com.fivegmag.a5gmscommonlibrary.eventbus | ||
|
||
import android.telephony.CellInfo | ||
import androidx.media3.exoplayer.analytics.AnalyticsListener.EventTime | ||
import androidx.media3.exoplayer.source.LoadEventInfo | ||
import androidx.media3.exoplayer.source.MediaLoadData | ||
|
||
class DownstreamFormatChangedEvent(val mediaLoadData: MediaLoadData) | ||
class DownstreamFormatChangedEvent( | ||
val eventTime: EventTime, | ||
val mediaLoadData: MediaLoadData | ||
) | ||
|
||
class PlaybackStateChangedEvent( | ||
val eventTime: EventTime, | ||
val playbackState: String | ||
) | ||
|
||
class LoadStartedEvent( | ||
val eventTime: EventTime, | ||
val loadEventInfo: LoadEventInfo, | ||
val mediaLoadData: MediaLoadData | ||
) | ||
|
||
class CellInfoUpdatedEvent( | ||
val cellInfoList: MutableList<CellInfo> | ||
) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
25 changes: 0 additions & 25 deletions
25
app/src/main/java/com/fivegmag/a5gmscommonlibrary/models/ConsumptionReporting.kt
This file was deleted.
Oops, something went wrong.
16 changes: 16 additions & 0 deletions
16
app/src/main/java/com/fivegmag/a5gmscommonlibrary/models/MessageModels.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
package com.fivegmag.a5gmscommonlibrary.models | ||
|
||
import android.os.Parcelable | ||
import kotlinx.parcelize.Parcelize | ||
|
||
@Parcelize | ||
data class PlaybackRequest( | ||
val entryPoints: ArrayList<EntryPoint>, | ||
val playbackConsumptionReportingConfiguration: PlaybackConsumptionReportingConfiguration | ||
) : Parcelable | ||
|
||
@Parcelize | ||
data class PlaybackConsumptionReportingConfiguration( | ||
var accessReporting : Boolean? = false, | ||
var locationReporting : Boolean? = false | ||
) : Parcelable |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.