|
|
@@ -34,6 +34,7 @@ class MixinVideoUtil private constructor(private val context: Context) : MixinHa
|
|
|
private lateinit var decodeAsyncBgmPath: String
|
|
|
private lateinit var encodeAudioWithBgmPath: String
|
|
|
private lateinit var mixVideoPath: String
|
|
|
+ private lateinit var mixinName: String
|
|
|
|
|
|
private var mixinVideoCallBack: MixinVideoCallBack? = null
|
|
|
private val pausableThreadPool: PausableThreadPool = PausableThreadPool(1)
|
|
|
@@ -53,7 +54,7 @@ class MixinVideoUtil private constructor(private val context: Context) : MixinHa
|
|
|
|
|
|
fun initParams(
|
|
|
videoId: String, bgmPath: String, videoPath: String, durationList: List<Long>, endTimeList: List<Long>, audioDecodePaths: List<String>,
|
|
|
- pathBgmDecodeDir: String, pathBgmRecordSyncDir: String, pathBgmRecordDecodeSyncDir: String, pathVideoMixinDir: String
|
|
|
+ pathBgmDecodeDir: String, pathBgmRecordSyncDir: String, pathBgmRecordDecodeSyncDir: String, pathVideoMixinDir: String, mixinName: String
|
|
|
): MixinVideoUtil {
|
|
|
this.videoId = videoId
|
|
|
this.bgmPath = bgmPath
|
|
|
@@ -65,6 +66,7 @@ class MixinVideoUtil private constructor(private val context: Context) : MixinHa
|
|
|
this.pathBgmRecordSyncDir = pathBgmRecordSyncDir
|
|
|
this.pathBgmRecordDecodeSyncDir = pathBgmRecordDecodeSyncDir
|
|
|
this.pathVideoMixinDir = pathVideoMixinDir
|
|
|
+ this.mixinName = mixinName
|
|
|
return instance!!
|
|
|
}
|
|
|
|
|
|
@@ -150,7 +152,8 @@ class MixinVideoUtil private constructor(private val context: Context) : MixinHa
|
|
|
val videoAudioMixer = VideoAudioMixer(context)
|
|
|
videoAudioMixer.setListener(object : VideoAudioMixer.VideoAudioMixListener {
|
|
|
override fun mixSuccess() {
|
|
|
- mixVideoPath = pathVideoMixinDir + "${videoId}_mix.mp4"
|
|
|
+// mixVideoPath = pathVideoMixinDir + "${videoId}_${System.currentTimeMillis()}.mp4"
|
|
|
+ mixVideoPath = pathVideoMixinDir + mixinName
|
|
|
val msg = Message()
|
|
|
msg.what = HandlerMessage.AUDIO_MIX_VIDIO_FINISHED.value
|
|
|
mixinHandler.sendMessage(msg)
|
|
|
@@ -161,7 +164,7 @@ class MixinVideoUtil private constructor(private val context: Context) : MixinHa
|
|
|
}
|
|
|
})
|
|
|
videoAudioMixer.mux(encodeAudioWithBgmPath, videoPath,
|
|
|
- "${videoId}_mix.mp4", pathVideoMixinDir)
|
|
|
+ mixinName, pathVideoMixinDir)
|
|
|
}
|
|
|
}
|
|
|
|