Fix crashes due to missing TrueHD overrun checks #16813
Conversation
CAEBitstreamPacker and CDVDAudioCodecPassthrough copy TrueHD frames into buffers without checking for overruns. Fix that. This should fix crashes of issue xbmc#16704. However, audio dropouts still remain. To fix those, the TrueHD packet offsets will need to be dynamically scaled based on the input_timing field (TrueHD bytes 2-3) which allows determining the amount of time required between the previous frame and the current frame.
anssih
added
Type: Fix
|
CC @graham8 |
| if (m_trueHDPos == 0) | ||
| maxSize -= sizeof(mat_start_code) + BURST_HEADER_SIZE; | ||
| else if (m_trueHDPos == 11) | ||
| maxSize -= -MAT_MIDDLE_CODE_OFFSET; |
There was a problem hiding this comment.
I don't know the code that well, nor do i know the truehd bitstream protocol. But you are adding to the max size here instead of subtracting. Is that on purpose?
There was a problem hiding this comment.
MAT_MIDDLE_CODE_OFFSET is -4, so maxSize ends up being reduced.
I agree it is a bit confusing, though.
|
I've pushed this to OSMC tonight to get some feedback, despite it still being in PR stage. Early testing before pushing it to general release was positive. As we discussed in the audioimprove chat, there's refinement needed to fix the dropouts, but crashes are resolved. This was discussed in OSMC chat. If anyone wishes to join the chat and wants an invite, let me know. We are keen to get it solved. |
|
jenkins build this please |
|
Android-ARM failure seems unrelated ("Gradle build daemon disappeared unexpectedly"), WIN-UWP-64 failure seems unrelated (python37.lib issue). |
|
@anssih please always set the milestone before or right after merging a PR. |
Fix crashes due to missing TrueHD overrun checks
CAEBitstreamPacker and CDVDAudioCodecPassthrough copy TrueHD frames into
buffers without checking for overruns.
Fix that.
This should fix crashes of issue #16704.
However, audio dropouts still remain. To fix those, the TrueHD packet
offsets will need to be dynamically scaled based on the input_timing
field (TrueHD bytes 2-3) which allows determining the amount of time
required between the previous frame and the current frame.