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 ADC8442F40 for ; Thu, 13 Jan 2022 02:44:06 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id DA8C568B938; Thu, 13 Jan 2022 04:06:09 +0200 (EET) Received: from mail-qk1-f169.google.com (mail-qk1-f169.google.com [209.85.222.169]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CC27968B8F0 for ; Thu, 13 Jan 2022 04:06:05 +0200 (EET) Received: by mail-qk1-f169.google.com with SMTP id g2so5630028qkp.1 for ; Wed, 12 Jan 2022 18:06:05 -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=Ck/Uxho0yx+MpNfzxUSE0wPIap+3NLZKmfCnmb0bWTY=; b=Ty0E7SJDchntCyykzgwC1aJLLmS+njxnAIAwCg07GVFROtXVNyXqQ/UX4Y51k2H3zV AoNXXaZHhomQgBmQBk88RXwsY56T+7dVkkYpDIydcw11w67b855G8Z+TI+NV2DmAxpqr 6aYJVHN5rQ5sBK+jlRltHYZtQXyA7UV4lgm+rxIyIZo1s2ObP30TMisCmmlH/p4QQ6JY EZ74U0r0sWybmGIs94rutM5jl0Eblfu7lNDZ7A0eRVTDjMulECV83n9f/wVKKVoKFrlZ 9vKK8MqEfSysKizYTF0EK6hThnumuGVWj+42Y6cMBaAjmkGa87/evIbAplmQrShgN0gV LMRg== 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=Ck/Uxho0yx+MpNfzxUSE0wPIap+3NLZKmfCnmb0bWTY=; b=WvM6YyMSiyr2E1MC+o7ZWlcsqaaMXBDjpu3ulcGkIMYNJ/ozZ2skkDqDC8wNT4BhJC NLl0jDCBxP+NqPxJUvGDvJBbOpBKoetkcqPBsFkUL4zBLEqNrvzOLqUVTs2Sb6gwxKtd DwrOd9db4hKgM4EWZaeR9W6pnhgxrLZc5xnIEPodrlXomTeyomDty6AG0JhqhyqPL9wx yF2nEyxKQn5lfnxtOoYBlHQ87AIyzbwO1bCaYDy+jr/qnYWCQx7np+dKddTBo+MNTl6y 2njh0Q6OY1nnkmDa2IHiT+tWCYXFJSNbUH6CHwNtFqoB80VhZELmxJ53u8QzF5wvAcrj OMfQ== X-Gm-Message-State: AOAM531UyzOoWn0KzNXNOoqLKOimJHERTQbh4jd8/938kC3m2MDIwjI3 GxYqjyE3ziyBy3qV2MrfNr+T+XdklLU= X-Google-Smtp-Source: ABdhPJwLI9g0Mva+Kzq/hvoB6jTjqsvAmtUvd3UP2QQIR87W4jHqBsB8bnvDP0wme55d9+bBFW/rqg== X-Received: by 2002:a05:620a:78c:: with SMTP id 12mr1778512qka.758.1642039564401; Wed, 12 Jan 2022 18:06:04 -0800 (PST) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id k9sm1264556qko.29.2022.01.12.18.06.03 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jan 2022 18:06:04 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jan 2022 23:05:16 -0300 Message-Id: <20220113020518.730-28-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 237/281] mf: 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: Signed-off-by: James Almer --- libavcodec/mfenc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavcodec/mfenc.c b/libavcodec/mfenc.c index 410ad64d8d..043026112a 100644 --- a/libavcodec/mfenc.c +++ b/libavcodec/mfenc.c @@ -288,7 +288,7 @@ static IMFSample *mf_a_avframe_to_sample(AVCodecContext *avctx, const AVFrame *f size_t bps; IMFSample *sample; - bps = av_get_bytes_per_sample(avctx->sample_fmt) * avctx->channels; + bps = av_get_bytes_per_sample(avctx->sample_fmt) * avctx->ch_layout.nb_channels; len = frame->nb_samples * bps; sample = ff_create_memory_sample(frame->data[0], len, c->in_info.cbAlignment); @@ -536,7 +536,7 @@ static int64_t mf_enca_output_score(AVCodecContext *avctx, IMFMediaType *type) score |= 1LL << 32; hr = IMFAttributes_GetUINT32(type, &MF_MT_AUDIO_NUM_CHANNELS, &t); - if (!FAILED(hr) && t == avctx->channels) + if (!FAILED(hr) && t == avctx->ch_layout.nb_channels) score |= 2LL << 32; hr = IMFAttributes_GetGUID(type, &MF_MT_SUBTYPE, &tg); @@ -591,7 +591,7 @@ static int64_t mf_enca_input_score(AVCodecContext *avctx, IMFMediaType *type) score |= 2; hr = IMFAttributes_GetUINT32(type, &MF_MT_AUDIO_NUM_CHANNELS, &t); - if (!FAILED(hr) && t == avctx->channels) + if (!FAILED(hr) && t == avctx->ch_layout.nb_channels) score |= 4; return score; @@ -615,7 +615,7 @@ static int mf_enca_input_adjust(AVCodecContext *avctx, IMFMediaType *type) } hr = IMFAttributes_GetUINT32(type, &MF_MT_AUDIO_NUM_CHANNELS, &t); - if (FAILED(hr) || t != avctx->channels) { + if (FAILED(hr) || t != avctx->ch_layout.nb_channels) { av_log(avctx, AV_LOG_ERROR, "unsupported input channel number set\n"); return AVERROR(EINVAL); } -- 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".