|
@@ -591,11 +591,13 @@ public class PQGPUImagePlayerView: UIView {
|
|
//画面的比例
|
|
//画面的比例
|
|
let canverAspectRatio = String(format: "%.6f",(movie?.mShowVidoSize.width ?? 0.0) / (movie?.mShowVidoSize.height ?? 0.0))
|
|
let canverAspectRatio = String(format: "%.6f",(movie?.mShowVidoSize.width ?? 0.0) / (movie?.mShowVidoSize.height ?? 0.0))
|
|
if(showFilter.stickerInfo?.type == StickerType.IMAGE.rawValue && showGaussianBlur && Float(stickerAspectRatio) != Float(canverAspectRatio)){
|
|
if(showFilter.stickerInfo?.type == StickerType.IMAGE.rawValue && showGaussianBlur && Float(stickerAspectRatio) != Float(canverAspectRatio)){
|
|
|
|
+ FilterLog(message: "显示图片filter")
|
|
// //高斯层
|
|
// //高斯层
|
|
let blurStickerModel:PQEditVisionTrackMaterialsModel? = showFilter.stickerInfo?.copy() as? PQEditVisionTrackMaterialsModel
|
|
let blurStickerModel:PQEditVisionTrackMaterialsModel? = showFilter.stickerInfo?.copy() as? PQEditVisionTrackMaterialsModel
|
|
blurStickerModel?.canvasFillType = stickerContentMode.aspectFillStr.rawValue
|
|
blurStickerModel?.canvasFillType = stickerContentMode.aspectFillStr.rawValue
|
|
|
|
|
|
if blurStickerModel == nil {
|
|
if blurStickerModel == nil {
|
|
|
|
+ FilterLog(message: "显示图片filter blurStickerModel is nil")
|
|
return
|
|
return
|
|
}
|
|
}
|
|
let showGaussianFitler:PQBaseFilter = PQImageFilter(sticker: blurStickerModel!, isExport: (movie?.mIsExport) ?? false, showUISize: mCanverSize)
|
|
let showGaussianFitler:PQBaseFilter = PQImageFilter(sticker: blurStickerModel!, isExport: (movie?.mIsExport) ?? false, showUISize: mCanverSize)
|
|
@@ -605,8 +607,10 @@ public class PQGPUImagePlayerView: UIView {
|
|
showGaussianFitler.addTarget(iosb)
|
|
showGaussianFitler.addTarget(iosb)
|
|
|
|
|
|
self.movie?.addTarget(showGaussianFitler, atTargetIndex: 0)
|
|
self.movie?.addTarget(showGaussianFitler, atTargetIndex: 0)
|
|
- iosb.addTarget(showFilter)
|
|
|
|
|
|
+ iosb.addTarget(showFilter,atTargetIndex: 0)
|
|
showFilter.addTarget(self.renderView as ImageConsumer, atTargetIndex: 0)
|
|
showFilter.addTarget(self.renderView as ImageConsumer, atTargetIndex: 0)
|
|
|
|
+
|
|
|
|
+ FilterLog(message: "filter 添加成功 注意是否添加成功。")
|
|
|
|
|
|
// }
|
|
// }
|
|
|
|
|