From patchwork Mon Nov 11 01:05:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lance Wang X-Patchwork-Id: 16198 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 AD2F4448207 for ; Mon, 11 Nov 2019 03:11:20 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6FA4C68AAC7; Mon, 11 Nov 2019 03:11:20 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f194.google.com (mail-pg1-f194.google.com [209.85.215.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CB22568AA3A for ; Mon, 11 Nov 2019 03:11:13 +0200 (EET) Received: by mail-pg1-f194.google.com with SMTP id z188so2413833pgb.1 for ; Sun, 10 Nov 2019 17:11:13 -0800 (PST) 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; bh=C4gdkdNlWzfWaAN7GMk9QiS8+IEkJXhoh5wpGtTcrQ4=; b=LvAaq1HcQoGClOFx9rDG+e5oTDV/MmhobwTES291QuQ76+gtVqu2bQUrOszpOH3akx qnyCLBtG+qdvoxrAZcUBat7RLru+ZTccYd3erxLw35AzRimgnSrGh8a91yv5nyNhyPYP fN/8QITfV/CS2c0zTmxzDgNoxir7BqSOSGnonnDowrrKmDhVo46j27Ybh08PgipFY95Y j92OXgoEz7GQg7Z7Vt9l/HkEQwLEbOlDAkNbXQOvHqRt08+GzMzYWuZhYbG95U3vXbtY gUfCtwo50e6cXfHXiS5Cp/4zcrhuVd4xoR0fTvrRMf2K9a3as6Lj0eg3db95PqWrCEmW Crfg== 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; bh=C4gdkdNlWzfWaAN7GMk9QiS8+IEkJXhoh5wpGtTcrQ4=; b=mZUlzXXzcrFA+GcAQbsGdyCB+C7KpQ/9JSW2CWPe00sPmpa1mIFe9dmgjRtLDhx7+3 XZjtjQqpEEjqA7xsE4+3WTNJcJnAnS12a5ReqakEXyezmH0hu3ojYrJ+YVgxMrlBC2uR vjb6YhvTic9A5MR3Zd5eGYmmJA8AFI57wJAe8dWeSR3xkgQVa3/5MMbuhyO6aPSKwq0X O16FrJbNX0PtGqkCsSAypL7QrblPqiEVo28CmxKgzP6oPUvCTX0i9M5hapq/MhnGgwO7 oCMYvtP95X/J9zLkPUu7MqlK8+hEqdAsCD93cLYIAcdL6sy5zUEJi7r0+i3n6obiCRKR yCmQ== X-Gm-Message-State: APjAAAVFBsJHtfxiGyI6B82vaOjA7tQYX2ERpII535KfsqNobNCq+cL0 qbpGVro8TT/TEIdU8RdVA2ZrM8YF X-Google-Smtp-Source: APXvYqx0K4l0CfBOwMYJEgZfaHxtGhDQTWKNAKbk5No/CBUDGs47S3g/sVVpgZ+Wy65O5IOdl2AmXw== X-Received: by 2002:a63:715d:: with SMTP id b29mr25317864pgn.369.1573434310899; Sun, 10 Nov 2019 17:05:10 -0800 (PST) Received: from vpn.localdomain ([47.90.99.151]) by smtp.gmail.com with ESMTPSA id p3sm15238287pfb.163.2019.11.10.17.05.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 10 Nov 2019 17:05:10 -0800 (PST) From: lance.lmwang@gmail.com To: ffmpeg-devel@ffmpeg.org Date: Mon, 11 Nov 2019 09:05:02 +0800 Message-Id: <20191111010502.1894-2-lance.lmwang@gmail.com> X-Mailer: git-send-email 2.9.5 In-Reply-To: <20191111010502.1894-1-lance.lmwang@gmail.com> References: <20191111010502.1894-1-lance.lmwang@gmail.com> Subject: [FFmpeg-devel] [PATCH v1 2/2] avformat/mp3dec: replace SAME_HEADER_MASK with MP3_MASK 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: Limin Wang MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Limin Wang mp3 header bitstream syntax: header() { syncword 12bits bslsf id 1bit bslsf layer 2bit bslsf protection_bit 1bit bslsf bitrate_index 4bits bslsf sampling_frequency 2bits bslsf padding_bit 1bit bslsf private_bit 1bit bslsf mode 2bits bslsf mode_extension 2bits bslsf copyright 1bit bslsf original/home 1bit bslsf emphasis 2bits bslsf } if the header is masking with MP3_MASK(0xFFFE0CCF), below fields will be cleared: protection_bit, bitrate_index, sampling_freqency, mode with SAME_HEADER_MASK(0xFFFE0C00), extra below fields will be cleared which didn't make sense: mode_extension, copyright, original/home, emphasis As the MP3_MASK is good for same mp3 header masking and is defined in the header, so it's preferable to remove SAME_HEADER_MASK to keep the masking same. Signed-off-by: Limin Wang --- libavformat/mp3dec.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/libavformat/mp3dec.c b/libavformat/mp3dec.c index a047878..71a4ed7 100644 --- a/libavformat/mp3dec.c +++ b/libavformat/mp3dec.c @@ -42,8 +42,6 @@ #define XING_TOC_COUNT 100 -#define SAME_HEADER_MASK \ - (0xffe00000 | (3 << 17) | (3 << 10) | (3 << 19)) typedef struct { AVClass *class; @@ -406,7 +404,7 @@ static int mp3_read_header(AVFormatContext *s) ffio_ensure_seekback(s->pb, i + 1024 + frame_size + 4); ret = check(s->pb, off + i + frame_size, &header2); if (ret >= 0 && - (header & SAME_HEADER_MASK) == (header2 & SAME_HEADER_MASK)) + (header & MP3_MASK) == (header2 & MP3_MASK)) { av_log(s, i > 0 ? AV_LOG_INFO : AV_LOG_VERBOSE, "Skipping %d bytes of junk at %"PRId64".\n", i, off); ret = avio_seek(s->pb, off + i, SEEK_SET);