SGPlayer: scalingMode.

nickarora · Jun 27, 2019 · 6b48b21 · 6b48b21
1 parent 1744d1a
commit 6b48b21
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/SGPlayer/Classes/Core/SGDefine/SGMapping.h b/SGPlayer/Classes/Core/SGDefine/SGMapping.h
@@ -9,15 +9,15 @@
 #import <Foundation/Foundation.h>
 #import "SGGLTextureUploader.h"
 #import "SGVideoRenderer.h"
-#import "SGGLViewport.h"
+#import "SGMetalViewport.h"
 #import "SGGLProgram.h"
 #import "SGGLModel.h"
 #import "SGFFmpeg.h"
 
 // FF/SG -> GL
 SGGLModelType SGDisplay2Model(SGDisplayMode displayMode);
 SGGLProgramType SGFormat2Program(enum AVPixelFormat format, CVPixelBufferRef pixelBuffer);
-SGGLViewportMode SGScaling2Viewport(SGScalingMode scalingMode);
+SGMetalViewportMode SGScaling2Viewport(SGScalingMode scalingMode);
 
 // FF <-> SG
 SGMediaType SGMediaTypeFF2SG(enum AVMediaType mediaType);

diff --git a/SGPlayer/Classes/Core/SGDefine/SGMapping.m b/SGPlayer/Classes/Core/SGDefine/SGMapping.m
@@ -37,17 +37,17 @@ SGGLProgramType SGFormat2Program(enum AVPixelFormat format, CVPixelBufferRef pix
     }
 }
 
-SGGLViewportMode SGScaling2Viewport(SGScalingMode scalingMode)
+SGMetalViewportMode SGScaling2Viewport(SGScalingMode scalingMode)
 {
     switch (scalingMode) {
         case SGScalingModeResize:
-            return SGGLViewportModeResize;
+            return SGMetalViewportModeResize;
         case SGScalingModeResizeAspect:
-            return SGGLViewportModeResizeAspect;
+            return SGMetalViewportModeResizeAspect;
         case SGScalingModeResizeAspectFill:
-            return SGGLViewportModeResizeAspectFill;
+            return SGMetalViewportModeResizeAspectFill;
     }
-    return SGGLViewportModeResizeAspect;
+    return SGMetalViewportModeResizeAspect;
 }
 
 SGMediaType SGMediaTypeFF2SG(enum AVMediaType mediaType)

diff --git a/SGPlayer/Classes/Core/SGRenderer/SGVideoRenderer.m b/SGPlayer/Classes/Core/SGRenderer/SGVideoRenderer.m
@@ -404,7 +404,7 @@ - (void)drawInMTKView:(MTKView *)view
     switch (displayMode) {
         case SGDisplayModePlane: {
             ((SGMetalUniforms *)self->_uniformBuffer1.contents)->mvp = matrix_identity_float4x4;
-            viewports[0] = [SGMetalViewport viewportWithLayerSize:layerSize textureSize:textureSize mode:SGMetalViewportModeResizeAspect];
+            viewports[0] = [SGMetalViewport viewportWithLayerSize:layerSize textureSize:textureSize mode:SGScaling2Viewport(self->_scalingMode)];
             uniforms = @[self->_uniformBuffer1];
         }
             break;