Skip to content

upipe_x264: fix reconfigure when input changes #1249

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 8 commits into from
Sep 23, 2026
Merged

upipe_x264: fix reconfigure when input changes #1249

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
75cafbb
Add uref_attr_copy_array helper
quarium Aug 5, 2026
040210d
upipe_x264: use UPIPE_HELPER_FLOW_DEF_CHECK
quarium Sep 4, 2026
409ec1d
upipe_x264: split handle function
quarium Sep 4, 2026
349f131
upipe_x264: factorize color space getter
quarium Sep 4, 2026
d195eb9
upipe_x264: fix reconfigure when input changes
quarium Sep 4, 2026
0df47dc
upipe_x264: merge open/update function
quarium Sep 4, 2026
b84f948
upipe_x264: remove useless input latency field
quarium Sep 4, 2026
7bfc7b1
upipe_x264: remove useless headers_requested field
quarium Sep 4, 2026
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
4 changes: 2 additions & 2 deletions include/upipe-modules/uref_aes_flow.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,12 @@ static inline int uref_aes_delete(struct uref *uref)

static inline int uref_aes_copy(struct uref *uref, struct uref *uref_src)
{
int (*list[])(struct uref *, struct uref *) = {
int (*attrs[])(struct uref *, struct uref *) = {
uref_aes_copy_method,
uref_aes_copy_key,
uref_aes_copy_iv,
};
return uref_attr_copy_list(uref, uref_src, list, UBASE_ARRAY_SIZE(list));
return uref_attr_copy_array(uref, uref_src, attrs);
}

#ifdef __cplusplus
Expand Down
4 changes: 4 additions & 0 deletions include/upipe/uref_attr.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,10 @@ static inline int uref_attr_copy_list(struct uref *uref, struct uref *uref_src,
return err;
}

/** @This is an helper to copy an array of attributes from an uref to another */
#define uref_attr_copy_array(uref_dst, uref_src, array) \
uref_attr_copy_list(uref_dst, uref_src, array, UBASE_ARRAY_SIZE(array))

/** @This deletes an attribute.
*
* @param uref pointer to the uref
Expand Down
4 changes: 2 additions & 2 deletions include/upipe/uref_m3u_master.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ static inline int uref_m3u_master_delete(struct uref *uref)
static inline int uref_m3u_master_copy(struct uref *uref,
struct uref *uref_src)
{
int (*list[])(struct uref *, struct uref *) = {
int (*attrs[])(struct uref *, struct uref *) = {
uref_m3u_master_copy_bandwidth,
uref_m3u_master_copy_codecs,
uref_m3u_master_copy_resolution,
Expand All @@ -62,7 +62,7 @@ static inline int uref_m3u_master_copy(struct uref *uref,
uref_m3u_master_copy_media_name,
uref_m3u_master_copy_media_group,
};
return uref_attr_copy_list(uref, uref_src, list, UBASE_ARRAY_SIZE(list));
return uref_attr_copy_array(uref, uref_src, attrs);
}

static inline int uref_m3u_master_iterate_codecs(struct uref *uref,
Expand Down
16 changes: 8 additions & 8 deletions include/upipe/uref_m3u_playlist.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,27 +111,27 @@ static inline int uref_m3u_playlist_delete(struct uref *uref)
static inline int uref_m3u_playlist_key_copy(struct uref *uref,
struct uref *uref_src)
{
int (*list[])(struct uref *, struct uref *) = {
int (*attrs[])(struct uref *, struct uref *) = {
uref_m3u_playlist_key_copy_method,
uref_m3u_playlist_key_copy_uri,
uref_m3u_playlist_key_copy_iv,
};
return uref_attr_copy_list(uref, uref_src, list, UBASE_ARRAY_SIZE(list));
return uref_attr_copy_array(uref, uref_src, attrs);
}

static inline int uref_m3u_playlist_map_copy(struct uref *uref,
struct uref *uref_src)
{
int (*list[])(struct uref *, struct uref *) = {
int (*attrs[])(struct uref *, struct uref *) = {
uref_m3u_playlist_map_copy_uri,
};
return uref_attr_copy_list(uref, uref_src, list, UBASE_ARRAY_SIZE(list));
return uref_attr_copy_array(uref, uref_src, attrs);
}

static inline int uref_m3u_playlist_daterange_copy(struct uref *uref,
struct uref *uref_src)
{
int (*list[])(struct uref *, struct uref *) = {
int (*attrs[])(struct uref *, struct uref *) = {
uref_m3u_playlist_daterange_copy_id,
uref_m3u_playlist_daterange_copy_start_date,
uref_m3u_playlist_daterange_copy_end_date,
Expand All @@ -141,13 +141,13 @@ static inline int uref_m3u_playlist_daterange_copy(struct uref *uref,
uref_m3u_playlist_daterange_copy_scte35_out,
uref_m3u_playlist_daterange_copy_scte35_in,
};
return uref_attr_copy_list(uref, uref_src, list, UBASE_ARRAY_SIZE(list));
return uref_attr_copy_array(uref, uref_src, attrs);
}

static inline int uref_m3u_playlist_copy(struct uref *uref,
struct uref *uref_src)
{
int (*list[])(struct uref *, struct uref *) = {
int (*attrs[])(struct uref *, struct uref *) = {
uref_m3u_playlist_copy_seq_duration,
uref_m3u_playlist_copy_byte_range_len,
uref_m3u_playlist_copy_byte_range_off,
Expand All @@ -158,7 +158,7 @@ static inline int uref_m3u_playlist_copy(struct uref *uref,
uref_m3u_playlist_map_copy,
uref_m3u_playlist_daterange_copy,
};
return uref_attr_copy_list(uref, uref_src, list, UBASE_ARRAY_SIZE(list));
return uref_attr_copy_array(uref, uref_src, attrs);
}

#ifdef __cplusplus
Expand Down
4 changes: 2 additions & 2 deletions include/upipe/uref_m3u_playlist_flow.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,15 +43,15 @@ static inline int uref_m3u_playlist_flow_delete(struct uref *uref)
static inline int uref_m3u_playlist_flow_copy(struct uref *uref,
struct uref *uref_src)
{
int (*list[])(struct uref *, struct uref *) = {
int (*attrs[])(struct uref *, struct uref *) = {
uref_m3u_playlist_flow_copy_type,
uref_m3u_playlist_flow_copy_target_duration,
uref_m3u_playlist_flow_copy_media_sequence,
uref_m3u_playlist_flow_copy_discontinuity_sequence,
uref_m3u_playlist_flow_copy_endlist,
};

return uref_attr_copy_list(uref, uref_src, list, UBASE_ARRAY_SIZE(list));
return uref_attr_copy_array(uref, uref_src, attrs);
}

#ifdef __cplusplus
Expand Down
4 changes: 2 additions & 2 deletions include/upipe/uref_uri.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ static inline int uref_uri_delete(struct uref *uref)

static inline int uref_uri_copy(struct uref *uref, struct uref *from)
{
int (*list[])(struct uref *, struct uref *) = {
int (*attrs[])(struct uref *, struct uref *) = {
uref_uri_copy_scheme,
uref_uri_copy_userinfo,
uref_uri_copy_host,
Expand All @@ -53,7 +53,7 @@ static inline int uref_uri_copy(struct uref *uref, struct uref *from)
uref_uri_copy_query,
uref_uri_copy_fragment,
};
return uref_attr_copy_list(uref, from, list, UBASE_ARRAY_SIZE(list));
return uref_attr_copy_array(uref, from, attrs);
}

#ifdef __cplusplus
Expand Down
Loading