diff options
Diffstat (limited to 'demux')
-rw-r--r-- | demux/demux.c | 17 | ||||
-rw-r--r-- | demux/demux.h | 1 | ||||
-rw-r--r-- | demux/demux_disc.c | 3 |
3 files changed, 0 insertions, 21 deletions
diff --git a/demux/demux.c b/demux/demux.c index d936f51fd4..2d40643a71 100644 --- a/demux/demux.c +++ b/demux/demux.c @@ -127,7 +127,6 @@ struct demux_internal { // Cached state. bool force_cache_update; double time_length; - struct mp_nav_event *nav_event; struct mp_tags *stream_metadata; int64_t stream_size; int64_t stream_cache_size; @@ -243,7 +242,6 @@ void free_demuxer(demuxer_t *demuxer) ds_flush(demuxer->streams[n]->ds); pthread_mutex_destroy(&in->lock); pthread_cond_destroy(&in->wakeup); - talloc_free(in->nav_event); talloc_free(demuxer); } @@ -1297,17 +1295,10 @@ static void update_cache(struct demux_internal *in) int64_t stream_cache_size = -1; int64_t stream_cache_fill = -1; int stream_cache_idle = -1; - struct mp_nav_event *nav_event = NULL; - - pthread_mutex_lock(&in->lock); - bool need_nav_event = !in->nav_event;; - pthread_mutex_unlock(&in->lock); if (demuxer->desc->control) { demuxer->desc->control(demuxer, DEMUXER_CTRL_GET_TIME_LENGTH, &time_length); - if (need_nav_event) - demuxer->desc->control(demuxer, DEMUXER_CTRL_GET_NAV_EVENT, &nav_event); } stream_control(stream, STREAM_CTRL_GET_METADATA, &stream_metadata); @@ -1327,7 +1318,6 @@ static void update_cache(struct demux_internal *in) in->stream_metadata = talloc_steal(in, stream_metadata); in->d_buffer->events |= DEMUX_EVENT_METADATA; } - in->nav_event = nav_event ? nav_event : in->nav_event; pthread_mutex_unlock(&in->lock); } @@ -1426,13 +1416,6 @@ static int cached_demux_control(struct demux_internal *in, int cmd, void *arg) r->ts_duration = 0; return DEMUXER_CTRL_OK; } - case DEMUXER_CTRL_GET_NAV_EVENT: - if (!in->nav_event) - return DEMUXER_CTRL_NOTIMPL; - *(struct mp_nav_event **)arg = in->nav_event; - in->nav_event = NULL; - return DEMUXER_CTRL_OK; - } return DEMUXER_CTRL_DONTKNOW; } diff --git a/demux/demux.h b/demux/demux.h index 32c5d274f6..09b49bbf97 100644 --- a/demux/demux.h +++ b/demux/demux.h @@ -47,7 +47,6 @@ enum demux_ctrl { DEMUXER_CTRL_IDENTIFY_PROGRAM, DEMUXER_CTRL_STREAM_CTRL, DEMUXER_CTRL_GET_READER_STATE, - DEMUXER_CTRL_GET_NAV_EVENT, DEMUXER_CTRL_GET_BITRATE_STATS, // double[STREAM_TYPE_COUNT] }; diff --git a/demux/demux_disc.c b/demux/demux_disc.c index 11cbea9361..a816a74fa8 100644 --- a/demux/demux_disc.c +++ b/demux/demux_disc.c @@ -361,9 +361,6 @@ static int d_control(demuxer_t *demuxer, int cmd, void *arg) case DEMUXER_CTRL_SWITCHED_TRACKS: reselect_streams(demuxer); return DEMUXER_CTRL_OK; - case DEMUXER_CTRL_GET_NAV_EVENT: - return stream_control(demuxer->stream, STREAM_CTRL_GET_NAV_EVENT, arg) - == STREAM_OK ? DEMUXER_CTRL_OK : DEMUXER_CTRL_DONTKNOW; } return demux_control(p->slave, cmd, arg); } |