Add HD DVD AACS support#939
Open
FakeShemp wants to merge 2 commits into
Open
Conversation
|
|
||
| while(doneSectors < trackSectors) | ||
| { | ||
| if(aborted) |
Comment on lines
+323
to
+367
| foreach(IReadOnlyFilesystem rofs in plugins.Filesystems.Values.OfType<IReadOnlyFilesystem>()) | ||
| { | ||
| if(!rofs.Identify(image, partition)) | ||
| continue; | ||
|
|
||
| if(rofs.Mount(image, partition, encoding, null, null) != ErrorNumber.NoError) | ||
| continue; | ||
|
|
||
| try | ||
| { | ||
| foreach(string path in HddvdTkfPaths) | ||
| { | ||
| if(TryReadFileFromFs(rofs, path, out fileBytes)) | ||
| return true; | ||
| } | ||
|
|
||
| if(rofs.OpenDir("AACS", out IDirNode? dirNode) == ErrorNumber.NoError && dirNode is not null) | ||
| { | ||
| try | ||
| { | ||
| while(true) | ||
| { | ||
| ErrorNumber errno = rofs.ReadDir(dirNode, out string? filename); | ||
|
|
||
| if(errno != ErrorNumber.NoError || filename is null) | ||
| break; | ||
|
|
||
| if(!IsTkfFilename(filename)) | ||
| continue; | ||
|
|
||
| if(TryReadFileFromFs(rofs, "AACS/" + filename, out fileBytes)) | ||
| return true; | ||
| } | ||
| } | ||
| finally | ||
| { | ||
| rofs.CloseDir(dirNode); | ||
| } | ||
| } | ||
| } | ||
| finally | ||
| { | ||
| rofs.Unmount(); | ||
| } | ||
| } |
Comment on lines
+333
to
+337
| foreach(string path in HddvdTkfPaths) | ||
| { | ||
| if(TryReadFileFromFs(rofs, path, out fileBytes)) | ||
| return true; | ||
| } |
Contributor
Author
There was a problem hiding this comment.
I don't think this one would work.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Types of changes
Resolves #931
Decrypt video HD DVDs with AACS.
There are apparently also audio HD DVDs with a slightly different AACS pipeline, but I have none to test with.
Also adapt the media type handling a bit on zzzRawImage as HD DVDs were never detected. It still only detects video HD DVDs, but there wasn't much other use for them anyway.