From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 2994642F93 for ; Thu, 13 Jan 2022 02:49:09 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id AEB7A68BA09; Thu, 13 Jan 2022 04:07:55 +0200 (EET) Received: from mail-qk1-f182.google.com (mail-qk1-f182.google.com [209.85.222.182]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B3EF968BA00 for ; Thu, 13 Jan 2022 04:07:53 +0200 (EET) Received: by mail-qk1-f182.google.com with SMTP id 82so5571306qki.10 for ; Wed, 12 Jan 2022 18: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=MVyiQlJbOwR/dGdIMQKZz2jUaUjWpczlzpqBh2zcPLw=; b=hVqb2JL3V9ZtdkgbwJ8b1kTf5Ejx89+GkldJxuYZU58e/8VVQuD7uflIaOZFvJI3nY 9Kp4zKn44KUrzZuyjvo3HTUG5zC+N0qqVCtU++vB5jj3lOQjR2OEBrTZXSztks5FqRnP 1KQpc8SzVb1GpwnuQULSzk2ITZ3rYrmU9O9/GibObLE4sdPc5YkH9CAm5LXTYcQRhjt0 coPOHm5buZ6aPX2wS9PFSBLRJS6FnDYNBwSt7oAWG63SQSqz27h4y4qvf7L92K7jt2mv wEKwJ4LajxtyuGX1bl//qWwa+z7x9PU/4pz3ZzDw2+2++zAxyRM6MOyv5HxGb1EyL7zN Hccg== 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=MVyiQlJbOwR/dGdIMQKZz2jUaUjWpczlzpqBh2zcPLw=; b=kGYIuNu08KaaboGe53n7MIi+VgAV1NBUClpC/yXLOAMcDijWFXrGfYz3ignJHgDTW0 JFKv+rbS3JaEJR7F5HLLgsc+090Ho5ZsZT0Rx1EDxgceAsqyO8UzmSvsKkP/NTV83sus 6NuGaF4W2SQ/1GzHsOThbjy+8oIZoHtmN23VdCNrxvwm18b51TAIVjqlEFwZrtnPxaaB Xzal0G70vucrA6i9anvB6NWxNVVgnVE07d0C5CR+3HL+sfGjx2n6nU1I/eXgLwlbgILr JUV/9lYcTKSsH016dPd63EvOK2LDS8FdeaosKAEWlO9g//l0EMli+pJxIUdrhHxIR5pN y/Ng== X-Gm-Message-State: AOAM531L4yciCAlKmKpSUppmAbq1CcdA9aNA6L1/k8xVIdzbD/mTyvt5 GNfuERGAdwXJfopBsRkrOxceAoW4KMk= X-Google-Smtp-Source: ABdhPJw6YouJH7o7SMQDfymT3rPyq+vUyE3wHH+yuwtlBwh/ecb9voNAjXbllZoLepHpV3q7sGRvog== X-Received: by 2002:a37:a84:: with SMTP id 126mr1905135qkk.72.1642039672288; Wed, 12 Jan 2022 18:07:52 -0800 (PST) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id a16sm1085946qta.13.2022.01.12.18.07.51 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jan 2022 18:07:51 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jan 2022 23:07:03 -0300 Message-Id: <20220113020713.801-20-jamrial@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220113015101.4-1-jamrial@gmail.com> References: <20220113015101.4-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 259/281] smacker: 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: From: Anton Khirnov Signed-off-by: Vittorio Giovara Signed-off-by: Anton Khirnov Signed-off-by: James Almer --- libavcodec/smacker.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/libavcodec/smacker.c b/libavcodec/smacker.c index 75ab5d7120..4a3999e4f1 100644 --- a/libavcodec/smacker.c +++ b/libavcodec/smacker.c @@ -572,11 +572,13 @@ static av_cold int decode_init(AVCodecContext *avctx) static av_cold int smka_decode_init(AVCodecContext *avctx) { - if (avctx->channels < 1 || avctx->channels > 2) { + int channels = avctx->ch_layout.nb_channels; + if (channels < 1 || channels > 2) { av_log(avctx, AV_LOG_ERROR, "invalid number of channels\n"); return AVERROR_INVALIDDATA; } - avctx->channel_layout = (avctx->channels==2) ? AV_CH_LAYOUT_STEREO : AV_CH_LAYOUT_MONO; + av_channel_layout_uninit(&avctx->ch_layout); + av_channel_layout_default(&avctx->ch_layout, channels); avctx->sample_fmt = avctx->bits_per_coded_sample == 8 ? AV_SAMPLE_FMT_U8 : AV_SAMPLE_FMT_S16; return 0; @@ -623,7 +625,7 @@ static int smka_decode_frame(AVCodecContext *avctx, void *data, } stereo = get_bits1(&gb); bits = get_bits1(&gb); - if (stereo ^ (avctx->channels != 1)) { + if (stereo ^ (avctx->ch_layout.nb_channels != 1)) { av_log(avctx, AV_LOG_ERROR, "channels mismatch\n"); return AVERROR_INVALIDDATA; } @@ -633,8 +635,8 @@ static int smka_decode_frame(AVCodecContext *avctx, void *data, } /* get output buffer */ - frame->nb_samples = unp_size / (avctx->channels * (bits + 1)); - if (unp_size % (avctx->channels * (bits + 1))) { + frame->nb_samples = unp_size / (avctx->ch_layout.nb_channels * (bits + 1)); + if (unp_size % (avctx->ch_layout.nb_channels * (bits + 1))) { av_log(avctx, AV_LOG_ERROR, "The buffer does not contain an integer number of samples\n"); return AVERROR_INVALIDDATA; -- 2.34.1 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".