RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avutil/avframe: fix channel layout checks in av_frame_copy() 

Normally, both the source and dest frame would have only the old API fields
set, only the new API fields set, or both set. But in some cases, like when
calling av_frame_ref() using a non reference counted source frame where only
the old channel layout API fields were populated, the result would be the dst
frame having both the new and old fields populated.

This commit takes this into account and fixes the checks by calling
av_channel_layout_compare() only if the source frame has the new API fields
set, and doing sanity checks for the source frame old API fields if the new
ones are not set.

Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2022-05-25 12:27:59 -03:00
parent e93006c67b
commit 5929ea6d4b
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libavutil/frame.c
View File

@ -727,19 +727,28 @@ static int frame_copy_audio(AVFrame *dst, const AVFrame *src)
#if FF_API_OLD_CHANNEL_LAYOUT #if FF_API_OLD_CHANNEL_LAYOUT
FF_DISABLE_DEPRECATION_WARNINGS FF_DISABLE_DEPRECATION_WARNINGS
if (!channels) { if (!channels || !src->ch_layout.nb_channels) {
if (dst->channels != src->channels || if (dst->channels != src->channels ||
dst->channel_layout != src->channel_layout) dst->channel_layout != src->channel_layout)
return AVERROR(EINVAL); return AVERROR(EINVAL);
CHECK_CHANNELS_CONSISTENCY(src);
}
if (!channels) {
channels = dst->channels; channels = dst->channels;
planes = planar ? channels : 1; planes = planar ? channels : 1;
CHECK_CHANNELS_CONSISTENCY(src);
} }
FF_ENABLE_DEPRECATION_WARNINGS FF_ENABLE_DEPRECATION_WARNINGS
#endif #endif
if (dst->nb_samples != src->nb_samples || if (dst->nb_samples != src->nb_samples ||
#if FF_API_OLD_CHANNEL_LAYOUT
(av_channel_layout_check(&dst->ch_layout) &&
av_channel_layout_check(&src->ch_layout) &&
#endif
av_channel_layout_compare(&dst->ch_layout, &src->ch_layout)) av_channel_layout_compare(&dst->ch_layout, &src->ch_layout))
#if FF_API_OLD_CHANNEL_LAYOUT
)
#endif
return AVERROR(EINVAL); return AVERROR(EINVAL);
for (i = 0; i < planes; i++) for (i = 0; i < planes; i++)
@ -763,7 +772,7 @@ FF_DISABLE_DEPRECATION_WARNINGS
else if (dst->nb_samples > 0 && else if (dst->nb_samples > 0 &&
(av_channel_layout_check(&dst->ch_layout) (av_channel_layout_check(&dst->ch_layout)
#if FF_API_OLD_CHANNEL_LAYOUT #if FF_API_OLD_CHANNEL_LAYOUT
|| dst->channel_layout || dst->channels || dst->channels > 0
#endif #endif
)) ))
return frame_copy_audio(dst, src); return frame_copy_audio(dst, src);