Skip to content

Commit 5e207c0

Browse files
ThibaultBeeThibaultBee
committed
fu flv
1 parent 40c4d99 commit 5e207c0

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+199
-187
lines changed

‎flv/src/commonMain/kotlin/io/github/thibaultbee/krtmp/flv/FLVDemuxer.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616
package io.github.thibaultbee.krtmp.flv
1717

1818
import io.github.thibaultbee.krtmp.amf.AmfVersion
19-
import io.github.thibaultbee.krtmp.flv.models.tags.FLVTag
20-
import io.github.thibaultbee.krtmp.flv.models.tags.RawFLVTag
21-
import io.github.thibaultbee.krtmp.flv.models.util.FLVHeader
19+
import io.github.thibaultbee.krtmp.flv.tags.FLVTag
20+
import io.github.thibaultbee.krtmp.flv.tags.RawFLVTag
21+
import io.github.thibaultbee.krtmp.flv.util.FLVHeader
2222
import kotlinx.io.Source
2323
import kotlinx.io.buffered
2424
import kotlinx.io.files.Path

‎flv/src/commonMain/kotlin/io/github/thibaultbee/krtmp/flv/FLVMuxer.kt‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@
1616
package io.github.thibaultbee.krtmp.flv
1717

1818
import io.github.thibaultbee.krtmp.amf.AmfVersion
19-
import io.github.thibaultbee.krtmp.flv.models.tags.FLVData
20-
import io.github.thibaultbee.krtmp.flv.models.tags.FLVTag
21-
import io.github.thibaultbee.krtmp.flv.models.tags.RawFLVTag
22-
import io.github.thibaultbee.krtmp.flv.models.tags.aacAudioData
23-
import io.github.thibaultbee.krtmp.flv.models.tags.avcHeaderLegacyVideoData
24-
import io.github.thibaultbee.krtmp.flv.models.tags.avcLegacyVideoData
25-
import io.github.thibaultbee.krtmp.flv.models.util.FLVHeader
19+
import io.github.thibaultbee.krtmp.flv.tags.FLVData
20+
import io.github.thibaultbee.krtmp.flv.tags.FLVTag
21+
import io.github.thibaultbee.krtmp.flv.tags.RawFLVTag
22+
import io.github.thibaultbee.krtmp.flv.tags.aacAudioData
23+
import io.github.thibaultbee.krtmp.flv.tags.avcHeaderLegacyVideoData
24+
import io.github.thibaultbee.krtmp.flv.tags.avcLegacyVideoData
25+
import io.github.thibaultbee.krtmp.flv.util.FLVHeader
2626
import kotlinx.io.Sink
2727
import kotlinx.io.buffered
2828
import kotlinx.io.files.Path

flv/src/commonMain/kotlin/io/github/thibaultbee/krtmp/flv/models/bitreaders/BitReader.kt renamed to flv/src/commonMain/kotlin/io/github/thibaultbee/krtmp/flv/bitreaders/BitReader.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package io.github.thibaultbee.krtmp.flv.models.bitreaders
16+
package io.github.thibaultbee.krtmp.flv.bitreaders
1717

1818
import kotlinx.io.Source
1919
import kotlin.math.ceil

flv/src/commonMain/kotlin/io/github/thibaultbee/krtmp/flv/models/bitreaders/H26XBitReader.kt renamed to flv/src/commonMain/kotlin/io/github/thibaultbee/krtmp/flv/bitreaders/H26XBitReader.kt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,16 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package io.github.thibaultbee.krtmp.flv.models.bitreaders
16+
package io.github.thibaultbee.krtmp.flv.bitreaders
1717

18-
import io.github.thibaultbee.krtmp.flv.models.bitreaders.BitReader
1918
import kotlinx.io.Source
2019

2120
/**
2221
* A reader for reading bits from a [Source] designed for H26X bitstreams.
2322
*
2423
* @param source the source to read from
2524
*/
26-
class H26XBitReader(source: Source): BitReader(source) {
25+
class H26XBitReader(source: Source) : BitReader(source) {
2726
fun readUE(): Int {
2827
val leadingZeros = numOfLeadingZeros()
2928

flv/src/commonMain/kotlin/io/github/thibaultbee/krtmp/flv/models/config/AudioByteFormat.kt renamed to flv/src/commonMain/kotlin/io/github/thibaultbee/krtmp/flv/config/AudioByteFormat.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package io.github.thibaultbee.krtmp.flv.models.config
16+
package io.github.thibaultbee.krtmp.flv.config
1717

1818
enum class AudioByteFormat(val numOfBytes: Int) {
1919
S_8(1),

flv/src/commonMain/kotlin/io/github/thibaultbee/krtmp/flv/models/config/FLVAudioConfig.kt renamed to flv/src/commonMain/kotlin/io/github/thibaultbee/krtmp/flv/config/FLVAudioConfig.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package io.github.thibaultbee.krtmp.flv.models.config
16+
package io.github.thibaultbee.krtmp.flv.config
1717

1818
class FLVAudioConfig(
1919
override val mediaType: AudioMediaType,

flv/src/commonMain/kotlin/io/github/thibaultbee/krtmp/flv/models/config/FLVConfig.kt renamed to flv/src/commonMain/kotlin/io/github/thibaultbee/krtmp/flv/config/FLVConfig.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package io.github.thibaultbee.krtmp.flv.models.config
16+
package io.github.thibaultbee.krtmp.flv.config
1717

1818
/**
1919
* Interface for FLV configuration.

flv/src/commonMain/kotlin/io/github/thibaultbee/krtmp/flv/models/config/FLVVideoConfig.kt renamed to flv/src/commonMain/kotlin/io/github/thibaultbee/krtmp/flv/config/FLVVideoConfig.kt

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package io.github.thibaultbee.krtmp.flv.models.config
16+
package io.github.thibaultbee.krtmp.flv.config
1717

1818
class FLVVideoConfig(
1919
override val mediaType: VideoMediaType,
@@ -80,7 +80,11 @@ class AVCHEVCFourCC(
8080
* A meta class for [CodecID] and [VideoFourCC].
8181
*/
8282
enum class VideoMediaType(val codecID: CodecID?, val fourCCs: VideoFourCC?) {
83-
H263(CodecID.SORENSON_H263, null),
83+
SCREEN_1(CodecID.SCREEN_1, null),
84+
VP6(CodecID.VP6, null),
85+
VP6_ALPHA(CodecID.VP6_ALPHA, null),
86+
SCREEN_2(CodecID.SCREEN_2, null),
87+
SORENSON_H263(CodecID.SORENSON_H263, null),
8488
AVC(CodecID.AVC, VideoFourCC.AVC),
8589
HEVC(null, VideoFourCC.HEVC),
8690
VP8(null, VideoFourCC.VP8),

flv/src/commonMain/kotlin/io/github/thibaultbee/krtmp/flv/models/config/FourCC.kt renamed to flv/src/commonMain/kotlin/io/github/thibaultbee/krtmp/flv/config/FourCC.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package io.github.thibaultbee.krtmp.flv.models.config
16+
package io.github.thibaultbee.krtmp.flv.config
1717

1818
/**
1919
* FourCC is a 4 bytes code used to identify a codec.

flv/src/commonMain/kotlin/io/github/thibaultbee/krtmp/flv/models/sources/ByteArrayRawSource.kt renamed to flv/src/commonMain/kotlin/io/github/thibaultbee/krtmp/flv/sources/ByteArrayRawSource.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16-
package io.github.thibaultbee.krtmp.flv.models.sources
16+
package io.github.thibaultbee.krtmp.flv.sources
1717

1818
import kotlinx.io.Buffer
1919
import kotlinx.io.RawSource

0 commit comments

Comments
 (0)