From patchwork Thu Jan 13 01:56:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 33386 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp26950iog; Wed, 12 Jan 2022 18:15:11 -0800 (PST) X-Google-Smtp-Source: ABdhPJxLDpApXsydFJroRoudTUVgVQKw0nxYtrcq3EU3IrrbDq3bRWZAZ1wCPqm9JSmy7xuELVUW X-Received: by 2002:a05:6402:5216:: with SMTP id s22mr2274902edd.132.1642040111415; Wed, 12 Jan 2022 18:15:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642040111; cv=none; d=google.com; s=arc-20160816; b=ltM15teSItBtD6PhybwheWnrvQSpd5bKdCzfyhPd8jndc81QwEpHz+bWjXIZfNDJTG KW+BstXLD1UAR9Fipxj622uw8u9Mr8pQUMz97bOUU9uTttjwaLRXRWpVJIt+2VAitve4 H2XtNnfsQZMqPhJCX1nzuFf1BsIQ8GVbxyrAynAhzLSylOo0x2jk1G6Vm+Ug58UrW56L r/QNh2O31UiAtaorQS7FCaAmtQmP47Akr6FcKzpasdFi5jHk9Lj/Vw/vCsj+bas8/kOW sd9b7Ti/RzZcoQaC0cjN4VSg8nhzVSNcvAO5GCsLsaZ6teoqXqzAKReT0l1sljJfQcgM Y8BQ== 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=zxmxHAJft23Y2eSi13rflba/AaytZxblAsRW6Zfmmog=; b=LSczj6DntgDoWyd70M6jUE6gnd99s1pUgGnE+mkFdkYl3nKtZA5jXmGMi1pd5uwTlI 1jVPwsy+xbXlIKFmRJv/lGNio+hw6scMSphD9AFYfO/1cdrhtZrVVJvdJidq1AiITgf9 uL0u0H5mpBIr9i2/W3+zmijpvIs7sNOpr+4ttb+k7WFGjQ9LInj5KaGWaDIKLF6h/Nju sBCdhZNbWQjNWlDGqkPGFRbS0gTGXY3UXWz1DaaVr93RZk9j7b+dH47g08qT28kL7P7u 2ebWyz8iGJ3f+wxlwjw5fWWYfPbqdFYkBCcqPKlDZRHKprD2r0h6907xaCOsMRW1xZHB GA/g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=B4bXRBxW; 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 o13si854907edz.353.2022.01.12.18.15.11; Wed, 12 Jan 2022 18:15:11 -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=B4bXRBxW; 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 2930168B2B7; Thu, 13 Jan 2022 03:56:50 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f175.google.com (mail-qt1-f175.google.com [209.85.160.175]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5610168B2A7 for ; Thu, 13 Jan 2022 03:56:48 +0200 (EET) Received: by mail-qt1-f175.google.com with SMTP id v7so5314625qtw.13 for ; Wed, 12 Jan 2022 17:56:48 -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=nfAF4bnDBv+Y4DEx4GFPCgxTY4zlgk/JprsXcoOV1J0=; b=B4bXRBxWPApWN0/772gH74yEYGDHm5fcr0nFhZW+eT0w7+iEXMZIvR70WlCcfD5EwT H/PM+ur8Sgm+EPglDtYwvg+6/Qd2pZcUS/LgB89vxw8JtsJyMYSxjjoU5H0qFEgBRS60 L80sIJT/NGx3RZlI9Hw4gbKiKfHhENNKgtmqO+bLa4N/oBfprAc3NIqX4LmNSRkk6xn4 ThamPl8IuY1iNPCwPc4xmgArMG7L18IVJS3oXKLvHOSm/dmllcbny4e9oZXzxhC2mY4V 8Pf9RW8qGiXZ79h//ViB974jrngc45fTzEHr7OzrQlBfXjHwYq2iRAuvP6t9IAMq0NHV TZIw== 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=nfAF4bnDBv+Y4DEx4GFPCgxTY4zlgk/JprsXcoOV1J0=; b=cwvHJZb/B7Zn5nwuGWV47A2XFcMXINL5wkiOVV8zOI4Uzj5bfBUEQD3KchoXI4w3Dm UiIqvnnJqiKmRAmxKwRc7YJu/ks1RrDJM7paqIcOIdlROPbJTMGe7yQxobG06Z6Yrfd3 BNUxWuuCPerw9YlYHZ3DiEpSJhXljSvpFthGf9Si36S1oMPjkxcLjR/jK60JG1cdFjVR 5S5C+ksyJcS0yYKm8ooCAfv7ovC3njr5pEQAFdrIdlGq3uzPoBLD+7wGZLAOTqLzfHA2 aKnvKMHlHmbB1Ak7dtTVBKJy0tvlCHwtpY6a1//A1dPCR7BfeW72FAqr0H3OPXgdIlNP PnWQ== X-Gm-Message-State: AOAM531o/5wwXE9AXNBV3FfAqA9uMI+B+KMkTbkQlmKs4L1YVRSYeuEU z73/yw6fS6pF5wpJaCQW93oz3JlSYTM= X-Received: by 2002:a05:622a:245:: with SMTP id c5mr2023987qtx.189.1642039006976; Wed, 12 Jan 2022 17:56:46 -0800 (PST) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id t11sm906506qkm.77.2022.01.12.17.56.46 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jan 2022 17:56:46 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jan 2022 22:56:00 -0300 Message-Id: <20220113015612.448-19-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 107/281] mvdec: 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: Nu3snFBkJjRq From: Vittorio Giovara Signed-off-by: Vittorio Giovara Signed-off-by: James Almer --- libavformat/mvdec.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/libavformat/mvdec.c b/libavformat/mvdec.c index 4f233aff5f..b37fe2ce69 100644 --- a/libavformat/mvdec.c +++ b/libavformat/mvdec.c @@ -111,9 +111,7 @@ static int set_channels(AVFormatContext *avctx, AVStream *st, int channels) av_log(avctx, AV_LOG_ERROR, "Channel count %d invalid.\n", channels); return AVERROR_INVALIDDATA; } - st->codecpar->channels = channels; - st->codecpar->channel_layout = (st->codecpar->channels == 1) ? AV_CH_LAYOUT_MONO - : AV_CH_LAYOUT_STEREO; + av_channel_layout_default(&st->codecpar->ch_layout, channels); return 0; } @@ -283,7 +281,7 @@ static void read_index(AVIOContext *pb, AVStream *st) return ; av_add_index_entry(st, pos, timestamp, size, 0, AVINDEX_KEYFRAME); if (st->codecpar->codec_type == AVMEDIA_TYPE_AUDIO) { - timestamp += size / (st->codecpar->channels * 2LL); + timestamp += size / (st->codecpar->ch_layout.nb_channels * 2LL); } else { timestamp++; } @@ -402,7 +400,7 @@ static int mv_read_header(AVFormatContext *avctx) avio_skip(pb, 8); if (ast) { av_add_index_entry(ast, pos, timestamp, asize, 0, AVINDEX_KEYFRAME); - timestamp += asize / (ast->codecpar->channels * (uint64_t)bytes_per_sample); + timestamp += asize / (ast->codecpar->ch_layout.nb_channels * (uint64_t)bytes_per_sample); } av_add_index_entry(vst, pos + asize, i, vsize, 0, AVINDEX_KEYFRAME); } @@ -439,7 +437,7 @@ static int mv_read_header(AVFormatContext *avctx) ast->codecpar->bits_per_coded_sample); ast->codecpar->codec_id = AV_CODEC_ID_NONE; } - if (ast->codecpar->channels <= 0) { + if (ast->codecpar->ch_layout.nb_channels <= 0) { av_log(avctx, AV_LOG_ERROR, "No valid channel count found.\n"); return AVERROR_INVALIDDATA; }