Preserve frame props after hardware downloads#2321
Merged
Conversation
CarlosRDomin
force-pushed
the
fix/preserve-hwframe-props
branch
from
df79d2b to
77a4649
Compare
CarlosRDomin
force-pushed
the
fix/preserve-hwframe-props
branch
from
77a4649 to
ed50af2
Compare
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
2 participants
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.
This PR fixes hardware frame downloads losing AVFrame properties, as reported in #2231.
The regression test uses fate("hevc/hdr10_plus_h265_sample.hevc"), which carries non-default color metadata. Before this change, CPU decode preserved those frame properties, but hardware-download paths lost them:
is_hw_owned=Falseloses them inVideoCodecContext._transfer_hwframe()is_hw_owned=Truekeeps them on the hardware frame, but loses them whenVideoReformatterdownloads the frame before swscaleThe fix is to call
_copy_internal_attributes(frame, data_layout=False)afterav_hwframe_transfer_data(). That copiesAVFramemetadata viaav_frame_copy_propswithout overwriting the downloaded frame's actual format/width/height/data layout.Note that I also removed the previous
frame_sw._init_user_attributes()call fromVideoReformatter. The downloadedframe_swthere is only a temporary source frame for swscale and is not returned to the user (the returned output frame is already initialized separately).