Skip to content
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

upipe_avcodec_encode: update flow def latency #1015

Merged
merged 1 commit into from
Dec 7, 2024
Merged

upipe_avcodec_encode: update flow def latency #1015

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
17 changes: 17 additions & 0 deletions lib/upipe-av/upipe_avcodec_encode.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,8 @@ struct upipe_avcenc {
struct uchain urefs_in_use;
/** last incoming pts (in avcodec timebase) */
int64_t avcpts;
/** last PTS */
uint64_t last_pts;
/** last DTS */
uint64_t last_dts;
/** last DTS (system time) */
Expand All @@ -180,6 +182,8 @@ struct upipe_avcenc {
uint64_t input_pts;
/** last input PTS (system time) */
uint64_t input_pts_sys;
/** latency in the input flow */
uint64_t input_latency;

/** frame counter */
uint64_t counter;
Expand Down Expand Up @@ -532,6 +536,14 @@ static void upipe_avcenc_build_flow_def(struct upipe *upipe)
UBASE_FATAL(upipe, uref_ts_flow_set_sub_ancillary(flow_def, 1, 0))
}

/* find latency */
if (upipe_avcenc->input_pts != UINT64_MAX) {
uint64_t latency = upipe_avcenc->input_pts - upipe_avcenc->last_pts;
upipe_notice_va(upipe, "latency: %" PRIu64 " ms",
1000 * latency / UCLOCK_FREQ);
uref_clock_set_latency(flow_def, upipe_avcenc->input_latency + latency);
}

upipe_avcenc_store_flow_def(upipe, flow_def);
}

Expand Down Expand Up @@ -655,6 +667,7 @@ static void upipe_avcenc_output_pkt(struct upipe *upipe,

uref_clock_rebase_dts_orig(uref);
uref_clock_set_rate(uref, upipe_avcenc->drift_rate);
uref_clock_get_pts_prog(uref, &upipe_avcenc->last_pts);

upipe_avcenc->last_dts = dts;
upipe_avcenc->last_dts_sys = dts_sys;
Expand Down Expand Up @@ -1090,6 +1103,8 @@ static bool upipe_avcenc_handle(struct upipe *upipe, struct uref *uref,
AVCodecContext *context = upipe_avcenc->context;
const char *def;
if (unlikely(uref != NULL && ubase_check(uref_flow_get_def(uref, &def)))) {
upipe_avcenc->input_latency = 0;
uref_clock_get_latency(uref, &upipe_avcenc->input_latency);
upipe_avcenc_store_flow_def(upipe, NULL);
uref_free(upipe_avcenc->flow_def_requested);
upipe_avcenc->flow_def_requested = NULL;
Expand Down Expand Up @@ -2091,11 +2106,13 @@ static struct upipe *upipe_avcenc_alloc(struct upipe_mgr *mgr,

ulist_init(&upipe_avcenc->urefs_in_use);
upipe_avcenc->avcpts = AVCPTS_INIT;
upipe_avcenc->last_pts = UINT64_MAX;
upipe_avcenc->last_dts = UINT64_MAX;
upipe_avcenc->last_dts_sys = UINT64_MAX;
upipe_avcenc->drift_rate.num = upipe_avcenc->drift_rate.den = 1;
upipe_avcenc->input_pts = UINT64_MAX;
upipe_avcenc->input_pts_sys = UINT64_MAX;
upipe_avcenc->input_latency = 0;

upipe_throw_ready(upipe);
upipe_avcenc_build_flow_def_attr(upipe);
Expand Down
Loading