Skip to content

audio: ffmpeg_dec: reject frames whose channel count differs from sink #11351

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Shrusti-pk wants to merge 1 commit into
base: main
Choose a base branch
from
Open

audio: ffmpeg_dec: reject frames whose channel count differs from sink #11351

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions src/audio/ffmpeg_dec/ffmpeg_dec-convert.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,6 +345,14 @@ int ffmpeg_dec_convert_frame(const AVFrame *frame, uint8_t *out, size_t out_size

if (channels <= 0 || frame->nb_samples <= 0)
return -EINVAL;

/*
* The frame's channel count comes from the bitstream, @channels from the
* sink. Every path below indexes the frame planes with @channels, so a
* stream with fewer channels than the sink would be read past its end.
*/
if (frame->ch_layout.nb_channels != channels)
return -EINVAL;
if (need > out_size)
return -ENOSPC;

Expand Down
3 changes: 2 additions & 1 deletion src/audio/ffmpeg_dec/ffmpeg_dec-convert.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@
* Dispatches to specialized HiFi/SIMD and unrolled scalar conversion routines
* based on the source AVFrame format and the destination SOF sink format.
*
* Returns number of bytes written, or a negative errno on error.
* Returns number of bytes written, -ENOSPC if @out is too small, or -EINVAL for
* an empty frame or one whose channel count does not match @channels.
*/
int ffmpeg_dec_convert_frame(const AVFrame *frame, uint8_t *out, size_t out_size,
int sink_fmt, int channels);
Expand Down
Loading