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 7C4F84BE05 for ; Wed, 17 Jul 2024 01:50:12 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 3186168DAA3; Wed, 17 Jul 2024 04:49:49 +0300 (EEST) Received: from mail-pg1-f180.google.com (mail-pg1-f180.google.com [209.85.215.180]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B617568DAA8 for ; Wed, 17 Jul 2024 04:49:41 +0300 (EEST) Received: by mail-pg1-f180.google.com with SMTP id 41be03b00d2f7-78512d44a17so4448625a12.3 for ; Tue, 16 Jul 2024 18:49:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1721180979; x=1721785779; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=HjiJgIi8Y5iLVRHS/9Luw0DKHpEbdJEqtOJuwJt7BRI=; b=KgWuvkvSdQaKil8xSJwUuQdG7WDHj5PB8VuuMmZVM3hsRskWaRzFyvCvnEUCMKD631 Mh6NPuCmoumRBWlujphciUNuidjtzMcaryPBqRBfKEvfSSMBXkuup2QGxWxNCi+JADbC u74rIu0450PW88YiAIAYt6oORVCg+t+Y/mwTw7JWFohRV4OiCsvmiPpRA3E+4EPABHFn 3I2b4uUs49OJwA4gwjh1oXXxbyhLiGh5y6qO7SK/tWS/rp01MIGQ3wGUFsn9x9uOw02W bjZE3UPv85vFDq1KLY70/EXmevvhHxr1KT+iwZX7dh0RC1VBNQKd++xiTx1z8jRe/PNp 6d8Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721180979; x=1721785779; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=HjiJgIi8Y5iLVRHS/9Luw0DKHpEbdJEqtOJuwJt7BRI=; b=w188q2aZSvEtIt3ZZexiIo2wFoU7/fzArx2XeZPgUp7CrJUs4F2kDfxY1tH9cfuuwa LQ6CJikhqENF/Z17V+sVSFUQ7kF5U8JZMyp/+6AqxZ23UQHBfYB9qk4qmYC0GaL1gF0Q 68n76jPRitQP12kos2eLzBGGD0A6/gAr1agPOd+F6y09R7I0u176bzqMElxVApHrFhXx oINzvvkfCV6TDaViAWmZKOAStsQBlARI7Hg3TGhpq85dsdAV/Ay08xaaD7OnP0UdLy6E t6etHeDzcW8N+/M9bic7FBKOGvy7b6kkCAGZnaTVSYwbWbKBNCwnWGeQ60yLx5cGq62N UvSQ== X-Gm-Message-State: AOJu0YzdIbXdjxvg9wHo5NcTPuZx/EFKGOdRpAq3ydB5WFPqR4xyVBoz 5cYypv/43E+NJh2G/nexNe6V1UGUi/9RVIew993ObfJ2rKt8y7TMfaHgTA== X-Google-Smtp-Source: AGHT+IEUKXLKLWRqsCLF3Kha4cQQuRQpnWnbLThnMHU+L9/0UM6sHnPSUG/+NL5ZwLTNatigSD5hjQ== X-Received: by 2002:a05:6a20:c888:b0:1c3:a446:160 with SMTP id adf61e73a8af0-1c3fdddcea5mr453324637.56.1721180978660; Tue, 16 Jul 2024 18:49:38 -0700 (PDT) Received: from localhost.localdomain ([190.194.167.233]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-70b7eca7545sm7025815b3a.153.2024.07.16.18.49.37 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Jul 2024 18:49:38 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Tue, 16 Jul 2024 22:49:25 -0300 Message-ID: <20240717014925.16517-4-jamrial@gmail.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240717014925.16517-1-jamrial@gmail.com> References: <20240717014925.16517-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 4/4] avformat/iamf: byteswap values in OpusHeader 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: Clause 3.11.1 of IAMF[1] states the values are stored in big endian, in contrast to the Ogg Encapsulation for Opus[2] where they are in little endian. [1]https://aomediacodec.github.io/iamf/v1.0.0-errata.html#opus-specific [2]https://datatracker.ietf.org/doc/html/rfc7845#section-5.1 Signed-off-by: James Almer --- libavformat/iamf_parse.c | 3 +++ libavformat/iamf_writer.c | 8 ++++++-- tests/ref/fate/iamf-5_1-copy | 8 ++++---- tests/ref/fate/iamf-5_1-demux | 8 ++++---- 4 files changed, 17 insertions(+), 10 deletions(-) diff --git a/libavformat/iamf_parse.c b/libavformat/iamf_parse.c index 2674a5186d..8e9c48568f 100644 --- a/libavformat/iamf_parse.c +++ b/libavformat/iamf_parse.c @@ -272,6 +272,9 @@ static int update_extradata(AVCodecParameters *codecpar) switch(codecpar->codec_id) { case AV_CODEC_ID_OPUS: AV_WB8(codecpar->extradata + 9, codecpar->ch_layout.nb_channels); + AV_WL16(codecpar->extradata + 10, AV_RB16(codecpar->extradata + 10)); // Byte swap pre-skip + AV_WL32(codecpar->extradata + 12, AV_RB32(codecpar->extradata + 12)); // Byte swap sample rate + AV_WL16(codecpar->extradata + 16, AV_RB16(codecpar->extradata + 16)); // Byte swap Output Gain break; case AV_CODEC_ID_AAC: { uint8_t buf[5]; diff --git a/libavformat/iamf_writer.c b/libavformat/iamf_writer.c index af837ccb1f..7522f15548 100644 --- a/libavformat/iamf_writer.c +++ b/libavformat/iamf_writer.c @@ -42,8 +42,12 @@ static int update_extradata(IAMFCodecConfig *codec_config) if (codec_config->extradata_size < 19) return AVERROR_INVALIDDATA; codec_config->extradata_size -= 8; - memmove(codec_config->extradata, codec_config->extradata + 8, codec_config->extradata_size); - AV_WB8(codec_config->extradata + 1, 2); // set channels to stereo + AV_WB8(codec_config->extradata + 0, AV_RL8(codec_config->extradata + 8)); // version + AV_WB8(codec_config->extradata + 1, 2); // set channels to stereo + AV_WB16(codec_config->extradata + 2, AV_RL16(codec_config->extradata + 10)); // Byte swap pre-skip + AV_WB32(codec_config->extradata + 4, AV_RL32(codec_config->extradata + 12)); // Byte swap sample rate + AV_WB16(codec_config->extradata + 8, 0); // set Output Gain to 0 + AV_WB8(codec_config->extradata + 10, AV_RL8(codec_config->extradata + 18)); // Mapping family break; case AV_CODEC_ID_FLAC: { uint8_t buf[13]; diff --git a/tests/ref/fate/iamf-5_1-copy b/tests/ref/fate/iamf-5_1-copy index bc4df7c57f..ed2046fe3b 100644 --- a/tests/ref/fate/iamf-5_1-copy +++ b/tests/ref/fate/iamf-5_1-copy @@ -1,7 +1,7 @@ -#extradata 0: 19, 0x379c0490 -#extradata 1: 19, 0x379c0490 -#extradata 2: 19, 0x3792048f -#extradata 3: 19, 0x3792048f +#extradata 0: 19, 0x3a0e0490 +#extradata 1: 19, 0x3a0e0490 +#extradata 2: 19, 0x3a04048f +#extradata 3: 19, 0x3a04048f #tb 0: 1/48000 #media_type 0: audio #codec_id 0: opus diff --git a/tests/ref/fate/iamf-5_1-demux b/tests/ref/fate/iamf-5_1-demux index bc4df7c57f..ed2046fe3b 100644 --- a/tests/ref/fate/iamf-5_1-demux +++ b/tests/ref/fate/iamf-5_1-demux @@ -1,7 +1,7 @@ -#extradata 0: 19, 0x379c0490 -#extradata 1: 19, 0x379c0490 -#extradata 2: 19, 0x3792048f -#extradata 3: 19, 0x3792048f +#extradata 0: 19, 0x3a0e0490 +#extradata 1: 19, 0x3a0e0490 +#extradata 2: 19, 0x3a04048f +#extradata 3: 19, 0x3a04048f #tb 0: 1/48000 #media_type 0: audio #codec_id 0: opus -- 2.45.2 _______________________________________________ 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".