mirror of
https://github.com/bggRGjQaUbCoE/PiliPlus.git
synced 2026-05-29 12:38:34 +00:00
fix(player): disable audio normalization on missing audio input (#1865)
* fix(player): disable audio normalization on missing audio input * fix(player): skip normalization when local audio input is missing * fix `hasDashAudio` --------- Co-authored-by: dom <githubaccount56556@proton.me>
This commit is contained in:
@@ -161,6 +161,7 @@ abstract final class DownloadHttp {
|
||||
dashDrmType: 0,
|
||||
),
|
||||
];
|
||||
entry.hasDashAudio = true;
|
||||
}
|
||||
return Type2(
|
||||
duration: dash.duration!,
|
||||
|
||||
@@ -7,7 +7,7 @@ import 'package:get/route_manager.dart';
|
||||
|
||||
class BiliDownloadEntryInfo with MultiSelectData {
|
||||
int mediaType;
|
||||
final bool hasDashAudio;
|
||||
bool hasDashAudio;
|
||||
bool isCompleted;
|
||||
int totalBytes;
|
||||
int downloadedBytes;
|
||||
|
||||
@@ -687,6 +687,7 @@ class VideoDetailController extends GetxController
|
||||
dir: args['dirPath'],
|
||||
typeTag: entry.typeTag!,
|
||||
isMp4: entry.mediaType == 1,
|
||||
hasDashAudio: entry.hasDashAudio,
|
||||
)
|
||||
: NetworkSource(
|
||||
videoSource: video ?? videoUrl!,
|
||||
|
||||
@@ -788,33 +788,32 @@ class PlPlayerController with BlockConfigMixin {
|
||||
extras['audio-files'] =
|
||||
'"${Platform.isWindows ? audio.replaceAll(';', r'\;') : audio.replaceAll(':', r'\:')}"';
|
||||
}
|
||||
}
|
||||
|
||||
if (kDebugMode || Platform.isAndroid) {
|
||||
String audioNormalization = AudioNormalization.getParamFromConfig(
|
||||
Pref.audioNormalization,
|
||||
);
|
||||
if (volume != null && volume.isNotEmpty) {
|
||||
audioNormalization = audioNormalization.replaceFirstMapped(
|
||||
loudnormRegExp,
|
||||
(i) =>
|
||||
'loudnorm=${volume.format(
|
||||
Map.fromEntries(
|
||||
i.group(1)!.split(':').map((item) {
|
||||
final parts = item.split('=');
|
||||
return MapEntry(parts[0].toLowerCase(), num.parse(parts[1]));
|
||||
}),
|
||||
),
|
||||
)}',
|
||||
if (kDebugMode || Platform.isAndroid) {
|
||||
String audioNormalization = AudioNormalization.getParamFromConfig(
|
||||
Pref.audioNormalization,
|
||||
);
|
||||
} else {
|
||||
audioNormalization = audioNormalization.replaceFirst(
|
||||
loudnormRegExp,
|
||||
AudioNormalization.getParamFromConfig(Pref.fallbackNormalization),
|
||||
);
|
||||
}
|
||||
if (audioNormalization.isNotEmpty) {
|
||||
extras['lavfi-complex'] = '"[aid1] $audioNormalization [ao]"';
|
||||
if (volume != null && volume.isNotEmpty) {
|
||||
audioNormalization = audioNormalization.replaceFirstMapped(
|
||||
loudnormRegExp,
|
||||
(i) =>
|
||||
'loudnorm=${volume.format(
|
||||
Map.fromEntries(
|
||||
i.group(1)!.split(':').map((item) {
|
||||
final parts = item.split('=');
|
||||
return MapEntry(parts[0].toLowerCase(), num.parse(parts[1]));
|
||||
}),
|
||||
),
|
||||
)}',
|
||||
);
|
||||
} else {
|
||||
audioNormalization = audioNormalization.replaceFirst(
|
||||
loudnormRegExp,
|
||||
AudioNormalization.getParamFromConfig(Pref.fallbackNormalization),
|
||||
);
|
||||
}
|
||||
if (audioNormalization.isNotEmpty) {
|
||||
extras['lavfi-complex'] = '"[aid1] $audioNormalization [ao]"';
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -840,21 +839,21 @@ class PlPlayerController with BlockConfigMixin {
|
||||
SmartDialog.showToast('视频源为空,请重新进入本页面');
|
||||
return false;
|
||||
}
|
||||
String? audioUri;
|
||||
if (!isLive) {
|
||||
if (dataSource.audioSource.isNullOrEmpty) {
|
||||
SmartDialog.showToast('音频源为空');
|
||||
final Map<String, String> extras = {};
|
||||
String video = dataSource.videoSource;
|
||||
if (dataSource.audioSource case final audio? when (audio.isNotEmpty)) {
|
||||
if (onlyPlayAudio.value) {
|
||||
video = audio;
|
||||
} else {
|
||||
audioUri = Platform.isWindows
|
||||
? dataSource.audioSource!.replaceAll(';', '\\;')
|
||||
: dataSource.audioSource!.replaceAll(':', '\\:');
|
||||
extras['audio-files'] =
|
||||
'"${Platform.isWindows ? audio.replaceAll(';', r'\;') : audio.replaceAll(':', r'\:')}"';
|
||||
}
|
||||
}
|
||||
await _videoPlayerController!.open(
|
||||
Media(
|
||||
dataSource.videoSource,
|
||||
video,
|
||||
start: position,
|
||||
extras: audioUri == null ? null : {'audio-files': '"$audioUri"'},
|
||||
extras: extras.isEmpty ? null : extras,
|
||||
),
|
||||
play: true,
|
||||
);
|
||||
|
||||
@@ -25,6 +25,7 @@ class FileSource extends DataSource {
|
||||
FileSource({
|
||||
required this.dir,
|
||||
required this.isMp4,
|
||||
required bool hasDashAudio,
|
||||
required String typeTag,
|
||||
}) : super(
|
||||
videoSource: path.join(
|
||||
@@ -32,7 +33,7 @@ class FileSource extends DataSource {
|
||||
typeTag,
|
||||
isMp4 ? PathUtils.videoNameType1 : PathUtils.videoNameType2,
|
||||
),
|
||||
audioSource: isMp4
|
||||
audioSource: isMp4 || !hasDashAudio
|
||||
? null
|
||||
: path.join(dir, typeTag, PathUtils.audioNameType2),
|
||||
);
|
||||
|
||||
@@ -138,7 +138,7 @@ class DownloadService extends GetxService {
|
||||
final currentTime = DateTime.now().millisecondsSinceEpoch ~/ 1000;
|
||||
final entry = BiliDownloadEntryInfo(
|
||||
mediaType: 2,
|
||||
hasDashAudio: true,
|
||||
hasDashAudio: false,
|
||||
isCompleted: false,
|
||||
totalBytes: 0,
|
||||
downloadedBytes: 0,
|
||||
@@ -206,7 +206,7 @@ class DownloadService extends GetxService {
|
||||
);
|
||||
final entry = BiliDownloadEntryInfo(
|
||||
mediaType: 2,
|
||||
hasDashAudio: true,
|
||||
hasDashAudio: false,
|
||||
isCompleted: false,
|
||||
totalBytes: 0,
|
||||
downloadedBytes: 0,
|
||||
|
||||
Reference in New Issue
Block a user