From 3dbc9007b080028f0aebbbf8b9ab1233cd70c45b Mon Sep 17 00:00:00 2001 From: wm4 Date: Sat, 21 Dec 2013 20:24:20 +0100 Subject: demux: mp_msg conversions The TV code pretends to be part of stream/, but it's actually demuxer code too. The audio_in code is shared between the TV code and stream_radio.c, so stream_radio.c needs a small hack until stream.c is converted. --- demux/demux.c | 96 ++++++++-------- demux/demux.h | 7 +- demux/demux_lavf.c | 59 +++++----- demux/demux_libass.c | 2 +- demux/demux_mf.c | 10 +- demux/demux_mkv.c | 297 ++++++++++++++++++++++-------------------------- demux/demux_raw.c | 5 +- demux/demux_subreader.c | 58 +++++----- demux/ebml.c | 72 ++++++------ demux/ebml.h | 8 +- demux/mf.c | 37 +++--- demux/mf.h | 7 +- 12 files changed, 316 insertions(+), 342 deletions(-) (limited to 'demux') diff --git a/demux/demux.c b/demux/demux.c index 8d46f79391..7643b58a38 100644 --- a/demux/demux.c +++ b/demux/demux.c @@ -33,6 +33,7 @@ #include "common/av_common.h" #include "talloc.h" #include "common/msg.h" +#include "common/global.h" #include "stream/stream.h" #include "demux.h" @@ -225,7 +226,7 @@ struct demux_packet *demux_copy_packet(struct demux_packet *dp) struct sh_stream *new_sh_stream(demuxer_t *demuxer, enum stream_type type) { if (demuxer->num_streams > MAX_SH_STREAMS) { - mp_msg(MSGT_DEMUXER, MSGL_WARN, "Too many streams."); + MP_WARN(demuxer, "Too many streams."); return NULL; } @@ -353,8 +354,7 @@ int demuxer_add_packet(demuxer_t *demuxer, struct sh_stream *stream, if (stream->type != STREAM_VIDEO && dp->pts == MP_NOPTS_VALUE) dp->pts = dp->dts; - mp_msg(MSGT_DEMUXER, MSGL_DBG2, - "DEMUX: Append packet to %s, len=%d pts=%5.3f pos=%"PRIu64" " + MP_DBG(demuxer, "DEMUX: Append packet to %s, len=%d pts=%5.3f pos=%"PRIu64" " "[packs: A=%d V=%d S=%d]\n", stream_type_name(stream->type), dp->len, dp->pts, dp->pos, count_packs(demuxer, STREAM_AUDIO), count_packs(demuxer, STREAM_VIDEO), count_packs(demuxer, STREAM_SUB)); @@ -373,13 +373,13 @@ static bool demux_check_queue_full(demuxer_t *demux) overflow: if (!demux->warned_queue_overflow) { - mp_msg(MSGT_DEMUXER, MSGL_ERR, "\nToo many packets in the demuxer " - "packet queue (video: %d packets in %d bytes, audio: %d " - "packets in %d bytes, sub: %d packets in %d bytes).\n", - count_packs(demux, STREAM_VIDEO), count_bytes(demux, STREAM_VIDEO), - count_packs(demux, STREAM_AUDIO), count_bytes(demux, STREAM_AUDIO), - count_packs(demux, STREAM_SUB), count_bytes(demux, STREAM_SUB)); - mp_msg(MSGT_DEMUXER, MSGL_HINT, "Maybe you are playing a non-" + MP_ERR(demux, "\nToo many packets in the demuxer " + "packet queue (video: %d packets in %d bytes, audio: %d " + "packets in %d bytes, sub: %d packets in %d bytes).\n", + count_packs(demux, STREAM_VIDEO), count_bytes(demux, STREAM_VIDEO), + count_packs(demux, STREAM_AUDIO), count_bytes(demux, STREAM_AUDIO), + count_packs(demux, STREAM_SUB), count_bytes(demux, STREAM_SUB)); + MP_INFO(demux, "Maybe you are playing a non-" "interleaved stream/file or the codec failed?\n"); } demux->warned_queue_overflow = true; @@ -399,8 +399,8 @@ static void ds_get_packets(struct sh_stream *sh) { struct demux_stream *ds = sh->ds; demuxer_t *demux = sh->demuxer; - mp_msg(MSGT_DEMUXER, MSGL_DBG3, "ds_get_packets (%s) called\n", - stream_type_name(sh->type)); + MP_TRACE(demux, "ds_get_packets (%s) called\n", + stream_type_name(sh->type)); while (1) { if (ds->head) return; @@ -411,8 +411,8 @@ static void ds_get_packets(struct sh_stream *sh) if (!demux_fill_buffer(demux)) break; // EOF } - mp_msg(MSGT_DEMUXER, MSGL_V, "ds_get_packets: EOF reached (stream: %s)\n", - stream_type_name(sh->type)); + MP_VERBOSE(demux, "ds_get_packets: EOF reached (stream: %s)\n", + stream_type_name(sh->type)); ds->eof = 1; } @@ -476,16 +476,15 @@ bool demux_stream_eof(struct sh_stream *sh) // ==================================================================== -void demuxer_help(void) +void demuxer_help(struct mp_log *log) { int i; - mp_msg(MSGT_DEMUXER, MSGL_INFO, "Available demuxers:\n"); - mp_msg(MSGT_DEMUXER, MSGL_INFO, " demuxer: info:\n"); - mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_DEMUXERS\n"); + mp_info(log, "Available demuxers:\n"); + mp_info(log, " demuxer: info:\n"); for (i = 0; demuxer_list[i]; i++) { - mp_msg(MSGT_DEMUXER, MSGL_INFO, "%10s %s\n", - demuxer_list[i]->name, demuxer_list[i]->desc); + mp_info(log, "%10s %s\n", + demuxer_list[i]->name, demuxer_list[i]->desc); } } @@ -500,7 +499,8 @@ static const char *d_level(enum demux_check level) abort(); } -static struct demuxer *open_given_type(struct MPOpts *opts, +static struct demuxer *open_given_type(struct mpv_global *global, + struct mp_log *log, const struct demuxer_desc *desc, struct stream *stream, struct demuxer_params *params, @@ -516,25 +516,26 @@ static struct demuxer *open_given_type(struct MPOpts *opts, stream->end_pos > 0, .accurate_seek = true, .filepos = -1, - .opts = opts, + .opts = global->opts, + .global = global, + .log = mp_log_new(demuxer, log, desc->name), .filename = talloc_strdup(demuxer, stream->url), .metadata = talloc_zero(demuxer, struct mp_tags), }; demuxer->params = params; // temporary during open() stream_seek(stream, stream->start_pos); - mp_msg(MSGT_DEMUXER, MSGL_V, "Trying demuxer: %s (force-level: %s)\n", - desc->name, d_level(check)); + mp_verbose(log, "Trying demuxer: %s (force-level: %s)\n", + desc->name, d_level(check)); int ret = demuxer->desc->open(demuxer, check); if (ret >= 0) { demuxer->params = NULL; if (demuxer->filetype) - mp_msg(MSGT_DEMUXER, MSGL_INFO, "Detected file format: %s (%s)\n", + mp_info(log, "Detected file format: %s (%s)\n", demuxer->filetype, desc->desc); else - mp_msg(MSGT_DEMUXER, MSGL_INFO, "Detected file format: %s\n", - desc->desc); + mp_info(log, "Detected file format: %s\n", desc->desc); if (stream_manages_timeline(demuxer->stream)) { // Incorrect, but fixes some behavior with DVD/BD demuxer->ts_resets_possible = false; @@ -548,8 +549,8 @@ static struct demuxer *open_given_type(struct MPOpts *opts, demux_info_update(demuxer); // Pretend we can seek if we can't seek, but there's a cache. if (!demuxer->seekable && stream->uncached_stream) { - mp_msg(MSGT_DEMUXER, MSGL_WARN, - "File is not seekable, but there's a cache: enabling seeking.\n"); + mp_warn(log, + "File is not seekable, but there's a cache: enabling seeking.\n"); demuxer->seekable = true; } return demuxer; @@ -564,10 +565,13 @@ static const int d_request[] = {DEMUX_CHECK_REQUEST, -1}; static const int d_force[] = {DEMUX_CHECK_FORCE, -1}; struct demuxer *demux_open(struct stream *stream, char *force_format, - struct demuxer_params *params, struct MPOpts *opts) + struct demuxer_params *params, + struct mpv_global *global) { const int *check_levels = d_normal; const struct demuxer_desc *check_desc = NULL; + struct mp_log *log = mp_log_new(NULL, global->log, "!demux"); + struct demuxer *demuxer = NULL; if (!force_format) force_format = stream->demuxer; @@ -583,9 +587,8 @@ struct demuxer *demux_open(struct stream *stream, char *force_format, check_desc = demuxer_list[n]; } if (!check_desc) { - mp_msg(MSGT_DEMUXER, MSGL_ERR, "Demuxer %s does not exist.\n", - force_format); - return NULL; + mp_err(log, "Demuxer %s does not exist.\n", force_format); + goto done; } } @@ -599,15 +602,16 @@ struct demuxer *demux_open(struct stream *stream, char *force_format, for (int n = 0; demuxer_list[n]; n++) { const struct demuxer_desc *desc = demuxer_list[n]; if (!check_desc || desc == check_desc) { - struct demuxer *demuxer = open_given_type(opts, desc, stream, - params, level); + demuxer = open_given_type(global, log, desc, stream, params, level); if (demuxer) - return demuxer; + goto done; } } } - return NULL; +done: + talloc_free(log); + return demuxer; } void demux_flush(demuxer_t *demuxer) @@ -620,7 +624,7 @@ void demux_flush(demuxer_t *demuxer) int demux_seek(demuxer_t *demuxer, float rel_seek_secs, int flags) { if (!demuxer->seekable) { - mp_msg(MSGT_DEMUXER, MSGL_WARN, "Cannot seek in this file.\n"); + MP_WARN(demuxer, "Cannot seek in this file.\n"); return 0; } @@ -716,7 +720,7 @@ int demux_info_add_bstr(demuxer_t *demuxer, struct bstr opt, struct bstr param) if (oldval) { if (bstrcmp0(param, oldval) == 0) return 0; - mp_msg(MSGT_DEMUX, MSGL_INFO, "Demuxer info %.*s changed to %.*s\n", + MP_INFO(demuxer, "Demuxer info %.*s changed to %.*s\n", BSTR_P(opt), BSTR_P(param)); } @@ -732,16 +736,16 @@ int demux_info_print(demuxer_t *demuxer) if (!info || !info->num_keys) return 0; - mp_msg(MSGT_DEMUX, MSGL_INFO, "Clip info:\n"); + MP_INFO(demuxer, "Clip info:\n"); for (n = 0; n < info->num_keys; n++) { - mp_msg(MSGT_DEMUX, MSGL_INFO, " %s: %s\n", info->keys[n], - info->values[n]); - mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_CLIP_INFO_NAME%d=%s\n", n, - info->keys[n]); - mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_CLIP_INFO_VALUE%d=%s\n", n, + MP_INFO(demuxer, " %s: %s\n", info->keys[n], info->values[n]); + MP_SMODE(demuxer, "ID_CLIP_INFO_NAME%d=%s\n", n, + info->keys[n]); + MP_SMODE(demuxer, "ID_CLIP_INFO_VALUE%d=%s\n", n, + info->values[n]); } - mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_CLIP_INFO_N=%d\n", n); + MP_SMODE(demuxer, "ID_CLIP_INFO_N=%d\n", n); return 0; } diff --git a/demux/demux.h b/demux/demux.h index 6d5253786f..7b25032011 100644 --- a/demux/demux.h +++ b/demux/demux.h @@ -194,6 +194,8 @@ typedef struct demuxer { void *priv; // demuxer-specific internal data struct MPOpts *opts; + struct mpv_global *global; + struct mp_log *log; struct demuxer_params *params; } demuxer_t; @@ -227,7 +229,8 @@ bool demux_stream_eof(struct sh_stream *sh); struct sh_stream *new_sh_stream(struct demuxer *demuxer, enum stream_type type); struct demuxer *demux_open(struct stream *stream, char *force_format, - struct demuxer_params *params, struct MPOpts *opts); + struct demuxer_params *params, + struct mpv_global *global); void demux_flush(struct demuxer *demuxer); int demux_seek(struct demuxer *demuxer, float rel_seek_secs, int flags); @@ -247,7 +250,7 @@ void demuxer_select_track(struct demuxer *demuxer, struct sh_stream *stream, bool selected); void demuxer_enable_autoselect(struct demuxer *demuxer); -void demuxer_help(void); +void demuxer_help(struct mp_log *log); int demuxer_add_attachment(struct demuxer *demuxer, struct bstr name, struct bstr type, struct bstr data); diff --git a/demux/demux_lavf.c b/demux/demux_lavf.c index 9057284c1e..ceef14f4d0 100644 --- a/demux/demux_lavf.c +++ b/demux/demux_lavf.c @@ -121,8 +121,7 @@ static int mp_read(void *opaque, uint8_t *buf, int size) ret = stream_read(stream, buf, size); - mp_msg(MSGT_HEADER, MSGL_DBG2, - "%d=mp_read(%p, %p, %d), pos: %"PRId64", eof:%d\n", + MP_DBG(demuxer, "%d=mp_read(%p, %p, %d), pos: %"PRId64", eof:%d\n", ret, stream, buf, size, stream_tell(stream), stream->eof); return ret; } @@ -132,7 +131,7 @@ static int64_t mp_seek(void *opaque, int64_t pos, int whence) struct demuxer *demuxer = opaque; struct stream *stream = demuxer->stream; int64_t current_pos; - mp_msg(MSGT_HEADER, MSGL_DBG2, "mp_seek(%p, %"PRId64", %d)\n", + MP_DBG(demuxer, "mp_seek(%p, %"PRId64", %d)\n", stream, pos, whence); if (whence == SEEK_CUR) pos += stream_tell(stream); @@ -171,12 +170,12 @@ static int64_t mp_read_seek(void *opaque, int stream_idx, int64_t ts, int flags) return ret; } -static void list_formats(void) +static void list_formats(struct demuxer *demuxer) { - mp_msg(MSGT_DEMUX, MSGL_INFO, "Available lavf input formats:\n"); + MP_INFO(demuxer, "Available lavf input formats:\n"); AVInputFormat *fmt = NULL; while ((fmt = av_iformat_next(fmt))) - mp_msg(MSGT_DEMUX, MSGL_INFO, "%15s : %s\n", fmt->name, fmt->long_name); + MP_INFO(demuxer, "%15s : %s\n", fmt->name, fmt->long_name); } static char *remove_prefix(char *s, const char **prefixes) @@ -206,7 +205,7 @@ static int lavf_check_file(demuxer_t *demuxer, enum demux_check check) priv->filename = s->url; if (!priv->filename) { priv->filename = "mp:unknown"; - mp_msg(MSGT_DEMUX, MSGL_WARN, "Stream url is not set!\n"); + MP_WARN(demuxer, "Stream url is not set!\n"); } priv->filename = remove_prefix(priv->filename, prefixes); @@ -216,8 +215,7 @@ static int lavf_check_file(demuxer_t *demuxer, enum demux_check check) // always require filename in the form "format:filename" char *sep = strchr(priv->filename, ':'); if (!sep) { - mp_msg(MSGT_DEMUX, MSGL_FATAL, - "Must specify filename in 'format:filename' form\n"); + MP_FATAL(demuxer, "Must specify filename in 'format:filename' form\n"); return -1; } avdevice_format = talloc_strndup(priv, priv->filename, @@ -244,15 +242,15 @@ static int lavf_check_file(demuxer_t *demuxer, enum demux_check check) format = avdevice_format; if (format) { if (strcmp(format, "help") == 0) { - list_formats(); + list_formats(demuxer); return -1; } priv->avif = av_find_input_format(format); if (!priv->avif) { - mp_msg(MSGT_DEMUX, MSGL_FATAL, "Unknown lavf format %s\n", format); + MP_FATAL(demuxer, "Unknown lavf format %s\n", format); return -1; } - mp_msg(MSGT_DEMUX, MSGL_INFO, "Forced lavf %s demuxer\n", + MP_INFO(demuxer, "Forced lavf %s demuxer\n", priv->avif->long_name); goto success; } @@ -284,7 +282,7 @@ static int lavf_check_file(demuxer_t *demuxer, enum demux_check check) priv->avif = av_probe_input_format2(&avpd, avpd.buf_size > 0, &score); if (priv->avif) { - mp_msg(MSGT_HEADER, MSGL_V, "Found '%s' at score=%d size=%d.\n", + MP_VERBOSE(demuxer, "Found '%s' at score=%d size=%d.\n", priv->avif->name, score, avpd.buf_size); if (score >= min_probe) @@ -305,7 +303,7 @@ static int lavf_check_file(demuxer_t *demuxer, enum demux_check check) if (priv->avif && !format) { for (int n = 0; format_blacklist[n]; n++) { if (strcmp(format_blacklist[n], priv->avif->name) == 0) { - mp_msg(MSGT_HEADER, MSGL_V, "Format blacklisted.\n"); + MP_VERBOSE(demuxer, "Format blacklisted.\n"); priv->avif = NULL; break; } @@ -313,8 +311,7 @@ static int lavf_check_file(demuxer_t *demuxer, enum demux_check check) } if (!priv->avif) { - mp_msg(MSGT_HEADER, MSGL_V, - "No format found, try lowering probescore or forcing the format.\n"); + MP_VERBOSE(demuxer, "No format found, try lowering probescore or forcing the format.\n"); return -1; } @@ -444,7 +441,7 @@ static void handle_stream(demuxer_t *demuxer, int i) // This also applies to vfw-muxed mkv, but we can't detect these easily. sh_video->avi_dts = matches_avinputformat_name(priv, "avi"); - mp_msg(MSGT_DEMUX, MSGL_DBG2, "aspect= %d*%d/(%d*%d)\n", + MP_DBG(demuxer, "aspect= %d*%d/(%d*%d)\n", codec->width, codec->sample_aspect_ratio.num, codec->height, codec->sample_aspect_ratio.den); break; @@ -542,8 +539,7 @@ static int demux_open_lavf(demuxer_t *demuxer, enum demux_check check) if (lavfdopts->probesize) { if (av_opt_set_int(avfc, "probesize", lavfdopts->probesize, 0) < 0) - mp_msg(MSGT_HEADER, MSGL_ERR, - "demux_lavf, couldn't set option probesize to %u\n", + MP_ERR(demuxer, "demux_lavf, couldn't set option probesize to %u\n", lavfdopts->probesize); } @@ -554,14 +550,13 @@ static int demux_open_lavf(demuxer_t *demuxer, enum demux_check check) if (analyze_duration > 0) { if (av_opt_set_int(avfc, "analyzeduration", analyze_duration * AV_TIME_BASE, 0) < 0) - mp_msg(MSGT_HEADER, MSGL_ERR, "demux_lavf, couldn't set option " + MP_ERR(demuxer, "demux_lavf, couldn't set option " "analyzeduration to %f\n", analyze_duration); } if (lavfdopts->avopt) { if (parse_avopts(avfc, lavfdopts->avopt) < 0) { - mp_msg(MSGT_HEADER, MSGL_ERR, - "Your options /%s/ look like gibberish to me pal\n", + MP_ERR(demuxer, "Your options /%s/ look like gibberish to me pal\n", lavfdopts->avopt); return -1; } @@ -601,27 +596,25 @@ static int demux_open_lavf(demuxer_t *demuxer, enum demux_check check) } if (avformat_open_input(&avfc, priv->filename, priv->avif, &dopts) < 0) { - mp_msg(MSGT_HEADER, MSGL_ERR, - "LAVF_header: avformat_open_input() failed\n"); + MP_ERR(demuxer, "LAVF_header: avformat_open_input() failed\n"); av_dict_free(&dopts); return -1; } t = NULL; while ((t = av_dict_get(dopts, "", t, AV_DICT_IGNORE_SUFFIX))) { - mp_msg(MSGT_OPEN, MSGL_V, "[lavf] Could not set demux option %s=%s\n", + MP_VERBOSE(demuxer, "[lavf] Could not set demux option %s=%s\n", t->key, t->value); } av_dict_free(&dopts); priv->avfc = avfc; if (avformat_find_stream_info(avfc, NULL) < 0) { - mp_msg(MSGT_HEADER, MSGL_ERR, - "LAVF_header: av_find_stream_info() failed\n"); + MP_ERR(demuxer, "LAVF_header: av_find_stream_info() failed\n"); return -1; } - mp_msg(MSGT_HEADER, MSGL_V, "demux_lavf: avformat_find_stream_info() " + MP_VERBOSE(demuxer, "demux_lavf: avformat_find_stream_info() " "finished after %"PRId64" bytes.\n", stream_tell(demuxer->stream)); for (i = 0; i < avfc->nb_chapters; i++) { @@ -658,13 +651,13 @@ static int demux_open_lavf(demuxer_t *demuxer, enum demux_check check) for (p = 0; p < avfc->nb_programs; p++) { AVProgram *program = avfc->programs[p]; t = av_dict_get(program->metadata, "title", NULL, 0); - mp_msg(MSGT_HEADER, MSGL_INFO, "LAVF: Program %d %s\n", + MP_INFO(demuxer, "LAVF: Program %d %s\n", program->id, t ? t->value : ""); - mp_msg(MSGT_IDENTIFY, MSGL_V, "PROGRAM_ID=%d\n", program->id); + MP_VERBOSE(demuxer, "PROGRAM_ID=%d\n", program->id); } } - mp_msg(MSGT_HEADER, MSGL_V, "LAVF: build %d\n", LIBAVFORMAT_BUILD); + MP_VERBOSE(demuxer, "LAVF: build %d\n", LIBAVFORMAT_BUILD); demuxer->ts_resets_possible = priv->avif->flags & AVFMT_TS_DISCONT; @@ -680,7 +673,7 @@ static int demux_lavf_fill_buffer(demuxer_t *demux) { lavf_priv_t *priv = demux->priv; demux_packet_t *dp; - mp_msg(MSGT_DEMUX, MSGL_DBG2, "demux_lavf_fill_buffer()\n"); + MP_DBG(demux, "demux_lavf_fill_buffer()\n"); AVPacket *pkt = talloc(NULL, AVPacket); if (av_read_frame(priv->avfc, pkt) < 0) { @@ -737,7 +730,7 @@ static void demux_seek_lavf(demuxer_t *demuxer, float rel_seek_secs, int flags) { lavf_priv_t *priv = demuxer->priv; int avsflags = 0; - mp_msg(MSGT_DEMUX, MSGL_DBG2, "demux_seek_lavf(%p, %f, %d)\n", + MP_DBG(demuxer, "demux_seek_lavf(%p, %f, %d)\n", demuxer, rel_seek_secs, flags); if (flags & SEEK_ABSOLUTE) diff --git a/demux/demux_libass.c b/demux/demux_libass.c index f01b999d9e..15f5195cfc 100644 --- a/demux/demux_libass.c +++ b/demux/demux_libass.c @@ -73,7 +73,7 @@ static int d_check_file(struct demuxer *demuxer, enum demux_check check) bstr buf = stream_read_complete(s, NULL, 100000000); if (!buf.start) { - mp_msg(MSGT_ASS, MSGL_ERR, "Refusing to load subtitle file " + MP_ERR(demuxer, "Refusing to load subtitle file " "larger than 100 MB: %s\n", demuxer->filename); return -1; } diff --git a/demux/demux_mf.c b/demux/demux_mf.c index 876b17a025..1d80cfaa85 100644 --- a/demux/demux_mf.c +++ b/demux/demux_mf.c @@ -158,11 +158,9 @@ static const char *probe_format(mf_t *mf, enum demux_check check) } if (check == DEMUX_CHECK_REQUEST) { if (!mf_type) { - mp_msg(MSGT_DEMUX, MSGL_ERR, - "[demux_mf] file type was not set! (try --mf-type=ext)\n"); + MP_ERR(mf, "file type was not set! (try --mf-type=ext)\n"); } else { - mp_msg(MSGT_DEMUX, MSGL_ERR, - "[demux_mf] --mf-type set to an unknown codec!\n"); + MP_ERR(mf, "--mf-type set to an unknown codec!\n"); } } return NULL; @@ -175,9 +173,9 @@ static int demux_open_mf(demuxer_t *demuxer, enum demux_check check) if (strncmp(demuxer->stream->url, "mf://", 5) == 0 && demuxer->stream->type == STREAMTYPE_MF) - mf = open_mf_pattern(demuxer, demuxer->stream->url + 5); + mf = open_mf_pattern(demuxer, demuxer->log, demuxer->stream->url + 5); else { - mf = open_mf_single(demuxer, demuxer->stream->url); + mf = open_mf_single(demuxer, demuxer->log, demuxer->stream->url); int bog = 0; MP_TARRAY_APPEND(mf, mf->streams, bog, demuxer->stream); } diff --git a/demux/demux_mkv.c b/demux/demux_mkv.c index 52ab592eb0..8c3189b539 100644 --- a/demux/demux_mkv.c +++ b/demux/demux_mkv.c @@ -249,7 +249,8 @@ static int aac_get_sample_rate_index(uint32_t sample_rate) return i; } -static bstr demux_mkv_decode(mkv_track_t *track, bstr data, uint32_t type) +static bstr demux_mkv_decode(struct mp_log *log, mkv_track_t *track, + bstr data, uint32_t type) { uint8_t *src = data.start; uint8_t *orig_src = src; @@ -278,8 +279,7 @@ static bstr demux_mkv_decode(mkv_track_t *track, bstr data, uint32_t type) zstream.zfree = (free_func) 0; zstream.opaque = (voidpf) 0; if (inflateInit(&zstream) != Z_OK) { - mp_msg(MSGT_DEMUX, MSGL_WARN, - "[mkv] zlib initialization failed.\n"); + mp_warn(log, "zlib initialization failed.\n"); goto error; } zstream.next_in = (Bytef *) src; @@ -294,8 +294,7 @@ static bstr demux_mkv_decode(mkv_track_t *track, bstr data, uint32_t type) zstream.next_out = (Bytef *) (dest + zstream.total_out); result = inflate(&zstream, Z_NO_FLUSH); if (result != Z_OK && result != Z_STREAM_END) { - mp_msg(MSGT_DEMUX, MSGL_WARN, - "[mkv] zlib decompression failed.\n"); + mp_warn(log, "zlib decompression failed.\n"); talloc_free(dest); dest = NULL; inflateEnd(&zstream); @@ -323,14 +322,12 @@ static bstr demux_mkv_decode(mkv_track_t *track, bstr data, uint32_t type) if (result == 0) break; if (!(result & AV_LZO_OUTPUT_FULL)) { - mp_msg(MSGT_DEMUX, MSGL_WARN, - "[mkv] lzo decompression failed.\n"); + mp_warn(log, "lzo decompression failed.\n"); talloc_free(dest); dest = NULL; goto error; } - mp_msg(MSGT_DEMUX, MSGL_DBG2, - "[mkv] lzo decompression buffer too small.\n"); + mp_dbg(log, "lzo decompression buffer too small.\n"); dstlen *= 2; } size = dstlen - out_avail; @@ -359,17 +356,16 @@ static int demux_mkv_read_info(demuxer_t *demuxer) mkv_d->duration = 0; struct ebml_info info = {0}; - struct ebml_parse_ctx parse_ctx = {0}; + struct ebml_parse_ctx parse_ctx = {demuxer->log}; if (ebml_read_element(s, &parse_ctx, &info, &ebml_info_desc) < 0) return -1; if (info.n_timecode_scale) { mkv_d->tc_scale = info.timecode_scale; - mp_msg(MSGT_DEMUX, MSGL_V, - "[mkv] | + timecode scale: %" PRIu64 "\n", mkv_d->tc_scale); + MP_VERBOSE(demuxer, "| + timecode scale: %" PRIu64 "\n", mkv_d->tc_scale); } if (info.n_duration) { mkv_d->duration = info.duration * mkv_d->tc_scale / 1e9; - mp_msg(MSGT_DEMUX, MSGL_V, "[mkv] | + duration: %.3fs\n", + MP_VERBOSE(demuxer, "| + duration: %.3fs\n", mkv_d->duration); } if (info.n_title) { @@ -378,16 +374,15 @@ static int demux_mkv_read_info(demuxer_t *demuxer) if (info.n_segment_uid) { int len = info.segment_uid.len; if (len != sizeof(demuxer->matroska_data.uid.segment)) { - mp_msg(MSGT_DEMUX, MSGL_INFO, - "[mkv] segment uid invalid length %d\n", len); + MP_INFO(demuxer, "segment uid invalid length %d\n", len); } else { memcpy(demuxer->matroska_data.uid.segment, info.segment_uid.start, len); - mp_msg(MSGT_DEMUX, MSGL_V, "[mkv] | + segment uid"); + MP_VERBOSE(demuxer, "| + segment uid"); for (int i = 0; i < len; i++) - mp_msg(MSGT_DEMUX, MSGL_V, " %02x", + MP_VERBOSE(demuxer, " %02x", demuxer->matroska_data.uid.segment[i]); - mp_msg(MSGT_DEMUX, MSGL_V, "\n"); + MP_VERBOSE(demuxer, "\n"); } } if (demuxer->params && demuxer->params->matroska_wanted_uids) { @@ -400,8 +395,7 @@ static int demux_mkv_read_info(demuxer_t *demuxer) } } } - mp_msg(MSGT_DEMUX, MSGL_INFO, - "[mkv] This is not one of the wanted files. " + MP_INFO(demuxer, "This is not one of the wanted files. " "Stopping attempt to open.\n"); res = -2; } @@ -439,29 +433,26 @@ static void parse_trackencodings(struct demuxer *demuxer, } if (e.type == 1) { - mp_msg(MSGT_DEMUX, MSGL_WARN, "[mkv] Track " + MP_WARN(demuxer, "Track " "number %u has been encrypted and " "decryption has not yet been\n" - "[mkv] implemented. Skipping track.\n", + "implemented. Skipping track.\n", track->tnum); } else if (e.type != 0) { - mp_msg(MSGT_DEMUX, MSGL_WARN, - "[mkv] Unknown content encoding type for " + MP_WARN(demuxer, "Unknown content encoding type for " "track %u. Skipping track.\n", track->tnum); } else if (e.comp_algo != 0 && e.comp_algo != 2 && e.comp_algo != 3) { - mp_msg(MSGT_DEMUX, MSGL_WARN, - "[mkv] Track %u has been compressed with " + MP_WARN(demuxer, "Track %u has been compressed with " "an unknown/unsupported compression\n" - "[mkv] algorithm (%" PRIu64 "). Skipping track.\n", + "algorithm (%" PRIu64 "). Skipping track.\n", track->tnum, e.comp_algo); } #if !HAVE_ZLIB else if (e.comp_algo == 0) { - mp_msg(MSGT_DEMUX, MSGL_WARN, - "[mkv] Track %u was compressed with zlib " + MP_WARN(demuxer, "Track %u was compressed with zlib " "but mpv has not been compiled\n" - "[mkv] with support for zlib compression. " + "with support for zlib compression. " "Skipping track.\n", track->tnum); } @@ -485,26 +476,24 @@ static void parse_trackaudio(struct demuxer *demuxer, struct mkv_track *track, { if (audio->n_sampling_frequency) { track->a_sfreq = audio->sampling_frequency; - mp_msg(MSGT_DEMUX, MSGL_V, - "[mkv] | + Sampling frequency: %f\n", track->a_sfreq); + MP_VERBOSE(demuxer, "| + Sampling frequency: %f\n", track->a_sfreq); } else { track->a_sfreq = 8000; } if (audio->n_output_sampling_frequency) { track->a_osfreq = audio->output_sampling_frequency; - mp_msg(MSGT_DEMUX, MSGL_V, - "[mkv] | + Output sampling frequency: %f\n", track->a_osfreq); + MP_VERBOSE(demuxer, "| + Output sampling frequency: %f\n", track->a_osfreq); } else { track->a_osfreq = track->a_sfreq; } if (audio->n_bit_depth) { track->a_bps = audio->bit_depth; - mp_msg(MSGT_DEMUX, MSGL_V, "[mkv] | + Bit depth: %u\n", + MP_VERBOSE(demuxer, "| + Bit depth: %u\n", track->a_bps); } if (audio->n_channels) { track->a_channels = audio->channels; - mp_msg(MSGT_DEMUX, MSGL_V, "[mkv] | + Channels: %u\n", + MP_VERBOSE(demuxer, "| + Channels: %u\n", track->a_channels); } else { track->a_channels = 1; @@ -516,7 +505,7 @@ static void parse_trackvideo(struct demuxer *demuxer, struct mkv_track *track, { if (video->n_frame_rate) { track->v_frate = video->frame_rate; - mp_msg(MSGT_DEMUX, MSGL_V, "[mkv] | + Frame rate: %f\n", + MP_VERBOSE(demuxer, "| + Frame rate: %f\n", track->v_frate); if (track->v_frate > 0) track->default_duration = 1 / track->v_frate; @@ -524,29 +513,29 @@ static void parse_trackvideo(struct demuxer *demuxer, struct mkv_track *track, if (video->n_display_width) { track->v_dwidth = video->display_width; track->v_dwidth_set = true; - mp_msg(MSGT_DEMUX, MSGL_V, "[mkv] | + Display width: %u\n", + MP_VERBOSE(demuxer, "| + Display width: %u\n", track->v_dwidth); } if (video->n_display_height) { track->v_dheight = video->display_height; track->v_dheight_set = true; - mp_msg(MSGT_DEMUX, MSGL_V, "[mkv] | + Display height: %u\n", + MP_VERBOSE(demuxer, "| + Display height: %u\n", track->v_dheight); } if (video->n_pixel_width) { track->v_width = video->pixel_width; - mp_msg(MSGT_DEMUX, MSGL_V, "[mkv] | + Pixel width: %u\n", + MP_VERBOSE(demuxer, "| + Pixel width: %u\n", track->v_width); } if (video->n_pixel_height) { track->v_height = video->pixel_height; - mp_msg(MSGT_DEMUX, MSGL_V, "[mkv] | + Pixel height: %u\n", + MP_VERBOSE(demuxer, "| + Pixel height: %u\n", track->v_height); } if (video->n_colour_space && video->colour_space.len == 4) { uint8_t *d = (uint8_t *)&video->colour_space.start[0]; track->colorspace = d[0] | (d[1] << 8) | (d[2] << 16) | (d[3] << 24); - mp_msg(MSGT_DEMUX, MSGL_V, "[mkv] | + Colorspace: %#x\n", + MP_VERBOSE(demuxer, "| + Colorspace: %#x\n", (unsigned int)track->colorspace); } } @@ -569,43 +558,43 @@ static void parse_trackentry(struct demuxer *demuxer, track->tnum = entry->track_number; if (track->tnum) { - mp_msg(MSGT_DEMUX, MSGL_V, "[mkv] | + Track number: %u\n", + MP_VERBOSE(demuxer, "| + Track number: %u\n", track->tnum); } else { - mp_msg(MSGT_DEMUX, MSGL_ERR, "[mkv] Missing track number!\n"); + MP_ERR(demuxer, "Missing track number!\n"); } if (entry->n_name) { track->name = talloc_strndup(track, entry->name.start, entry->name.len); - mp_msg(MSGT_DEMUX, MSGL_V, "[mkv] | + Name: %s\n", + MP_VERBOSE(demuxer, "| + Name: %s\n", track->name); } track->type = entry->track_type; - mp_msg(MSGT_DEMUX, MSGL_V, "[mkv] | + Track type: "); + MP_VERBOSE(demuxer, "| + Track type: "); switch (track->type) { case MATROSKA_TRACK_AUDIO: - mp_msg(MSGT_DEMUX, MSGL_V, "Audio\n"); + MP_VERBOSE(demuxer, "Audio\n"); break; case MATROSKA_TRACK_VIDEO: - mp_msg(MSGT_DEMUX, MSGL_V, "Video\n"); + MP_VERBOSE(demuxer, "Video\n"); break; case MATROSKA_TRACK_SUBTITLE: - mp_msg(MSGT_DEMUX, MSGL_V, "Subtitle\n"); + MP_VERBOSE(demuxer, "Subtitle\n"); break; default: - mp_msg(MSGT_DEMUX, MSGL_V, "unknown\n"); + MP_VERBOSE(demuxer, "unknown\n"); break; } if (entry->n_audio) { - mp_msg(MSGT_DEMUX, MSGL_V, "[mkv] | + Audio track\n"); + MP_VERBOSE(demuxer, "| + Audio track\n"); parse_trackaudio(demuxer, track, &entry->audio); } if (entry->n_video) { - mp_msg(MSGT_DEMUX, MSGL_V, "[mkv] | + Video track\n"); + MP_VERBOSE(demuxer, "| + Video track\n"); parse_trackvideo(demuxer, track, &entry->video); } @@ -615,10 +604,10 @@ static void parse_trackentry(struct demuxer *demuxer, if (!strcmp(track->codec_id, MKV_V_MSCOMP) || !strcmp(track->codec_id, MKV_A_ACM)) track->ms_compat = 1; - mp_msg(MSGT_DEMUX, MSGL_V, "[mkv] | + Codec ID: %s\n", + MP_VERBOSE(demuxer, "| + Codec ID: %s\n", track->codec_id); } else { - mp_msg(MSGT_DEMUX, MSGL_ERR, "[mkv] Missing codec ID!\n"); + MP_ERR(demuxer, "Missing codec ID!\n"); track->codec_id = ""; } @@ -627,14 +616,14 @@ static void parse_trackentry(struct demuxer *demuxer, track->private_data = talloc_size(track, len + AV_LZO_INPUT_PADDING); memcpy(track->private_data, entry->codec_private.start, len); track->private_size = len; - mp_msg(MSGT_DEMUX, MSGL_V, "[mkv] | + CodecPrivate, length %u\n", + MP_VERBOSE(demuxer, "| + CodecPrivate, length %u\n", track->private_size); } if (entry->n_language) { track->language = talloc_strndup(track, entry->language.start, entry->language.len); - mp_msg(MSGT_DEMUX, MSGL_V, "[mkv] | + Language: %s\n", + MP_VERBOSE(demuxer, "| + Language: %s\n", track->language); } else { track->language = talloc_strdup(track, "eng"); @@ -642,7 +631,7 @@ static void parse_trackentry(struct demuxer *demuxer, if (entry->n_flag_default) { track->default_track = entry->flag_default; - mp_msg(MSGT_DEMUX, MSGL_V, "[mkv] | + Default flag: %u\n", + MP_VERBOSE(demuxer, "| + Default flag: %u\n", track->default_track); } else { track->default_track = 1; @@ -651,12 +640,11 @@ static void parse_trackentry(struct demuxer *demuxer, if (entry->n_default_duration) { track->default_duration = entry->default_duration / 1e9; if (entry->default_duration == 0) { - mp_msg(MSGT_DEMUX, MSGL_V, "[mkv] | + Default duration: 0"); + MP_VERBOSE(demuxer, "| + Default duration: 0"); } else { if (!track->v_frate) track->v_frate = 1e9 / entry->default_duration; - mp_msg(MSGT_DEMUX, MSGL_V, - "[mkv] | + Default duration: %.3fms ( = %.3f fps)\n", + MP_VERBOSE(demuxer, "| + Default duration: %.3fms ( = %.3f fps)\n", entry->default_duration / 1000000.0, track->v_frate); } } @@ -673,14 +661,14 @@ static int demux_mkv_read_tracks(demuxer_t *demuxer) stream_t *s = demuxer->stream; struct ebml_tracks tracks = {0}; - struct ebml_parse_ctx parse_ctx = {0}; + struct ebml_parse_ctx parse_ctx = {demuxer->log}; if (ebml_read_element(s, &parse_ctx, &tracks, &ebml_tracks_desc) < 0) return -1; mkv_d->tracks = talloc_size(mkv_d, tracks.n_track_entry * sizeof(*mkv_d->tracks)); for (int i = 0; i < tracks.n_track_entry; i++) { - mp_msg(MSGT_DEMUX, MSGL_V, "[mkv] | + a track...\n"); + MP_VERBOSE(demuxer, "| + a track...\n"); parse_trackentry(demuxer, &tracks.track_entry[i]); } talloc_free(parse_ctx.talloc_ctx); @@ -730,9 +718,9 @@ static int demux_mkv_read_cues(demuxer_t *demuxer) return 0; } - mp_msg(MSGT_DEMUX, MSGL_V, "[mkv] /---- [ parsing cues ] -----------\n"); + MP_VERBOSE(demuxer, "/---- [ parsing cues ] -----------\n"); struct ebml_cues cues = {0}; - struct ebml_parse_ctx parse_ctx = {0}; + struct ebml_parse_ctx parse_ctx = {demuxer->log}; if (ebml_read_element(s, &parse_ctx, &cues, &ebml_cues_desc) < 0) return -1; @@ -741,7 +729,7 @@ static int demux_mkv_read_cues(demuxer_t *demuxer) for (int i = 0; i < cues.n_cue_point; i++) { struct ebml_cue_point *cuepoint = &cues.cue_point[i]; if (cuepoint->n_cue_time != 1 || !cuepoint->n_cue_track_positions) { - mp_msg(MSGT_DEMUX, MSGL_WARN, "[mkv] Malformed CuePoint element\n"); + MP_WARN(demuxer, "Malformed CuePoint element\n"); continue; } uint64_t time = cuepoint->cue_time; @@ -750,8 +738,7 @@ static int demux_mkv_read_cues(demuxer_t *demuxer) &cuepoint->cue_track_positions[c]; uint64_t pos = mkv_d->segment_start + trackpos->cue_cluster_position; cue_index_add(demuxer, trackpos->cue_track, pos, time); - mp_msg(MSGT_DEMUX, MSGL_DBG2, - "[mkv] |+ found cue point for track %" PRIu64 + MP_DBG(demuxer, "|+ found cue point for track %" PRIu64 ": timecode %" PRIu64 ", filepos: %" PRIu64 "\n", trackpos->cue_track, time, pos); } @@ -760,7 +747,7 @@ static int demux_mkv_read_cues(demuxer_t *demuxer) // Do not attempt to create index on the fly. mkv_d->index_complete = true; - mp_msg(MSGT_DEMUX, MSGL_V, "[mkv] \\---- [ parsing cues ] -----------\n"); + MP_VERBOSE(demuxer, "\\---- [ parsing cues ] -----------\n"); talloc_free(parse_ctx.talloc_ctx); return 0; } @@ -774,11 +761,11 @@ static void read_deferred_cues(demuxer_t *demuxer) int64_t pos = mkv_d->deferred_cues; mkv_d->deferred_cues = 0; if (!stream_seek(s, pos)) { - mp_msg(MSGT_DEMUX, MSGL_WARN, "[mkv] Failed to seek to cues\n"); + MP_WARN(demuxer, "Failed to seek to cues\n"); return; } if (ebml_read_id(s, NULL) != MATROSKA_ID_CUES) { - mp_msg(MSGT_DEMUX, MSGL_WARN, "[mkv] Expected element not found\n"); + MP_WARN(demuxer, "Expected element not found\n"); return; } demux_mkv_read_cues(demuxer); @@ -797,9 +784,9 @@ static int demux_mkv_read_chapters(struct demuxer *demuxer) if (wanted_edition_uid) wanted_edition = -1; - mp_msg(MSGT_DEMUX, MSGL_V, "[mkv] /---- [ parsing chapters ] ---------\n"); + MP_VERBOSE(demuxer, "/---- [ parsing chapters ] ---------\n"); struct ebml_chapters file_chapters = {0}; - struct ebml_parse_ctx parse_ctx = {0}; + struct ebml_parse_ctx parse_ctx = {demuxer->log}; if (ebml_read_element(s, &parse_ctx, &file_chapters, &ebml_chapters_desc) < 0) return -1; @@ -809,7 +796,7 @@ static int demux_mkv_read_chapters(struct demuxer *demuxer) struct ebml_edition_entry *editions = file_chapters.edition_entry; if (wanted_edition >= 0 && wanted_edition < num_editions) { selected_edition = wanted_edition; - mp_msg(MSGT_DEMUX, MSGL_V, "[mkv] User-specified edition: %d\n", + MP_VERBOSE(demuxer, "User-specified edition: %d\n", selected_edition); } else { for (int i = 0; i < num_editions; i++) { @@ -819,15 +806,14 @@ static int demux_mkv_read_chapters(struct demuxer *demuxer) break; } else if (editions[i].edition_flag_default) { selected_edition = i; - mp_msg(MSGT_DEMUX, MSGL_V, "[mkv] Default edition: %d\n", i); + MP_VERBOSE(demuxer, "Default edition: %d\n", i); break; } } } if (selected_edition < 0) { if (wanted_edition_uid) { - mp_msg(MSGT_DEMUX, MSGL_ERR, - "[mkv] Unable to find expected edition uid: %"PRIu64"\n", + MP_ERR(demuxer, "Unable to find expected edition uid: %"PRIu64"\n", wanted_edition_uid); return -1; } else { @@ -836,13 +822,13 @@ static int demux_mkv_read_chapters(struct demuxer *demuxer) } for (int idx = 0; idx < num_editions; idx++) { - mp_msg(MSGT_DEMUX, MSGL_V, "[mkv] New edition %d\n", idx); + MP_VERBOSE(demuxer, "New edition %d\n", idx); int warn_level = idx == selected_edition ? MSGL_WARN : MSGL_V; if (editions[idx].n_edition_flag_default) - mp_msg(MSGT_DEMUX, MSGL_V, "[mkv] Default edition flag: %"PRIu64 + MP_VERBOSE(demuxer, "Default edition flag: %"PRIu64 "\n", editions[idx].edition_flag_default); if (editions[idx].n_edition_flag_ordered) - mp_msg(MSGT_DEMUX, MSGL_V, "[mkv] Ordered chapter flag: %"PRIu64 + MP_VERBOSE(demuxer, "Ordered chapter flag: %"PRIu64 "\n", editions[idx].edition_flag_ordered); int chapter_count = editions[idx].n_chapter_atom; @@ -860,17 +846,17 @@ static int demux_mkv_read_chapters(struct demuxer *demuxer) struct bstr name = { "(unnamed)", 9 }; if (!ca->n_chapter_time_start) - mp_msg(MSGT_DEMUX, warn_level, - "[mkv] Chapter lacks start time\n"); + MP_MSG(demuxer, warn_level, + "Chapter lacks start time\n"); chapter.start = ca->chapter_time_start; chapter.end = ca->chapter_time_end; if (ca->n_chapter_display) { if (ca->n_chapter_display > 1) - mp_msg(MSGT_DEMUX, warn_level, "[mkv] Multiple chapter " + MP_MSG(demuxer, warn_level, "Multiple chapter " "names not supported, picking first\n"); if (!ca->chapter_display[0].n_chap_string) - mp_msg(MSGT_DEMUX, warn_level, "[mkv] Malformed chapter " + MP_MSG(demuxer, warn_level, "Malformed chapter " "name entry\n"); else name = ca->chapter_display[0].chap_string; @@ -880,8 +866,8 @@ static int demux_mkv_read_chapters(struct demuxer *demuxer) chapter.has_segment_uid = true; int len = ca->chapter_segment_uid.len; if (len != sizeof(chapter.uid.segment)) - mp_msg(MSGT_DEMUX, warn_level, - "[mkv] Chapter segment uid bad length %d\n", len); + MP_MSG(demuxer, warn_level, + "Chapter segment uid bad length %d\n", len); else { memcpy(chapter.uid.segment, ca->chapter_segment_uid.start, len); @@ -889,16 +875,15 @@ static int demux_mkv_read_chapters(struct demuxer *demuxer) chapter.uid.edition = ca->chapter_segment_edition_uid; else chapter.uid.edition = 0; - mp_msg(MSGT_DEMUX, MSGL_V, "[mkv] Chapter segment uid "); + MP_VERBOSE(demuxer, "Chapter segment uid "); for (int n = 0; n < len; n++) - mp_msg(MSGT_DEMUX, MSGL_V, "%02x ", + MP_VERBOSE(demuxer, "%02x ", chapter.uid.segment[n]); - mp_msg(MSGT_DEMUX, MSGL_V, "\n"); + MP_VERBOSE(demuxer, "\n"); } } - mp_msg(MSGT_DEMUX, MSGL_V, - "[mkv] Chapter %u from %02d:%02d:%02d.%03d " + MP_VERBOSE(demuxer, "Chapter %u from %02d:%02d:%02d.%03d " "to %02d:%02d:%02d.%03d, %.*s\n", i, (int) (chapter.start / 60 / 60 / 1000000000), (int) ((chapter.start / 60 / 1000000000) % 60), @@ -921,16 +906,14 @@ static int demux_mkv_read_chapters(struct demuxer *demuxer) } } if (num_editions > 1) - mp_msg(MSGT_DEMUX, MSGL_INFO, - "[mkv] Found %d editions, will play #%d (first is 0).\n", + MP_INFO(demuxer, "Found %d editions, will play #%d (first is 0).\n", num_editions, selected_edition); demuxer->num_editions = num_editions; demuxer->edition = selected_edition; talloc_free(parse_ctx.talloc_ctx); - mp_msg(MSGT_DEMUX, MSGL_V, - "[mkv] \\---- [ parsing chapters ] ---------\n"); + MP_VERBOSE(demuxer, "\\---- [ parsing chapters ] ---------\n"); return 0; } @@ -938,7 +921,7 @@ static int demux_mkv_read_tags(demuxer_t *demuxer) { stream_t *s = demuxer->stream; - struct ebml_parse_ctx parse_ctx = {0}; + struct ebml_parse_ctx parse_ctx = {demuxer->log}; struct ebml_tags tags = {0}; if (ebml_read_element(s, &parse_ctx, &tags, &ebml_tags_desc) < 0) return -1; @@ -971,11 +954,10 @@ static int demux_mkv_read_attachments(demuxer_t *demuxer) { stream_t *s = demuxer->stream; - mp_msg(MSGT_DEMUX, MSGL_V, - "[mkv] /---- [ parsing attachments ] ---------\n"); + MP_VERBOSE(demuxer, "/---- [ parsing attachments ] ---------\n"); struct ebml_attachments attachments = {0}; - struct ebml_parse_ctx parse_ctx = {0}; + struct ebml_parse_ctx parse_ctx = {demuxer->log}; if (ebml_read_element(s, &parse_ctx, &attachments, &ebml_attachments_desc) < 0) return -1; @@ -984,19 +966,18 @@ static int demux_mkv_read_attachments(demuxer_t *demuxer) struct ebml_attached_file *attachment = &attachments.attached_file[i]; if (!attachment->n_file_name || !attachment->n_file_mime_type || !attachment->n_file_data) { - mp_msg(MSGT_DEMUX, MSGL_WARN, "[mkv] Malformed attachment\n"); + MP_WARN(demuxer, "Malformed attachment\n"); continue; } struct bstr name = attachment->file_name; struct bstr mime = attachment->file_mime_type; demuxer_add_attachment(demuxer, name, mime, attachment->file_data); - mp_msg(MSGT_DEMUX, MSGL_V, "[mkv] Attachment: %.*s, %.*s, %zu bytes\n", + MP_VERBOSE(demuxer, "Attachment: %.*s, %.*s, %zu bytes\n", BSTR_P(name), BSTR_P(mime), attachment->file_data.len); } talloc_free(parse_ctx.talloc_ctx); - mp_msg(MSGT_DEMUX, MSGL_V, - "[mkv] \\---- [ parsing attachments ] ---------\n"); + MP_VERBOSE(demuxer, "\\---- [ parsing attachments ] ---------\n"); return 0; } @@ -1009,10 +990,9 @@ static int demux_mkv_read_seekhead(demuxer_t *demuxer) struct stream *s = demuxer->stream; int res = 0; struct ebml_seek_head seekhead = {0}; - struct ebml_parse_ctx parse_ctx = {0}; + struct ebml_parse_ctx parse_ctx = {demuxer->log}; - mp_msg(MSGT_DEMUX, MSGL_V, - "[mkv] /---- [ parsing seek head ] ---------\n"); + MP_VERBOSE(demuxer, "/---- [ parsing seek head ] ---------\n"); if (ebml_read_element(s, &parse_ctx, &seekhead, &ebml_seek_head_desc) < 0) { res = -1; goto out; @@ -1022,12 +1002,12 @@ static int demux_mkv_read_seekhead(demuxer_t *demuxer) for (int i = 0; i < seekhead.n_seek; i++) { struct ebml_seek *seek = &seekhead.seek[i]; if (seek->n_seek_id != 1 || seek->n_seek_position != 1) { - mp_msg(MSGT_DEMUX, MSGL_WARN, "[mkv] Invalid SeekHead entry\n"); + MP_WARN(demuxer, "Invalid SeekHead entry\n"); continue; } uint64_t pos = seek->seek_position + mkv_d->segment_start; if (pos >= s->end_pos) { - mp_msg(MSGT_DEMUX, MSGL_WARN, "[mkv] SeekHead position beyond " + MP_WARN(demuxer, "SeekHead position beyond " "end of file - incomplete file?\n"); continue; } @@ -1038,25 +1018,25 @@ static int demux_mkv_read_seekhead(demuxer_t *demuxer) } } if (!stream_seek(s, off)) { - mp_msg(MSGT_DEMUX, MSGL_ERR, "[mkv] Couldn't seek back after " + MP_ERR(demuxer, "Couldn't seek back after " "SeekHead??\n"); res = -1; } out: - mp_msg(MSGT_DEMUX, MSGL_V, - "[mkv] \\---- [ parsing seek head ] ---------\n"); + MP_VERBOSE(demuxer, "\\---- [ parsing seek head ] ---------\n"); talloc_free(parse_ctx.talloc_ctx); return res; } -static bool seek_pos_id(struct stream *s, int64_t pos, uint32_t id) +static bool seek_pos_id(struct demuxer *demuxer, int64_t pos, uint32_t id) { + stream_t *s = demuxer->stream; if (!stream_seek(s, pos)) { - mp_msg(MSGT_DEMUX, MSGL_WARN, "[mkv] Failed to seek in file\n"); + MP_WARN(demuxer, "Failed to seek in file\n"); return false; } if (ebml_read_id(s, NULL) != id) { - mp_msg(MSGT_DEMUX, MSGL_WARN, "[mkv] Expected element not found\n"); + MP_WARN(demuxer, "Expected element not found\n"); return false; } return true; @@ -1074,19 +1054,19 @@ static int read_header_element(struct demuxer *demuxer, uint32_t id, case MATROSKA_ID_INFO: if (mkv_d->parsed_info) break; - if (at_filepos && !seek_pos_id(s, at_filepos, id)) + if (at_filepos && !seek_pos_id(demuxer, at_filepos, id)) return -1; - mp_msg(MSGT_DEMUX, MSGL_V, "[mkv] |+ segment information...\n"); + MP_VERBOSE(demuxer, "|+ segment information...\n"); mkv_d->parsed_info = true; return demux_mkv_read_info(demuxer); case MATROSKA_ID_TRACKS: if (mkv_d->parsed_tracks) break; - if (at_filepos && !seek_pos_id(s, at_filepos, id)) + if (at_filepos && !seek_pos_id(demuxer, at_filepos, id)) return -1; mkv_d->parsed_tracks = true; - mp_msg(MSGT_DEMUX, MSGL_V, "[mkv] |+ segment tracks...\n"); + MP_VERBOSE(demuxer, "|+ segment tracks...\n"); return demux_mkv_read_tracks(demuxer); case MATROSKA_ID_CUES: @@ -1104,7 +1084,7 @@ static int read_header_element(struct demuxer *demuxer, uint32_t id, case MATROSKA_ID_TAGS: if (mkv_d->parsed_tags) break; - if (at_filepos && !seek_pos_id(s, at_filepos, id)) + if (at_filepos && !seek_pos_id(demuxer, at_filepos, id)) return -1; mkv_d->parsed_tags = true; return demux_mkv_read_tags(demuxer); @@ -1112,14 +1092,14 @@ static int read_header_element(struct demuxer *demuxer, uint32_t id, case MATROSKA_ID_SEEKHEAD: if (is_parsed_header(mkv_d, pos)) break; - if (at_filepos && !seek_pos_id(s, at_filepos, id)) + if (at_filepos && !seek_pos_id(demuxer, at_filepos, id)) return -1; return demux_mkv_read_seekhead(demuxer); case MATROSKA_ID_CHAPTERS: if (mkv_d->parsed_chapters) break; - if (at_filepos && !seek_pos_id(s, at_filepos, id)) + if (at_filepos && !seek_pos_id(demuxer, at_filepos, id)) return -1; mkv_d->parsed_chapters = true; return demux_mkv_read_chapters(demuxer); @@ -1127,7 +1107,7 @@ static int read_header_element(struct demuxer *demuxer, uint32_t id, case MATROSKA_ID_ATTACHMENTS: if (mkv_d->parsed_attachments) break; - if (at_filepos && !seek_pos_id(s, at_filepos, id)) + if (at_filepos && !seek_pos_id(demuxer, at_filepos, id)) return -1; mkv_d->parsed_attachments = true; return demux_mkv_read_attachments(demuxer); @@ -1171,12 +1151,11 @@ static void display_create_tracks(demuxer_t *demuxer) break; } if (mkv_d->tracks[i]->name) - mp_msg(MSGT_DEMUX, MSGL_V, - "[mkv] Track ID %u: %s (%s) \"%s\"\n", + MP_VERBOSE(demuxer, "Track ID %u: %s (%s) \"%s\"\n", mkv_d->tracks[i]->tnum, type, mkv_d->tracks[i]->codec_id, mkv_d->tracks[i]->name); else - mp_msg(MSGT_DEMUX, MSGL_V, "[mkv] Track ID %u: %s (%s)\n", + MP_VERBOSE(demuxer, "Track ID %u: %s (%s)\n", mkv_d->tracks[i]->tnum, type, mkv_d->tracks[i]->codec_id); } } @@ -1286,9 +1265,9 @@ static int demux_mkv_open_video(demuxer_t *demuxer, mkv_track_t *track) extradata_size = track->private_size; } if (!vi->id) { - mp_msg(MSGT_DEMUX, MSGL_WARN, "[mkv] Unknown/unsupported " + MP_WARN(demuxer, "Unknown/unsupported " "CodecID (%s) or missing/bad CodecPrivate\n" - "[mkv] data (track %u).\n", + "data (track %u).\n", track->codec_id, track->tnum); return 1; } @@ -1304,7 +1283,7 @@ static int demux_mkv_open_video(demuxer_t *demuxer, mkv_track_t *track) sh->title = talloc_strdup(sh_v, track->name); sh_v->bih = talloc_size(sh_v, sizeof(MP_BITMAPINFOHEADER) + extradata_size); if (!sh_v->bih) { - mp_msg(MSGT_DEMUX, MSGL_FATAL, "Memory allocation failure!\n"); + MP_FATAL(demuxer, "Memory allocation failure!\n"); abort(); } *sh_v->bih = *bih; @@ -1337,7 +1316,7 @@ static int demux_mkv_open_video(demuxer_t *demuxer, mkv_track_t *track) sh_v->disp_w = track->v_dwidth; sh_v->disp_h = track->v_dheight; } - mp_msg(MSGT_DEMUX, MSGL_V, "[mkv] Aspect: %f\n", sh_v->aspect); + MP_VERBOSE(demuxer, "Aspect: %f\n", sh_v->aspect); sh_v->avi_dts = track->ms_compat; return 0; @@ -1407,7 +1386,7 @@ static int demux_mkv_open_audio(demuxer_t *demuxer, mkv_track_t *track) if (track->ms_compat) { if (track->private_size < sizeof(*sh_a->wf)) goto error; - mp_msg(MSGT_DEMUX, MSGL_V, "[mkv] track with MS compat audio.\n"); + MP_VERBOSE(demuxer, "track with MS compat audio.\n"); MP_WAVEFORMATEX *wf = (MP_WAVEFORMATEX *) track->private_data; sh_a->wf = talloc_zero_size(sh_a, track->private_size); sh_a->wf->wFormatTag = le2me_16(wf->wFormatTag); @@ -1652,8 +1631,8 @@ static int demux_mkv_open_audio(demuxer_t *demuxer, mkv_track_t *track) return 0; error: - mp_msg(MSGT_DEMUX, MSGL_WARN, "[mkv] Unknown/unsupported audio " - "codec ID '%s' for track %u or missing/faulty\n[mkv] " + MP_WARN(demuxer, "Unknown/unsupported audio " + "codec ID '%s' for track %u or missing/faulty\n" "private codec data.\n", track->codec_id, track->tnum); return 1; } @@ -1691,7 +1670,7 @@ static int demux_mkv_open_sub(demuxer_t *demuxer, mkv_track_t *track) sh->demuxer_id = track->tnum; track->sh_sub = sh_s; sh->codec = subtitle_type; - bstr buffer = demux_mkv_decode(track, in, 2); + bstr buffer = demux_mkv_decode(demuxer->log, track, in, 2); if (buffer.start && buffer.start != track->private_data) { talloc_free(track->private_data); talloc_steal(track, buffer.start); @@ -1707,8 +1686,7 @@ static int demux_mkv_open_sub(demuxer_t *demuxer, mkv_track_t *track) sh->default_track = track->default_track; if (!subtitle_type) { - mp_msg(MSGT_DEMUX, MSGL_ERR, - "[mkv] Subtitle type '%s' is not supported.\n", + MP_ERR(demuxer, "Subtitle type '%s' is not supported.\n", track->codec_id); } @@ -1732,20 +1710,20 @@ static int read_ebml_header(demuxer_t *demuxer) if (ebml_read_id(s, NULL) != EBML_ID_EBML) return 0; struct ebml_ebml ebml_master = {{0}}; - struct ebml_parse_ctx parse_ctx = { .no_error_messages = true }; + struct ebml_parse_ctx parse_ctx = { demuxer->log, .no_error_messages = true }; if (ebml_read_element(s, &parse_ctx, &ebml_master, &ebml_ebml_desc) < 0) return 0; if (ebml_master.doc_type.start == NULL) { - mp_msg(MSGT_DEMUX, MSGL_V, "[mkv] File has EBML header but no doctype." + MP_VERBOSE(demuxer, "File has EBML header but no doctype." " Assuming \"matroska\".\n"); } else if (bstrcmp(ebml_master.doc_type, bstr0("matroska")) != 0 && bstrcmp(ebml_master.doc_type, bstr0("webm")) != 0) { - mp_msg(MSGT_DEMUX, MSGL_DBG2, "[mkv] no head found\n"); + MP_DBG(demuxer, "no head found\n"); talloc_free(parse_ctx.talloc_ctx); return 0; } if (ebml_master.doc_type_read_version > 2) { - mp_msg(MSGT_DEMUX, MSGL_WARN, "[mkv] This looks like a Matroska file, " + MP_WARN(demuxer, "This looks like a Matroska file, " "but we don't support format version %"PRIu64"\n", ebml_master.doc_type_read_version); talloc_free(parse_ctx.talloc_ctx); @@ -1758,7 +1736,7 @@ static int read_ebml_header(demuxer_t *demuxer) || (ebml_master.n_ebml_max_id_length && ebml_master.ebml_max_id_length != 4)) { - mp_msg(MSGT_DEMUX, MSGL_WARN, "[mkv] This looks like a Matroska file, " + MP_WARN(demuxer, "This looks like a Matroska file, " "but the header has bad parameters\n"); talloc_free(parse_ctx.talloc_ctx); return 0; @@ -1777,22 +1755,22 @@ static int read_mkv_segment_header(demuxer_t *demuxer) while (!s->eof) { if (ebml_read_id(s, NULL) != MATROSKA_ID_SEGMENT) { - mp_msg(MSGT_DEMUX, MSGL_V, "[mkv] segment not found\n"); + MP_VERBOSE(demuxer, "segment not found\n"); return 0; } - mp_msg(MSGT_DEMUX, MSGL_V, "[mkv] + a segment...\n"); + MP_VERBOSE(demuxer, "+ a segment...\n"); uint64_t len = ebml_read_length(s, NULL); if (num_skip <= 0) return 1; num_skip--; - mp_msg(MSGT_DEMUX, MSGL_V, "[mkv] (skipping)\n"); + MP_VERBOSE(demuxer, " (skipping)\n"); if (len == EBML_UINT_INVALID) break; int64_t next = stream_tell(s) + len; if (next >= s->end_pos) return 0; if (!stream_seek(s, next)) { - mp_msg(MSGT_DEMUX, MSGL_WARN, "[mkv] Failed to seek in file\n"); + MP_WARN(demuxer, "Failed to seek in file\n"); return 0; } // Segments are like concatenated Matroska files @@ -1800,7 +1778,7 @@ static int read_mkv_segment_header(demuxer_t *demuxer) return 0; } - mp_msg(MSGT_DEMUX, MSGL_V, "[mkv] End of file, no further segments.\n"); + MP_VERBOSE(demuxer, "End of file, no further segments.\n"); return 0; } @@ -1813,7 +1791,7 @@ static int demux_mkv_open(demuxer_t *demuxer, enum demux_check check) if (!read_ebml_header(demuxer)) return -1; - mp_msg(MSGT_DEMUX, MSGL_V, "[mkv] Found the head...\n"); + MP_VERBOSE(demuxer, "Found the head...\n"); if (!read_mkv_segment_header(demuxer)) return -1; @@ -1829,12 +1807,11 @@ static int demux_mkv_open(demuxer_t *demuxer, enum demux_check check) while (1) { uint32_t id = ebml_read_id(s, NULL); if (s->eof) { - mp_msg(MSGT_DEMUX, MSGL_WARN, - "[mkv] Unexpected end of file (no clusters found)\n"); + MP_WARN(demuxer, "Unexpected end of file (no clusters found)\n"); break; } if (id == MATROSKA_ID_CLUSTER) { - mp_msg(MSGT_DEMUX, MSGL_V, "[mkv] |+ found cluster, headers are " + MP_VERBOSE(demuxer, "|+ found cluster, headers are " "parsed completely :)\n"); stream_seek(s, stream_tell(s) - 4); break; @@ -1936,7 +1913,6 @@ static int demux_mkv_read_block_lacing(bstr *buffer, int *laces, return 0; error: - mp_msg(MSGT_DEMUX, MSGL_ERR, "[mkv] Bad input [lacing]\n"); return 1; } @@ -2311,8 +2287,10 @@ static int handle_block(demuxer_t *demuxer, struct block_info *block_info) if (!demuxer_stream_is_selected(demuxer, stream)) return 0; - if (demux_mkv_read_block_lacing(&data, &laces, lace_size)) + if (demux_mkv_read_block_lacing(&data, &laces, lace_size)) { + MP_ERR(demuxer, "Bad input [lacing]\n"); return 0; + } current_pts = tc / 1e9; @@ -2336,7 +2314,7 @@ static int handle_block(demuxer_t *demuxer, struct block_info *block_info) } if (use_this_block) { if (laces > 1) { - mp_msg(MSGT_DEMUX, MSGL_WARN, "[mkv] Subtitles use Matroska " + MP_WARN(demuxer, "Subtitles use Matroska " "lacing. This is abnormal and not supported.\n"); use_this_block = 0; } @@ -2357,7 +2335,7 @@ static int handle_block(demuxer_t *demuxer, struct block_info *block_info) else if (stream->type == STREAM_AUDIO && track->realmedia) handle_realaudio(demuxer, track, block, keyframe); else { - bstr buffer = demux_mkv_decode(track, block, 1); + bstr buffer = demux_mkv_decode(demuxer->log, track, block, 1); mkv_parse_packet(track, &buffer); if (buffer.start) { demux_packet_t *dp = @@ -2426,7 +2404,7 @@ static int read_block_group(demuxer_t *demuxer, int64_t end, goto error; default: - if (ebml_read_skip_or_resync_cluster(s, NULL) != 0) + if (ebml_read_skip_or_resync_cluster(demuxer->log, s, NULL) != 0) goto error; break; } @@ -2485,7 +2463,7 @@ static int read_next_block(demuxer_t *demuxer, struct block_info *block) goto find_next_cluster; default: ; - if (ebml_read_skip_or_resync_cluster(s, NULL) != 0) + if (ebml_read_skip_or_resync_cluster(demuxer->log, s, NULL) != 0) goto find_next_cluster; break; } @@ -2500,7 +2478,7 @@ static int read_next_block(demuxer_t *demuxer, struct block_info *block) break; if (s->eof) return -1; - ebml_read_skip_or_resync_cluster(s, NULL); + ebml_read_skip_or_resync_cluster(demuxer->log, s, NULL); } next_cluster: mkv_d->cluster_end = ebml_read_length(s, NULL); @@ -2564,8 +2542,7 @@ static int create_index_until(struct demuxer *demuxer, uint64_t timecode) uint64_t old_cluster_tc = mkv_d->cluster_tc; if (index) stream_seek(s, index->filepos); - mp_msg(MSGT_DEMUX, MSGL_V, - "[mkv] creating index until T