iktdev/MediaProcessing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated library & main.yaml

Browse Source
This commit is contained in:
Brage 2023-07-19 20:11:19 +02:00
parent bd3125ed44
commit f152533cba
3 changed files with 47 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
.github/workflows/main.yml vendored
View File

@ -17,9 +17,15 @@ jobs:
- name: Checkout repository - name: Checkout repository
uses: actions/checkout@v2 uses: actions/checkout@v2
- name: Cache CommonCode Gradle dependencies
id: cache-gradle
uses: actions/cache@v2
with:
path: ~/.gradle/caches
key: ${{ runner.os }}-gradle-${{ hashFiles('CommonCode/gradle/wrapper/gradle-wrapper.properties') }}
- name: Build CommonCode - name: Build CommonCode
if: steps.cache-gradle.outputs.cache-hit != 'true'
run: | run: |
cd CommonCode cd CommonCode
chmod +x ./gradlew chmod +x ./gradlew
@ -44,6 +50,14 @@ jobs:
echo "::set-output name=changed::false" echo "::set-output name=changed::false"
fi fi
- name: Cache CommonCode Gradle dependencies
id: cache-gradle
uses: actions/cache@v2
with:
path: ~/.gradle/caches
key: ${{ runner.os }}-gradle-${{ hashFiles('CommonCode/gradle/wrapper/gradle-wrapper.properties') }}
- name: Build Encode module - name: Build Encode module
id: build-encode id: build-encode
run: | run: |
@ -97,6 +111,13 @@ jobs:
echo "::set-output name=changed::false" echo "::set-output name=changed::false"
fi fi
- name: Cache CommonCode Gradle dependencies
id: cache-gradle
uses: actions/cache@v2
with:
path: ~/.gradle/caches
key: ${{ runner.os }}-gradle-${{ hashFiles('CommonCode/gradle/wrapper/gradle-wrapper.properties') }}
- name: Build Reader module - name: Build Reader module
id: build-reader id: build-reader
run: | run: |

2
Reader/build.gradle.kts
View File

@ -23,7 +23,7 @@ repositories {
} }
dependencies { dependencies {
implementation("no.iktdev.streamit.library:streamit-library-kafka:0.0.2-alpha39") implementation("no.iktdev.streamit.library:streamit-library-kafka:0.0.2-alpha41")
implementation("no.iktdev:exfl:0.0.4-SNAPSHOT") implementation("no.iktdev:exfl:0.0.4-SNAPSHOT")
implementation("com.github.pgreze:kotlin-process:1.3.1") implementation("com.github.pgreze:kotlin-process:1.3.1")

43
Reader/src/main/kotlin/no/iktdev/streamit/content/reader/analyzer/EncodedDeserializers.kt
View File

@ -27,31 +27,36 @@ class EncodedDeserializers {
val mediaStreams = object : IMessageDataDeserialization<MediaStreams> { val mediaStreams = object : IMessageDataDeserialization<MediaStreams> {
override fun deserialize(incomingMessage: Message): MediaStreams? { override fun deserialize(incomingMessage: Message): MediaStreams? {
if (incomingMessage.status.statusType != StatusType.SUCCESS) { return try {
return null if (incomingMessage.status.statusType != StatusType.SUCCESS) {
} return null
/*return gson.fromJson(streams.value().data as String, MediaStreams::class.java)*/ }
val jsonObject = gson.fromJson(incomingMessage.dataAsJson(), JsonObject::class.java) /*return gson.fromJson(streams.value().data as String, MediaStreams::class.java)*/
val jsonObject = gson.fromJson(incomingMessage.dataAsJson(), JsonObject::class.java)
val streamsJsonArray = jsonObject.getAsJsonArray("streams") val streamsJsonArray = jsonObject.getAsJsonArray("streams")
val rstreams = streamsJsonArray.mapNotNull { streamJson -> val rstreams = streamsJsonArray.mapNotNull { streamJson ->
val streamObject = streamJson.asJsonObject val streamObject = streamJson.asJsonObject
val codecType = streamObject.get("codec_type").asString val codecType = streamObject.get("codec_type").asString
if (streamObject.has("codec_name") && streamObject.get("codec_name").asString == "mjpeg") { if (streamObject.has("codec_name") && streamObject.get("codec_name").asString == "mjpeg") {
null null
} else { } else {
when (codecType) { when (codecType) {
"video" -> gson.fromJson(streamObject, VideoStream::class.java) "video" -> gson.fromJson(streamObject, VideoStream::class.java)
"audio" -> gson.fromJson(streamObject, AudioStream::class.java) "audio" -> gson.fromJson(streamObject, AudioStream::class.java)
"subtitle" -> gson.fromJson(streamObject, SubtitleStream::class.java) "subtitle" -> gson.fromJson(streamObject, SubtitleStream::class.java)
else -> null //throw IllegalArgumentException("Unknown stream type: $codecType") else -> null //throw IllegalArgumentException("Unknown stream type: $codecType")
}
} }
} }
}
return MediaStreams(rstreams) return MediaStreams(rstreams)
} catch (e: Exception) {
e.printStackTrace()
null
}
} }
} }