|
@@ -349,23 +349,15 @@ public class BFRecordExport {
|
|
|
if voiceCount > 0 || videoStickers.count > 1 {
|
|
|
let (audioMix, composition) = mergeAudio(videoStickers: videoStickers, audios: voiceList, synthesisAll: synthesisAll)
|
|
|
|
|
|
- var filters: [PQBaseFilter] = Array()
|
|
|
- for sticker in videoStickers {
|
|
|
- if sticker.type == StickerType.IMAGE.rawValue {
|
|
|
- filters.append(PQImageFilter(sticker: sticker))
|
|
|
- } else if sticker.type == StickerType.VIDEO.rawValue {
|
|
|
- filters.append(PQMovieFilter(movieSticker: sticker))
|
|
|
- }
|
|
|
- }
|
|
|
let outputSize: CGSize = CGSize(width: 1080, height: Int(1080 * CGFloat(UIScreen.main.bounds.size.height / UIScreen.main.bounds.size.width)))
|
|
|
BFLog(message: "输出视频大小:\(outputSize)")
|
|
|
|
|
|
// add by ak 有字幕数据 & 显示字幕开关打开 添加字幕filter
|
|
|
- if titleStickers.count > 0, titleStickers.first?.setting.subtitleIsShow ?? true {
|
|
|
- filters.append(PQSubTitleFilter(st: titleStickers, inputSize: outputSize))
|
|
|
+ var subtitleFilter:PQSubTitleFilter?
|
|
|
+ if titleStickers.count > 0,titleStickers.first?.setting.subtitleIsShow ?? true {
|
|
|
+ subtitleFilter = PQSubTitleFilter(st: titleStickers, inputSize: outputSize)
|
|
|
}
|
|
|
-
|
|
|
- exporter = PQCompositionExporter(asset: composition, videoComposition: nil, audioMix: audioMix, filters: filters, animationTool: nil, exportURL: outPutMP4URL)
|
|
|
+ exporter = PQCompositionExporter(asset: composition, videoComposition: nil, audioMix: audioMix, filters:nil,stickers: videoStickers, animationTool: nil, exportURL: outPutMP4URL,subTitleFilter:subtitleFilter)
|
|
|
|
|
|
var orgeBitRate = Int(outputSize.width * outputSize.height * 3)
|
|
|
|