From patchwork Sat May 30 16:05:17 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 19999 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 C487D44A6AD for ; Sat, 30 May 2020 19:06:33 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A8F8268AFBA; Sat, 30 May 2020 19:06:33 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f44.google.com (mail-wr1-f44.google.com [209.85.221.44]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9154B68ADF1 for ; Sat, 30 May 2020 19:06:25 +0300 (EEST) Received: by mail-wr1-f44.google.com with SMTP id x6so7099060wrm.13 for ; Sat, 30 May 2020 09:06:25 -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=hVNi0ov4KwpZXc/Abm8u3TRTn9r00JZ7fYZs+e9JIzk=; b=jhfB+rb4H9f766Sn76Cx0oYfx+HXLMT4uYu0hF9LuvueBW5OoxxugWNhzXypZHacQM TLcisGHXdQxW42uGm8SqZCz0YljFC1o5Wh9i9BLgFybS63U3xz0+o9u1neu0tWuONOaO fdqDwSL21CLaajPII/e9bvDNLwrCx0K03gxmxQ8DABDhlRtrQ5kIG/rrXtW6Aks9a1py c61Qckb8pl+kiBWGBbeYa1RwdLHySMM4UEQyVVUfRdw1I7m7QeH0m/hUnnI8+MkIHz9T /oxrPCiZlV5oJW2Es3+TRHwz5JBibtPgUX/BfnmLBvxpfNUiicIzp1rc3Wpj7m3m4Z1B fOvg== 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=hVNi0ov4KwpZXc/Abm8u3TRTn9r00JZ7fYZs+e9JIzk=; b=Gwjl/HCTeLeFTh5dqYgLQHtPRr8l5Tkjm/e7zWsRDGo+ROTa4dpnIlfAvKfb6NkcqI lBjZJ2sezGQOS6RXlxyhmA+4dkTh5CrGZv6j9unPQguFg9tBgWRxzlTFPkwJu0tJqxpp W8BGpfK4pYwb3GWPB78kPfn5vbebv6q1mGjaCKN74/sKBDoEdFFSK7FDSGucLa+8UqdQ j6gvneT4DlHAEvLYSEQE8v999n1Mdidbr5eH3iUG9FqAY547Z0/oy4Szl/kX9Eaps6Ml EZ9XgBHMqktyXM3JijIOiRThMrujABX9acPxujqmYX+4nZcBDcoIbgQw0sob+viL8/e/ yfeQ== X-Gm-Message-State: AOAM532mZQn3RuSN3obUb2bm0w5/Fu76m7rUcMP0mU0lF7cE+CZnHkmw crLnhpT/QDin1LZVyQh2dA9oMQQI X-Google-Smtp-Source: ABdhPJyWIwgFSZJIeT6ypJg/TS2dViZ6y702keMRUKu0gkhBd1y47Gavanzdo0zvNh6k2Qcg+6cucg== X-Received: by 2002:adf:ca0e:: with SMTP id o14mr14841365wrh.254.1590854784564; Sat, 30 May 2020 09:06:24 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1ab57.dynamic.kabel-deutschland.de. [188.193.171.87]) by smtp.gmail.com with ESMTPSA id v27sm15186517wrv.81.2020.05.30.09.06.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 30 May 2020 09:06:23 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 30 May 2020 18:05:17 +0200 Message-Id: <20200530160541.29517-12-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200530160541.29517-1-andreas.rheinhardt@gmail.com> References: <20200530160541.29517-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 12/36] avcodec/mp3_header_decompress_bsf: Don't output uninitialized CRC 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 --- libavcodec/mp3_header_decompress_bsf.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libavcodec/mp3_header_decompress_bsf.c b/libavcodec/mp3_header_decompress_bsf.c index 44c174c21c..fe021deed3 100644 --- a/libavcodec/mp3_header_decompress_bsf.c +++ b/libavcodec/mp3_header_decompress_bsf.c @@ -85,7 +85,7 @@ static int mp3_header_decompress(AVBSFContext *ctx, AVPacket *out) header |= (bitrate_index&1)<<9; header |= (bitrate_index>>1)<<12; - header |= (frame_size == buf_size + 4)<<16; //FIXME actually set a correct crc instead of 0 + header |= (frame_size == buf_size + 4)<<16; ret = av_new_packet(out, frame_size); if (ret < 0) @@ -109,6 +109,10 @@ static int mp3_header_decompress(AVBSFContext *ctx, AVPacket *out) } } + if (frame_size == buf_size + 6) { + //FIXME actually set a correct crc instead of 0 + AV_WN16(out->data + 4, 0); + } AV_WB32(out->data, header); ret = 0;