search

SabreTools / MPF

Redumper/Aaru/DiscImageCreator GUI in C#
GNU General Public License v3.0
427 stars 34 forks source link

[Problem] Only in redumper, BD-ROM-66 is reported incorrectly #617

Closed fuzz6001 closed 9 months ago

fuzz6001 commented 9 months ago

Version

What version are you using?

Build

What runtime version are you using?

Describe the issue

Only in redumper, BD-ROM-66 is reported incorrectly.

Media Type: BD-ROM-50

In DIC, BD-ROM-66 is reported.

Media Type: BD-ROM-66

Incidentally, the PIC files for both match.

To Reproduce

Steps to reproduce the behavior:

  1. Dump by redumper
  2. Run MPF.Check

Expected behavior

Output media type BD-ROM-66.

Additional context

redumper !submissionInfo.txt ``` Common Disc Info: Title: (REQUIRED) Foreign Title (Non-latin): (OPTIONAL) Disc Number / Letter: (OPTIONAL) Disc Title: (OPTIONAL) System: Sony PlayStation 5 Media Type: BD-ROM-50 Category: Games Region: SPACE! (CHANGE THIS) Languages: SILENCE! (CHANGE THIS) Disc Serial: (REQUIRED, IF EXISTS) Ringcode Information: Layer 0 (Outer) Mastering Code (laser branded/etched): (REQUIRED, IF EXISTS) Layer 0 (Outer) Mastering SID Code: (REQUIRED, IF EXISTS) Layer 0 (Outer) Toolstamp or Mastering Code (engraved/stamped): (REQUIRED, IF EXISTS) Data Side Mould SID Code: (REQUIRED, IF EXISTS) Data Side Additional Mould: (REQUIRED, IF EXISTS) Layer 1 (Inner) Mastering Code (laser branded/etched): (REQUIRED, IF EXISTS) Layer 1 (Inner) Mastering SID Code: (REQUIRED, IF EXISTS) Layer 1 (Inner) Toolstamp or Mastering Code (engraved/stamped): (REQUIRED, IF EXISTS) Label Side Mould SID Code: (REQUIRED, IF EXISTS) Barcode: (OPTIONAL) Comments: (OPTIONAL) Contents: (OPTIONAL) Version and Editions: Version: Edition/Release: (VERIFY THIS) Original Extras: Primary Volume Descriptor (PVD): 0320 : 20 20 20 20 20 20 20 20 20 20 20 20 20 32 30 32 202 0330 : 33 30 36 30 32 31 38 33 34 30 39 31 36 00 30 30 3060218340916.00 0340 : 30 30 30 30 30 30 30 30 30 30 30 30 30 30 00 30 00000000000000.0 0350 : 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 00 000000000000000. 0360 : 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 0000000000000000 0370 : 00 01 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ Permanent Information & Control (PIC): 10020000444901100000200042445532 2905030001000000036C719F00100000 01089BFE000000000000000000000000 00000000000000000000000000000000 00000000444901110001200042445532 2905030001000000036C719F02F76400 03EFFFFE000000000000000000000000 00000000000000000000000000000000 00000000 Size & Checksum: Size: 49078403072 CRC32: e6f99e72 MD5: d1a8339132656306f4813ead467f55bd SHA1: 5361a54d795d4bc65de8280b3a69052371dbf13e Dumping Info: Dumping Program: Redumper v2023.12.25 build_302 Date: 2024-01-01 13:26:26 Manufacturer: ASUS Model: BW-16D1HT Firmware: 3.02 (W000800KLGK8LF2132) Reported Disc Type: BD-ROM ```
redumper logs ``` === 2024-01-01 21:29:33 ======================================================== redumper v2023.12.25 build_302 [Dec 26 2023, 00:00:02] arguments: bd --verbose --drive=n: --speed=8 --retries=20 --image-name=dump drive path: n: drive: ASUS - BW-16D1HT (revision level: 3.02, vendor specific: W000800KLGK8LF2132) drive configuration: LG_ASU3 (read offset: +6, C2 shift: 0, pre-gap start: -135, read method: BE_CDDA, sector order: DATA_C2_SUB) drive read speed: 36000 KB current profile: BD-ROM image path: . image name: dump *** DUMP disc structure: DI { format: 1, layer: 0, sequence number: 0, unit size: 32, continuation: 0 } disc type: BDU disc size: 120mm disc class: 3 disc version: 2 layers count: 2 channel length: reserved3 polarity: 3 BCA: no PSN last { PSN: 57438623, hPSN: 0x36C719F } AUN { PSN: [1048576 .. 17341438], length: 16292864, hPSN: [0x100000 .. 0x1089BFE] } DI { format: 1, layer: 1, sequence number: 1, unit size: 32, continuation: 0 } disc type: BDU disc size: 120mm disc class: 3 disc version: 2 layers count: 2 channel length: reserved3 polarity: 3 BCA: no PSN last { PSN: 57438623, hPSN: 0x36C719F } AUN { PSN: [49767424 .. 66060286], length: 16292864, hPSN: [0x2F76400 .. 0x3EFFFFE] } layer break: 16292864 media errors: SCSI: 0 *** REFINE (time check: 1805s) *** HASH dat: *** INFO ISO9660 [dump.iso]: volume identifier: PS5VOLUME PVD: 0320 : 20 20 20 20 20 20 20 20 20 20 20 20 20 32 30 32 202 0330 : 33 30 36 30 32 31 38 33 34 30 39 31 36 00 30 30 3060218340916.00 0340 : 30 30 30 30 30 30 30 30 30 30 30 30 30 30 00 30 00000000000000.0 0350 : 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 00 000000000000000. 0360 : 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 0000000000000000 0370 : 00 01 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ *** SKELETON *** END (time check: 1606s) ```
DIC !submissionInfo.txt ``` Common Disc Info: Title: (REQUIRED) Foreign Title (Non-latin): (OPTIONAL) Disc Number / Letter: (OPTIONAL) Disc Title: (OPTIONAL) System: Sony PlayStation 5 Media Type: BD-ROM-66 Category: Games Region: SPACE! (CHANGE THIS) Languages: SILENCE! (CHANGE THIS) Disc Serial: (REQUIRED, IF EXISTS) Ringcode Information: Layer 0 (Outer) Mastering Code (laser branded/etched): (REQUIRED, IF EXISTS) Layer 0 (Outer) Mastering SID Code: (REQUIRED, IF EXISTS) Layer 0 (Outer) Toolstamp or Mastering Code (engraved/stamped): (REQUIRED, IF EXISTS) Data Side Mould SID Code: (REQUIRED, IF EXISTS) Data Side Additional Mould: (REQUIRED, IF EXISTS) Layer 1 (Inner) Mastering Code (laser branded/etched): (REQUIRED, IF EXISTS) Layer 1 (Inner) Mastering SID Code: (REQUIRED, IF EXISTS) Layer 1 (Inner) Toolstamp or Mastering Code (engraved/stamped): (REQUIRED, IF EXISTS) Label Side Mould SID Code: (REQUIRED, IF EXISTS) Barcode: (OPTIONAL) Comments: [T:ISN] PPSA02269 (OPTIONAL) Contents: (OPTIONAL) Version and Editions: Version: 01.00 Edition/Release: (VERIFY THIS) Original Extras: Primary Volume Descriptor (PVD): 0320 : 20 20 20 20 20 20 20 20 20 20 20 20 20 32 30 32 202 0330 : 33 30 36 30 32 31 38 33 34 30 39 31 36 00 30 30 3060218340916.00 0340 : 30 30 30 30 30 30 30 30 30 30 30 30 30 30 00 30 00000000000000.0 0350 : 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 00 000000000000000. 0360 : 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 30 0000000000000000 0370 : 00 01 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ Permanent Information & Control (PIC): 10020000444901100000200042445532 2905030001000000036C719F00100000 01089BFE000000000000000000000000 00000000000000000000000000000000 00000000444901110001200042445532 2905030001000000036C719F02F76400 03EFFFFE000000000000000000000000 00000000000000000000000000000000 00000000 Size & Checksum: Size: 49078403072 CRC32: e6f99e72 MD5: d1a8339132656306f4813ead467f55bd SHA1: 5361a54d795d4bc65de8280b3a69052371dbf13e Dumping Info: Dumping Program: DiscImageCreator 20240101 Date: 2024-01-01 08:19:16 Manufacturer: ASUS Model: BW-16D1HT Firmware: 3.02 Reported Disc Type: 00, BDU ```
Deterous commented 9 months ago

@fuzz6001 would you be able to test this build for me with the same disc/dump: https://ci.appveyor.com/project/Deterous/mpf/build/artifacts I have attempted to fix it with this change: https://github.com/Deterous/MPF/commit/5521f87e29ed4130a749f513c05008377f5d3be5

fuzz6001 commented 9 months ago

@Deterous ~Just now I finished fixing it and was creating PR.~ That code works. Thanks for fixing!

Media Type: BD-ROM-66
Deterous commented 9 months ago

@Deterous ~Just now I finished fixing it and was creating PR.~ That code works. Thanks for fixing!

Media Type: BD-ROM-66

Perfect. If you had solved it differently, let me know, otherwise I'll submit this change as a PR.

fuzz6001 commented 9 months ago

I copied the code for DIC. https://github.com/fuzz6001/MPF/commit/3125ec997566f51e0471b7d381994832479ee03a

https://github.com/SabreTools/MPF/blob/32c12e13326709ba19adfe29ea5d5c200666d045/MPF.Core/Modules/DiscImageCreator/Parameters.cs#L469-L484

Deterous commented 9 months ago

I copied the code for DIC. fuzz6001@3125ec9

Alright, that's the same as what I did, but only the two lines about GetPICIdentifier are needed as the redumper log already provides the layerbreak values (I think).

mnadareski commented 9 months ago

Fixed by https://github.com/SabreTools/MPF/commit/8cb0b37e8008e096a51143f5c59f2d8cb85668de