mirror of
https://github.com/mpv-player/mpv
synced 2024-12-21 22:30:22 +00:00
1ad4a62336
With a recent cleanup, rar support was stuffed into demux_playlist.c (because "opening" rar files pretty much just lists archive contents and adds them to a playlist using a special rar:// protocol, which will actually access the rar file contents). Since demux_playlist.c is probed _after_ demux_lavf.c (and should/must be), libavformat was given the chance to detect DTS streams embedded within the rar file. This is not really what we want, and a regression what happened before rar listing was moved to demux_playlist.c. Fix it by moving the rar listing into its own pseudo-demuxer, and let ir probe before demux_lavf.c. (Yes, this feature still has users.)
63 lines
1.7 KiB
C
63 lines
1.7 KiB
C
/*
|
|
* This file is part of mpv.
|
|
*
|
|
* mpv is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* mpv is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License along
|
|
* with mpv. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#include "common/common.h"
|
|
#include "common/playlist.h"
|
|
#include "stream/stream.h"
|
|
#include "stream/rar.h"
|
|
#include "demux.h"
|
|
|
|
static int open_file(struct demuxer *demuxer, enum demux_check check)
|
|
{
|
|
if (RarProbe(demuxer->stream))
|
|
return -1;
|
|
|
|
int count;
|
|
rar_file_t **files;
|
|
if (RarParse(demuxer->stream, &count, &files))
|
|
return -1;
|
|
|
|
void *tmp = talloc_new(NULL);
|
|
talloc_steal(tmp, files);
|
|
|
|
struct playlist *pl = talloc_zero(demuxer, struct playlist);
|
|
demuxer->playlist = pl;
|
|
|
|
// make it load rar://
|
|
pl->disable_safety = true;
|
|
|
|
char *prefix = mp_url_escape(tmp, demuxer->stream->url, "~|");
|
|
for (int n = 0; n < count; n++) {
|
|
// stream_rar.c does the real work
|
|
playlist_add_file(pl,
|
|
talloc_asprintf(tmp, "rar://%s|%s", prefix, files[n]->name));
|
|
RarFileDelete(files[n]);
|
|
}
|
|
|
|
demuxer->filetype = "rar";
|
|
demuxer->fully_read = true;
|
|
|
|
talloc_free(tmp);
|
|
return 0;
|
|
}
|
|
|
|
const struct demuxer_desc demuxer_desc_rar = {
|
|
.name = "rar",
|
|
.desc = "Rar archive file",
|
|
.open = open_file,
|
|
};
|