Skip to content

upipe_h264f: fix SEI parsing #1084

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

Merged
merged 1 commit into from
Aug 5, 2025
Merged

upipe_h264f: fix SEI parsing #1084

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
72 changes: 39 additions & 33 deletions lib/upipe-framers/upipe_h264_framer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1290,47 +1290,53 @@ static int upipe_h264f_handle_sei(struct upipe *upipe, struct ubuf *ubuf,
{
struct upipe_h264f *upipe_h264f = upipe_h264f_from_upipe(upipe);

uint8_t type;
if (unlikely(!ubase_check(ubuf_block_extract(ubuf, offset + 1, 1, &type))))
return UBASE_ERR_INVALID;
struct upipe_h26xf_stream f;
upipe_h26xf_stream_init(&f);
struct ubuf_block_stream *s = &f.s;
UBASE_RETURN(ubuf_block_stream_init(s, ubuf, offset + 1))

int err = UBASE_ERR_NONE;

switch (type) {
case H264SEI_BUFFERING_PERIOD:
case H264SEI_PIC_TIMING: {
struct upipe_h26xf_stream f;
upipe_h26xf_stream_init(&f);
struct ubuf_block_stream *s = &f.s;
UBASE_RETURN(ubuf_block_stream_init(s, ubuf, offset + 2))

/* size field */
uint8_t octet;
do {
upipe_h26xf_stream_fill_bits(s, 8);
octet = ubuf_block_stream_show_bits(s, 8);
ubuf_block_stream_skip_bits(s, 8);
} while (octet == UINT8_MAX);

switch (type) {
case H264SEI_BUFFERING_PERIOD:
err = upipe_h264f_handle_sei_buffering_period(upipe, s);
break;
case H264SEI_PIC_TIMING:
err = upipe_h264f_handle_sei_pic_timing(upipe, s);
break;
default:
break;
int end = size * 8 - ubuf_block_stream_position(s);

while (ubuf_block_stream_position(s) + 16 < end) {
uint8_t octet;
int payload_type = 0;
do {
UBASE_RETURN(upipe_h26xf_stream_get(s, &octet))
payload_type += octet;
} while (octet == 0xff);

int payload_size = 0;
do {
UBASE_RETURN(upipe_h26xf_stream_get(s, &octet))
payload_size += octet;
} while (octet == 0xff);

switch (payload_type) {
case H264SEI_BUFFERING_PERIOD:
case H264SEI_PIC_TIMING: {
struct upipe_h26xf_stream f2 = f;
struct ubuf_block_stream *s2 = &f2.s;
switch (payload_type) {
case H264SEI_BUFFERING_PERIOD:
err = upipe_h264f_handle_sei_buffering_period(upipe, s2);
break;
case H264SEI_PIC_TIMING:
err = upipe_h264f_handle_sei_pic_timing(upipe, s2);
break;
}
}

ubuf_block_stream_clean(s);
break;
}

default:
if (unlikely(!ubase_check(err)))
break;

for (int i = 0; i < payload_size; i++) {
UBASE_RETURN(upipe_h26xf_stream_get(s, &octet))
}
}

ubuf_block_stream_clean(s);
if (unlikely(!ubase_check(err)))
return err;

Expand Down
Loading