Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[submodule "code/dep_external/src/oar-private"]
path = code/dep_external/src/oar-private
url = https://github.com/AOMediaCodec/oar-private
[submodule "code/dep_external/src/oar"]
path = code/dep_external/src/oar
url = https://github.com/AOMediaCodec/oar
6 changes: 3 additions & 3 deletions code/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ else()
set(OAR_ENABLE_BINAURALIZER OFF)
endif()
set(OAR_BUILD_SHARED_LIBRARY OFF)
add_subdirectory(dep_external/src/oar-private/liboar EXCLUDE_FROM_ALL)
add_subdirectory(dep_external/src/oar EXCLUDE_FROM_ALL)

file(GLOB_RECURSE sources CONFIGURE_DEPENDS
"${CMAKE_CURRENT_SOURCE_DIR}/src/*.c"
Expand All @@ -82,8 +82,8 @@ include_directories(
include
${DEP_CODECS_DIR}/include
${DEP_EXTERNAL_DIR}/include
${DEP_EXTERNAL_DIR}/src/oar-private/liboar/include
${DEP_EXTERNAL_DIR}/src/oar-private/liboar/src/common
${DEP_EXTERNAL_DIR}/src/oar/include
${DEP_EXTERNAL_DIR}/src/oar/src/common
${PROJECT_SOURCE_DIR}/src/iamf_dec
${PROJECT_SOURCE_DIR}/src/iamf_dec/codec
${PROJECT_SOURCE_DIR}/src/iamf_dec/codec/opus
Expand Down
2 changes: 1 addition & 1 deletion code/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ The `iamf-tools` reference encoder and its documentation are available at https:
### Channel ordering

The ordering of channel from IAMF decoder is based on the related [ITU-2051-3](https://www.itu.int/rec/R-REC-BS.2051) layout.
Please refer to the [Output WAV files](https://github.com/AOMediaCodec/libiamf/blob/main/tests/README.md#output-wav-files) in `test` directory, or liboar's [loudspeaker ordering](https://github.com/AOMediaCodec/oar-private/blob/main/liboar/doc/loudspeaker_layout_channel_order.md) documentation
Please refer to the [Output WAV files](https://github.com/AOMediaCodec/libiamf/blob/main/tests/README.md#output-wav-files) in `test` directory, or liboar's [loudspeaker ordering](https://github.com/AOMediaCodec/oar/blob/main/doc/loudspeaker_layout_channel_order.md) documentation

## Coding style

Expand Down
1 change: 1 addition & 0 deletions code/dep_external/src/oar
Submodule oar added at 3d1d23
1 change: 0 additions & 1 deletion code/dep_external/src/oar-private
Submodule oar-private deleted from 450139
Loading