From patchwork Sun Apr 5 15:37:15 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carl Eugen Hoyos X-Patchwork-Id: 18694 Delivered-To: andriy.gelman@gmail.com Received: by 2002:a0c:c987:0:0:0:0:0 with SMTP id b7csp644169qvk; Sun, 5 Apr 2020 08:37:38 -0700 (PDT) X-Google-Smtp-Source: APiQypLxArNorNSWZzSOpw/1+76KmjfbA9D2KW81wpWd1VoWo1clOXvX9lnNaoO4oBWIh5S9hO14 X-Received: by 2002:a17:906:d81:: with SMTP id m1mr17094903eji.152.1586101058754; Sun, 05 Apr 2020 08:37:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1586101058; cv=none; d=google.com; s=arc-20160816; b=QnZpV3orKHL6JYKtJbMYWp1I5vtVBIT9y2+0GV6aSK1xEUGzXpAr7OhPtTRXSmq8NF +2tJfkKUliEmNQxiqEJRizn66IGb4jmwcEe8rz/1kR5x1rqEVp6JLyfl1XvwXshCxl0y zkLJySzufC+MShP8qYsBhAJN/nCtYDsrKMRCZc0KhUBb9eJGKwUKcu0YzzKR9VeyJMyl Usm3JFWyrxhb6ENv/qL02ZQcc+GkXdH9TwT23ixYAv8NwIJe+8FZ1qdjBQdP1wr+TBhz Of5/CX9yF2GOZs4Wyw4l+CYMpHRdIR8brATABC+fwPFzcAzX5eC7PFE0k4l8AAZxTTk4 ulkg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:subject:to :message-id:date:from:in-reply-to:references:mime-version :dkim-signature:delivered-to; bh=On6Ln4BBhjguOP1cKucFIDpKTiEgN42F3uQcpfCX5lE=; b=zhNUwnbNoFr2N6rTPhqtxTedZ9Ql4XFJM0cwsXDWC9V9xLgPWS4iFZApIWedGzt3yB UQn4kjpiALWg3weOk2M59e+9rvVMAc8JN2eMd1hNQdT5nELM3GbyeHkMs5sbCbE7oK/c AWQRdTsjzo9HUl+eRqBElvl3b7X1LcxtV3HoW3KRqhWaH+t4jeo8NNRs3iy78CJnC7Mx 7C/nAhblc26Ek8yOBlOKBQjw9LLMN5B9NZBRHNJM5V+BnMJreGme2JncIgA7oRKW60na H1cJqBYBdMFgw29kvxCUh6M6MxELvaE0aN/BH2QUtcK3oJWwU1/oYBqWWEd6ivVJpITV lmPA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=FofNhikQ; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id m14si9147392edr.197.2020.04.05.08.37.38; Sun, 05 Apr 2020 08:37:38 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=FofNhikQ; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3114968B1A7; Sun, 5 Apr 2020 18:37:35 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-io1-f51.google.com (mail-io1-f51.google.com [209.85.166.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C628F689EBE for ; Sun, 5 Apr 2020 18:37:27 +0300 (EEST) Received: by mail-io1-f51.google.com with SMTP id x9so12929085iom.10 for ; Sun, 05 Apr 2020 08:37:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to; bh=RL6CDE7DbIsm/EosNRGYI6TW8uj3EkKwsPWsjyy77MA=; b=FofNhikQeTlLqQvG/8UYrBbpec41iCSjPqJf482PmU6mIG5SF3lW6rN3H7sZ73f0C1 4DdzauWx9/aoqYPZzLkm6tY3zzJfTGMeY3K+6e0qhd3cBJSB28tYqJaS0LPQYr7Y7vhf lWO74M54Rm27K4+xxzhP1S22PLgocIB84tBVESwQ2N+Oq0r+O74Grb17ZvEqJti3jCVD 65RHc5VOtZUDk0lLTUhjEmGyqHeTcNjciPF9aQRMzllT/noVaRSct9/r1axgVL+u8ZwX 7f5/VV0H3zdk8dhb2fv33N68BGT3NCKoEMp+I9AoMQMfpoqfEUzPINvoZ+vYxdb+9mUU Zndg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to; bh=RL6CDE7DbIsm/EosNRGYI6TW8uj3EkKwsPWsjyy77MA=; b=U7fDSJPKKnB1HtYM+sipQvmrAsUVkHDKwk66CP0YSPKl9k6/uaVhktwOYxxd5X9Tjp Kys3S4h/XtY1fqbAC9fu1suaVzXmSlvYsYfB480L9pWfXzBNcfqu27rxlGBmX2WPXUMP wxiG7pxgIdgudvOJh/6q0Tn0d0XT4LKGAuMn4OrWDt8wvRs7Jqdu8P9DhUolXeDzEkWj XKaTvWUnc0PL/n2KQnwb8vxSsv+MSjJcAub+Z3PXptOhnRWrwmxK5UxaPBTa9d5zL/cT P/ikDk/buGfKinvlvSS/qNIjV2hjE2SsePgRmuZyWe6mBrSJzYlqDgcUG1BhzFYOEGbc Q+Rw== X-Gm-Message-State: AGi0Pub79awCJkRLscC193DPkNSuO0Tu3Qz5VsVYiAkFnKxkPl0JvmXB FaY8TbNCHlS5I0qbG78Vq79O2VP+5toNIWcefc7USA== X-Received: by 2002:a02:2944:: with SMTP id p65mr16332623jap.89.1586101046237; Sun, 05 Apr 2020 08:37:26 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Carl Eugen Hoyos Date: Sun, 5 Apr 2020 17:37:15 +0200 Message-ID: To: FFmpeg development discussions and patches Subject: [FFmpeg-devel] [PATCH v2]lavc/amrwb: Output silence for frames marked as broken 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" X-TUID: x1VarPQACWeC Content-Length: 3221 Am So., 5. Apr. 2020 um 02:01 Uhr schrieb Carl Eugen Hoyos : > Attached patch makes the output of the file in ticket #7113 very > similar to the reference decoder. New patch attached. Carl Eugen From c5c63dd531aac11f0c927c09a66d2bcff6ea5356 Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Sun, 5 Apr 2020 17:35:38 +0200 Subject: [PATCH] lavc/amrwbdec: Output silence for frames marked as corrupt. Fixes ticket #7113. --- libavcodec/amrwbdec.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavcodec/amrwbdec.c b/libavcodec/amrwbdec.c index 5943bfc84e..7d357a2685 100644 --- a/libavcodec/amrwbdec.c +++ b/libavcodec/amrwbdec.c @@ -1121,7 +1121,10 @@ static int amrwb_decode_frame(AVCodecContext *avctx, void *data, header_size = decode_mime_header(ctx, buf); expected_fr_size = ((cf_sizes_wb[ctx->fr_cur_mode] + 7) >> 3) + 1; - if (ctx->fr_cur_mode == NO_DATA) { + if (!ctx->fr_quality) + av_log(avctx, AV_LOG_ERROR, "Encountered a bad or corrupted frame\n"); + + if (ctx->fr_cur_mode == NO_DATA || !ctx->fr_quality) { av_samples_set_silence(&frame->data[0], 0, frame->nb_samples, 1, AV_SAMPLE_FMT_FLT); *got_frame_ptr = 1; return expected_fr_size; @@ -1139,9 +1142,6 @@ static int amrwb_decode_frame(AVCodecContext *avctx, void *data, return AVERROR_INVALIDDATA; } - if (!ctx->fr_quality || ctx->fr_cur_mode > MODE_SID) - av_log(avctx, AV_LOG_ERROR, "Encountered a bad or corrupted frame\n"); - if (ctx->fr_cur_mode == MODE_SID) { /* Comfort noise frame */ avpriv_request_sample(avctx, "SID mode"); return AVERROR_PATCHWELCOME; -- 2.24.1