From patchwork Thu Feb 28 21:58:42 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dale Curtis X-Patchwork-Id: 12173 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 1E83F447226 for ; Thu, 28 Feb 2019 23:59:03 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id EC3A6680976; Thu, 28 Feb 2019 23:59:02 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-yw1-f44.google.com (mail-yw1-f44.google.com [209.85.161.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 34F55680937 for ; Thu, 28 Feb 2019 23:58:56 +0200 (EET) Received: by mail-yw1-f44.google.com with SMTP id i204so9899201ywb.0 for ; Thu, 28 Feb 2019 13:58:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=mime-version:from:date:message-id:subject:to; bh=x8RFIvR2DoX20OCAm2bkiGjC/P9/7wQPpw5X0Ly5yJ4=; b=dslKSA9DRwEVnuMB1ZmWdYIJqDgkM4yWcpPbVa2UJ3xLcMFIfK9y/onck5MzVYcI4v bniPWj0DR6YXoFBIEYhFyUvIrixUUALA1QVMZqVgE/r3IFspkB9xoaK/Vdf5Bd4FoKnS ZNYmTy5HkLjFvtSpJO8eQRW5i/kw+o7jtAsVU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=x8RFIvR2DoX20OCAm2bkiGjC/P9/7wQPpw5X0Ly5yJ4=; b=AdjTKnuHK34OcRVuJvhKEFsXXOMQnKgB6b59QJAwh5YNmVT5gwNvMkXsTlg6UsvUu8 nsBqQJ6OO+5uZfCIp/SE5iV+VrU3CcEhtzGNOMjIlv7u3XhHhqqopAjwgwtMVmG+Vi/b fNQBVSRP0aDRrd/V0I0HlQO4kcixLWkX4ogccRyWVpV1/xxUpQuXSxvuy7oRBqVZqyib mjvDMGq3KtO9ZNmb95HTddwC/1MNRofBVDI9TD/WdxKfz54mQKXwIvT2oLqSScOp0rhN xJMGN9Owi21AywurnxdAm9bi09kBQKQSRdZ5ue4HdsCgv0bQtsZmF+27rr0j/ZQ7bKHo iLog== X-Gm-Message-State: APjAAAWMLzuhJ2X6dnHu0o3vPhiXU7GJs5OhiP342ft0SMgSFpjLilUN yHQBifRGLbXETodOdXlJwxAcOuL82+Xwu8Zna/OS/+eldYrAAg== X-Google-Smtp-Source: APXvYqwR8WyO7lVP8opVpwOr0C2DAYkBSuMEE6mLwaYShX1zHSjSigHDq/65qoroPQ8sUmroq0QkG/JfMZkJrWTFtwg= X-Received: by 2002:a25:dd7:: with SMTP id 206mr1614081ybn.214.1551391133813; Thu, 28 Feb 2019 13:58:53 -0800 (PST) MIME-Version: 1.0 From: Dale Curtis Date: Thu, 28 Feb 2019 13:58:42 -0800 Message-ID: To: FFmpeg development discussions and patches X-Content-Filtered-By: Mailman/MimeDel 2.1.20 Subject: [FFmpeg-devel] [PATCH] Don't trigger errors for multiple id3 tags. 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Such errors may make sense for specific formats, but general parsing logic shouldn't be treating these as errors regardless of the error recognition mode. Fixes loading of the following wave when using -err_detect explode: https://cs.chromium.org/chromium/src/third_party/blink/web_tests/external/wpt/webaudio/resources/4ch-440.wav Signed-off-by: Dale Curtis From 14c2244631e7d02d6f66a6d5a678125002b89675 Mon Sep 17 00:00:00 2001 From: Dale Curtis Date: Thu, 28 Feb 2019 13:51:30 -0800 Subject: [PATCH] Don't trigger errors for multiple id3 tags. Such errors may make sense for specific formats, but general parsing logic shouldn't be treating these as errors regardless of the error recognition mode. Fixes loading of the following wave when using -err_detect explode: https://cs.chromium.org/chromium/src/third_party/blink/web_tests/external/wpt/webaudio/resources/4ch-440.wav Signed-off-by: Dale Curtis --- libavformat/utils.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/libavformat/utils.c b/libavformat/utils.c index d113a16c80..b940246512 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -635,13 +635,8 @@ FF_ENABLE_DEPRECATION_WARNINGS s->metadata = s->internal->id3v2_meta; s->internal->id3v2_meta = NULL; } else if (s->internal->id3v2_meta) { - int level = AV_LOG_WARNING; - if (s->error_recognition & AV_EF_COMPLIANT) - level = AV_LOG_ERROR; - av_log(s, level, "Discarding ID3 tags because more suitable tags were found.\n"); + av_log(s, AV_LOG_WARNING, "Discarding ID3 tags because more suitable tags were found.\n"); av_dict_free(&s->internal->id3v2_meta); - if (s->error_recognition & AV_EF_EXPLODE) - return AVERROR_INVALIDDATA; } if (id3v2_extra_meta) { -- 2.21.0.352.gf09ad66450-goog