From patchwork Thu Jan 13 01:50:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 33344 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp19985iog; Wed, 12 Jan 2022 18:04:44 -0800 (PST) X-Google-Smtp-Source: ABdhPJyvFUXVs6L1kujx533W0njqsv62ADDY3v643rqHnQxqesAh+3btiilp1Cz3X1na3aTT0h24 X-Received: by 2002:a17:906:58c7:: with SMTP id e7mr1876568ejs.146.1642039484449; Wed, 12 Jan 2022 18:04:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642039484; cv=none; d=google.com; s=arc-20160816; b=h/yfcvWunlPZjAzoqbqygf8sLglDp10cjKk/7XLMf9iXluxTzFuzBxpqYiaKiIv8yu /wwlaw+VWBuCZuciwBj0rsgmIACcvMC43LQnckawHXL5OZj9bPQpD1ouhoYpHmMaMEME 1Aj2d5u4lNNGR8qgAl/S42w/OuWaZ/NR1R/cONZ6R1A9uaVKzCWTgHmztRooBrv71ffC GcqmuYmEYSOugWY9BcRkcjEe+FCC4HZZNDonvXZJhXLGNmB5QwiSlt66U5vhwC67Jamy /FOxWljy1V/TMpLEggdNc/xNGqJD6EckUORlyzWZP8env5+h1xGy4eT+PyaEmd/3gV8n /CLg== 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=9FHjD/oDehCDOfMwfxqH8xJtHRZw79RUbbJjEaAQZu4=; b=vUftj9H4r+QdbonAr+bPS3KGAP9zPbvtS5e6ekA8BeoWsbd+suI7/ijmbRQYZk1VaN UVr561o0MzSY8fBrLHGsZz8xPx5ERrLVakPu87WY2iRkiIPETCra27SGLiTsgmqskYW6 XXIRDd7X5XsCjZ4F91o8RrUt3FRBUKti3Uv7GEmBwtPVHAt4nBMPQuyWBmGFBcWGWSm7 aUUxo2YvUWn1PLC+LlE9stWg/zRbv7UNKQZg3liy69FLYyXmY0cXtcxn8o8WsWpQx/lt YMF7dIrNs/6NJSHg9O6WU1hlpsbUJ6swUGna0II69x8TWdZG/eUYyipd+m+VJpiQBuUN Kr6Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=DP0n5Jzl; 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 v5si700266eje.162.2022.01.12.18.04.44; Wed, 12 Jan 2022 18:04:44 -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=DP0n5Jzl; 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 3311968B16F; Thu, 13 Jan 2022 03:53:17 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f171.google.com (mail-qk1-f171.google.com [209.85.222.171]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BF4E068B071 for ; Thu, 13 Jan 2022 03:53:13 +0200 (EET) Received: by mail-qk1-f171.google.com with SMTP id z10so1202537qkf.7 for ; Wed, 12 Jan 2022 17:53:13 -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=v51JgMFmD0tvHTOHjaOD6r7QwTTeDHXrrguK4Q2kPCc=; b=DP0n5JzlvgJienwAmTIGqkqLVzMtPAkgj88RQc8Lc0tqGjQuB+8pP/u4Nuud+K75Ue Nmx5DKWpXDSPwtL7JHjVHM4K1JQ6NCA00kuUR+rvZDC43l+As64K9U62Q9n7KPGzJDs3 +ZY8hPioWf0OOygsn6YZx5AR2GtY3riYR29IMP3JfYblF0smam2fAr9sfma/5TKTA4wk yRwyUwjE+QidMiHGDxusKytjRr4kXhKamYGcJhycLMtwTYjpvUShhg+RO/mVh8tHUTOQ uULpHv63vlidqHICRtRh41ZGqA/VpED/IOVODEWgI1Lh8KK9YLQ/8RQV4m4OmE/isC9d f4PQ== 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=v51JgMFmD0tvHTOHjaOD6r7QwTTeDHXrrguK4Q2kPCc=; b=HRFJFpKM5aP9aZ/AUYW6WLw2Rirl5ttaLVqEIx1+PUjfSSPN4e5QPd+vfH1i4oH68s 3I0SUdyNP1lxEpzBoTop5/Ew1VqcAH+5awC98yiRNpHuPczu6eiZWo6K8EXHmZfpdoJF lspHVYBUuDYNuN/tN1yx7KQiIqdUJL95n/ZKPDk/uMGCDeBUVCzWPFGwAwmBJAf6iyxm VCSwwkDZZMSxz1LAFP0RUjG3zMu9stBSdcuJ1s8bSkrD51GuvzNboj6BhjFAit5huQ+j ST+7pFbJreAQWnfEzmB0xMyRK6+vj2lEvxsJOsa03YpXZ4KuLcT7/pgPhqmGe8TTEzTv B92A== X-Gm-Message-State: AOAM5318ff7VEJMBam6jQx/L2YmJ0bzjopq1UeXQVeYM7QKuTTXHgRkC MNKqca1LInxCL8U1dw9wogQl/xNdngI= X-Received: by 2002:a37:bdc7:: with SMTP id n190mr1866016qkf.658.1642038792289; Wed, 12 Jan 2022 17:53:12 -0800 (PST) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id i21sm1204710qti.31.2022.01.12.17.53.11 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jan 2022 17:53:11 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jan 2022 22:50:22 -0300 Message-Id: <20220113015101.4-61-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 060/281] flv: 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: +PR3sxILOOOn From: Vittorio Giovara Signed-off-by: Vittorio Giovara Signed-off-by: Anton Khirnov Signed-off-by: James Almer --- libavformat/flvdec.c | 15 +++++---------- libavformat/flvenc.c | 10 +++++----- 2 files changed, 10 insertions(+), 15 deletions(-) diff --git a/libavformat/flvdec.c b/libavformat/flvdec.c index b9e36b3ff1..cb24b1cc26 100644 --- a/libavformat/flvdec.c +++ b/libavformat/flvdec.c @@ -629,10 +629,7 @@ static int amf_parse_object(AVFormatContext *s, AVStream *astream, } else if (!strcmp(key, "audiosamplesize") && apar) { apar->bits_per_coded_sample = num_val; } else if (!strcmp(key, "stereo") && apar) { - apar->channels = num_val + 1; - apar->channel_layout = apar->channels == 2 ? - AV_CH_LAYOUT_STEREO : - AV_CH_LAYOUT_MONO; + av_channel_layout_default(&apar->ch_layout, num_val + 1); } else if (!strcmp(key, "width") && vpar) { vpar->width = num_val; } else if (!strcmp(key, "height") && vpar) { @@ -1202,12 +1199,10 @@ retry_duration: sample_rate = 44100 << ((flags & FLV_AUDIO_SAMPLERATE_MASK) >> FLV_AUDIO_SAMPLERATE_OFFSET) >> 3; bits_per_coded_sample = (flags & FLV_AUDIO_SAMPLESIZE_MASK) ? 16 : 8; - if (!st->codecpar->channels || !st->codecpar->sample_rate || + if (!av_channel_layout_check(&st->codecpar->ch_layout) || + !st->codecpar->sample_rate || !st->codecpar->bits_per_coded_sample) { - st->codecpar->channels = channels; - st->codecpar->channel_layout = channels == 1 - ? AV_CH_LAYOUT_MONO - : AV_CH_LAYOUT_STEREO; + av_channel_layout_default(&st->codecpar->ch_layout, channels); st->codecpar->sample_rate = sample_rate; st->codecpar->bits_per_coded_sample = bits_per_coded_sample; } @@ -1217,7 +1212,7 @@ retry_duration: flv->last_sample_rate = sample_rate = st->codecpar->sample_rate; flv->last_channels = - channels = st->codecpar->channels; + channels = st->codecpar->ch_layout.nb_channels; } else { AVCodecParameters *par = avcodec_parameters_alloc(); if (!par) { diff --git a/libavformat/flvenc.c b/libavformat/flvenc.c index 66c530a2ff..429732297d 100644 --- a/libavformat/flvenc.c +++ b/libavformat/flvenc.c @@ -138,7 +138,7 @@ static int get_audio_flags(AVFormatContext *s, AVCodecParameters *par) "FLV only supports wideband (16kHz) Speex audio\n"); return AVERROR(EINVAL); } - if (par->channels != 1) { + if (par->ch_layout.nb_channels != 1) { av_log(s, AV_LOG_ERROR, "FLV only supports mono Speex audio\n"); return AVERROR(EINVAL); } @@ -178,7 +178,7 @@ error: } } - if (par->channels > 1) + if (par->ch_layout.nb_channels > 1) flags |= FLV_STEREO; switch (par->codec_id) { @@ -342,7 +342,7 @@ static void write_metadata(AVFormatContext *s, unsigned int ts) put_amf_double(pb, flv->audio_par->codec_id == AV_CODEC_ID_PCM_U8 ? 8 : 16); put_amf_string(pb, "stereo"); - put_amf_bool(pb, flv->audio_par->channels == 2); + put_amf_bool(pb, flv->audio_par->ch_layout.nb_channels == 2); put_amf_string(pb, "audiocodecid"); put_amf_double(pb, flv->audio_par->codec_tag); @@ -507,8 +507,8 @@ static void flv_write_codec_header(AVFormatContext* s, AVCodecParameters* par, i if (!par->extradata_size && (flv->flags & FLV_AAC_SEQ_HEADER_DETECT)) { PutBitContext pbc; int samplerate_index; - int channels = flv->audio_par->channels - - (flv->audio_par->channels == 8 ? 1 : 0); + int channels = flv->audio_par->ch_layout.nb_channels + - (flv->audio_par->ch_layout.nb_channels == 8 ? 1 : 0); uint8_t data[2]; for (samplerate_index = 0; samplerate_index < 16;