winegstreamer: Don't get stream ID wires crossed#320
Open
Alcaro wants to merge 1 commit intoValveSoftware:proton_10.0from
Open
winegstreamer: Don't get stream ID wires crossed#320Alcaro wants to merge 1 commit intoValveSoftware:proton_10.0from
Alcaro wants to merge 1 commit intoValveSoftware:proton_10.0from
Conversation
Contributor
Author
|
Another option would be ignore this PR, and make the aforementioned commit conditional on SteamGameId. I have no opinion on which is better. |
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.
Applying commit 55e5a1c to upstream Wine, then running this program
returns a
dlls/winegstreamer/wg_parser.c:401: wg_parser_stream_copy_buffer: Assertion `offset + size <= stream->map_info.size' failed.error, due to getting some wires crossed between the audio and video streams.This patch re-crosses the streams, so the crossings cancel out and it stops asserting.
I originally found the issue by running https://store.steampowered.com/app/333600/NEKOPARA_Vol_1/ in a slightly modded Proton that uses Glorious Eggroll's WMV/WMA codecs, rather than the media converter. (Standard Proton also crashes at the same point; symptoms differ, but I'd suspect the same root cause. I didn't investigate standard Proton any further.)
The issue only reproduces with some WMVs; I can upload this one if you want, but it's 503MB. Probably easier to extract it from Nekopara yourself - just make reader_OpenStream dump its IStream to disk. (That's what I did.)
Since I don't know what CW-Bug-Id: #23483 refers to (and it's probably a game I don't have), I am unable to test this patch very thoroughly.
Fair chance there are better solutions - the original patch feels like a hack, and this patch is another hack on top of that. But I don't know how such a solution would look.