-
Notifications
You must be signed in to change notification settings - Fork 92
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Showing
12 changed files
with
276 additions
and
4 deletions.
There are no files selected for viewing
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
29 changes: 29 additions & 0 deletions
29
...t-android-sdk/src/main/java/io/livekit/android/annotations/FeatureStabilityAnnotations.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,29 @@ | ||
/* | ||
* Copyright 2024 LiveKit, Inc. | ||
* | ||
* 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 | ||
* | ||
* http://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. | ||
*/ | ||
|
||
package io.livekit.android.annotations | ||
|
||
@Retention(AnnotationRetention.BINARY) | ||
@RequiresOptIn | ||
annotation class Experimental | ||
|
||
@Retention(AnnotationRetention.BINARY) | ||
@RequiresOptIn | ||
annotation class Alpha | ||
|
||
@Retention(AnnotationRetention.BINARY) | ||
@RequiresOptIn | ||
annotation class Beta |
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
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
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
68 changes: 68 additions & 0 deletions
68
livekit-android-sdk/src/main/java/io/livekit/android/room/types/TranscriptionSegment.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,68 @@ | ||
/* | ||
* Copyright 2024 LiveKit, Inc. | ||
* | ||
* 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 | ||
* | ||
* http://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. | ||
*/ | ||
|
||
package io.livekit.android.room.types | ||
|
||
import io.livekit.android.util.LKLog | ||
import livekit.LivekitModels | ||
|
||
data class TranscriptionSegment( | ||
val id: String, | ||
val text: String, | ||
val language: String, | ||
val startTime: Long, | ||
val endTime: Long, | ||
val final: Boolean, | ||
) { | ||
override fun equals(other: Any?): Boolean { | ||
if (this === other) return true | ||
if (javaClass != other?.javaClass) return false | ||
|
||
other as TranscriptionSegment | ||
|
||
return id == other.id | ||
} | ||
|
||
override fun hashCode(): Int { | ||
return id.hashCode() | ||
} | ||
} | ||
|
||
/** | ||
* Merges new segments into the map. The key should correspond to the segment id. | ||
*/ | ||
fun MutableMap<String, TranscriptionSegment>.mergeNewSegments(newSegments: Collection<TranscriptionSegment>) { | ||
for (segment in newSegments) { | ||
val existingSegment = get(segment.id) | ||
if (existingSegment?.final == true) { | ||
LKLog.d { "new segment for ${segment.id} overwriting final segment?" } | ||
} | ||
put(segment.id, segment) | ||
} | ||
} | ||
|
||
/** | ||
* @suppress | ||
*/ | ||
fun LivekitModels.TranscriptionSegment.toSDKType() = | ||
TranscriptionSegment( | ||
id = id, | ||
text = text, | ||
language = language, | ||
startTime = startTime, | ||
endTime = endTime, | ||
final = final, | ||
) |
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
27 changes: 27 additions & 0 deletions
27
livekit-android-test/src/main/java/io/livekit/android/test/util/DataChannelBufferExt.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,27 @@ | ||
/* | ||
* Copyright 2024 LiveKit, Inc. | ||
* | ||
* 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 | ||
* | ||
* http://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. | ||
*/ | ||
|
||
package io.livekit.android.test.util | ||
|
||
import com.google.protobuf.MessageLite | ||
import livekit.org.webrtc.DataChannel | ||
import java.nio.ByteBuffer | ||
|
||
fun MessageLite.toDataChannelBuffer() = | ||
DataChannel.Buffer( | ||
ByteBuffer.wrap(toByteArray()), | ||
true, | ||
) |
58 changes: 58 additions & 0 deletions
58
livekit-android-test/src/test/java/io/livekit/android/room/RoomTranscriptionMockE2ETest.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,58 @@ | ||
/* | ||
* Copyright 2023-2024 LiveKit, Inc. | ||
* | ||
* 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 | ||
* | ||
* http://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. | ||
*/ | ||
|
||
package io.livekit.android.room | ||
|
||
import io.livekit.android.events.RoomEvent | ||
import io.livekit.android.test.MockE2ETest | ||
import io.livekit.android.test.assert.assertIsClass | ||
import io.livekit.android.test.events.EventCollector | ||
import io.livekit.android.test.mock.MockDataChannel | ||
import io.livekit.android.test.mock.MockPeerConnection | ||
import io.livekit.android.test.mock.TestData | ||
import io.livekit.android.test.util.toDataChannelBuffer | ||
import kotlinx.coroutines.ExperimentalCoroutinesApi | ||
import org.junit.Assert.assertEquals | ||
import org.junit.Test | ||
|
||
@OptIn(ExperimentalCoroutinesApi::class) | ||
class RoomTranscriptionMockE2ETest : MockE2ETest() { | ||
@Test | ||
fun transcriptionReceived() = runTest { | ||
connect() | ||
val subPeerConnection = component.rtcEngine().getSubscriberPeerConnection() as MockPeerConnection | ||
val subDataChannel = MockDataChannel(RTCEngine.RELIABLE_DATA_CHANNEL_LABEL) | ||
subPeerConnection.observer?.onDataChannel(subDataChannel) | ||
|
||
val collector = EventCollector(room.events, coroutineRule.scope) | ||
val dataBuffer = TestData.DATA_PACKET_TRANSCRIPTION.toDataChannelBuffer() | ||
|
||
subDataChannel.observer?.onMessage(dataBuffer) | ||
val events = collector.stopCollecting() | ||
|
||
assertEquals(1, events.size) | ||
assertIsClass(RoomEvent.TranscriptionReceived::class.java, events[0]) | ||
|
||
val event = events.first() as RoomEvent.TranscriptionReceived | ||
assertEquals(room, event.room) | ||
assertEquals(room.localParticipant, event.participant) | ||
|
||
val expectedSegment = TestData.DATA_PACKET_TRANSCRIPTION.transcription.getSegments(0) | ||
val receivedSegment = event.transcriptionSegments.first() | ||
assertEquals(expectedSegment.id, receivedSegment.id) | ||
assertEquals(expectedSegment.text, receivedSegment.text) | ||
} | ||
} |