diff options
author | wm4 <wm4@nowhere> | 2014-07-05 16:45:12 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2014-07-05 17:07:14 +0200 |
commit | e4221f318936aa970eeb1d220d8deae95fb91d98 (patch) | |
tree | 92676116524064b02b4610679322978976df3775 /demux/demux.c | |
parent | 18e6d07612030d6163bf5ca08c7e4ed472bcfc5b (diff) | |
download | mpv-e4221f318936aa970eeb1d220d8deae95fb91d98.tar.bz2 mpv-e4221f318936aa970eeb1d220d8deae95fb91d98.tar.xz |
demux: move packet list functions
Move them to the only place where they are used, demux_subreader.c.
Diffstat (limited to 'demux/demux.c')
-rw-r--r-- | demux/demux.c | 66 |
1 files changed, 0 insertions, 66 deletions
diff --git a/demux/demux.c b/demux/demux.c index 2c47bcefe3..f2310d2aa7 100644 --- a/demux/demux.c +++ b/demux/demux.c @@ -957,69 +957,3 @@ int demuxer_set_angle(demuxer_t *demuxer, int angle) return angle; } - -static int packet_sort_compare(const void *p1, const void *p2) -{ - struct demux_packet *c1 = *(struct demux_packet **)p1; - struct demux_packet *c2 = *(struct demux_packet **)p2; - - if (c1->pts > c2->pts) - return 1; - else if (c1->pts < c2->pts) - return -1; - return 0; -} - -void demux_packet_list_sort(struct demux_packet **pkts, int num_pkts) -{ - qsort(pkts, num_pkts, sizeof(struct demux_packet *), packet_sort_compare); -} - -void demux_packet_list_seek(struct demux_packet **pkts, int num_pkts, - int *current, float rel_seek_secs, int flags) -{ - double ref_time = 0; - if (*current >= 0 && *current < num_pkts) { - ref_time = pkts[*current]->pts; - } else if (*current == num_pkts && num_pkts > 0) { - ref_time = pkts[num_pkts - 1]->pts + pkts[num_pkts - 1]->duration; - } - - if (flags & SEEK_ABSOLUTE) - ref_time = 0; - - if (flags & SEEK_FACTOR) { - ref_time += demux_packet_list_duration(pkts, num_pkts) * rel_seek_secs; - } else { - ref_time += rel_seek_secs; - } - - // Could do binary search, but it's probably not worth the complexity. - int last_index = 0; - for (int n = 0; n < num_pkts; n++) { - if (pkts[n]->pts > ref_time) - break; - last_index = n; - } - *current = last_index; -} - -double demux_packet_list_duration(struct demux_packet **pkts, int num_pkts) -{ - if (num_pkts > 0) - return pkts[num_pkts - 1]->pts + pkts[num_pkts - 1]->duration; - return 0; -} - -struct demux_packet *demux_packet_list_fill(struct demux_packet **pkts, - int num_pkts, int *current) -{ - if (*current < 0) - *current = 0; - if (*current >= num_pkts) - return NULL; - struct demux_packet *new = talloc(NULL, struct demux_packet); - *new = *pkts[*current]; - *current += 1; - return new; -} |