Skip to content

Commit 9993b2b

Browse files
author
tanpengcheng
committed
[fix] Add v1.4.1,fix single player replay file crash.
1 parent 0c7403b commit 9993b2b

File tree

5 files changed

+9
-9
lines changed

5 files changed

+9
-9
lines changed

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,4 +35,4 @@ ANDROID_TARGET_SDK=34
3535
CMAKE_VERSION=3.22.1
3636
NDK_VERSION=24.0.8215888
3737

38-
VERSION_NAME=1.4.0
38+
VERSION_NAME=1.4.1

tmediaplayer/publish.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
GROUP_ID=io.github.tans5
22
ARTIFACT_ID=tmediaplayer
3-
VERSION_NAME=1.4.0
3+
VERSION_NAME=1.4.1
44

55
RELEASE_REPOSITORY_URL=https://s01.oss.sonatype.org/service/local/staging/deploy/maven2
66
SNAPSHOT_REPOSITORY_URL=https://s01.oss.sonatype.org/content/repositories/snapshots

tmediaplayer/src/main/cpp/tmediaplayer/jni.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ Java_com_tans_tmediaplayer_player_tMediaPlayer_moveDecodedAudioFrameToBufferNati
158158
}
159159

160160
extern "C" JNIEXPORT void JNICALL
161-
Java_com_tans_tmediaplayer_player_tMediaPlayer_interruptPacketRead(
161+
Java_com_tans_tmediaplayer_player_tMediaPlayer_interruptPacketReadNative(
162162
JNIEnv * env,
163163
jobject j_player,
164164
jlong native_player) {

tmediaplayer/src/main/java/com/tans/tmediaplayer/player/model/Constants.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ internal const val VIDEO_FRAME_QUEUE_SIZE = 4
1515

1616
internal const val VIDEO_EOF_MAX_CHECK_TIMES = VIDEO_FRAME_QUEUE_SIZE * 2
1717

18-
internal const val AUDIO_FRAME_QUEUE_SIZE = 10
18+
internal const val AUDIO_FRAME_QUEUE_SIZE = 12
1919

20-
internal const val AUDIO_TRACK_QUEUE_SIZE = 12
20+
internal const val AUDIO_TRACK_QUEUE_SIZE = 14
2121

2222
internal const val AUDIO_EOF_MAX_CHECK_TIMES = AUDIO_FRAME_QUEUE_SIZE * 2

tmediaplayer/src/main/java/com/tans/tmediaplayer/player/tMediaPlayer.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ class tMediaPlayer(
143143
// region public methods
144144
@Synchronized
145145
override fun prepare(file: String): OptResult {
146-
getMediaInfo()?.let { releasePacketInternal(it.nativePlayer) }
146+
getMediaInfo()?.let { interruptPacketReadNative(it.nativePlayer) }
147147
synchronized(packetReader) {
148148
synchronized(audioDecoder) {
149149
synchronized(videoDecoder) {
@@ -218,7 +218,7 @@ class tMediaPlayer(
218218
MediaLog.d(TAG, "Prepare player success: mediaInfo=${getMediaInfo()}")
219219
} else {
220220
// Load media file fail.
221-
interruptPacketRead(nativePlayer)
221+
interruptPacketReadNative(nativePlayer)
222222
releaseNative(nativePlayer)
223223
MediaLog.e(TAG, "Prepare player fail.")
224224
dispatchNewState(new = tMediaPlayerState.Error("Prepare player fail."), old = getState())
@@ -411,7 +411,7 @@ class tMediaPlayer(
411411

412412
@Synchronized
413413
override fun release(): OptResult {
414-
getMediaInfo()?.let { interruptPacketRead(it.nativePlayer) }
414+
getMediaInfo()?.let { interruptPacketReadNative(it.nativePlayer) }
415415
synchronized(packetReader) {
416416
synchronized(audioDecoder) {
417417
synchronized(videoDecoder) {
@@ -912,7 +912,7 @@ class tMediaPlayer(
912912

913913
private external fun moveDecodedAudioFrameToBufferNative(nativePlayer: Long, nativeBuffer: Long): Int
914914

915-
private external fun interruptPacketRead(nativePlayer: Long)
915+
private external fun interruptPacketReadNative(nativePlayer: Long)
916916

917917
private external fun releaseNative(nativePlayer: Long)
918918
// endregion

0 commit comments

Comments
 (0)