From patchwork Tue Oct 22 13:01:50 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 15896 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 E3C9744818A for ; Tue, 22 Oct 2019 16:03:00 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C558A68ADD9; Tue, 22 Oct 2019 16:03:00 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f194.google.com (mail-qt1-f194.google.com [209.85.160.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 552F968A59B for ; Tue, 22 Oct 2019 16:02:54 +0300 (EEST) Received: by mail-qt1-f194.google.com with SMTP id r5so26647934qtd.0 for ; Tue, 22 Oct 2019 06:02:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=gStS0b7R1Ln9uGp3LH92ftNZAKGU8hSidJQyLcGN5n8=; b=MI/+LJlsduEIK0Xyf52uM6Cckn9chNK6GxK/uW5MAeIm9Rj4kM2d4BGgLV5VcHhBgG Tmq/FE6M3CnyElzBH+LR5uofo0XbsGQ8gP6C87quY06tAqRBQ6ZNkliesmkLXRaCAIIy QhxfICjqFvrwnY3Tc2KTZlzOOPmFJl0GuNnymCWjp20CzWv+uq+JxuGtDnvFz52OmVMV Wld+jEOjNPiWIwlYziVXk740S6H65yffaW/T7Ys7UpOn7Ce5ZsKElSE/wIUcUCVg1CmP PTFDemNa7rr7BZJiV6R2TETydzyomzFos1vapnVzOj0F/4K4fULuEfvdOff/FRhja9/M CpGQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=gStS0b7R1Ln9uGp3LH92ftNZAKGU8hSidJQyLcGN5n8=; b=N/8qF9eAQOscTuYR4qvIVG3VJjs/WAmScLL2EpMILCWyYb3Z1Wqksn4nl4oerq8BjR 14I2Byjl/HXMgI0TJgocObZRXMXxCzHCAkfH7ezPGnBOtodj3Njiz9oLYyVXXPCGAy8n FxnCBErlKaZwFAqMB5rjhCPg+dGxqaTkDmgRjF5ZUR/11GPXvNrNPXstt9DHNpbSdNSH D+jf+R/CE0szBGKbV7j2kCMfnRbvsiIqGob1Z0kQORqKkR2fnXt4/bHBiopt/eiJbSlU 67ZUeIaCtibL8m6UQNCuq3eviR5RWJ1cic5U/Pl+oUBVuOCpm5MhgKd7EeR4RRaZpLLX xjsQ== X-Gm-Message-State: APjAAAXQZoYLHx8CRzvs3dRQIgszIyEqNgmJFXkciQyhFqHwjDwuNYhL c2l/hFf8gvXeXA+hfNTgCM0y9Ok7 X-Google-Smtp-Source: APXvYqwftO9DF04x5EFdOySemuSXlcnEj6IU0XQSOUAWs1jz8zFmfaUBrtuoFrzo+EymxfQ5EZKIQg== X-Received: by 2002:a05:6214:1812:: with SMTP id o18mr547619qvw.33.1571749372558; Tue, 22 Oct 2019 06:02:52 -0700 (PDT) Received: from localhost.localdomain ([181.23.69.30]) by smtp.gmail.com with ESMTPSA id n4sm9700318qkc.61.2019.10.22.06.02.51 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Oct 2019 06:02:51 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Tue, 22 Oct 2019 10:01:50 -0300 Message-Id: <20191022130150.393-1-jamrial@gmail.com> X-Mailer: git-send-email 2.23.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/atrac9tab: use explicit ATRAC9BlockConfig struct initializers 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" Cosmetic change. Signed-off-by: James Almer Signed-off-by: James Almer --- libavcodec/atrac9tab.h | 79 ++++++++++++++++++------------------------ 1 file changed, 33 insertions(+), 46 deletions(-) diff --git a/libavcodec/atrac9tab.h b/libavcodec/atrac9tab.h index d25c6f1b7f..8f290f158c 100644 --- a/libavcodec/atrac9tab.h +++ b/libavcodec/atrac9tab.h @@ -41,61 +41,48 @@ typedef struct ATRAC9BlockConfig { static const ATRAC9BlockConfig at9_block_layout[] = { { /* Mono */ - AV_CH_LAYOUT_MONO, - { - ATRAC9_BLOCK_TYPE_SCE, - }, - { { 0 }, }, - 1, + .channel_layout = AV_CH_LAYOUT_MONO, + .type = { ATRAC9_BLOCK_TYPE_SCE, }, + .count = 1, }, { /* Dual Mono */ - AV_CH_LAYOUT_STEREO, - { - ATRAC9_BLOCK_TYPE_SCE, - ATRAC9_BLOCK_TYPE_SCE, - }, - { { 0 }, { 1 }, }, - 2, + .channel_layout = AV_CH_LAYOUT_STEREO, + .type = { ATRAC9_BLOCK_TYPE_SCE, + ATRAC9_BLOCK_TYPE_SCE, }, + .plane_map = { { 0 }, { 1 }, }, + .count = 2, }, { /* Stereo */ - AV_CH_LAYOUT_STEREO, - { - ATRAC9_BLOCK_TYPE_CPE, - }, - { { 0, 1 }, }, - 1, + .channel_layout = AV_CH_LAYOUT_STEREO, + .type = { ATRAC9_BLOCK_TYPE_CPE, }, + .plane_map = { { 0, 1 }, }, + .count = 1, }, { /* 5.1 */ - AV_CH_LAYOUT_5POINT1, - { - ATRAC9_BLOCK_TYPE_CPE, - ATRAC9_BLOCK_TYPE_SCE, - ATRAC9_BLOCK_TYPE_LFE, - ATRAC9_BLOCK_TYPE_CPE, - }, - { { 0, 1 }, { 2 }, { 3 }, { 4, 5 }, }, - 4, + .channel_layout = AV_CH_LAYOUT_5POINT1, + .type = { ATRAC9_BLOCK_TYPE_CPE, + ATRAC9_BLOCK_TYPE_SCE, + ATRAC9_BLOCK_TYPE_LFE, + ATRAC9_BLOCK_TYPE_CPE, }, + .plane_map = { { 0, 1 }, { 2 }, { 3 }, { 4, 5 }, }, + .count = 4, }, - { /* 5.1 */ - AV_CH_LAYOUT_7POINT1, - { - ATRAC9_BLOCK_TYPE_CPE, - ATRAC9_BLOCK_TYPE_SCE, - ATRAC9_BLOCK_TYPE_LFE, - ATRAC9_BLOCK_TYPE_CPE, - ATRAC9_BLOCK_TYPE_CPE, - }, - { { 0, 1 }, { 2 }, { 3 }, { 4, 5 }, { 6, 7 }, }, - 5, + { /* 7.1 */ + .channel_layout = AV_CH_LAYOUT_7POINT1, + .type = { ATRAC9_BLOCK_TYPE_CPE, + ATRAC9_BLOCK_TYPE_SCE, + ATRAC9_BLOCK_TYPE_LFE, + ATRAC9_BLOCK_TYPE_CPE, + ATRAC9_BLOCK_TYPE_CPE, }, + .plane_map = { { 0, 1 }, { 2 }, { 3 }, { 4, 5 }, { 6, 7 }, }, + .count = 5, }, { /* Quad */ - AV_CH_LAYOUT_QUAD, - { - ATRAC9_BLOCK_TYPE_CPE, - ATRAC9_BLOCK_TYPE_CPE, - }, - { { 0, 1 }, { 2, 3 }, }, - 2, + .channel_layout = AV_CH_LAYOUT_QUAD, + .type = { ATRAC9_BLOCK_TYPE_CPE, + ATRAC9_BLOCK_TYPE_CPE, }, + .plane_map = { { 0, 1 }, { 2, 3 }, }, + .count = 2, }, };