diff options
Diffstat (limited to 'libmpdemux')
| -rw-r--r-- | libmpdemux/demux_cue.c | 65 | ||||
| -rw-r--r-- | libmpdemux/demux_lmlm4.c | 1 | ||||
| -rw-r--r-- | libmpdemux/demuxer.c | 29 | ||||
| -rw-r--r-- | libmpdemux/demuxer.h | 1 |
4 files changed, 94 insertions, 2 deletions
diff --git a/libmpdemux/demux_cue.c b/libmpdemux/demux_cue.c new file mode 100644 index 0000000000..d2fd06ce71 --- /dev/null +++ b/libmpdemux/demux_cue.c @@ -0,0 +1,65 @@ +/* + * This file is part of MPlayer. + * + * MPlayer 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. + * + * MPlayer 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 MPlayer; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ + +#include <stdlib.h> +#include <stdbool.h> +#include <string.h> + +#include "bstr.h" +#include "demuxer.h" +#include "stream/stream.h" + +// timeline/tl_cue.c +bool mp_probe_cue(struct bstr s); + +#define PROBE_SIZE 512 + +static int try_open_file(struct demuxer *demuxer) +{ + struct stream *s = demuxer->stream; + char buf[PROBE_SIZE]; + int len = stream_read(s, buf, sizeof(buf)); + if (len <= 0) + return 0; + if (!mp_probe_cue((struct bstr) { buf, len })) + return 0; + stream_seek(s, 0); + demuxer->file_contents = stream_read_complete(s, demuxer, 1000000, 0); + if (demuxer->file_contents.start == NULL) + return 0; + if (!mp_probe_cue((struct bstr) { buf, len })) + return 0; + return DEMUXER_TYPE_CUE; +} + +static int dummy_fill_buffer(struct demuxer *demuxer, struct demux_stream *ds) +{ + return 0; +} + +const struct demuxer_desc demuxer_desc_cue = { + .info = "CUE file demuxer", + .name = "cue", + .shortdesc = "CUE", + .author = "Uoti Urpala", + .comment = "", + .type = DEMUXER_TYPE_CUE, + .safe_check = true, + .check_file = try_open_file, // no separate .open + .fill_buffer = dummy_fill_buffer, +}; diff --git a/libmpdemux/demux_lmlm4.c b/libmpdemux/demux_lmlm4.c index 05cec05282..739343cdb4 100644 --- a/libmpdemux/demux_lmlm4.c +++ b/libmpdemux/demux_lmlm4.c @@ -181,7 +181,6 @@ static int lmlm4_check_file(demuxer_t* demuxer) mp_msg(MSGT_DEMUX, MSGL_V, "Checking for LMLM4 Stream Format\n"); if(getFrame(demuxer, &frameInfo)!=1){ - stream_skip(demuxer->stream,-8); mp_msg(MSGT_DEMUX, MSGL_V, "LMLM4 Stream Format not found\n"); return 0; } diff --git a/libmpdemux/demuxer.c b/libmpdemux/demuxer.c index f00b0551d5..ea8c4e01f1 100644 --- a/libmpdemux/demuxer.c +++ b/libmpdemux/demuxer.c @@ -52,6 +52,7 @@ static void clear_parser(sh_common_t *sh); // Demuxer list extern const struct demuxer_desc demuxer_desc_edl; +extern const struct demuxer_desc demuxer_desc_cue; extern const demuxer_desc_t demuxer_desc_rawaudio; extern const demuxer_desc_t demuxer_desc_rawvideo; extern const demuxer_desc_t demuxer_desc_tv; @@ -101,6 +102,7 @@ extern const demuxer_desc_t demuxer_desc_mng; const demuxer_desc_t *const demuxer_list[] = { &demuxer_desc_edl, + &demuxer_desc_cue, &demuxer_desc_rawaudio, &demuxer_desc_rawvideo, #ifdef CONFIG_TV @@ -1360,6 +1362,24 @@ int demuxer_add_attachment(demuxer_t *demuxer, struct bstr name, return demuxer->num_attachments++; } +static int chapter_compare(const void *p1, const void *p2) +{ + struct demux_chapter *c1 = (void *)p1; + struct demux_chapter *c2 = (void *)p2; + + if (c1->start > c2->start) + return 1; + else if (c1->start < c2->start) + return -1; + return 0; +} + +static void demuxer_sort_chapters(demuxer_t *demuxer) +{ + qsort(demuxer->chapters, demuxer->num_chapters, + sizeof(struct demux_chapter), chapter_compare); +} + int demuxer_add_chapter(demuxer_t *demuxer, struct bstr name, uint64_t start, uint64_t end) { @@ -1374,7 +1394,14 @@ int demuxer_add_chapter(demuxer_t *demuxer, struct bstr name, talloc_strndup(demuxer->chapters, name.start, name.len) : talloc_strdup(demuxer->chapters, mp_gtext("unknown")); - return demuxer->num_chapters++; + demuxer->num_chapters++; + + if (demuxer->num_chapters > 1 + && demuxer->chapters[demuxer->num_chapters - 2].start + < demuxer->chapters[demuxer->num_chapters - 1].start) + demuxer_sort_chapters(demuxer); + + return 0; } /** diff --git a/libmpdemux/demuxer.h b/libmpdemux/demuxer.h index 24b4edac19..03b1fee830 100644 --- a/libmpdemux/demuxer.h +++ b/libmpdemux/demuxer.h @@ -89,6 +89,7 @@ enum demuxer_type { DEMUXER_TYPE_RTP_NEMESI, DEMUXER_TYPE_MNG, DEMUXER_TYPE_EDL, + DEMUXER_TYPE_CUE, /* Values after this are for internal use and can not be selected * as demuxer type by the user (-demuxer option). */ |