Skip to content

Commit f54493d

Browse files
committed
fix: sar 导致 pv 导入失败
1 parent 183b3dc commit f54493d

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

MaiChartManager/Controllers/Music/MovieConvertController.cs

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -83,12 +83,13 @@ private static IConversion Concatenate(string vf, params IMediaInfo[] mediaInfos
8383
}
8484

8585
conversion.AddParameter("-filter_complex \"");
86-
var videoStream = mediaInfos.Select((Func<IMediaInfo, IVideoStream>)(x => x.VideoStreams.OrderByDescending<IVideoStream, int>(z => z.Width).First())).OrderByDescending((Func<IVideoStream, int>)(x => x.Width)).First();
8786
for (var index = 0; index < mediaInfos.Length; ++index)
88-
conversion.AddParameter($"[{index}:v] ");
87+
conversion.AddParameter($"[{index}:v]setsar=1[{index}s];");
88+
for (var index = 0; index < mediaInfos.Length; ++index)
89+
conversion.AddParameter($"[{index}s] ");
8990
conversion.AddParameter($"concat=n={mediaInfos.Length}:v=1 [v]; [v]{vf}[vout]\" -map \"[vout]\"");
9091

91-
conversion.AddParameter("-aspect " + videoStream.Ratio);
92+
conversion.AddParameter("-aspect 1:1");
9293
return conversion;
9394
}
9495

@@ -138,10 +139,10 @@ public async Task SetMovie(int id, [FromForm] double padding, IFormFile file, [F
138139
}
139140

140141
var vf = "";
142+
var scale = h264 ? 2160 : 1080;
141143
if (!noScale)
142144
{
143-
var scale = h264 ? 2160 : 1080;
144-
vf = $"scale={scale}:-1,pad=2160:2160:(2160-iw)/2:(2160-ih)/2:black";
145+
vf = $"scale={scale}:-1,pad={scale}:{scale}:({scale}-iw)/2:({scale}-ih)/2:black";
145146
}
146147

147148
if (padding < 0)

0 commit comments

Comments
 (0)