From patchwork Sun May 17 23:13:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 19725 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 9C44E4489FD for ; Mon, 18 May 2020 02:13:59 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 79093689E53; Mon, 18 May 2020 02:13:59 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f67.google.com (mail-wm1-f67.google.com [209.85.128.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DF4C9680821 for ; Mon, 18 May 2020 02:13:52 +0300 (EEST) Received: by mail-wm1-f67.google.com with SMTP id f13so7461350wmc.5 for ; Sun, 17 May 2020 16:13:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=G5zuiNpf0tloZdoh+CWr0Y1KSUuaARGitsvcnRr1V00=; b=UDsLv+e0JVoFAqMguFrgJ2Uq/ZQo4MlRs/zK6+Jmdwahkbm0jzpfrxlBKufVdtkKuE et9sgVPmRCbudr67XKYXg8oa4TkRbCG56fieEVrAnjds8RLTpfE3300oxlUtXJ4siUFv 41dJ926RH8RS8fiE0y15jakGRNkvH6hIUdQKOrSy2sBNU34I45QdomkP1qOAaatsBtXo JdrmS3b7kWdub+cUsq4RqyjijQ5PVxl9/Y/k83nY0tWBV5d8ELqCTvGG1Cozkw2d9a3U TThgCltI6A0d2LU4qrqPerPaE4Aw/ZqN6mnXrpTqdjofv1iZISElFIqDYIz4mbrVabtv +okA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=G5zuiNpf0tloZdoh+CWr0Y1KSUuaARGitsvcnRr1V00=; b=eEC9qthXrE45PM2en5xL4QzViusixRX+4NDr+3k3U1iD8CoAeakSrJJigZUj/iCMUl tbJsHUTgg2OtS/FjRjvs1vbeHNdCOJYHQ0u29G/HF7Jf0xnxpx38ADnXNmHEtDMuhsRN ZWdDohx2v7n4G2jXaN5LqB1ng5F3rIuxKK0zDIUdt2JEHncBaGqlk/LWmsCVN9WZon9E pQP2CSyBxLwF8Bk4rhfo//im2KsajrALY0bdqSOo01/YmdPcrI9qRF9PfVJXFqyKoXUq Xqja5bYRGFiaHw6PxF62gzMtHtW+C2fNWklzNUAmDoaWg3NxI12zY5cyTUSVjqzlJuy+ lzxA== X-Gm-Message-State: AOAM532LRtY/MCywvQ83dKorPf556Oh1l0ll7TiX9BWOKS1YSBZxJD7o J8zW4RdWbdicRH/1UvoyiHSmWc4h X-Google-Smtp-Source: ABdhPJzUuTb/2bxCofbEchi2maDqMdj/z6UrcD+HkY9FJa0dANJzMT6ymJCzxusORAPJ8f7XH3hc5w== X-Received: by 2002:a1c:c2c6:: with SMTP id s189mr16879808wmf.25.1589757231955; Sun, 17 May 2020 16:13:51 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1ab57.dynamic.kabel-deutschland.de. [188.193.171.87]) by smtp.gmail.com with ESMTPSA id q144sm14700203wme.0.2020.05.17.16.13.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 17 May 2020 16:13:51 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 18 May 2020 01:13:18 +0200 Message-Id: <20200517231319.13067-5-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200517231319.13067-1-andreas.rheinhardt@gmail.com> References: <20200517231319.13067-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 5/6] avformat/matroskadec: Use proper context for logging X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Andreas Rheinhardt --- libavformat/matroskadec.c | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index b277c05f9d..81e7b16821 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -1771,7 +1771,7 @@ static void matroska_convert_tags(AVFormatContext *s) } } if (!found) { - av_log(NULL, AV_LOG_WARNING, + av_log(s, AV_LOG_WARNING, "The tags at index %d refer to a " "non-existent attachment %"PRId64".\n", i, tags[i].target.attachuid); @@ -1788,7 +1788,7 @@ static void matroska_convert_tags(AVFormatContext *s) } } if (!found) { - av_log(NULL, AV_LOG_WARNING, + av_log(s, AV_LOG_WARNING, "The tags at index %d refer to a non-existent chapter " "%"PRId64".\n", i, tags[i].target.chapteruid); @@ -1805,7 +1805,7 @@ static void matroska_convert_tags(AVFormatContext *s) } } if (!found) { - av_log(NULL, AV_LOG_WARNING, + av_log(s, AV_LOG_WARNING, "The tags at index %d refer to a non-existent track " "%"PRId64".\n", i, tags[i].target.trackuid); @@ -2157,7 +2157,9 @@ static int mkv_parse_video_color(AVStream *st, const MatroskaTrack *track) { return 0; } -static int mkv_parse_video_projection(AVStream *st, const MatroskaTrack *track) { +static int mkv_parse_video_projection(AVStream *st, const MatroskaTrack *track, + void *logctx) +{ AVSphericalMapping *spherical; enum AVSphericalProjection projection; size_t spherical_size; @@ -2170,7 +2172,7 @@ static int mkv_parse_video_projection(AVStream *st, const MatroskaTrack *track) track->video.projection.private.size); if (bytestream2_get_byte(&gb) != 0) { - av_log(NULL, AV_LOG_WARNING, "Unknown spherical metadata\n"); + av_log(logctx, AV_LOG_WARNING, "Unknown spherical metadata\n"); return 0; } @@ -2185,14 +2187,14 @@ static int mkv_parse_video_projection(AVStream *st, const MatroskaTrack *track) r = bytestream2_get_be32(&gb); if (b >= UINT_MAX - t || r >= UINT_MAX - l) { - av_log(NULL, AV_LOG_ERROR, + av_log(logctx, AV_LOG_ERROR, "Invalid bounding rectangle coordinates " "%"PRIu32",%"PRIu32",%"PRIu32",%"PRIu32"\n", l, t, r, b); return AVERROR_INVALIDDATA; } } else if (track->video.projection.private.size != 0) { - av_log(NULL, AV_LOG_ERROR, "Unknown spherical metadata\n"); + av_log(logctx, AV_LOG_ERROR, "Unknown spherical metadata\n"); return AVERROR_INVALIDDATA; } @@ -2203,19 +2205,19 @@ static int mkv_parse_video_projection(AVStream *st, const MatroskaTrack *track) break; case MATROSKA_VIDEO_PROJECTION_TYPE_CUBEMAP: if (track->video.projection.private.size < 4) { - av_log(NULL, AV_LOG_ERROR, "Missing projection private properties\n"); + av_log(logctx, AV_LOG_ERROR, "Missing projection private properties\n"); return AVERROR_INVALIDDATA; } else if (track->video.projection.private.size == 12) { uint32_t layout = bytestream2_get_be32(&gb); if (layout) { - av_log(NULL, AV_LOG_WARNING, + av_log(logctx, AV_LOG_WARNING, "Unknown spherical cubemap layout %"PRIu32"\n", layout); return 0; } projection = AV_SPHERICAL_CUBEMAP; padding = bytestream2_get_be32(&gb); } else { - av_log(NULL, AV_LOG_ERROR, "Unknown spherical metadata\n"); + av_log(logctx, AV_LOG_ERROR, "Unknown spherical metadata\n"); return AVERROR_INVALIDDATA; } break; @@ -2223,7 +2225,7 @@ static int mkv_parse_video_projection(AVStream *st, const MatroskaTrack *track) /* No Spherical metadata */ return 0; default: - av_log(NULL, AV_LOG_WARNING, + av_log(logctx, AV_LOG_WARNING, "Unknown spherical metadata type %"PRIu64"\n", track->video.projection.type); return 0; @@ -2779,7 +2781,7 @@ static int matroska_parse_tracks(AVFormatContext *s) ret = mkv_parse_video_color(st, track); if (ret < 0) return ret; - ret = mkv_parse_video_projection(st, track); + ret = mkv_parse_video_projection(st, track, matroska->ctx); if (ret < 0) return ret; } else if (track->type == MATROSKA_TRACK_TYPE_AUDIO) {