diff --git a/frontend/src/MovieFile/Editor/MovieFileEditorRow.css b/frontend/src/MovieFile/Editor/MovieFileEditorRow.css index 35883e345..9e120d266 100644 --- a/frontend/src/MovieFile/Editor/MovieFileEditorRow.css +++ b/frontend/src/MovieFile/Editor/MovieFileEditorRow.css @@ -38,6 +38,7 @@ } .audioLanguages, +.videoDynamicRangeType, .subtitles { composes: cell from '~Components/Table/Cells/TableRowCell.css'; diff --git a/frontend/src/MovieFile/Editor/MovieFileEditorRow.css.d.ts b/frontend/src/MovieFile/Editor/MovieFileEditorRow.css.d.ts index 2989c594d..02a6e372c 100644 --- a/frontend/src/MovieFile/Editor/MovieFileEditorRow.css.d.ts +++ b/frontend/src/MovieFile/Editor/MovieFileEditorRow.css.d.ts @@ -17,6 +17,7 @@ interface CssExports { 'size': string; 'subtitles': string; 'video': string; + 'videoDynamicRangeType': string; } export const cssExports: CssExports; export default cssExports; diff --git a/frontend/src/MovieFile/Editor/MovieFileEditorRow.js b/frontend/src/MovieFile/Editor/MovieFileEditorRow.js index 89e3900ce..759e780cf 100644 --- a/frontend/src/MovieFile/Editor/MovieFileEditorRow.js +++ b/frontend/src/MovieFile/Editor/MovieFileEditorRow.js @@ -201,8 +201,8 @@ class MovieFileEditorRow extends Component { className={styles.audio} > ); @@ -243,8 +243,22 @@ class MovieFileEditorRow extends Component { className={styles.video} > + + ); + } + + if (name === 'videoDynamicRangeType') { + return ( + + ); diff --git a/frontend/src/MovieFile/MediaInfo.js b/frontend/src/MovieFile/MediaInfo.js index 0c5c20328..e45e4b472 100644 --- a/frontend/src/MovieFile/MediaInfo.js +++ b/frontend/src/MovieFile/MediaInfo.js @@ -42,7 +42,8 @@ function MediaInfo(props) { audioCodec, audioLanguages, subtitles, - videoCodec + videoCodec, + videoDynamicRangeType } = props; if (type === mediaInfoTypes.AUDIO) { @@ -79,6 +80,14 @@ function MediaInfo(props) { ); } + if (type === mediaInfoTypes.VIDEO_DYNAMIC_RANGE_TYPE) { + return ( + + {videoDynamicRangeType} + + ); + } + return null; } @@ -88,7 +97,8 @@ MediaInfo.propTypes = { audioCodec: PropTypes.string, audioLanguages: PropTypes.string, subtitles: PropTypes.string, - videoCodec: PropTypes.string + videoCodec: PropTypes.string, + videoDynamicRangeType: PropTypes.string }; export default MediaInfo; diff --git a/frontend/src/MovieFile/mediaInfoTypes.js b/frontend/src/MovieFile/mediaInfoTypes.js index 425b3d98b..5ff3ee1e4 100644 --- a/frontend/src/MovieFile/mediaInfoTypes.js +++ b/frontend/src/MovieFile/mediaInfoTypes.js @@ -2,3 +2,4 @@ export const AUDIO = 'audio'; export const AUDIO_LANGUAGES = 'audioLanguages'; export const SUBTITLES = 'subtitles'; export const VIDEO = 'video'; +export const VIDEO_DYNAMIC_RANGE_TYPE = 'videoDynamicRangeType'; diff --git a/frontend/src/Store/Actions/movieFileActions.js b/frontend/src/Store/Actions/movieFileActions.js index 51210274a..610fe10c3 100644 --- a/frontend/src/Store/Actions/movieFileActions.js +++ b/frontend/src/Store/Actions/movieFileActions.js @@ -44,6 +44,11 @@ export const defaultState = { label: () => translate('VideoCodec'), isVisible: true }, + { + name: 'videoDynamicRangeType', + label: () => translate('VideoDynamicRange'), + isVisible: false + }, { name: 'audioInfo', label: () => translate('AudioInfo'), diff --git a/src/NzbDrone.Core/Localization/Core/en.json b/src/NzbDrone.Core/Localization/Core/en.json index 0d3983afd..29c155a43 100644 --- a/src/NzbDrone.Core/Localization/Core/en.json +++ b/src/NzbDrone.Core/Localization/Core/en.json @@ -1247,6 +1247,7 @@ "Version": "Version", "VersionUpdateText": "Version {0} of Radarr has been installed, in order to get the latest changes you'll need to reload Radarr.", "VideoCodec": "Video Codec", + "VideoDynamicRange": "Video Dynamic Range", "View": "View", "VisitGithubCustomFormatsAphrodite": "Visit the wiki for more details: ", "Waiting": "Waiting", diff --git a/src/Radarr.Api.V3/MovieFiles/MediaInfoResource.cs b/src/Radarr.Api.V3/MovieFiles/MediaInfoResource.cs index 6f8330648..77efce543 100644 --- a/src/Radarr.Api.V3/MovieFiles/MediaInfoResource.cs +++ b/src/Radarr.Api.V3/MovieFiles/MediaInfoResource.cs @@ -15,8 +15,9 @@ namespace Radarr.Api.V3.MovieFiles public int VideoBitDepth { get; set; } public long VideoBitrate { get; set; } public string VideoCodec { get; set; } - public string VideoDynamicRangeType { get; set; } public decimal VideoFps { get; set; } + public string VideoDynamicRange { get; set; } + public string VideoDynamicRangeType { get; set; } public string Resolution { get; set; } public string RunTime { get; set; } public string ScanType { get; set; } @@ -42,8 +43,9 @@ namespace Radarr.Api.V3.MovieFiles VideoBitDepth = model.VideoBitDepth, VideoBitrate = model.VideoBitrate, VideoCodec = MediaInfoFormatter.FormatVideoCodec(model, sceneName), - VideoDynamicRangeType = MediaInfoFormatter.FormatVideoDynamicRangeType(model), VideoFps = Math.Round(model.VideoFps, 3), + VideoDynamicRange = MediaInfoFormatter.FormatVideoDynamicRange(model), + VideoDynamicRangeType = MediaInfoFormatter.FormatVideoDynamicRangeType(model), Resolution = $"{model.Width}x{model.Height}", RunTime = FormatRuntime(model.RunTime), ScanType = model.ScanType,