* Adding #544 Download HDR10 Metadata button in Source Details tab for exporting mastering display and content light level data in x265-compatible format (thanks to yundebian918)

cdgriffith · cdgriffith · commit 38b633291448 · 2026-04-05T18:29:48.000-05:00
diff --git a/CHANGES b/CHANGES
@@ -20,6 +20,7 @@
 * Adding #682 HE-AAC and HE-AAC v2 audio profile selection for AAC and libfdk_aac codecs (thanks to Augusto7743)
 * Adding Reverse Video option in the Advanced panel (applies FFmpeg reverse video filter and areverse audio filter for converted tracks)
 * Adding rigaya encoder support for Equalizer (--vpp-tweak), Denoise (--vpp-nlmeans/knn/pmd), Deblock (--vpp-deblock), Output FPS (--vpp-fps), and Video Track Title — only Video Speed and Reverse Video remain unsupported
+* Adding #544 Download HDR10 Metadata button in Source Details tab for exporting mastering display and content light level data in x265-compatible format (thanks to yundebian918)
 * Adding structured table view to Source Details tab with grouped sections, human-readable value formatting, Download JSON export, and full path tooltips on source/output filename fields
 * Adding warning in Data & Attachments tab and reason text when tracks are incompatible with the output format (e.g. data streams in MKV)
 * Changing Advanced panel layout to use QGroupBox sections (Video Details, Frame Rate, Video Processing, Color & Appearance, Color, Output) with restoration filters separated from color correction filters
@@ -35,6 +36,7 @@
 * Fixing HDR tonemapping failing with zscale "no path between colorspaces" by passing complete source colorspace parameters (primaries, matrix, transfer) to the zscale filter, with fallback retry for crop previews when tonemapping still fails
 * Fixing bitrate combobox being unreadably small on x264 and x265 encoders — combo now sizes to fit its widest item
 * Fixing rigaya encoder pad/letterbox calculation ignoring crop dimensions due to incorrect type check
+* Fixing rigaya encoders (NVEncC, QSVEncC, VCEEncC) crashing with no output when data streams are copied to non-MKV containers — `--data-copy` and `--attachment-copy` are now only emitted for Matroska output
 * Fixing startup crash when queue file exists but is missing the 'queue' key
 
 ## Version 6.2.1
diff --git a/fastflix/data/languages.yaml b/fastflix/data/languages.yaml
@@ -1723,6 +1723,10 @@ Download JSON:
   ukr: Завантажити JSON
   kor: JSON 다운로드
   ron: Descărcați JSON
+Download HDR10:
+  eng: Download HDR10
+Text Files:
+  eng: Text Files
 Download Cancelled:
   deu: Download abgebrochen
   eng: Download Cancelled
@@ -13752,6 +13756,8 @@ Data streams are not supported in this output format:
   ukr: Потоки даних не підтримуються у цьому форматі виводу
   kor: 이 출력 형식에서는 데이터 스트림이 지원되지 않습니다.
   ron: Fluxurile de date nu sunt acceptate în acest format de ieșire
+Data and attachment streams are not supported by hardware encoders for this output format:
+  eng: Data and attachment streams are not supported by hardware encoders for this output format
 Downloading HDR10+ Tool:
   eng: Downloading HDR10+ Tool
   deu: Herunterladen des HDR10+ Tools
diff --git a/fastflix/encoders/common/encc_helpers.py b/fastflix/encoders/common/encc_helpers.py
@@ -268,9 +268,17 @@ def build_subtitle(subtitle_tracks: list[SubtitleTrack], subtitle_streams, video
     return result
 
 
-def build_data(data_tracks: list[DataTrack], data_streams, attachment_streams) -> List[str]:
+def build_data(data_tracks: list[DataTrack], data_streams, attachment_streams, output_path=None) -> List[str]:
     if not data_tracks:
         return []
+
+    # Rigaya encoders can only copy data/attachment streams to Matroska containers.
+    # MP4/MOV and other formats crash because the muxer can't handle data streams.
+    if output_path:
+        ext = str(output_path).rsplit(".", 1)[-1].lower() if "." in str(output_path) else ""
+        if f".{ext}" not in {".mkv", ".mka"}:
+            return []
+
     command_list = []
     data_copies = []
     attachment_copies = []
diff --git a/fastflix/encoders/nvencc_av1/command_builder.py b/fastflix/encoders/nvencc_av1/command_builder.py
@@ -182,7 +182,12 @@ def build(fastflix: FastFlix):
     command.extend(build_audio(video.audio_tracks, video.streams.audio))
     command.extend(build_subtitle(video.subtitle_tracks, video.streams.subtitle, video_height=video.height))
     command.extend(
-        build_data(video.data_tracks, getattr(video.streams, "data", []), getattr(video.streams, "attachment", []))
+        build_data(
+            video.data_tracks,
+            getattr(video.streams, "data", []),
+            getattr(video.streams, "attachment", []),
+            video.video_settings.output_path,
+        )
     )
 
     if settings.extra:
diff --git a/fastflix/encoders/nvencc_avc/command_builder.py b/fastflix/encoders/nvencc_avc/command_builder.py
@@ -152,7 +152,12 @@ def build(fastflix: FastFlix):
     command.extend(build_audio(video.audio_tracks, video.streams.audio))
     command.extend(build_subtitle(video.subtitle_tracks, video.streams.subtitle, video_height=video.height))
     command.extend(
-        build_data(video.data_tracks, getattr(video.streams, "data", []), getattr(video.streams, "attachment", []))
+        build_data(
+            video.data_tracks,
+            getattr(video.streams, "data", []),
+            getattr(video.streams, "attachment", []),
+            video.video_settings.output_path,
+        )
     )
 
     if settings.extra:
diff --git a/fastflix/encoders/nvencc_hevc/command_builder.py b/fastflix/encoders/nvencc_hevc/command_builder.py
@@ -182,7 +182,12 @@ def build(fastflix: FastFlix):
     command.extend(build_audio(video.audio_tracks, video.streams.audio))
     command.extend(build_subtitle(video.subtitle_tracks, video.streams.subtitle, video_height=video.height))
     command.extend(
-        build_data(video.data_tracks, getattr(video.streams, "data", []), getattr(video.streams, "attachment", []))
+        build_data(
+            video.data_tracks,
+            getattr(video.streams, "data", []),
+            getattr(video.streams, "attachment", []),
+            video.video_settings.output_path,
+        )
     )
 
     if settings.extra:
diff --git a/fastflix/encoders/qsvencc_av1/command_builder.py b/fastflix/encoders/qsvencc_av1/command_builder.py
@@ -186,7 +186,12 @@ def build(fastflix: FastFlix):
     command.extend(build_audio(video.audio_tracks, video.streams.audio))
     command.extend(build_subtitle(video.subtitle_tracks, video.streams.subtitle, video_height=video.height))
     command.extend(
-        build_data(video.data_tracks, getattr(video.streams, "data", []), getattr(video.streams, "attachment", []))
+        build_data(
+            video.data_tracks,
+            getattr(video.streams, "data", []),
+            getattr(video.streams, "attachment", []),
+            video.video_settings.output_path,
+        )
     )
 
     if settings.extra:
diff --git a/fastflix/encoders/qsvencc_avc/command_builder.py b/fastflix/encoders/qsvencc_avc/command_builder.py
@@ -165,7 +165,12 @@ def build(fastflix: FastFlix):
     command.extend(build_audio(video.audio_tracks, video.streams.audio))
     command.extend(build_subtitle(video.subtitle_tracks, video.streams.subtitle, video_height=video.height))
     command.extend(
-        build_data(video.data_tracks, getattr(video.streams, "data", []), getattr(video.streams, "attachment", []))
+        build_data(
+            video.data_tracks,
+            getattr(video.streams, "data", []),
+            getattr(video.streams, "attachment", []),
+            video.video_settings.output_path,
+        )
     )
 
     if settings.extra:
diff --git a/fastflix/encoders/qsvencc_hevc/command_builder.py b/fastflix/encoders/qsvencc_hevc/command_builder.py
@@ -186,7 +186,12 @@ def build(fastflix: FastFlix):
     command.extend(build_audio(video.audio_tracks, video.streams.audio))
     command.extend(build_subtitle(video.subtitle_tracks, video.streams.subtitle, video_height=video.height))
     command.extend(
-        build_data(video.data_tracks, getattr(video.streams, "data", []), getattr(video.streams, "attachment", []))
+        build_data(
+            video.data_tracks,
+            getattr(video.streams, "data", []),
+            getattr(video.streams, "attachment", []),
+            video.video_settings.output_path,
+        )
     )
 
     if settings.extra:
diff --git a/fastflix/encoders/vceencc_av1/command_builder.py b/fastflix/encoders/vceencc_av1/command_builder.py
@@ -158,7 +158,12 @@ def build(fastflix: FastFlix):
     command.extend(build_audio(video.audio_tracks, video.streams.audio))
     command.extend(build_subtitle(video.subtitle_tracks, video.streams.subtitle, video_height=video.height))
     command.extend(
-        build_data(video.data_tracks, getattr(video.streams, "data", []), getattr(video.streams, "attachment", []))
+        build_data(
+            video.data_tracks,
+            getattr(video.streams, "data", []),
+            getattr(video.streams, "attachment", []),
+            video.video_settings.output_path,
+        )
     )
 
     if settings.extra:
diff --git a/fastflix/encoders/vceencc_avc/command_builder.py b/fastflix/encoders/vceencc_avc/command_builder.py
@@ -144,7 +144,12 @@ def build(fastflix: FastFlix):
     command.extend(build_audio(video.audio_tracks, video.streams.audio))
     command.extend(build_subtitle(video.subtitle_tracks, video.streams.subtitle, video_height=video.height))
     command.extend(
-        build_data(video.data_tracks, getattr(video.streams, "data", []), getattr(video.streams, "attachment", []))
+        build_data(
+            video.data_tracks,
+            getattr(video.streams, "data", []),
+            getattr(video.streams, "attachment", []),
+            video.video_settings.output_path,
+        )
     )
 
     if settings.extra:
diff --git a/fastflix/encoders/vceencc_hevc/command_builder.py b/fastflix/encoders/vceencc_hevc/command_builder.py
@@ -159,7 +159,12 @@ def build(fastflix: FastFlix):
     command.extend(build_audio(video.audio_tracks, video.streams.audio))
     command.extend(build_subtitle(video.subtitle_tracks, video.streams.subtitle, video_height=video.height))
     command.extend(
-        build_data(video.data_tracks, getattr(video.streams, "data", []), getattr(video.streams, "attachment", []))
+        build_data(
+            video.data_tracks,
+            getattr(video.streams, "data", []),
+            getattr(video.streams, "attachment", []),
+            video.video_settings.output_path,
+        )
     )
 
     if settings.extra:
diff --git a/fastflix/widgets/panels/data_panel.py b/fastflix/widgets/panels/data_panel.py
@@ -112,7 +112,18 @@ def _check_compatibility(self, track: DataTrack = None):
         incompatible = False
         reason = ""
 
-        if track.codec_type == "data" and ext_with_dot in NO_DATA_EXTENSIONS:
+        # Check if current encoder is a rigaya hardware encoder (NVEncC, QSVEncC, VCEEncC)
+        is_rigaya = False
+        try:
+            encoder_name = self.app.fastflix.current_video.video_settings.video_encoder_settings.name
+            is_rigaya = "encc" in encoder_name.lower()
+        except (AttributeError, RuntimeError):
+            pass
+
+        if is_rigaya and ext_with_dot not in {".mkv", ".mka"}:
+            incompatible = True
+            reason = t("Data and attachment streams are not supported by hardware encoders for this output format")
+        elif track.codec_type == "data" and ext_with_dot in NO_DATA_EXTENSIONS:
             incompatible = True
             reason = t("Data streams are not supported in this output format")
         elif track.codec_type == "attachment" and ext_with_dot in NO_ATTACHMENT_EXTENSIONS:
diff --git a/fastflix/widgets/panels/info_panel.py b/fastflix/widgets/panels/info_panel.py
@@ -11,6 +11,7 @@
 from fastflix.language import t
 from fastflix.models.fastflix_app import FastFlixApp
 from fastflix.resources import get_icon
+from fastflix.ui_scale import scaler
 from fastflix.ui_styles import ONYX_COLORS
 
 logger = logging.getLogger("fastflix")
@@ -273,12 +274,29 @@ def __init__(self, parent, app: FastFlixApp):
         self.main = parent.main
         self.attachments = Box()
 
-        self.download_button = QtWidgets.QPushButton(
-            QtGui.QIcon(get_icon("onyx-save", self.app.fastflix.config.theme)), t("Download JSON")
-        )
+        save_icon = QtGui.QIcon(get_icon("onyx-save", self.app.fastflix.config.theme))
+
+        # Expand the tab bar via stylesheet so corner widget buttons fit without clipping
+        self.tabBar().setStyleSheet(f"QTabBar::tab {{ min-height: {scaler.scale(28)}px; }}")
+
+        corner_widget = QtWidgets.QWidget()
+        corner_layout = QtWidgets.QHBoxLayout()
+        corner_layout.setContentsMargins(0, 0, 0, 0)
+        corner_layout.setSpacing(4)
+
+        self.hdr10_button = QtWidgets.QPushButton(save_icon, t("Download HDR10"))
+        self.hdr10_button.setToolTip(t("Download HDR10"))
+        self.hdr10_button.clicked.connect(self.save_hdr10)
+        self.hdr10_button.hide()
+        corner_layout.addWidget(self.hdr10_button)
+
+        self.download_button = QtWidgets.QPushButton(save_icon, t("Download JSON"))
         self.download_button.setToolTip(t("Download JSON"))
         self.download_button.clicked.connect(self.save_json)
-        self.setCornerWidget(self.download_button, QtCore.Qt.Corner.TopRightCorner)
+        corner_layout.addWidget(self.download_button)
+
+        corner_widget.setLayout(corner_layout)
+        self.setCornerWidget(corner_widget, QtCore.Qt.Corner.TopRightCorner)
 
     def reset(self):
         for i in range(self.count() - 1, -1, -1):
@@ -304,6 +322,40 @@ def reset(self):
             tab_bar_height = self.tabBar().sizeHint().height()
             self.setMinimumHeight(max_content_height + tab_bar_height + 16)
 
+        video = self.app.fastflix.current_video
+        if video and (video.master_display or video.cll):
+            self.hdr10_button.show()
+        else:
+            self.hdr10_button.hide()
+
+    def save_hdr10(self):
+        video = self.app.fastflix.current_video
+        if not video:
+            return
+
+        lines = []
+        if video.master_display:
+            md = video.master_display
+            lines.append(f"master-display=G{md.green}B{md.blue}R{md.red}WP{md.white}L{md.luminance}")
+        if video.cll:
+            lines.append(f"max-cll={video.cll}")
+
+        if not lines:
+            return
+
+        source_name = video.source.stem
+        filename = QtWidgets.QFileDialog.getSaveFileName(
+            self,
+            caption=t("Download HDR10"),
+            dir=str(Path("~").expanduser() / f"{source_name}_hdr10.txt"),
+            filter=f"{t('Text Files')} (*.txt)",
+        )
+        if filename and filename[0]:
+            try:
+                Path(filename[0]).write_text("\n".join(lines) + "\n", encoding="utf-8")
+            except Exception:
+                logger.exception("Failed to save HDR10 metadata")
+
     def save_json(self):
         if not self.app.fastflix.current_video:
             return
diff --git a/tests/test_data_panel.py b/tests/test_data_panel.py
@@ -114,6 +114,53 @@ def test_multiple_data_streams(self):
         assert result[idx + 1] == "1,2"
 
 
+class TestBuildDataRigayaOutputFormat:
+    """Rigaya encoders can only copy data/attachment streams to MKV containers."""
+
+    def test_mp4_output_skips_data_copy(self):
+        tracks = [DataTrack(index=5, outdex=3, enabled=True, codec_type="data")]
+        data_streams = [Box({"index": 5})]
+        result = build_data(tracks, data_streams, [], output_path=Path("output.mp4"))
+        assert result == []
+
+    def test_mov_output_skips_data_copy(self):
+        tracks = [DataTrack(index=5, outdex=3, enabled=True, codec_type="data")]
+        data_streams = [Box({"index": 5})]
+        result = build_data(tracks, data_streams, [], output_path=Path("output.mov"))
+        assert result == []
+
+    def test_mkv_output_allows_data_copy(self):
+        tracks = [DataTrack(index=5, outdex=3, enabled=True, codec_type="data")]
+        data_streams = [Box({"index": 5})]
+        result = build_data(tracks, data_streams, [], output_path=Path("output.mkv"))
+        assert "--data-copy" in result
+
+    def test_mkv_output_allows_attachment_copy(self):
+        tracks = [DataTrack(index=10, outdex=5, enabled=True, codec_type="attachment")]
+        attachment_streams = [Box({"index": 10})]
+        result = build_data(tracks, [], attachment_streams, output_path=Path("output.mkv"))
+        assert "--attachment-copy" in result
+
+    def test_mp4_output_skips_attachment_copy(self):
+        tracks = [DataTrack(index=10, outdex=5, enabled=True, codec_type="attachment")]
+        attachment_streams = [Box({"index": 10})]
+        result = build_data(tracks, [], attachment_streams, output_path=Path("output.mp4"))
+        assert result == []
+
+    def test_ts_output_skips_data_copy(self):
+        tracks = [DataTrack(index=5, outdex=3, enabled=True, codec_type="data")]
+        data_streams = [Box({"index": 5})]
+        result = build_data(tracks, data_streams, [], output_path=Path("output.ts"))
+        assert result == []
+
+    def test_no_output_path_allows_data_copy(self):
+        """Backward compatibility: no output_path means no filtering."""
+        tracks = [DataTrack(index=5, outdex=3, enabled=True, codec_type="data")]
+        data_streams = [Box({"index": 5})]
+        result = build_data(tracks, data_streams, [])
+        assert "--data-copy" in result
+
+
 class TestGenerateEndingWithDataTracks:
     def test_with_data_tracks(self):
         tracks = [
