aaru-dps/Aaru
1
0
Fork 0
mirror of https://github.com/aaru-dps/Aaru.git synced 2025-12-16 19:24:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

* DiscImageChef/Commands/MediaInfo.cs:

Browse Source 
DCB was incorrectly being asked to HD DVD instead of DVD+.

	* DiscImageChef.Decoders/DVD/CSS&CPRM.cs:
	  Must return value.
This commit is contained in:
Natalia Portillo
2015-12-01 04:25:01 +00:00
parent 06f00c93f9
commit 94f14feeb7
4 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
DiscImageChef.Decoders/ChangeLog
View File

@@ -1,3 +1,8 @@
2015-12-01 Natalia Portillo <claunia@claunia.com>
* DVD/CSS&CPRM.cs:
Must return value.
2015-12-01 Natalia Portillo <claunia@claunia.com> 2015-12-01 Natalia Portillo <claunia@claunia.com>
* DVD/CSS&CPRM.cs: * DVD/CSS&CPRM.cs:

2
DiscImageChef.Decoders/DVD/CSS&CPRM.cs
View File

@@ -138,6 +138,8 @@ namespace DiscImageChef.Decoders.DVD
cmi.RegionInformation = response[5]; cmi.RegionInformation = response[5];
cmi.Reserved3 = response[6]; cmi.Reserved3 = response[6];
cmi.Reserved4 = response[7]; cmi.Reserved4 = response[7];
return cmi;
} }
public static string PrettifyLeadInCopyright(LeadInCopyright? cmi) public static string PrettifyLeadInCopyright(LeadInCopyright? cmi)

5
DiscImageChef/ChangeLog
View File

@@ -1,3 +1,8 @@
2015-12-01 Natalia Portillo <claunia@claunia.com>
* Commands/MediaInfo.cs:
DCB was incorrectly being asked to HD DVD instead of DVD+.
2015-12-01 Natalia Portillo <claunia@claunia.com> 2015-12-01 Natalia Portillo <claunia@claunia.com>
* Commands/MediaInfo.cs: * Commands/MediaInfo.cs:

14
DiscImageChef/Commands/MediaInfo.cs
View File

@@ -480,7 +480,13 @@ namespace DiscImageChef.Commands
if(sense) if(sense)
DicConsole.ErrorWriteLine("READ DISC STRUCTURE: ADIP\n{0}", Decoders.SCSI.Sense.PrettifySense(senseBuf)); DicConsole.ErrorWriteLine("READ DISC STRUCTURE: ADIP\n{0}", Decoders.SCSI.Sense.PrettifySense(senseBuf));
else else
doWriteFile(outputPrefix, "_readdiscstructure_dvd_adip.bin", "SCSI READ DISC STRUCTURE", cmdBuf); doWriteFile(outputPrefix, "_readdiscstructure_dvd+_adip.bin", "SCSI READ DISC STRUCTURE", cmdBuf);
sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.DVD, 0, 0, MmcDiscStructureFormat.DCB, 0, dev.Timeout, out duration);
if(sense)
DicConsole.ErrorWriteLine("READ DISC STRUCTURE: DCB\n{0}", Decoders.SCSI.Sense.PrettifySense(senseBuf));
else
doWriteFile(outputPrefix, "_readdiscstructure_dvd+_dcb.bin", "SCSI READ DISC STRUCTURE", cmdBuf);
} }
#endregion All DVD+ #endregion All DVD+
@@ -492,12 +498,6 @@ namespace DiscImageChef.Commands
DicConsole.ErrorWriteLine("READ DISC STRUCTURE: HDDVD CMI\n{0}", Decoders.SCSI.Sense.PrettifySense(senseBuf)); DicConsole.ErrorWriteLine("READ DISC STRUCTURE: HDDVD CMI\n{0}", Decoders.SCSI.Sense.PrettifySense(senseBuf));
else else
doWriteFile(outputPrefix, "_readdiscstructure_hddvd_cmi.bin", "SCSI READ DISC STRUCTURE", cmdBuf); doWriteFile(outputPrefix, "_readdiscstructure_hddvd_cmi.bin", "SCSI READ DISC STRUCTURE", cmdBuf);
sense = dev.ReadDiscStructure(out cmdBuf, out senseBuf, MmcDiscStructureMediaType.DVD, 0, 0, MmcDiscStructureFormat.DCB, 0, dev.Timeout, out duration);
if(sense)
DicConsole.ErrorWriteLine("READ DISC STRUCTURE: DCB\n{0}", Decoders.SCSI.Sense.PrettifySense(senseBuf));
else
doWriteFile(outputPrefix, "_readdiscstructure_dvd_dcb.bin", "SCSI READ DISC STRUCTURE", cmdBuf);
} }
#endregion HD DVD-ROM #endregion HD DVD-ROM