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 B99FF42E20 for ; Thu, 13 Jan 2022 02:23:09 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id AB03768B3AC; Thu, 13 Jan 2022 03:58:57 +0200 (EET) 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 75A5B68B3BD for ; Thu, 13 Jan 2022 03:58:55 +0200 (EET) Received: by mail-qt1-f175.google.com with SMTP id q14so5314114qtx.10 for ; Wed, 12 Jan 2022 17:58:55 -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=ZabWq2PqS6gOMugmzoewAcCJr8KPP9hXUIh60SxiYPg=; b=JJOHOi2S4kAqTEIBIBy8FGBooWwsQxSoRCc90LEfkps+yj3X3GIYg0D2uGmpqRccFH +wfyigFdkTAp64LFJnFaSEeRtc+nOj6/vOolGmbSZxrBu/CayZgRU+IS9cRWnTLXrmRM bQhpbza00fz83fBYoVBtFfNXbrC1UWXaz1WmSPGqrCnB94cdxyQ+iEAXB9BbKhdGyVKa /NDaRmzOgywF/OGFHvE0esxDuO9yOv2wO3iyjQ7oFOSOGc0NLsiiecnkT1C4TBcXmF4A 9TFdZBGOQMLFIElQ4AsuQnwEDVC4FbaYrn2P4GqyBy6tr/GDeUVs+H1Y4V7Dp7msNBIN UBNQ== 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=ZabWq2PqS6gOMugmzoewAcCJr8KPP9hXUIh60SxiYPg=; b=aU023eYcCHb75CBftWykC6uJpo4Y8Hbem3eU2Gs/UKPIwG1/nWe3rqfBtJBezsbFAo e+vNjjpon1mhnVJSlZBLgyK8zFf6bIV32l5A1KD7KtPz3Fxgjw+3KgkdesRJyxgbE+QI YLNaRcsuIDNBaV/ciZns2LqRga34gP2iKcbHN8+ut7d4Br+NcIkgbWNoVOIw2wUT1AEY 1EixT/BnNo/jUPQWVxkpErb6gD48hh3lJP97WUD6SzOC57+TMJMFMFmgRs2fRrPr+Vjp iwUubOQxnlXn2PomdswTl8Mc30FjQhIsUTgVVSjme5xkn2T+O6Yfx/puravo7A1qO9uE lxMQ== X-Gm-Message-State: AOAM533G7SEt+ejjlPuBVnjC1JWB2A0c7tMHd/Lh2+x5anloGdtkkNe9 bNMJmKiL00zhcUMXLOPzNaPgw1usfug= X-Google-Smtp-Source: ABdhPJxUBherPRRB/6H5sEfBTgkRvR9CBsA4GLl+NkFrdXaOtGR/wzAe9MLdtYcAz+Irwlb+nId8RQ== X-Received: by 2002:ac8:5f47:: with SMTP id y7mr2030334qta.414.1642039134083; Wed, 12 Jan 2022 17:58:54 -0800 (PST) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id u19sm893081qke.1.2022.01.12.17.58.53 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jan 2022 17:58:53 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jan 2022 22:57:59 -0300 Message-Id: <20220113015806.519-24-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 142/281] segafilm: 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: Vittorio Giovara Signed-off-by: James Almer --- libavformat/segafilm.c | 9 +++++---- libavformat/segafilmenc.c | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/libavformat/segafilm.c b/libavformat/segafilm.c index 3af7518d03..6c563a85af 100644 --- a/libavformat/segafilm.c +++ b/libavformat/segafilm.c @@ -177,20 +177,21 @@ static int film_read_header(AVFormatContext *s) st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; st->codecpar->codec_id = film->audio_type; st->codecpar->codec_tag = 1; - st->codecpar->channels = film->audio_channels; + st->codecpar->ch_layout.order = AV_CHANNEL_ORDER_UNSPEC; + st->codecpar->ch_layout.nb_channels = film->audio_channels; st->codecpar->sample_rate = film->audio_samplerate; if (film->audio_type == AV_CODEC_ID_ADPCM_ADX) { st->codecpar->bits_per_coded_sample = 18 * 8 / 32; - st->codecpar->block_align = st->codecpar->channels * 18; + st->codecpar->block_align = film->audio_channels * 18; ffstream(st)->need_parsing = AVSTREAM_PARSE_FULL; } else { st->codecpar->bits_per_coded_sample = film->audio_bits; - st->codecpar->block_align = st->codecpar->channels * + st->codecpar->block_align = film->audio_channels * st->codecpar->bits_per_coded_sample / 8; } - st->codecpar->bit_rate = st->codecpar->channels * st->codecpar->sample_rate * + st->codecpar->bit_rate = film->audio_channels * st->codecpar->sample_rate * st->codecpar->bits_per_coded_sample; } diff --git a/libavformat/segafilmenc.c b/libavformat/segafilmenc.c index 737805faa6..7a412fe9cc 100644 --- a/libavformat/segafilmenc.c +++ b/libavformat/segafilmenc.c @@ -236,7 +236,7 @@ static int film_write_header(AVFormatContext *format_context) AVStream *audio = format_context->streams[film->audio_index]; int audio_codec = get_audio_codec_id(audio->codecpar->codec_id); - bytestream_put_byte(&ptr, audio->codecpar->channels); /* Audio channels */ + bytestream_put_byte(&ptr, audio->codecpar->ch_layout.nb_channels); /* Audio channels */ bytestream_put_byte(&ptr, audio->codecpar->bits_per_coded_sample); /* Audio bit depth */ bytestream_put_byte(&ptr, audio_codec); /* Compression - 0 is PCM, 2 is ADX */ bytestream_put_be16(&ptr, audio->codecpar->sample_rate); /* Audio sampling rate */ -- 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".