TerribleDev/ente
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: add mechanism to show the stream details

Browse Source
This commit is contained in:
Prateek Sunal
2025-02-01 03:35:01 +05:30
parent bc7400c0a2
commit 47914126e5
6 changed files with 106 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mobile/lib/models/ffmpeg/ffprobe_props.dart
View File

@@ -105,7 +105,7 @@ class FFProbeProps {
switch (stringKey) {
case FFProbeKeys.bitrate:
case FFProbeKeys.bps:
result.bitrate = _formatMetric(json[key], 'b/s');
result.bitrate = formatBitrate(json[key], 'b/s');
parsedData[stringKey] = result.bitrate;
break;
case FFProbeKeys.byteCount:
@@ -369,7 +369,7 @@ class FFProbeProps {
return null;
}
static String? _formatMetric(dynamic size, String unit, {int round = 2}) {
static String? formatBitrate(dynamic size, String unit, {int round = 2}) {
if (size == null) return null;
if (size is String) {
final parsed = int.tryParse(size);

3
mobile/lib/ui/viewer/file/file_app_bar.dart
View File

@@ -300,7 +300,8 @@ class FileAppBarState extends State<FileAppBar> {
);
}
}
if (flagService.internalUser) {
if (flagService.internalUser &&
PreviewVideoStore.instance.isVideoStreamingEnabled) {
items.add(
PopupMenuItem(
value: 99,

13
mobile/lib/ui/viewer/file/file_details_widget.dart
View File

@@ -32,6 +32,7 @@ import 'package:photos/ui/viewer/file_details/exif_item_widgets.dart';
import "package:photos/ui/viewer/file_details/faces_item_widget.dart";
import "package:photos/ui/viewer/file_details/file_properties_item_widget.dart";
import "package:photos/ui/viewer/file_details/location_tags_widget.dart";
import "package:photos/ui/viewer/file_details/preview_properties_item_widget.dart";
import "package:photos/ui/viewer/file_details/video_exif_item.dart";
import "package:photos/utils/exif_util.dart";
import "package:photos/utils/file_util.dart";
@@ -177,6 +178,18 @@ class _FileDetailsWidgetState extends State<FileDetailsWidget> {
),
),
const FileDetailsDivider(),
if (widget.file.pubMagicMetadata?.previewSize != null) ...[
ValueListenableBuilder(
valueListenable: _exifNotifier,
builder: (context, _, __) => PreviewPropertiesItemWidget(
file,
_isImage,
_exifData,
_currentUserID,
),
),
const FileDetailsDivider(),
],
]);
fileDetailsTiles.add(
ValueListenableBuilder(

6
mobile/lib/ui/viewer/file/preview_status_widget.dart
View File

@@ -70,9 +70,9 @@ class _PreviewStatusWidgetState extends State<PreviewStatusWidget> {
?.containsKey(widget.file.uploadedFileID) ??
false);
// if (widget.file.localID != null && preview == null) {
// return const SizedBox();
// }
if (widget.file.localID != null && preview == null) {
return const SizedBox();
}
final isInProgress = preview?.status == PreviewItemStatus.compressing ||
preview?.status == PreviewItemStatus.uploading;
final isInQueue = preview?.status == PreviewItemStatus.inQueue ||

9
mobile/lib/ui/viewer/file_details/file_properties_item_widget.dart
View File

@@ -48,6 +48,7 @@ class _FilePropertiesItemWidgetState extends State<FilePropertiesItemWidget> {
}
Future<List<Widget>> _subTitleSection() async {
final textStyle = getEnteTextTheme(context).miniMuted;
final StringBuffer dimString = StringBuffer();
if (widget.exifData["resolution"] != null &&
widget.exifData["megaPixels"] != null) {
@@ -66,7 +67,7 @@ class _FilePropertiesItemWidgetState extends State<FilePropertiesItemWidget> {
subSectionWidgets.add(
Text(
dimString.toString(),
style: getEnteTextTheme(context).miniMuted,
style: textStyle,
),
);
}
@@ -80,7 +81,7 @@ class _FilePropertiesItemWidgetState extends State<FilePropertiesItemWidget> {
subSectionWidgets.add(
Text(
formatBytes(fileSize),
style: getEnteTextTheme(context).miniMuted,
style: textStyle,
),
);
@@ -90,7 +91,7 @@ class _FilePropertiesItemWidgetState extends State<FilePropertiesItemWidget> {
subSectionWidgets.add(
Text(
secondsToHHMMSS(widget.file.duration!),
style: getEnteTextTheme(context).miniMuted,
style: textStyle,
),
);
} else {
@@ -98,7 +99,7 @@ class _FilePropertiesItemWidgetState extends State<FilePropertiesItemWidget> {
subSectionWidgets.add(
Text(
asset?.videoDuration.toString().split(".")[0] ?? "",
style: getEnteTextTheme(context).miniMuted,
style: textStyle,
),
);
}

81
mobile/lib/ui/viewer/file_details/preview_properties_item_widget.dart Normal file
View File

@@ -0,0 +1,81 @@
import "package:flutter/material.dart";
import "package:photos/models/ffmpeg/ffprobe_props.dart";
import 'package:photos/models/file/file.dart';
import "package:photos/models/file/file_type.dart";
import "package:photos/theme/ente_theme.dart";
import "package:photos/ui/components/info_item_widget.dart";
import "package:photos/utils/data_util.dart";
class PreviewPropertiesItemWidget extends StatefulWidget {
final EnteFile file;
final bool isImage;
final Map<String, dynamic> exifData;
final int currentUserID;
const PreviewPropertiesItemWidget(
this.file,
this.isImage,
this.exifData,
this.currentUserID, {
super.key,
});
@override
State<PreviewPropertiesItemWidget> createState() =>
_PreviewPropertiesItemWidgetState();
}
class _PreviewPropertiesItemWidgetState
extends State<PreviewPropertiesItemWidget> {
@override
Widget build(BuildContext context) {
return InfoItemWidget(
key: const ValueKey("Stream properties"),
leadingIcon: Icons.play_circle_outline,
title: "Stream Details",
subtitleSection: _subTitleSection(),
);
}
Future<List<Widget>> _subTitleSection() async {
final textStyle = getEnteTextTheme(context).miniMuted;
final subSectionWidgets = <Widget>[];
if (widget.file.pubMagicMetadata?.previewWidth != null &&
widget.file.pubMagicMetadata?.previewHeight != null) {
subSectionWidgets.add(
Text(
"${widget.file.pubMagicMetadata?.previewWidth}x${widget.file.pubMagicMetadata?.previewHeight}",
style: textStyle,
),
);
}
if (widget.file.pubMagicMetadata?.previewSize != null) {
subSectionWidgets.add(
Text(
formatBytes(widget.file.pubMagicMetadata!.previewSize!),
style: textStyle,
),
);
}
if ((widget.file.fileType == FileType.video) &&
(widget.file.localID != null || widget.file.duration != 0) &&
widget.file.pubMagicMetadata!.previewSize != null) {
// show bitrate, i.e. size * 8 / duration formatted
final result = FFProbeProps.formatBitrate(
widget.file.pubMagicMetadata!.previewSize! * 8 / widget.file.duration!,
"b/s",
);
if (result != null) {
subSectionWidgets.add(
Text(
result,
style: textStyle,
),
);
}
}
return Future.value(subSectionWidgets);
}
}