diff options
| author | wm4 <wm4@nowhere> | 2019-09-29 01:39:17 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2019-09-29 01:41:19 +0200 |
| commit | a604dc12be13af547572f18b9e09222eeda193c9 (patch) | |
| tree | d8ebf6119415ed5dafa7996a0cfa4ed7265c4cf2 /demux/demux.c | |
| parent | 2bb5ab07b7ee09fb7ae0e90a74c1e8e5adcc3d59 (diff) | |
| download | mpv-a604dc12be13af547572f18b9e09222eeda193c9.tar.bz2 mpv-a604dc12be13af547572f18b9e09222eeda193c9.tar.xz | |
recorder: don't use a magic index for mp_recorder_get_sink()
Although this was sort of elegant, it just seems to complicate things
slightly. Originally, the API meant that you cache mp_recorder_sink
yourself (which would avoid the mess of passing an index around), but
that too seems slightly roundabout.
In a later change, I want to change the set of streams passed to
mp_recorder_create(), and then I'd have to keep track of the index for
each stream, which would suck. With this commit, I can just pass the
unambiguous sh_stream to it, and it will be guaranteed to match the
correct stream.
The disadvantages are barely worth discussing. It's a new linear search
per packet, but usually only 2 to 4 streams are active at a time. Also,
in theory a user could want to write 2 streams using the same sh_stream
(same metadata, just writing different packets or so), but in practice
this is never done.
Diffstat (limited to 'demux/demux.c')
| -rw-r--r-- | demux/demux.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/demux/demux.c b/demux/demux.c index 277bccb2a6..06ac255336 100644 --- a/demux/demux.c +++ b/demux/demux.c @@ -1907,7 +1907,8 @@ static void write_dump_packet(struct demux_internal *in, struct demux_packet *dp assert(in->dumper); assert(in->dumper_status == CONTROL_TRUE); - struct mp_recorder_sink *sink = mp_recorder_get_sink(in->dumper, dp->stream); + struct mp_recorder_sink *sink = + mp_recorder_get_sink(in->dumper, in->streams[dp->stream]); if (sink) { mp_recorder_feed_packet(sink, dp); } else { @@ -1935,7 +1936,7 @@ static void record_packet(struct demux_internal *in, struct demux_packet *dp) if (in->recorder) { struct mp_recorder_sink *sink = - mp_recorder_get_sink(in->recorder, dp->stream); + mp_recorder_get_sink(in->recorder, in->streams[dp->stream]); if (sink) { mp_recorder_feed_packet(sink, dp); } else { |