dvd/xbox.ixx (1)

330-385: Consider clamping negative L1 padding length before inserting ranges.

If ss_psn_first <= layer0_last, l1_padding_length becomes negative, which can create an inverted range in insert_range. A small clamp keeps this defensive.

🧰 Suggested tweak

     int32_t psn_first = sign_extend<24>(endian_swap(layer0_ld.data_start_sector));
     int32_t layer0_last = sign_extend<24>(endian_swap(layer0_ld.layer0_end_sector));
     int32_t ss_psn_first = sign_extend<24>(endian_swap(sld.ld.data_start_sector));

     int32_t l1_padding_length = ss_psn_first - layer0_last - 1;
+    if(l1_padding_length < 0)
+        l1_padding_length = 0;
     if(xgd_version(ss_layer0_last) == 3)
         l1_padding_length += 4096;

options.ixx (1)

412-412: Help text placement could be improved.

The --dvd-raw option is grouped under "drive specific" section, which is appropriate, but there's a missing newline before the next option (--mediatek-skip-leadout), which breaks the visual flow of the help output. Consider verifying the help output formatting.

dvd/dvd_raw.ixx (3)

21-25: MediatekCacheFrame struct is defined but unused.

This struct appears to be prepared for the TODO on line 40 (cmd_mediatek_read_cache). Consider adding a comment indicating its intended future use, or removing it until the cache read functionality is implemented.

---

28-41: TODO comments indicate incomplete implementation gates.

The function works but has two outstanding TODOs:

1. Line 37: OmniDrive check should gate this code path
2. Line 40: Mediatek cache read alternative is not implemented

These are appropriate markers for future work. Ensure these are tracked for follow-up.

Would you like me to open issues to track these TODO items?

---

34-34: Consider simplifying the address arithmetic.

address += -DVD_LBA_START is equivalent to address -= DVD_LBA_START. The current form works but the subtraction is more idiomatic.

♻️ Suggested simplification

-        address += -DVD_LBA_START;
+        address -= DVD_LBA_START;

systems/gc.ixx (1)

32-38: Consider adding error handling for failed reads.

If data_reader->read fails or returns less data than expected, the code continues to access header->magic which could contain uninitialized data. Consider checking the return value or initializing header_data to zero.

♻️ Suggested improvement

     void printInfo(std::ostream &os, DataReader *data_reader, const std::filesystem::path &track_path, bool) const override
     {
-        std::vector<uint8_t> header_data(FORM1_DATA_SIZE);
+        std::vector<uint8_t> header_data(FORM1_DATA_SIZE, 0);
         data_reader->read((uint8_t *)header_data.data(), 0, 1);
         auto header = (Header *)header_data.data();
         if(header->magic != _GC_MAGIC)
             return;

dvd/dvd_split.ixx (2)

134-135: Use std::ifstream::binary for the input file stream.

While std::ofstream::binary and std::ifstream::binary have the same underlying value (std::ios::binary), using std::ofstream::binary for an ifstream is misleading to readers.

♻️ Suggested fix

-    std::ifstream raw_fs(raw_path, std::ofstream::binary);
-    std::ofstream iso_fs(iso_path, std::ofstream::binary);
+    std::ifstream raw_fs(raw_path, std::ifstream::binary);
+    std::ofstream iso_fs(iso_path, std::ofstream::binary);

---

175-190: Consider adding progress feedback and interrupt handling.

The infinite loop lacks progress reporting and interrupt handling, unlike the dump loop in dvd_dump.ixx. For large DVD images, users have no visibility into the descrambling progress.

dvd/dvd_scrambler.ixx (1)

45-48: Implicit floating-point to integer conversion for Nintendo offset.

The expression ((*key ^ (psn >> 4 & 0xF)) + 7.5) * FORM1_DATA_SIZE uses floating-point arithmetic that gets implicitly truncated to uint32_t. Consider making the truncation explicit if this is intentional.

♻️ Suggested explicit cast

         // custom XOR table offset for nintendo
         if(key)
-            offset = ((*key ^ (psn >> 4 & 0xF)) + 7.5) * FORM1_DATA_SIZE;
+            offset = static_cast<uint32_t>(((*key ^ (psn >> 4 & 0xF)) + 7.5) * FORM1_DATA_SIZE);