Skip to content

Commit 0cbd458

Browse files
committed
refactor(core): remove listener from constructors
1 parent 7a6a2da commit 0cbd458

File tree

3 files changed

+3
-23
lines changed

3 files changed

+3
-23
lines changed

core/src/main/java/io/github/thibaultbee/streampack/internal/endpoints/muxers/flv/FlvMuxer.kt

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ import io.github.thibaultbee.streampack.internal.utils.extensions.isVideo
2929

3030
class FlvMuxer(
3131
override var listener: IMuxer.IMuxerListener? = null,
32-
initialStreams: List<Config>? = null,
3332
private val writeToFile: Boolean,
3433
) : IMuxer {
3534
override val info = FlvMuxerInfo
@@ -41,10 +40,6 @@ class FlvMuxer(
4140
private var startUpTime: Long? = null
4241
private var hasFirstFrame = false
4342

44-
init {
45-
initialStreams?.let { config -> streams.addAll(config.map { Stream(it) }) }
46-
}
47-
4843
override fun write(frame: Frame, streamPid: Int) {
4944
synchronized(this) {
5045
if (!hasFirstFrame) {

core/src/main/java/io/github/thibaultbee/streampack/internal/endpoints/muxers/mp4/MP4Muxer.kt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,12 @@ import io.github.thibaultbee.streampack.internal.utils.extensions.isVideo
3636
import java.nio.ByteBuffer
3737

3838
class MP4Muxer(
39-
initialListener: IMuxer.IMuxerListener? = null,
39+
override var listener: IMuxer.IMuxerListener? = null,
4040
private val timescale: Int = DEFAULT_TIMESCALE,
4141
private val segmenterFactory: MP4SegmenterFactory = DefaultMP4SegmenterFactory()
4242
) : IMuxer {
4343
override val info = MP4MuxerInfo
4444

45-
override var listener: IMuxer.IMuxerListener? =
46-
initialListener
4745
private val tracks = mutableListOf<Track>()
4846
private val hasAudio: Boolean
4947
get() = tracks.any { it.config.mimeType.isAudio }

core/src/main/java/io/github/thibaultbee/streampack/internal/endpoints/muxers/ts/TSMuxer.kt

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -36,17 +36,12 @@ import java.nio.ByteBuffer
3636
import java.util.MissingFormatArgumentException
3737
import kotlin.random.Random
3838

39-
class TSMuxer(
40-
initialListener: IMuxer.IMuxerListener? = null,
41-
initialTsServiceInfo: TsServiceInfo? = null,
42-
initialStreams: List<Config>? = null,
43-
) : IMuxer {
39+
class TSMuxer: IMuxer {
4440
override val info = TSMuxerInfo
4541
private val tsServices = mutableListOf<Service>()
4642
private val tsPes = mutableListOf<Pes>()
4743

48-
override var listener: IMuxer.IMuxerListener? =
49-
initialListener
44+
override var listener: IMuxer.IMuxerListener? = null
5045
set(value) {
5146
pat.listener = value
5247
sdt.listener = value
@@ -70,14 +65,6 @@ class TSMuxer(
7065
packetCount = 0
7166
)
7267

73-
init {
74-
if (initialStreams != null) {
75-
require(initialTsServiceInfo != null) { "If streams are specified, a service info must be specified too" }
76-
}
77-
initialTsServiceInfo?.let { addService(it) }
78-
initialStreams?.let { addStreams(tsServices[0], it) }
79-
}
80-
8168
/**
8269
* Encodes a frame to MPEG-TS format.
8370
* Each audio frames and each video key frames must come with an extra buffer containing sps, pps,...

0 commit comments

Comments
 (0)