mirror of
https://github.com/mpv-player/mpv.git
synced 2024-09-20 12:02:23 +02:00
demux: remove further calls to packet size estimation function
May as well be part of the previous commit.
This commit is contained in:
parent
976ee96e45
commit
e62afe4055
@ -638,7 +638,8 @@ static void remove_head_packet(struct demux_queue *queue)
|
|||||||
queue->keyframe_latest = NULL;
|
queue->keyframe_latest = NULL;
|
||||||
queue->is_bof = false;
|
queue->is_bof = false;
|
||||||
|
|
||||||
queue->ds->in->total_bytes -= demux_packet_estimate_total_size(dp);
|
uint64_t end_pos = dp->next ? dp->next->cum_pos : queue->tail_cum_pos;
|
||||||
|
queue->ds->in->total_bytes -= end_pos - dp->cum_pos;
|
||||||
|
|
||||||
if (queue->num_index && queue->index[0] == dp)
|
if (queue->num_index && queue->index[0] == dp)
|
||||||
MP_TARRAY_REMOVE_AT(queue->index, queue->num_index, 0);
|
MP_TARRAY_REMOVE_AT(queue->index, queue->num_index, 0);
|
||||||
@ -655,10 +656,12 @@ static void clear_queue(struct demux_queue *queue)
|
|||||||
struct demux_stream *ds = queue->ds;
|
struct demux_stream *ds = queue->ds;
|
||||||
struct demux_internal *in = ds->in;
|
struct demux_internal *in = ds->in;
|
||||||
|
|
||||||
|
if (queue->head)
|
||||||
|
in->total_bytes -= queue->tail_cum_pos - queue->head->cum_pos;
|
||||||
|
|
||||||
struct demux_packet *dp = queue->head;
|
struct demux_packet *dp = queue->head;
|
||||||
while (dp) {
|
while (dp) {
|
||||||
struct demux_packet *dn = dp->next;
|
struct demux_packet *dn = dp->next;
|
||||||
in->total_bytes -= demux_packet_estimate_total_size(dp);
|
|
||||||
assert(ds->reader_head != dp);
|
assert(ds->reader_head != dp);
|
||||||
talloc_free(dp);
|
talloc_free(dp);
|
||||||
dp = dn;
|
dp = dn;
|
||||||
|
Loading…
Reference in New Issue
Block a user