RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

demux_lavf: export demuxer_id for more formats which have it 

See previous commit. libavformat exports this information as AVStream.id
field.

The big problem is that the libavformat field is simply 0 if it's
unknown (i.e. the demuxer never sets it). So it needs to remain a
whitelist. Just add more formats which are known to have a meaningful
ID.

I considered exporting IDs for all formats, and then either leaving the
values as they are, or filtering duplicate values (and choosing
arbitrary but unique different IDs). But then again, I think it's sort
of mpv's job to filter FFmpeg's absurd bullshit API, and it should make
an effort to hide it rather than to reflect it.

See: #7211
This commit is contained in:
wm4 2019-12-03 21:15:40 +01:00
parent 370ed5777c
commit d60bbd86e3
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
demux/demux_lavf.c
View File

@ -134,7 +134,7 @@ struct format_hack {
bool max_probe : 1; // use probescore only if max. probe size reached bool max_probe : 1; // use probescore only if max. probe size reached
bool ignore : 1; // blacklisted bool ignore : 1; // blacklisted
bool no_stream : 1; // do not wrap struct stream as AVIOContext bool no_stream : 1; // do not wrap struct stream as AVIOContext
bool use_stream_ids : 1; // export the native stream IDs bool use_stream_ids : 1; // has a meaningful native stream IDs (export it)
bool fully_read : 1; // set demuxer.fully_read flag bool fully_read : 1; // set demuxer.fully_read flag
bool detect_charset : 1; // format is a small text file, possibly not UTF8 bool detect_charset : 1; // format is a small text file, possibly not UTF8
bool image_format : 1; // expected to contain exactly 1 frame bool image_format : 1; // expected to contain exactly 1 frame
@ -166,9 +166,12 @@ static const struct format_hack format_hacks[] = {
{"sdp", .clear_filepos = true, .is_network = true, .no_seek = true}, {"sdp", .clear_filepos = true, .is_network = true, .no_seek = true},
{"mpeg", .use_stream_ids = true}, {"mpeg", .use_stream_ids = true},
{"mpegts", .use_stream_ids = true}, {"mpegts", .use_stream_ids = true},
{"mxf", .use_stream_ids = true},
{"mp4", .skipinfo = true, .fix_editlists = true, .no_pcm_seek = true}, {"avi", .use_stream_ids = true},
{"matroska", .skipinfo = true, .no_pcm_seek = true}, {"asf", .use_stream_ids = true},
{"mp4", .skipinfo = true, .fix_editlists = true, .no_pcm_seek = true,
.use_stream_ids = true},
{"matroska", .skipinfo = true, .no_pcm_seek = true, .use_stream_ids = true},
{"v4l2", .no_seek = true}, {"v4l2", .no_seek = true},
@ -178,7 +181,7 @@ static const struct format_hack format_hacks[] = {
// Some Ogg shoutcast streams are essentially concatenated OGG files. They // Some Ogg shoutcast streams are essentially concatenated OGG files. They
// reset timestamps, which causes all sorts of problems. // reset timestamps, which causes all sorts of problems.
{"ogg", .linearize_audio_ts = true}, {"ogg", .linearize_audio_ts = true, .use_stream_ids = true},
TEXTSUB("aqtitle"), TEXTSUB("jacosub"), TEXTSUB("microdvd"), TEXTSUB("aqtitle"), TEXTSUB("jacosub"), TEXTSUB("microdvd"),
TEXTSUB("mpl2"), TEXTSUB("mpsub"), TEXTSUB("pjs"), TEXTSUB("realtext"), TEXTSUB("mpl2"), TEXTSUB("mpsub"), TEXTSUB("pjs"), TEXTSUB("realtext"),