From patchwork Wed Dec 8 01:06:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 32134 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp7046215iog; Tue, 7 Dec 2021 17:11:02 -0800 (PST) X-Google-Smtp-Source: ABdhPJy9ThxnU9iYwf4aoMTc+pqchB5Kml8KnBwJV6j2zA31aEk/LRWX/Uqo0gXB4YE8W7ESWbP8 X-Received: by 2002:a05:6402:440f:: with SMTP id y15mr14804655eda.22.1638925862446; Tue, 07 Dec 2021 17:11:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1638925862; cv=none; d=google.com; s=arc-20160816; b=lwxWDCq3+j7YcK/Mx5S389aq+uNpp5GKrZyVl7+tR+YIplvOQkkEImXtIhyOznDeTa iqHqe1KCF6KkuBhfCj8FVX7FEOUGlLrrOGo0wUgbo+QXgeiNvN5kBoe4SR/rr8ihqqjl hKpEzaMpnfIZn97+JhNG7o4GTkc7e6WcL3x9x9R2vuDarj1v7pzRqstJM1ieA9azUadb 4DW+m8Z5XgKX3jVWdAgepZoaTg4pp/b0PCOrE1EHOb94j3mJj2f8DO8FxUJ/V2ob4PWf 704guKxTjPRKMq0EGqIgLYkwJhQ4juUpVBtAzLwINSVknCoHrtF2WW3P4ey0PCfJU/JM uKdg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=i5eHeA3UVuK26smM4x+c/OkzaKMyYwT4D2TJIk4YW+s=; b=N0HyF9Y6aqO0OdMb3uNHt2+Rwelwin363S1GAbr33JFvxBIEYbqb0Rd+ky+bMrqCmR vRTMg6qe9aWHEBqJjtEASuF3UUiSEBxPuQC/yytk/3PQMdQT4nw18YFAVSc2+UKOfoyz vmVRwqo1aE5oTMEWhptEGWxYGeMV6wsw9FP3pFPnl6g6dt61cMVPnKeMR06+d0Okd/17 EhSn88KdYcJ0I7ihgjjgDsDJ7NOOmTcREfz2E8bWQNsWVkipw8G+cUPRfMyaMnC/oGYU e1mkHCVyiebjYuXCtwDf36uiMMWUSyKBqVq3sWyhhpk572jsELhYoKk5jub3Vf8B6N2X DQhg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=h2Ne6pKc; 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 hd37si2081826ejc.349.2021.12.07.17.11.02; Tue, 07 Dec 2021 17:11:02 -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=@gmail.com header.s=20210112 header.b=h2Ne6pKc; 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 61B0E68AEA3; Wed, 8 Dec 2021 03:08:00 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ua1-f53.google.com (mail-ua1-f53.google.com [209.85.222.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2685968AF21 for ; Wed, 8 Dec 2021 03:07:53 +0200 (EET) Received: by mail-ua1-f53.google.com with SMTP id a14so2032362uak.0 for ; Tue, 07 Dec 2021 17:07:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=2f5ZezIXZiTo3YVZLHysET0XIgDsctgDpAHf2Y4U/w8=; b=h2Ne6pKcM6B2OnEBtfCZerq+SV23I5kVue70Z06uVqdaQpjnN4BreIdUGx2rkFZ1XV DPaTQmHTRYZKyocKfy6LrMHANaBWkGolwapRgd4SxVTWHDgcsUj2+Cg8R+EsJh89dkXF yRPTk3rfS5Trt+EOQZQ0THZU2tnhxMzGzdxFAYE+BgY7WJsfhpspD6sTv51Dm73QG6Io Wl3Irar7Vbvwv7BVQhR0UiR3NGKevu+CFtJRaVsjhtsYp8hDDkQVnz4h1OHcVbfAXs6g RAK0eLlQMBUCUg24f+yUrkEH8tbG/nbPGEVuYiIMz1ndX7xlgnLqwRvJdGtqzuh/zc11 gyZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=2f5ZezIXZiTo3YVZLHysET0XIgDsctgDpAHf2Y4U/w8=; b=094PocHLozinBJUgJSioxj7PYGFyP2Wgy4m6byx8j95RdrunwpmltlUIsiqfuYMdE0 asMTm1gYncdDRIgwh6aIk82D1ni+dYzHX1MipL4MLL19+31K6L49AIsYaEs5Q4qW/JgJ Gttd975lnaz5x6p5/C8C4yRyIaUsu+qy2NeKX+Ac63Z45o2UEnu1Y4VH4aWw8c5ZVWuB rbkT7SEmE1Lwk95BTdcPkNaesKQCEi6f/dLyqUNYbyPcrCFTR4k4jxWBaPg2COxYvMNp kix79ekvK2woXhtVLW7y1SXQVm3LowZekwZL6qNq7vUD4R6Zpz647sczUuZzeFytE5oT EYew== X-Gm-Message-State: AOAM532HvLpPFw2FoOKEGX8aB43hqkBv1buBq3JBc1ayZvPKNn7Zy5qO TE3GcAeLFg4IiV0QYBrXR2Z1jIylflmQindc X-Received: by 2002:ab0:20d4:: with SMTP id z20mr4184992ual.23.1638925671702; Tue, 07 Dec 2021 17:07:51 -0800 (PST) Received: from localhost.localdomain ([181.170.250.138]) by smtp.gmail.com with ESMTPSA id b8sm949898vsl.19.2021.12.07.17.07.50 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Dec 2021 17:07:51 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Tue, 7 Dec 2021 22:06:35 -0300 Message-Id: <20211208010649.381-20-jamrial@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20211208010649.381-1-jamrial@gmail.com> References: <20211208010649.381-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 180/279] 8svx: convert to new channel layout API X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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: IBDFi0J6+/nw From: Anton Khirnov Signed-off-by: Vittorio Giovara Signed-off-by: Anton Khirnov Signed-off-by: James Almer --- libavcodec/8svx.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/libavcodec/8svx.c b/libavcodec/8svx.c index 6ef8cd73fe..6ef7921274 100644 --- a/libavcodec/8svx.c +++ b/libavcodec/8svx.c @@ -88,38 +88,39 @@ static int eightsvx_decode_frame(AVCodecContext *avctx, void *data, { EightSvxContext *esc = avctx->priv_data; AVFrame *frame = data; + int channels = avctx->ch_layout.nb_channels; int buf_size; int ch, ret; int hdr_size = 2; /* decode and interleave the first packet */ if (!esc->data[0] && avpkt) { - int chan_size = avpkt->size / avctx->channels - hdr_size; + int chan_size = avpkt->size / channels - hdr_size; - if (avpkt->size % avctx->channels) { + if (avpkt->size % channels) { av_log(avctx, AV_LOG_WARNING, "Packet with odd size, ignoring last byte\n"); } - if (avpkt->size < (hdr_size + 1) * avctx->channels) { + if (avpkt->size < (hdr_size + 1) * channels) { av_log(avctx, AV_LOG_ERROR, "packet size is too small\n"); return AVERROR_INVALIDDATA; } esc->fib_acc[0] = avpkt->data[1] + 128; - if (avctx->channels == 2) + if (channels == 2) esc->fib_acc[1] = avpkt->data[2+chan_size+1] + 128; esc->data_idx = 0; esc->data_size = chan_size; if (!(esc->data[0] = av_malloc(chan_size))) return AVERROR(ENOMEM); - if (avctx->channels == 2) { + if (channels == 2) { if (!(esc->data[1] = av_malloc(chan_size))) { av_freep(&esc->data[0]); return AVERROR(ENOMEM); } } memcpy(esc->data[0], &avpkt->data[hdr_size], chan_size); - if (avctx->channels == 2) + if (channels == 2) memcpy(esc->data[1], &avpkt->data[2*hdr_size+chan_size], chan_size); } if (!esc->data[0]) { @@ -139,7 +140,7 @@ static int eightsvx_decode_frame(AVCodecContext *avctx, void *data, if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) return ret; - for (ch = 0; ch < avctx->channels; ch++) { + for (ch = 0; ch < channels; ch++) { delta_decode(frame->data[ch], &esc->data[ch][esc->data_idx], buf_size, &esc->fib_acc[ch], esc->table); } @@ -148,14 +149,14 @@ static int eightsvx_decode_frame(AVCodecContext *avctx, void *data, *got_frame_ptr = 1; - return ((avctx->frame_number == 0)*hdr_size + buf_size)*avctx->channels; + return ((avctx->frame_number == 0) * hdr_size + buf_size) * channels; } static av_cold int eightsvx_decode_init(AVCodecContext *avctx) { EightSvxContext *esc = avctx->priv_data; - if (avctx->channels < 1 || avctx->channels > 2) { + if (avctx->ch_layout.nb_channels < 1 || avctx->ch_layout.nb_channels > 2) { av_log(avctx, AV_LOG_ERROR, "8SVX does not support more than 2 channels\n"); return AVERROR_INVALIDDATA; }