diff options
| -rw-r--r-- | demux/demux.c | 49 | ||||
| -rw-r--r-- | demux/demux.h | 4 | ||||
| -rw-r--r-- | demux/stheader.h | 1 |
3 files changed, 47 insertions, 7 deletions
diff --git a/demux/demux.c b/demux/demux.c index c8da399f43..eb120d874e 100644 --- a/demux/demux.c +++ b/demux/demux.c @@ -287,11 +287,16 @@ const char *sh_sub_type2str(int type) return "unknown"; } -static struct sh_stream *new_sh_stream(demuxer_t *demuxer, - enum stream_type type, - int stream_index, - int tid) +static struct sh_stream *new_sh_stream_id(demuxer_t *demuxer, + enum stream_type type, + int stream_index, + int tid) { + if (demuxer->num_streams > MAX_SH_STREAMS) { + mp_msg(MSGT_DEMUXER, MSGL_WARN, "Too many streams."); + return NULL; + } + struct sh_stream *sh = talloc_struct(demuxer, struct sh_stream, { .type = type, .demuxer = demuxer, @@ -339,6 +344,17 @@ static struct sh_stream *new_sh_stream(demuxer_t *demuxer, return sh; } +// This is what "modern" demuxers are supposed to use. +struct sh_stream *new_sh_stream(demuxer_t *demuxer, enum stream_type type) +{ + int num = 0; + for (int n = 0; n < demuxer->num_streams; n++) { + if (demuxer->streams[n]->type == type) + num++; + } + return new_sh_stream_id(demuxer, type, demuxer->num_streams, num); +} + static void free_sh_stream(struct sh_stream *sh) { if (sh->lav_headers) { @@ -358,7 +374,7 @@ sh_sub_t *new_sh_sub_sid(demuxer_t *demuxer, int id, int sid) if (demuxer->s_streams[id]) mp_msg(MSGT_DEMUXER, MSGL_WARN, "Sub stream %i redefined\n", id); else { - new_sh_stream(demuxer, STREAM_SUB, id, sid); + new_sh_stream_id(demuxer, STREAM_SUB, id, sid); mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_SUBTITLE_ID=%d\n", sid); } return demuxer->s_streams[id]; @@ -395,7 +411,7 @@ sh_audio_t *new_sh_audio_aid(demuxer_t *demuxer, int id, int aid) mp_tmsg(MSGT_DEMUXER, MSGL_WARN, "WARNING: Audio stream header %d redefined.\n", id); } else { mp_tmsg(MSGT_DEMUXER, MSGL_V, "==> Found audio stream: %d\n", id); - new_sh_stream(demuxer, STREAM_AUDIO, id, aid); + new_sh_stream_id(demuxer, STREAM_AUDIO, id, aid); mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_AUDIO_ID=%d\n", aid); } return demuxer->a_streams[id]; @@ -424,7 +440,7 @@ sh_video_t *new_sh_video_vid(demuxer_t *demuxer, int id, int vid) mp_tmsg(MSGT_DEMUXER, MSGL_WARN, "WARNING: Video stream header %d redefined.\n", id); else { mp_tmsg(MSGT_DEMUXER, MSGL_V, "==> Found video stream: %d\n", id); - new_sh_stream(demuxer, STREAM_VIDEO, id, vid); + new_sh_stream_id(demuxer, STREAM_VIDEO, id, vid); mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_VIDEO_ID=%d\n", vid); } return demuxer->v_streams[id]; @@ -463,6 +479,15 @@ void free_demuxer(demuxer_t *demuxer) talloc_free(demuxer); } +void demuxer_add_packet(demuxer_t *demuxer, struct sh_stream *stream, + demux_packet_t *dp) +{ + if (!demuxer_stream_is_selected(demuxer, stream)) { + free_demux_packet(dp); + } else { + ds_add_packet(demuxer->ds[stream->type], dp); + } +} void ds_add_packet(demux_stream_t *ds, demux_packet_t *dp) { @@ -1261,6 +1286,16 @@ void demuxer_switch_track(struct demuxer *demuxer, enum stream_type type, } } +bool demuxer_stream_is_selected(struct demuxer *d, struct sh_stream *stream) +{ + if (!stream) + return false; + int st_id = stream->tid; + if (stream->type == STREAM_SUB) // major braindeath + st_id = stream->stream_index; + return d->ds[stream->type]->id == st_id; +} + int demuxer_add_attachment(demuxer_t *demuxer, struct bstr name, struct bstr type, struct bstr data) { diff --git a/demux/demux.h b/demux/demux.h index d5f269aa7c..f3dee7bf86 100644 --- a/demux/demux.h +++ b/demux/demux.h @@ -311,6 +311,8 @@ void free_demuxer(struct demuxer *demuxer); struct sh_stream *ds_gsh(struct demux_stream *ds); +void demuxer_add_packet(demuxer_t *demuxer, struct sh_stream *stream, + demux_packet_t *dp); void ds_add_packet(struct demux_stream *ds, struct demux_packet *dp); void ds_read_packet(struct demux_stream *ds, struct stream *stream, int len, double pts, int64_t pos, bool keyframe); @@ -419,4 +421,6 @@ int demuxer_angles_count(struct demuxer *demuxer); struct sh_stream *demuxer_stream_by_demuxer_id(struct demuxer *d, enum stream_type t, int id); +bool demuxer_stream_is_selected(struct demuxer *d, struct sh_stream *stream); + #endif /* MPLAYER_DEMUXER_H */ diff --git a/demux/stheader.h b/demux/stheader.h index 8d1822c99f..03fdf4d2ea 100644 --- a/demux/stheader.h +++ b/demux/stheader.h @@ -190,6 +190,7 @@ struct sh_video *new_sh_video_vid(struct demuxer *demuxer, int id, int vid); struct sh_sub *new_sh_sub_sid(struct demuxer *demuxer, int id, int sid); struct sh_sub *new_sh_sub_sid_lang(struct demuxer *demuxer, int id, int sid, const char *lang); +struct sh_stream *new_sh_stream(struct demuxer *demuxer, enum stream_type type); const char *sh_sub_type2str(int type); |