From patchwork Mon Jan 29 23:13:54 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dale Curtis X-Patchwork-Id: 7445 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.156.27 with SMTP id q27csp4559854jak; Mon, 29 Jan 2018 15:14:21 -0800 (PST) X-Google-Smtp-Source: AH8x224RH5V3kswJSzCA0Vv+H2ylmbxF0sAUbb0luKguK6OcvAkHDmQWMit4EYkALjExmbC7BrbO X-Received: by 10.223.184.36 with SMTP id h33mr2828259wrf.15.1517267661791; Mon, 29 Jan 2018 15:14:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1517267661; cv=none; d=google.com; s=arc-20160816; b=bWLef8iLHI4Z1e3rIaCwLEOKnntHpdGVBSq/3EaC1CdmXgD8XWbz5fapSbcargLGZz +RZYdkLTkwwwirEdwiiBAeFdSDg0ILhlq/ewdkr3fvHXw2+dUsytEhBmkQz/+imbfEUK TbaqLBLsC/PwL6/RnczopzxceAYyHWVNzE3sOtjiNaBVN5qryuq+WtnRHz210zcCThSt 8okHk4uzBlt0vrgimaKEr00BH9mM0HaypN9mvsna41x/OM0tMBhpv4sVrcJMnySkqmXC jTO2O1rli4vKgbkhI+X5evbAb59mdmDzQGNyVn7SvZQyoDNc3uL8zhp235z9MLu8+gSB x03Q== 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:mime-version:dkim-signature:dkim-signature :delivered-to:arc-authentication-results; bh=pFbxBpGpGBp2qxUYUZPCYFe6k8WGp4pb7gsuAzvag+w=; b=ETaY47arc0vr6p7U5jdUrH08ry+9Fdrr3AUWQf8VYnZrqNL5wMxy0Ted+v3FOQGtZM 6ANvQqzP16pBaAPFr+1nuo3ZWzQ49mIp3l+/JqOQXyfxnwaz92EfqLO/A8SXJl9N8+39 eCdB7USG6ztY4+WWh0wYfC/+mX6VEVjS80v7sLw30nmtCMdjSzqiaspyox0ys5nW5CcE tdDHM2Yq0WBqluiDKUoVxhLJJcpzcCEpQ+zcSwL2mbM/7oVkxL+DPKdpZGeHagmBHE2U ALa4NDINbovAOFs+6OAigd/0rxon6DOT0O7r7m5sJi3n/K3dAYY5heSO12TieQ83en4v fVug== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@google.com header.s=20161025 header.b=ckc7P8Ms; dkim=neutral (body hash did not verify) header.i=@chromium.org header.s=google header.b=oOjWWMFn; 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=NONE dis=NONE) header.from=chromium.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id q23si8484399wmf.81.2018.01.29.15.14.20; Mon, 29 Jan 2018 15:14:21 -0800 (PST) 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=@google.com header.s=20161025 header.b=ckc7P8Ms; dkim=neutral (body hash did not verify) header.i=@chromium.org header.s=google header.b=oOjWWMFn; 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=NONE dis=NONE) header.from=chromium.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8B1CB688292; Tue, 30 Jan 2018 01:14:14 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-vk0-f51.google.com (mail-vk0-f51.google.com [209.85.213.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 36AFA680A24 for ; Tue, 30 Jan 2018 01:14:13 +0200 (EET) Received: by mail-vk0-f51.google.com with SMTP id z9so5641646vkd.5 for ; Mon, 29 Jan 2018 15:14:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=mime-version:sender:from:date:message-id:subject:to; bh=6hUuT2iimmkw7yQ5R3LI7qXH/I708PTCqJMK7qS9/Hc=; b=ckc7P8MsCfzX9X80qKgqfyrmo/8CSIgcF8yifJKO7iwZg0dzbZhuPF8GEoEZt1tv8E Ie51lKSs45jmk0NSDOqmUgZ6uwsE/+br3LnzQbHKjXk241DN+U4YEbVVwHsLab6qO9tL B/PMjgYhACIXbrpLpPpJ1J42dbdvwbT5x2Gb1v1EDCk3dy0f/L7yEDC/434X1UN7h06N dPLeVbeer32gDnoITY7B+BLkY7u2NqKzCcqrmodTNmTsXZKB7VlBQX7saK0E78UZBrj2 b3HkbC5ObLE5GIN2oEb4pr9aG82bnBYosgS3M7d5RnMY1gEnjpHukbr83iJlIwD6G5j0 Teaw== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=mime-version:sender:from:date:message-id:subject:to; bh=6hUuT2iimmkw7yQ5R3LI7qXH/I708PTCqJMK7qS9/Hc=; b=oOjWWMFno2aPNnmCT/08sbUDPOriVnkX5neh1XkSHj8p7VnN4tPk0EPty2VPirVlO6 OtZkvJlPFipDjAuA577PxhRKzqNX2n4pk+hEiGpEO1jJYmY00HZ/og2lDdREOdNS00Hj gxi2yja4XE4JxUWQl9mbErLc/kzFrfW/xy40c= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:sender:from:date:message-id:subject :to; bh=6hUuT2iimmkw7yQ5R3LI7qXH/I708PTCqJMK7qS9/Hc=; b=mvUACQqkwqyWjnr0XHRSBBTX5B5Y2U3KFHQaVpNNPHqzi2Xy6++sl1XwgxvfCyGvm/ pkKGsOy8HOmgZbc+cOxoTslzKvWFFdXclpwcpkwY651PAab7loEFHqx3EV4juZUNfN4S /+Crv/xOLH97jnW6zo7znLJiFKI3I29+AbAIiUGYlTmrODdZKxo4a2vwzEC9unSe/uU7 QeCN6t7Wyn+3A4mprgMlvyPq+JW2ZMKTaUvbrZh59Hej9f2g1OWH7nXpH9nM4AvUDUuF l0SKEynhffIhK6uQxXW+Km2C9jbAOOumTp63qBBwS6g9lyIG/wM+8mwydi9BQPthWwEK IoeQ== X-Gm-Message-State: AKwxytdiPLvEdrvRcrtUqiCrldzOMK6Kbc1BLHYsIkiufmESD2u0ISrJ 2UTPHWmMal+NTYrxl7QICjatmkaL6Qk4pmUhwqrVrpkHFBo= X-Received: by 10.31.93.2 with SMTP id r2mr20305039vkb.104.1517267655358; Mon, 29 Jan 2018 15:14:15 -0800 (PST) MIME-Version: 1.0 Received: by 10.31.149.83 with HTTP; Mon, 29 Jan 2018 15:13:54 -0800 (PST) From: Dale Curtis Date: Mon, 29 Jan 2018 15:13:54 -0800 X-Google-Sender-Auth: rKc4qUw3VOL6d07DTA_5y7FpAck Message-ID: To: FFmpeg development discussions and patches X-Content-Filtered-By: Mailman/MimeDel 2.1.20 Subject: [FFmpeg-devel] [mp3] Skip APE tags when parsing mp3 packets. 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" Otherwise the decoder will throw "Missing header" errors when the packets are sent for decoding. From 05f5e837862a958fb8791668ab3cdf8fc7766fe5 Mon Sep 17 00:00:00 2001 From: Dale Curtis Date: Mon, 29 Jan 2018 15:10:26 -0800 Subject: [PATCH] [mp3] Skip APE tags when parsing mp3 packets. Otherwise the decoder will throw "Missing header" errors when the packets are sent for decoding. --- libavcodec/mpegaudio_parser.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/libavcodec/mpegaudio_parser.c b/libavcodec/mpegaudio_parser.c index 8c39825792..244281b56f 100644 --- a/libavcodec/mpegaudio_parser.c +++ b/libavcodec/mpegaudio_parser.c @@ -23,6 +23,7 @@ #include "parser.h" #include "mpegaudiodecheader.h" #include "libavutil/common.h" +#include "libavformat/apetag.h" // for APE tag. #include "libavformat/id3v1.h" // for ID3v1_TAG_SIZE typedef struct MpegAudioParseContext { @@ -120,6 +121,12 @@ static int mpegaudio_parse(AVCodecParserContext *s1, return next; } + if (flush && buf_size >= APE_TAG_FOOTER_BYTES && memcmp(buf, APE_TAG_PREAMBLE, 8) == 0) { + *poutbuf = NULL; + *poutbuf_size = 0; + return next; + } + *poutbuf = buf; *poutbuf_size = buf_size; return next; -- 2.16.0.rc1.238.g530d649a79-goog