From ef6adce04d193e24ee051cf6f8822cab7bc6b4e2 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Fri, 24 May 2019 02:20:13 +0200
Subject: [PATCH] demux: rename a variable
It's "better". This is all what's left from an attempt to make the code
slightly nicer.
---
demux/demux.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/demux/demux.c b/demux/demux.c
index 1e8057ea18..985e53fb12 100644
--- a/demux/demux.c
+++ b/demux/demux.c
@@ -1335,7 +1335,7 @@ static void find_backward_restart_pos(struct demux_stream *ds)
// before restart_pos, but might be up to back_preroll packets earlier.
struct demux_packet *last_keyframe = NULL;
- struct demux_packet *last_preroll = NULL;
+ struct demux_packet *target = NULL;
// Keep this packet at back_preroll packets before last_keyframe.
struct demux_packet *pre_packet = ds->reader_head;
@@ -1348,7 +1348,7 @@ static void find_backward_restart_pos(struct demux_stream *ds)
{
if (cur->keyframe) {
last_keyframe = cur;
- last_preroll = pre_packet;
+ target = pre_packet;
}
if (pre_packet_offset) {
@@ -1374,7 +1374,7 @@ static void find_backward_restart_pos(struct demux_stream *ds)
}
int got_preroll = 0;
- for (struct demux_packet *cur = last_preroll;
+ for (struct demux_packet *cur = target;
cur != last_keyframe;
cur = cur->next)
got_preroll++;
@@ -1382,15 +1382,15 @@ static void find_backward_restart_pos(struct demux_stream *ds)
if (got_preroll < ds->back_preroll && !ds->queue->is_bof)
goto resume_earlier;
- // (Round preroll down to last_keyframe in the worst case.)
- while (!last_preroll->keyframe)
- last_preroll = last_preroll->next;
+ // (Round preroll down to 0 in the worst case.)
+ while (!target->keyframe)
+ target = target->next;
// Skip reader_head from previous keyframe to current one.
// Or if preroll is involved, the first preroll packet.
- while (ds->reader_head != last_preroll) {
+ while (ds->reader_head != target) {
if (!advance_reader_head(ds))
- assert(0); // last_preroll must be in list
+ assert(0); // target must be in list
}
ds->back_restarting = false;