diff --git a/.gitmodules b/.gitmodules index e18b6840..5edaea41 100644 --- a/.gitmodules +++ b/.gitmodules @@ -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 diff --git a/code/CMakeLists.txt b/code/CMakeLists.txt index df3f9d50..0caa8ccc 100755 --- a/code/CMakeLists.txt +++ b/code/CMakeLists.txt @@ -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" @@ -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 diff --git a/code/README.md b/code/README.md index 2c1c5024..543bec42 100755 --- a/code/README.md +++ b/code/README.md @@ -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 diff --git a/code/dep_external/src/oar b/code/dep_external/src/oar new file mode 160000 index 00000000..3d1d23b8 --- /dev/null +++ b/code/dep_external/src/oar @@ -0,0 +1 @@ +Subproject commit 3d1d23b807543f993a1d0cf0a9839c7f0746d94b diff --git a/code/dep_external/src/oar-private b/code/dep_external/src/oar-private deleted file mode 160000 index 45013981..00000000 --- a/code/dep_external/src/oar-private +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 45013981fc174c999f5f62b3b743c61b97fdb88d