Skip to content

h265f: respect preferred_transfer_characteristics #1120

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
cmassiot merged 1 commit into from
Jan 29, 2026
Merged

h265f: respect preferred_transfer_characteristics #1120

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
34 changes: 34 additions & 0 deletions lib/upipe-framers/upipe_h265_framer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,9 @@ struct upipe_h265f {
/** active picture parameter set, or -1 */
int active_pps;

/** alternative transfer characteristics */
int preferred_transfer_characteristics;

/* parsing results - headers */
/** VPS profile space */
uint8_t profile_space;
Expand Down Expand Up @@ -336,6 +339,9 @@ static struct upipe *upipe_h265f_alloc(struct upipe_mgr *mgr,
upipe_h265f->pps[i] = NULL;
upipe_h265f->active_pps = -1;

/* 2 is NULL, see transfer_characteristics in uref_pic_flow.c */
upipe_h265f->preferred_transfer_characteristics = 2;

upipe_h265f->acquired = false;
upipe_throw_ready(upipe);
return upipe;
Expand Down Expand Up @@ -1269,6 +1275,12 @@ static bool upipe_h265f_activate_sps(struct upipe *upipe, uint32_t sps_id)
else if (unlikely(!ubase_check(err)))
upipe_throw_fatal(upipe, err);

if (upipe_h265f->preferred_transfer_characteristics != 2) {
if (transfer_characteristics != upipe_h265f->preferred_transfer_characteristics)
transfer_characteristics = upipe_h265f->preferred_transfer_characteristics;
upipe_h265f->preferred_transfer_characteristics = 2;
}

err = uref_pic_flow_set_transfer_characteristics_val(
flow_def, transfer_characteristics);
if (unlikely(err == UBASE_ERR_UNHANDLED))
Expand Down Expand Up @@ -1502,6 +1514,24 @@ static int upipe_h265f_handle_sei_buffering_period(struct upipe *upipe,
return UBASE_ERR_NONE;
}

/** @internal @This handles the supplemental enhancement information called
* alternative transfer characteristics.
*
* @param upipe description structure of the pipe
* @param s block stream parsing structure
* @return an error code
*/
static int upipe_h265f_handle_sei_alternative_transfer_characteristics(struct upipe *upipe,
struct ubuf_block_stream *s)
{
struct upipe_h265f *upipe_h265f = upipe_h265f_from_upipe(upipe);

upipe_h26xf_stream_fill_bits(s, 8);
upipe_h265f->preferred_transfer_characteristics = ubuf_block_stream_show_bits(s, 8);

return UBASE_ERR_NONE;
}

/** @internal @This handles the supplemental enhancement information called
* picture timing.
*
Expand Down Expand Up @@ -1547,6 +1577,7 @@ static int upipe_h265f_handle_sei(struct upipe *upipe, struct ubuf *ubuf,

switch (type) {
case H265SEI_BUFFERING_PERIOD:
case H265SEI_ALTERNATIVE_TRANSFER_CHARACTERISTICS:
case H265SEI_PIC_TIMING: {
struct upipe_h26xf_stream f;
upipe_h26xf_stream_init(&f);
Expand All @@ -1568,6 +1599,9 @@ static int upipe_h265f_handle_sei(struct upipe *upipe, struct ubuf *ubuf,
case H265SEI_PIC_TIMING:
err = upipe_h265f_handle_sei_pic_timing(upipe, s);
break;
case H265SEI_ALTERNATIVE_TRANSFER_CHARACTERISTICS:
err = upipe_h265f_handle_sei_alternative_transfer_characteristics(upipe, s);
break;
default:
break;
}
Expand Down
Loading