mirror of
https://github.com/mpv-player/mpv.git
synced 2024-09-20 12:02:23 +02:00
eae693fc46
Indeed, FFmpeg found a way to maximize the misery around VfW/AVI-style muxing. It appears it can mux a number of random codecs by using random format tags. To make this even more stranger, it has a probably custom GUID for signaling them, although for unknown reasons this is done only "sometimes" (judging from FFmpeg's riffenc.c). Whatever, it's not too hard to support it. Also apparently fix the incorrect interpretation of extended formats - there's absolutely no reason to assume they're always PCM. Instead, check for the correct GUIDs. Also while we're at it, move the channel mask handling also to codec_tag.c, so all WAVEFORMATEXTENSIBLE handling is in one place. (With the normal wav header handling strangely still in demux_mkv.c.) The case I was looking at (aac_latm muxing) decodes now. While I'm not entirely sure about its correctness (libavformat has a weird special-case for SBR), it certainly doesn't try to play it as PCM, which is much of an improvement. The extradata mess in the demux_mkv.c A_MS/ACM code path is unfortunate and ugly, but has less impact than refactoring all the code to make this specific case nicer. Did I mention yet that I hate VfW-style mkv muxing? |
||
|---|---|---|
| .. | ||
| codec_tags.c | ||
| codec_tags.h | ||
| cue.c | ||
| cue.h | ||
| demux_cue.c | ||
| demux_disc.c | ||
| demux_edl.c | ||
| demux_lavf.c | ||
| demux_libarchive.c | ||
| demux_mf.c | ||
| demux_mkv_timeline.c | ||
| demux_mkv.c | ||
| demux_null.c | ||
| demux_playlist.c | ||
| demux_rar.c | ||
| demux_raw.c | ||
| demux_timeline.c | ||
| demux_tv.c | ||
| demux.c | ||
| demux.h | ||
| ebml.c | ||
| ebml.h | ||
| matroska.h | ||
| packet.c | ||
| packet.h | ||
| stheader.h | ||
| timeline.c | ||
| timeline.h | ||