diff --git a/.github/actions/build/action.yml b/.github/actions/build/action.yml index c7250475c..62b91630c 100644 --- a/.github/actions/build/action.yml +++ b/.github/actions/build/action.yml @@ -42,7 +42,7 @@ runs: restore-keys: webrtc-${{ env.WEBRTC_CACHE_BRANCH }}-${{ inputs.platform-name }}-${{ hashFiles('webrtc-jni/src/main/cpp/dependencies/webrtc/CMakeLists.txt', 'webrtc-jni/src/main/cpp/dependencies/webrtc/patches/**/*.patch') }}- - name: Derive the FFmpeg version from the pom - run: echo "FFMPEG_VERSION=$(sed -n 's|.*\([^<]*\).*|\1|p' webrtc-java-media/pom.xml)" >> "$GITHUB_ENV" + run: echo "FFMPEG_VERSION=$(sed -n 's|.*\([^<]*\).*|\1|p' webrtc-media/pom.xml)" >> "$GITHUB_ENV" shell: bash - id: ffmpeg-cache @@ -50,8 +50,8 @@ runs: uses: actions/cache/restore@v6 with: path: ~/ffmpeg - key: ffmpeg-${{ env.FFMPEG_VERSION }}-${{ inputs.platform-name }}-${{ hashFiles('webrtc-java-media/src/main/cpp/dependencies/ffmpeg/CMakeLists.txt', 'webrtc-java-media/src/main/cpp/dependencies/ffmpeg/patches/*.patch') }}-${{ hashFiles('webrtc-java-media/pom.xml') }} - restore-keys: ffmpeg-${{ env.FFMPEG_VERSION }}-${{ inputs.platform-name }}-${{ hashFiles('webrtc-java-media/src/main/cpp/dependencies/ffmpeg/CMakeLists.txt', 'webrtc-java-media/src/main/cpp/dependencies/ffmpeg/patches/*.patch') }}- + key: ffmpeg-${{ env.FFMPEG_VERSION }}-${{ inputs.platform-name }}-${{ hashFiles('webrtc-media/src/main/cpp/dependencies/ffmpeg/CMakeLists.txt', 'webrtc-media/src/main/cpp/dependencies/ffmpeg/patches/*.patch') }}-${{ hashFiles('webrtc-media/pom.xml') }} + restore-keys: ffmpeg-${{ env.FFMPEG_VERSION }}-${{ inputs.platform-name }}-${{ hashFiles('webrtc-media/src/main/cpp/dependencies/ffmpeg/CMakeLists.txt', 'webrtc-media/src/main/cpp/dependencies/ffmpeg/patches/*.patch') }}- # One cache per OS: the dependencies do not differ between the platforms of # an OS. The project's own artifacts change with every build and stay out @@ -112,9 +112,9 @@ runs: with: name: natives-media-${{ inputs.platform-name }} path: | - webrtc-java-media/target/webrtc-java-media-*-windows-*.jar - webrtc-java-media/target/webrtc-java-media-*-linux-*.jar - webrtc-java-media/target/webrtc-java-media-*-macos-*.jar + webrtc-media/target/webrtc-java-media-*-windows-*.jar + webrtc-media/target/webrtc-java-media-*-linux-*.jar + webrtc-media/target/webrtc-java-media-*-macos-*.jar if-no-files-found: error retention-days: ${{ inputs.retention-days }} overwrite: true diff --git a/.github/actions/publish/action.yml b/.github/actions/publish/action.yml index ae5f2613d..31a958e76 100644 --- a/.github/actions/publish/action.yml +++ b/.github/actions/publish/action.yml @@ -69,7 +69,7 @@ runs: -DgeneratePom=false shell: bash - # natives.dir makes webrtc and webrtc-java-media attach the jars of all + # natives.dir makes webrtc and webrtc-media attach the jars of all # platforms instead of the host's. skipUpload still stages and bundles the # release, but stops before uploading it. # @@ -83,7 +83,7 @@ runs: PROFILES: ${{ inputs.profiles }} SKIP_UPLOAD: ${{ inputs.skip-upload }} run: > - mvn -B deploy -pl .,webrtc,webrtc-java-media,webrtc-java-javafx -DskipTests + mvn -B deploy -pl .,webrtc,webrtc-media,webrtc-javafx -DskipTests -Dmaven.repository.credentialScope=id ${PROFILES:+-P$PROFILES} -Dnatives.dir="$PWD/natives" diff --git a/.github/actions/test-natives/action.yml b/.github/actions/test-natives/action.yml index 62aab3033..22cfb8103 100644 --- a/.github/actions/test-natives/action.yml +++ b/.github/actions/test-natives/action.yml @@ -124,8 +124,8 @@ runs: MEDIA_JAR="$PWD/$MEDIA_JAR" WEBRTC_JAR="$PWD/$WEBRTC_JAR" - mkdir -p webrtc-java-media/target/natives - cd webrtc-java-media/target/natives + mkdir -p webrtc-media/target/natives + cd webrtc-media/target/natives # jar rather than unzip: the JDK is set up above, and unzip is not on # every runner image. "$JAVA_HOME/bin/jar" xf "$MEDIA_JAR" @@ -142,7 +142,7 @@ runs: # The native build is off: these natives were cross compiled by another # job, and this runner is here to run them, not to build them again. - name: Test - run: mvn -B -pl webrtc,webrtc-java-media test -DskipNativeBuild -P${{ inputs.profile }} -Dsurefire.timeout=1800 + run: mvn -B -pl webrtc,webrtc-media test -DskipNativeBuild -P${{ inputs.profile }} -Dsurefire.timeout=1800 shell: bash # What failed, for runners that cannot be reproduced locally. diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 85bfdba3b..ef93063cc 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -223,8 +223,8 @@ jobs: echo "Artifacts destined for the deployment bundle:" echo '```' ls -1 webrtc/target/*.jar webrtc/target/*.asc \ - webrtc-java-media/target/*.jar webrtc-java-media/target/*.asc \ - webrtc-java-javafx/target/*.jar webrtc-java-javafx/target/*.asc \ + webrtc-media/target/*.jar webrtc-media/target/*.asc \ + webrtc-javafx/target/*.jar webrtc-javafx/target/*.asc \ natives/*.asc 2>/dev/null || true echo '```' } >> "$GITHUB_STEP_SUMMARY" @@ -238,12 +238,12 @@ jobs: webrtc/target/central-*/** webrtc/target/*.jar webrtc/target/*.asc - webrtc-java-media/target/central-*/** - webrtc-java-media/target/*.jar - webrtc-java-media/target/*.asc - webrtc-java-javafx/target/central-*/** - webrtc-java-javafx/target/*.jar - webrtc-java-javafx/target/*.asc + webrtc-media/target/central-*/** + webrtc-media/target/*.jar + webrtc-media/target/*.asc + webrtc-javafx/target/central-*/** + webrtc-javafx/target/*.jar + webrtc-javafx/target/*.asc natives/*.asc if-no-files-found: error retention-days: 7 diff --git a/.gitmodules b/.gitmodules index caafec670..640952d96 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,8 +1,8 @@ [submodule "webrtc-java-media/third-party/ffmpeg"] - path = webrtc-java-media/third-party/ffmpeg + path = webrtc-media/third-party/ffmpeg url = https://github.com/FFmpeg/FFmpeg.git shallow = true [submodule "webrtc-java-media/third-party/dav1d"] - path = webrtc-java-media/third-party/dav1d + path = webrtc-media/third-party/dav1d url = https://code.videolan.org/videolan/dav1d.git shallow = true diff --git a/docs/guide/build.md b/docs/guide/build.md index d0cd3e6f2..8c56882b8 100644 --- a/docs/guide/build.md +++ b/docs/guide/build.md @@ -21,7 +21,7 @@ You don't have to install Chromium's `depot_tools`, Siso or GN: the build clones FFmpeg and dav1d come from Git submodules, which a plain clone leaves empty. Fetch them before the first build: ```shell -git submodule update --init --depth 1 webrtc-java-media/third-party/ffmpeg webrtc-java-media/third-party/dav1d +git submodule update --init --depth 1 webrtc-media/third-party/ffmpeg webrtc-media/third-party/dav1d ``` ### Linux diff --git a/docs/guide/media/media-files.md b/docs/guide/media/media-files.md index 68cc4d5ca..bc382eec4 100644 --- a/docs/guide/media/media-files.md +++ b/docs/guide/media/media-files.md @@ -18,7 +18,7 @@ Decoding happens entirely in native code. Frames never travel through Java: the The module is part of the normal build, and it builds FFmpeg and dav1d (the software decoder of AV1) from submodules pinned to release tags, so the submodules have to be present: ```shell -git submodule update --init --depth 1 webrtc-java-media/third-party/ffmpeg webrtc-java-media/third-party/dav1d +git submodule update --init --depth 1 webrtc-media/third-party/ffmpeg webrtc-media/third-party/dav1d mvn install ``` diff --git a/pom.xml b/pom.xml index aa031f069..c64d5a35e 100644 --- a/pom.xml +++ b/pom.xml @@ -52,8 +52,8 @@ webrtc-jni webrtc - webrtc-java-media - webrtc-java-javafx + webrtc-media + webrtc-javafx webrtc-examples diff --git a/webrtc-examples/pom.xml b/webrtc-examples/pom.xml index c8a773a89..08d717f6f 100644 --- a/webrtc-examples/pom.xml +++ b/webrtc-examples/pom.xml @@ -39,7 +39,7 @@ 3.6.4 - ${project.basedir}/../webrtc-java-media/target/natives + ${project.basedir}/../webrtc-media/target/natives diff --git a/webrtc-java-javafx/pom.xml b/webrtc-javafx/pom.xml similarity index 100% rename from webrtc-java-javafx/pom.xml rename to webrtc-javafx/pom.xml diff --git a/webrtc-java-javafx/src/main/java/dev/onvoid/webrtc/client/javafx/VideoView.java b/webrtc-javafx/src/main/java/dev/onvoid/webrtc/client/javafx/VideoView.java similarity index 100% rename from webrtc-java-javafx/src/main/java/dev/onvoid/webrtc/client/javafx/VideoView.java rename to webrtc-javafx/src/main/java/dev/onvoid/webrtc/client/javafx/VideoView.java diff --git a/webrtc-java-javafx/src/main/java/module-info.java b/webrtc-javafx/src/main/java/module-info.java similarity index 100% rename from webrtc-java-javafx/src/main/java/module-info.java rename to webrtc-javafx/src/main/java/module-info.java diff --git a/webrtc-java-javafx/src/test/java/dev/onvoid/webrtc/client/javafx/VideoViewTest.java b/webrtc-javafx/src/test/java/dev/onvoid/webrtc/client/javafx/VideoViewTest.java similarity index 100% rename from webrtc-java-javafx/src/test/java/dev/onvoid/webrtc/client/javafx/VideoViewTest.java rename to webrtc-javafx/src/test/java/dev/onvoid/webrtc/client/javafx/VideoViewTest.java diff --git a/webrtc-java-media/.gitignore b/webrtc-media/.gitignore similarity index 100% rename from webrtc-java-media/.gitignore rename to webrtc-media/.gitignore diff --git a/webrtc-java-media/README.md b/webrtc-media/README.md similarity index 97% rename from webrtc-java-media/README.md rename to webrtc-media/README.md index 4e656a290..855d1fb3e 100644 --- a/webrtc-java-media/README.md +++ b/webrtc-media/README.md @@ -62,7 +62,7 @@ This module is part of the normal build, and it builds FFmpeg from a submodule, has to be present: ```shell -git submodule update --init --depth 1 webrtc-java-media/third-party/ffmpeg webrtc-java-media/third-party/dav1d +git submodule update --init --depth 1 webrtc-media/third-party/ffmpeg webrtc-media/third-party/dav1d mvn install ``` diff --git a/webrtc-java-media/pom.xml b/webrtc-media/pom.xml similarity index 99% rename from webrtc-java-media/pom.xml rename to webrtc-media/pom.xml index e51f76b0d..cd9f8983f 100644 --- a/webrtc-java-media/pom.xml +++ b/webrtc-media/pom.xml @@ -209,7 +209,7 @@ built natively then, and no natives jar is made for the host: the one downloaded for it is attached instead. - Run with: mvn deploy -pl .,webrtc,webrtc-java-media -Prelease -Dnatives.dir=/abs/path --> + Run with: mvn deploy -pl .,webrtc,webrtc-media -Prelease -Dnatives.dir=/abs/path --> attach-natives-all diff --git a/webrtc-java-media/src/main/cpp/CMakeLists.txt b/webrtc-media/src/main/cpp/CMakeLists.txt similarity index 100% rename from webrtc-java-media/src/main/cpp/CMakeLists.txt rename to webrtc-media/src/main/cpp/CMakeLists.txt diff --git a/webrtc-java-media/src/main/cpp/dependencies/ffmpeg/CMakeLists.txt b/webrtc-media/src/main/cpp/dependencies/ffmpeg/CMakeLists.txt similarity index 99% rename from webrtc-java-media/src/main/cpp/dependencies/ffmpeg/CMakeLists.txt rename to webrtc-media/src/main/cpp/dependencies/ffmpeg/CMakeLists.txt index e0b721410..1723512f1 100644 --- a/webrtc-java-media/src/main/cpp/dependencies/ffmpeg/CMakeLists.txt +++ b/webrtc-media/src/main/cpp/dependencies/ffmpeg/CMakeLists.txt @@ -418,7 +418,7 @@ else() if(NOT EXISTS "${FFMPEG_SOURCE_DIR}/configure") message(FATAL_ERROR "The FFmpeg submodule is not checked out. Run:\n" - " git submodule update --init --depth 1 webrtc-java-media/third-party/ffmpeg") + " git submodule update --init --depth 1 webrtc-media/third-party/ffmpeg") endif() # FFmpeg's configure and its makefiles are shell scripts, so a POSIX shell @@ -690,7 +690,7 @@ else() if(NOT EXISTS "${DAV1D_SOURCE_DIR}/meson.build") message(FATAL_ERROR "The dav1d submodule is not checked out. Run:\n" - " git submodule update --init --depth 1 webrtc-java-media/third-party/dav1d") + " git submodule update --init --depth 1 webrtc-media/third-party/dav1d") endif() find_program(MESON_EXECUTABLE NAMES meson) diff --git a/webrtc-java-media/src/main/cpp/dependencies/ffmpeg/FFmpeg-NOTICE.txt.in b/webrtc-media/src/main/cpp/dependencies/ffmpeg/FFmpeg-NOTICE.txt.in similarity index 97% rename from webrtc-java-media/src/main/cpp/dependencies/ffmpeg/FFmpeg-NOTICE.txt.in rename to webrtc-media/src/main/cpp/dependencies/ffmpeg/FFmpeg-NOTICE.txt.in index acb910b2e..7ec608662 100644 --- a/webrtc-java-media/src/main/cpp/dependencies/ffmpeg/FFmpeg-NOTICE.txt.in +++ b/webrtc-media/src/main/cpp/dependencies/ffmpeg/FFmpeg-NOTICE.txt.in @@ -37,7 +37,7 @@ modifications: How they are configured and built, including which demuxers, decoders, parsers and protocols are enabled, is set out in -webrtc-java-media/src/main/cpp/dependencies/ffmpeg/CMakeLists.txt of +webrtc-media/src/main/cpp/dependencies/ffmpeg/CMakeLists.txt of webrtc-java, at the release this jar belongs to: https://github.com/devopvoid/webrtc-java diff --git a/webrtc-java-media/src/main/cpp/dependencies/ffmpeg/patches/0001-d3d12va-reuse-the-reference-only-resource-of-a-texture.patch b/webrtc-media/src/main/cpp/dependencies/ffmpeg/patches/0001-d3d12va-reuse-the-reference-only-resource-of-a-texture.patch similarity index 100% rename from webrtc-java-media/src/main/cpp/dependencies/ffmpeg/patches/0001-d3d12va-reuse-the-reference-only-resource-of-a-texture.patch rename to webrtc-media/src/main/cpp/dependencies/ffmpeg/patches/0001-d3d12va-reuse-the-reference-only-resource-of-a-texture.patch diff --git a/webrtc-java-media/src/main/cpp/dependencies/ffmpeg/patches/README.md b/webrtc-media/src/main/cpp/dependencies/ffmpeg/patches/README.md similarity index 100% rename from webrtc-java-media/src/main/cpp/dependencies/ffmpeg/patches/README.md rename to webrtc-media/src/main/cpp/dependencies/ffmpeg/patches/README.md diff --git a/webrtc-java-media/src/main/cpp/dependencies/ffnvcodec/LICENSE b/webrtc-media/src/main/cpp/dependencies/ffnvcodec/LICENSE similarity index 100% rename from webrtc-java-media/src/main/cpp/dependencies/ffnvcodec/LICENSE rename to webrtc-media/src/main/cpp/dependencies/ffnvcodec/LICENSE diff --git a/webrtc-java-media/src/main/cpp/dependencies/ffnvcodec/README.md b/webrtc-media/src/main/cpp/dependencies/ffnvcodec/README.md similarity index 100% rename from webrtc-java-media/src/main/cpp/dependencies/ffnvcodec/README.md rename to webrtc-media/src/main/cpp/dependencies/ffnvcodec/README.md diff --git a/webrtc-java-media/src/main/cpp/dependencies/ffnvcodec/ffnvcodec.pc.in b/webrtc-media/src/main/cpp/dependencies/ffnvcodec/ffnvcodec.pc.in similarity index 100% rename from webrtc-java-media/src/main/cpp/dependencies/ffnvcodec/ffnvcodec.pc.in rename to webrtc-media/src/main/cpp/dependencies/ffnvcodec/ffnvcodec.pc.in diff --git a/webrtc-java-media/src/main/cpp/dependencies/ffnvcodec/include/ffnvcodec/dynlink_cuda.h b/webrtc-media/src/main/cpp/dependencies/ffnvcodec/include/ffnvcodec/dynlink_cuda.h similarity index 100% rename from webrtc-java-media/src/main/cpp/dependencies/ffnvcodec/include/ffnvcodec/dynlink_cuda.h rename to webrtc-media/src/main/cpp/dependencies/ffnvcodec/include/ffnvcodec/dynlink_cuda.h diff --git a/webrtc-java-media/src/main/cpp/dependencies/ffnvcodec/include/ffnvcodec/dynlink_cuviddec.h b/webrtc-media/src/main/cpp/dependencies/ffnvcodec/include/ffnvcodec/dynlink_cuviddec.h similarity index 100% rename from webrtc-java-media/src/main/cpp/dependencies/ffnvcodec/include/ffnvcodec/dynlink_cuviddec.h rename to webrtc-media/src/main/cpp/dependencies/ffnvcodec/include/ffnvcodec/dynlink_cuviddec.h diff --git a/webrtc-java-media/src/main/cpp/dependencies/ffnvcodec/include/ffnvcodec/dynlink_loader.h b/webrtc-media/src/main/cpp/dependencies/ffnvcodec/include/ffnvcodec/dynlink_loader.h similarity index 100% rename from webrtc-java-media/src/main/cpp/dependencies/ffnvcodec/include/ffnvcodec/dynlink_loader.h rename to webrtc-media/src/main/cpp/dependencies/ffnvcodec/include/ffnvcodec/dynlink_loader.h diff --git a/webrtc-java-media/src/main/cpp/dependencies/ffnvcodec/include/ffnvcodec/dynlink_nvcuvid.h b/webrtc-media/src/main/cpp/dependencies/ffnvcodec/include/ffnvcodec/dynlink_nvcuvid.h similarity index 100% rename from webrtc-java-media/src/main/cpp/dependencies/ffnvcodec/include/ffnvcodec/dynlink_nvcuvid.h rename to webrtc-media/src/main/cpp/dependencies/ffnvcodec/include/ffnvcodec/dynlink_nvcuvid.h diff --git a/webrtc-java-media/src/main/cpp/dependencies/ffnvcodec/include/ffnvcodec/nvEncodeAPI.h b/webrtc-media/src/main/cpp/dependencies/ffnvcodec/include/ffnvcodec/nvEncodeAPI.h similarity index 100% rename from webrtc-java-media/src/main/cpp/dependencies/ffnvcodec/include/ffnvcodec/nvEncodeAPI.h rename to webrtc-media/src/main/cpp/dependencies/ffnvcodec/include/ffnvcodec/nvEncodeAPI.h diff --git a/webrtc-java-media/src/main/cpp/dependencies/vulkan/LICENSE.md b/webrtc-media/src/main/cpp/dependencies/vulkan/LICENSE.md similarity index 100% rename from webrtc-java-media/src/main/cpp/dependencies/vulkan/LICENSE.md rename to webrtc-media/src/main/cpp/dependencies/vulkan/LICENSE.md diff --git a/webrtc-java-media/src/main/cpp/dependencies/vulkan/LICENSES/Apache-2.0.txt b/webrtc-media/src/main/cpp/dependencies/vulkan/LICENSES/Apache-2.0.txt similarity index 100% rename from webrtc-java-media/src/main/cpp/dependencies/vulkan/LICENSES/Apache-2.0.txt rename to webrtc-media/src/main/cpp/dependencies/vulkan/LICENSES/Apache-2.0.txt diff --git a/webrtc-java-media/src/main/cpp/dependencies/vulkan/LICENSES/MIT.txt b/webrtc-media/src/main/cpp/dependencies/vulkan/LICENSES/MIT.txt similarity index 100% rename from webrtc-java-media/src/main/cpp/dependencies/vulkan/LICENSES/MIT.txt rename to webrtc-media/src/main/cpp/dependencies/vulkan/LICENSES/MIT.txt diff --git a/webrtc-java-media/src/main/cpp/dependencies/vulkan/README.md b/webrtc-media/src/main/cpp/dependencies/vulkan/README.md similarity index 100% rename from webrtc-java-media/src/main/cpp/dependencies/vulkan/README.md rename to webrtc-media/src/main/cpp/dependencies/vulkan/README.md diff --git a/webrtc-java-media/src/main/cpp/dependencies/vulkan/include/vk_video/vulkan_video_codec_av1std.h b/webrtc-media/src/main/cpp/dependencies/vulkan/include/vk_video/vulkan_video_codec_av1std.h similarity index 100% rename from webrtc-java-media/src/main/cpp/dependencies/vulkan/include/vk_video/vulkan_video_codec_av1std.h rename to webrtc-media/src/main/cpp/dependencies/vulkan/include/vk_video/vulkan_video_codec_av1std.h diff --git a/webrtc-java-media/src/main/cpp/dependencies/vulkan/include/vk_video/vulkan_video_codec_av1std_decode.h b/webrtc-media/src/main/cpp/dependencies/vulkan/include/vk_video/vulkan_video_codec_av1std_decode.h similarity index 100% rename from webrtc-java-media/src/main/cpp/dependencies/vulkan/include/vk_video/vulkan_video_codec_av1std_decode.h rename to webrtc-media/src/main/cpp/dependencies/vulkan/include/vk_video/vulkan_video_codec_av1std_decode.h diff --git a/webrtc-java-media/src/main/cpp/dependencies/vulkan/include/vk_video/vulkan_video_codec_av1std_encode.h b/webrtc-media/src/main/cpp/dependencies/vulkan/include/vk_video/vulkan_video_codec_av1std_encode.h similarity index 100% rename from webrtc-java-media/src/main/cpp/dependencies/vulkan/include/vk_video/vulkan_video_codec_av1std_encode.h rename to webrtc-media/src/main/cpp/dependencies/vulkan/include/vk_video/vulkan_video_codec_av1std_encode.h diff --git a/webrtc-java-media/src/main/cpp/dependencies/vulkan/include/vk_video/vulkan_video_codec_h264std.h b/webrtc-media/src/main/cpp/dependencies/vulkan/include/vk_video/vulkan_video_codec_h264std.h similarity index 100% rename from webrtc-java-media/src/main/cpp/dependencies/vulkan/include/vk_video/vulkan_video_codec_h264std.h rename to webrtc-media/src/main/cpp/dependencies/vulkan/include/vk_video/vulkan_video_codec_h264std.h diff --git a/webrtc-java-media/src/main/cpp/dependencies/vulkan/include/vk_video/vulkan_video_codec_h264std_decode.h b/webrtc-media/src/main/cpp/dependencies/vulkan/include/vk_video/vulkan_video_codec_h264std_decode.h similarity index 100% rename from webrtc-java-media/src/main/cpp/dependencies/vulkan/include/vk_video/vulkan_video_codec_h264std_decode.h rename to webrtc-media/src/main/cpp/dependencies/vulkan/include/vk_video/vulkan_video_codec_h264std_decode.h diff --git a/webrtc-java-media/src/main/cpp/dependencies/vulkan/include/vk_video/vulkan_video_codec_h264std_encode.h b/webrtc-media/src/main/cpp/dependencies/vulkan/include/vk_video/vulkan_video_codec_h264std_encode.h similarity index 100% rename from webrtc-java-media/src/main/cpp/dependencies/vulkan/include/vk_video/vulkan_video_codec_h264std_encode.h rename to webrtc-media/src/main/cpp/dependencies/vulkan/include/vk_video/vulkan_video_codec_h264std_encode.h diff --git a/webrtc-java-media/src/main/cpp/dependencies/vulkan/include/vk_video/vulkan_video_codec_h265std.h b/webrtc-media/src/main/cpp/dependencies/vulkan/include/vk_video/vulkan_video_codec_h265std.h similarity index 100% rename from webrtc-java-media/src/main/cpp/dependencies/vulkan/include/vk_video/vulkan_video_codec_h265std.h rename to webrtc-media/src/main/cpp/dependencies/vulkan/include/vk_video/vulkan_video_codec_h265std.h diff --git a/webrtc-java-media/src/main/cpp/dependencies/vulkan/include/vk_video/vulkan_video_codec_h265std_decode.h b/webrtc-media/src/main/cpp/dependencies/vulkan/include/vk_video/vulkan_video_codec_h265std_decode.h similarity index 100% rename from webrtc-java-media/src/main/cpp/dependencies/vulkan/include/vk_video/vulkan_video_codec_h265std_decode.h rename to webrtc-media/src/main/cpp/dependencies/vulkan/include/vk_video/vulkan_video_codec_h265std_decode.h diff --git a/webrtc-java-media/src/main/cpp/dependencies/vulkan/include/vk_video/vulkan_video_codec_h265std_encode.h b/webrtc-media/src/main/cpp/dependencies/vulkan/include/vk_video/vulkan_video_codec_h265std_encode.h similarity index 100% rename from webrtc-java-media/src/main/cpp/dependencies/vulkan/include/vk_video/vulkan_video_codec_h265std_encode.h rename to webrtc-media/src/main/cpp/dependencies/vulkan/include/vk_video/vulkan_video_codec_h265std_encode.h diff --git a/webrtc-java-media/src/main/cpp/dependencies/vulkan/include/vk_video/vulkan_video_codec_vp9std.h b/webrtc-media/src/main/cpp/dependencies/vulkan/include/vk_video/vulkan_video_codec_vp9std.h similarity index 100% rename from webrtc-java-media/src/main/cpp/dependencies/vulkan/include/vk_video/vulkan_video_codec_vp9std.h rename to webrtc-media/src/main/cpp/dependencies/vulkan/include/vk_video/vulkan_video_codec_vp9std.h diff --git a/webrtc-java-media/src/main/cpp/dependencies/vulkan/include/vk_video/vulkan_video_codec_vp9std_decode.h b/webrtc-media/src/main/cpp/dependencies/vulkan/include/vk_video/vulkan_video_codec_vp9std_decode.h similarity index 100% rename from webrtc-java-media/src/main/cpp/dependencies/vulkan/include/vk_video/vulkan_video_codec_vp9std_decode.h rename to webrtc-media/src/main/cpp/dependencies/vulkan/include/vk_video/vulkan_video_codec_vp9std_decode.h diff --git a/webrtc-java-media/src/main/cpp/dependencies/vulkan/include/vk_video/vulkan_video_codecs_common.h b/webrtc-media/src/main/cpp/dependencies/vulkan/include/vk_video/vulkan_video_codecs_common.h similarity index 100% rename from webrtc-java-media/src/main/cpp/dependencies/vulkan/include/vk_video/vulkan_video_codecs_common.h rename to webrtc-media/src/main/cpp/dependencies/vulkan/include/vk_video/vulkan_video_codecs_common.h diff --git a/webrtc-java-media/src/main/cpp/dependencies/vulkan/include/vulkan/vk_icd.h b/webrtc-media/src/main/cpp/dependencies/vulkan/include/vulkan/vk_icd.h similarity index 100% rename from webrtc-java-media/src/main/cpp/dependencies/vulkan/include/vulkan/vk_icd.h rename to webrtc-media/src/main/cpp/dependencies/vulkan/include/vulkan/vk_icd.h diff --git a/webrtc-java-media/src/main/cpp/dependencies/vulkan/include/vulkan/vk_layer.h b/webrtc-media/src/main/cpp/dependencies/vulkan/include/vulkan/vk_layer.h similarity index 100% rename from webrtc-java-media/src/main/cpp/dependencies/vulkan/include/vulkan/vk_layer.h rename to webrtc-media/src/main/cpp/dependencies/vulkan/include/vulkan/vk_layer.h diff --git a/webrtc-java-media/src/main/cpp/dependencies/vulkan/include/vulkan/vk_platform.h b/webrtc-media/src/main/cpp/dependencies/vulkan/include/vulkan/vk_platform.h similarity index 100% rename from webrtc-java-media/src/main/cpp/dependencies/vulkan/include/vulkan/vk_platform.h rename to webrtc-media/src/main/cpp/dependencies/vulkan/include/vulkan/vk_platform.h diff --git a/webrtc-java-media/src/main/cpp/dependencies/vulkan/include/vulkan/vulkan.h b/webrtc-media/src/main/cpp/dependencies/vulkan/include/vulkan/vulkan.h similarity index 100% rename from webrtc-java-media/src/main/cpp/dependencies/vulkan/include/vulkan/vulkan.h rename to webrtc-media/src/main/cpp/dependencies/vulkan/include/vulkan/vulkan.h diff --git a/webrtc-java-media/src/main/cpp/dependencies/vulkan/include/vulkan/vulkan_android.h b/webrtc-media/src/main/cpp/dependencies/vulkan/include/vulkan/vulkan_android.h similarity index 100% rename from webrtc-java-media/src/main/cpp/dependencies/vulkan/include/vulkan/vulkan_android.h rename to webrtc-media/src/main/cpp/dependencies/vulkan/include/vulkan/vulkan_android.h diff --git a/webrtc-java-media/src/main/cpp/dependencies/vulkan/include/vulkan/vulkan_beta.h b/webrtc-media/src/main/cpp/dependencies/vulkan/include/vulkan/vulkan_beta.h similarity index 100% rename from webrtc-java-media/src/main/cpp/dependencies/vulkan/include/vulkan/vulkan_beta.h rename to webrtc-media/src/main/cpp/dependencies/vulkan/include/vulkan/vulkan_beta.h diff --git a/webrtc-java-media/src/main/cpp/dependencies/vulkan/include/vulkan/vulkan_core.h b/webrtc-media/src/main/cpp/dependencies/vulkan/include/vulkan/vulkan_core.h similarity index 100% rename from webrtc-java-media/src/main/cpp/dependencies/vulkan/include/vulkan/vulkan_core.h rename to webrtc-media/src/main/cpp/dependencies/vulkan/include/vulkan/vulkan_core.h diff --git a/webrtc-java-media/src/main/cpp/dependencies/vulkan/include/vulkan/vulkan_directfb.h b/webrtc-media/src/main/cpp/dependencies/vulkan/include/vulkan/vulkan_directfb.h similarity index 100% rename from webrtc-java-media/src/main/cpp/dependencies/vulkan/include/vulkan/vulkan_directfb.h rename to webrtc-media/src/main/cpp/dependencies/vulkan/include/vulkan/vulkan_directfb.h diff --git a/webrtc-java-media/src/main/cpp/dependencies/vulkan/include/vulkan/vulkan_fuchsia.h b/webrtc-media/src/main/cpp/dependencies/vulkan/include/vulkan/vulkan_fuchsia.h similarity index 100% rename from webrtc-java-media/src/main/cpp/dependencies/vulkan/include/vulkan/vulkan_fuchsia.h rename to webrtc-media/src/main/cpp/dependencies/vulkan/include/vulkan/vulkan_fuchsia.h diff --git a/webrtc-java-media/src/main/cpp/dependencies/vulkan/include/vulkan/vulkan_ggp.h b/webrtc-media/src/main/cpp/dependencies/vulkan/include/vulkan/vulkan_ggp.h similarity index 100% rename from webrtc-java-media/src/main/cpp/dependencies/vulkan/include/vulkan/vulkan_ggp.h rename to webrtc-media/src/main/cpp/dependencies/vulkan/include/vulkan/vulkan_ggp.h diff --git a/webrtc-java-media/src/main/cpp/dependencies/vulkan/include/vulkan/vulkan_ios.h b/webrtc-media/src/main/cpp/dependencies/vulkan/include/vulkan/vulkan_ios.h similarity index 100% rename from webrtc-java-media/src/main/cpp/dependencies/vulkan/include/vulkan/vulkan_ios.h rename to webrtc-media/src/main/cpp/dependencies/vulkan/include/vulkan/vulkan_ios.h diff --git a/webrtc-java-media/src/main/cpp/dependencies/vulkan/include/vulkan/vulkan_macos.h b/webrtc-media/src/main/cpp/dependencies/vulkan/include/vulkan/vulkan_macos.h similarity index 100% rename from webrtc-java-media/src/main/cpp/dependencies/vulkan/include/vulkan/vulkan_macos.h rename to webrtc-media/src/main/cpp/dependencies/vulkan/include/vulkan/vulkan_macos.h diff --git a/webrtc-java-media/src/main/cpp/dependencies/vulkan/include/vulkan/vulkan_metal.h b/webrtc-media/src/main/cpp/dependencies/vulkan/include/vulkan/vulkan_metal.h similarity index 100% rename from webrtc-java-media/src/main/cpp/dependencies/vulkan/include/vulkan/vulkan_metal.h rename to webrtc-media/src/main/cpp/dependencies/vulkan/include/vulkan/vulkan_metal.h diff --git a/webrtc-java-media/src/main/cpp/dependencies/vulkan/include/vulkan/vulkan_screen.h b/webrtc-media/src/main/cpp/dependencies/vulkan/include/vulkan/vulkan_screen.h similarity index 100% rename from webrtc-java-media/src/main/cpp/dependencies/vulkan/include/vulkan/vulkan_screen.h rename to webrtc-media/src/main/cpp/dependencies/vulkan/include/vulkan/vulkan_screen.h diff --git a/webrtc-java-media/src/main/cpp/dependencies/vulkan/include/vulkan/vulkan_vi.h b/webrtc-media/src/main/cpp/dependencies/vulkan/include/vulkan/vulkan_vi.h similarity index 100% rename from webrtc-java-media/src/main/cpp/dependencies/vulkan/include/vulkan/vulkan_vi.h rename to webrtc-media/src/main/cpp/dependencies/vulkan/include/vulkan/vulkan_vi.h diff --git a/webrtc-java-media/src/main/cpp/dependencies/vulkan/include/vulkan/vulkan_wayland.h b/webrtc-media/src/main/cpp/dependencies/vulkan/include/vulkan/vulkan_wayland.h similarity index 100% rename from webrtc-java-media/src/main/cpp/dependencies/vulkan/include/vulkan/vulkan_wayland.h rename to webrtc-media/src/main/cpp/dependencies/vulkan/include/vulkan/vulkan_wayland.h diff --git a/webrtc-java-media/src/main/cpp/dependencies/vulkan/include/vulkan/vulkan_win32.h b/webrtc-media/src/main/cpp/dependencies/vulkan/include/vulkan/vulkan_win32.h similarity index 100% rename from webrtc-java-media/src/main/cpp/dependencies/vulkan/include/vulkan/vulkan_win32.h rename to webrtc-media/src/main/cpp/dependencies/vulkan/include/vulkan/vulkan_win32.h diff --git a/webrtc-java-media/src/main/cpp/dependencies/vulkan/include/vulkan/vulkan_xcb.h b/webrtc-media/src/main/cpp/dependencies/vulkan/include/vulkan/vulkan_xcb.h similarity index 100% rename from webrtc-java-media/src/main/cpp/dependencies/vulkan/include/vulkan/vulkan_xcb.h rename to webrtc-media/src/main/cpp/dependencies/vulkan/include/vulkan/vulkan_xcb.h diff --git a/webrtc-java-media/src/main/cpp/dependencies/vulkan/include/vulkan/vulkan_xlib.h b/webrtc-media/src/main/cpp/dependencies/vulkan/include/vulkan/vulkan_xlib.h similarity index 100% rename from webrtc-java-media/src/main/cpp/dependencies/vulkan/include/vulkan/vulkan_xlib.h rename to webrtc-media/src/main/cpp/dependencies/vulkan/include/vulkan/vulkan_xlib.h diff --git a/webrtc-java-media/src/main/cpp/dependencies/vulkan/include/vulkan/vulkan_xlib_xrandr.h b/webrtc-media/src/main/cpp/dependencies/vulkan/include/vulkan/vulkan_xlib_xrandr.h similarity index 100% rename from webrtc-java-media/src/main/cpp/dependencies/vulkan/include/vulkan/vulkan_xlib_xrandr.h rename to webrtc-media/src/main/cpp/dependencies/vulkan/include/vulkan/vulkan_xlib_xrandr.h diff --git a/webrtc-java-media/src/main/cpp/dependencies/vulkan/vulkan.pc.in b/webrtc-media/src/main/cpp/dependencies/vulkan/vulkan.pc.in similarity index 100% rename from webrtc-java-media/src/main/cpp/dependencies/vulkan/vulkan.pc.in rename to webrtc-media/src/main/cpp/dependencies/vulkan/vulkan.pc.in diff --git a/webrtc-java-media/src/main/cpp/include/JNI_FFmpeg.h b/webrtc-media/src/main/cpp/include/JNI_FFmpeg.h similarity index 100% rename from webrtc-java-media/src/main/cpp/include/JNI_FFmpeg.h rename to webrtc-media/src/main/cpp/include/JNI_FFmpeg.h diff --git a/webrtc-java-media/src/main/cpp/include/JNI_HardwareFault.h b/webrtc-media/src/main/cpp/include/JNI_HardwareFault.h similarity index 100% rename from webrtc-java-media/src/main/cpp/include/JNI_HardwareFault.h rename to webrtc-media/src/main/cpp/include/JNI_HardwareFault.h diff --git a/webrtc-java-media/src/main/cpp/include/JNI_MediaPlayer.h b/webrtc-media/src/main/cpp/include/JNI_MediaPlayer.h similarity index 100% rename from webrtc-java-media/src/main/cpp/include/JNI_MediaPlayer.h rename to webrtc-media/src/main/cpp/include/JNI_MediaPlayer.h diff --git a/webrtc-java-media/src/main/cpp/include/JNI_MediaReader.h b/webrtc-media/src/main/cpp/include/JNI_MediaReader.h similarity index 100% rename from webrtc-java-media/src/main/cpp/include/JNI_MediaReader.h rename to webrtc-media/src/main/cpp/include/JNI_MediaReader.h diff --git a/webrtc-java-media/src/main/cpp/include/JNI_MediaRecorder.h b/webrtc-media/src/main/cpp/include/JNI_MediaRecorder.h similarity index 100% rename from webrtc-java-media/src/main/cpp/include/JNI_MediaRecorder.h rename to webrtc-media/src/main/cpp/include/JNI_MediaRecorder.h diff --git a/webrtc-java-media/src/main/cpp/include/media/ApiCheck.h b/webrtc-media/src/main/cpp/include/media/ApiCheck.h similarity index 100% rename from webrtc-java-media/src/main/cpp/include/media/ApiCheck.h rename to webrtc-media/src/main/cpp/include/media/ApiCheck.h diff --git a/webrtc-java-media/src/main/cpp/include/media/AudioDecoder.h b/webrtc-media/src/main/cpp/include/media/AudioDecoder.h similarity index 100% rename from webrtc-java-media/src/main/cpp/include/media/AudioDecoder.h rename to webrtc-media/src/main/cpp/include/media/AudioDecoder.h diff --git a/webrtc-java-media/src/main/cpp/include/media/ErrorText.h b/webrtc-media/src/main/cpp/include/media/ErrorText.h similarity index 100% rename from webrtc-java-media/src/main/cpp/include/media/ErrorText.h rename to webrtc-media/src/main/cpp/include/media/ErrorText.h diff --git a/webrtc-java-media/src/main/cpp/include/media/HardwareFault.h b/webrtc-media/src/main/cpp/include/media/HardwareFault.h similarity index 100% rename from webrtc-java-media/src/main/cpp/include/media/HardwareFault.h rename to webrtc-media/src/main/cpp/include/media/HardwareFault.h diff --git a/webrtc-java-media/src/main/cpp/include/media/JavaPlayerObserver.h b/webrtc-media/src/main/cpp/include/media/JavaPlayerObserver.h similarity index 100% rename from webrtc-java-media/src/main/cpp/include/media/JavaPlayerObserver.h rename to webrtc-media/src/main/cpp/include/media/JavaPlayerObserver.h diff --git a/webrtc-java-media/src/main/cpp/include/media/JavaRecorderObserver.h b/webrtc-media/src/main/cpp/include/media/JavaRecorderObserver.h similarity index 100% rename from webrtc-java-media/src/main/cpp/include/media/JavaRecorderObserver.h rename to webrtc-media/src/main/cpp/include/media/JavaRecorderObserver.h diff --git a/webrtc-java-media/src/main/cpp/include/media/MediaPacer.h b/webrtc-media/src/main/cpp/include/media/MediaPacer.h similarity index 100% rename from webrtc-java-media/src/main/cpp/include/media/MediaPacer.h rename to webrtc-media/src/main/cpp/include/media/MediaPacer.h diff --git a/webrtc-java-media/src/main/cpp/include/media/MediaPlayer.h b/webrtc-media/src/main/cpp/include/media/MediaPlayer.h similarity index 100% rename from webrtc-java-media/src/main/cpp/include/media/MediaPlayer.h rename to webrtc-media/src/main/cpp/include/media/MediaPlayer.h diff --git a/webrtc-java-media/src/main/cpp/include/media/MediaPlayerObserver.h b/webrtc-media/src/main/cpp/include/media/MediaPlayerObserver.h similarity index 100% rename from webrtc-java-media/src/main/cpp/include/media/MediaPlayerObserver.h rename to webrtc-media/src/main/cpp/include/media/MediaPlayerObserver.h diff --git a/webrtc-java-media/src/main/cpp/include/media/MediaReader.h b/webrtc-media/src/main/cpp/include/media/MediaReader.h similarity index 100% rename from webrtc-java-media/src/main/cpp/include/media/MediaReader.h rename to webrtc-media/src/main/cpp/include/media/MediaReader.h diff --git a/webrtc-java-media/src/main/cpp/include/media/MediaRecorder.h b/webrtc-media/src/main/cpp/include/media/MediaRecorder.h similarity index 100% rename from webrtc-java-media/src/main/cpp/include/media/MediaRecorder.h rename to webrtc-media/src/main/cpp/include/media/MediaRecorder.h diff --git a/webrtc-java-media/src/main/cpp/include/media/MediaRecorderObserver.h b/webrtc-media/src/main/cpp/include/media/MediaRecorderObserver.h similarity index 100% rename from webrtc-java-media/src/main/cpp/include/media/MediaRecorderObserver.h rename to webrtc-media/src/main/cpp/include/media/MediaRecorderObserver.h diff --git a/webrtc-java-media/src/main/cpp/include/media/RecorderTrack.h b/webrtc-media/src/main/cpp/include/media/RecorderTrack.h similarity index 100% rename from webrtc-java-media/src/main/cpp/include/media/RecorderTrack.h rename to webrtc-media/src/main/cpp/include/media/RecorderTrack.h diff --git a/webrtc-java-media/src/main/cpp/include/media/VideoDecoder.h b/webrtc-media/src/main/cpp/include/media/VideoDecoder.h similarity index 100% rename from webrtc-java-media/src/main/cpp/include/media/VideoDecoder.h rename to webrtc-media/src/main/cpp/include/media/VideoDecoder.h diff --git a/webrtc-java-media/src/main/cpp/src/JNI_FFmpeg.cpp b/webrtc-media/src/main/cpp/src/JNI_FFmpeg.cpp similarity index 100% rename from webrtc-java-media/src/main/cpp/src/JNI_FFmpeg.cpp rename to webrtc-media/src/main/cpp/src/JNI_FFmpeg.cpp diff --git a/webrtc-java-media/src/main/cpp/src/JNI_HardwareFault.cpp b/webrtc-media/src/main/cpp/src/JNI_HardwareFault.cpp similarity index 100% rename from webrtc-java-media/src/main/cpp/src/JNI_HardwareFault.cpp rename to webrtc-media/src/main/cpp/src/JNI_HardwareFault.cpp diff --git a/webrtc-java-media/src/main/cpp/src/JNI_MediaPlayer.cpp b/webrtc-media/src/main/cpp/src/JNI_MediaPlayer.cpp similarity index 100% rename from webrtc-java-media/src/main/cpp/src/JNI_MediaPlayer.cpp rename to webrtc-media/src/main/cpp/src/JNI_MediaPlayer.cpp diff --git a/webrtc-java-media/src/main/cpp/src/JNI_MediaReader.cpp b/webrtc-media/src/main/cpp/src/JNI_MediaReader.cpp similarity index 100% rename from webrtc-java-media/src/main/cpp/src/JNI_MediaReader.cpp rename to webrtc-media/src/main/cpp/src/JNI_MediaReader.cpp diff --git a/webrtc-java-media/src/main/cpp/src/JNI_MediaRecorder.cpp b/webrtc-media/src/main/cpp/src/JNI_MediaRecorder.cpp similarity index 100% rename from webrtc-java-media/src/main/cpp/src/JNI_MediaRecorder.cpp rename to webrtc-media/src/main/cpp/src/JNI_MediaRecorder.cpp diff --git a/webrtc-java-media/src/main/cpp/src/media/ApiCheck.cpp b/webrtc-media/src/main/cpp/src/media/ApiCheck.cpp similarity index 100% rename from webrtc-java-media/src/main/cpp/src/media/ApiCheck.cpp rename to webrtc-media/src/main/cpp/src/media/ApiCheck.cpp diff --git a/webrtc-java-media/src/main/cpp/src/media/AudioDecoder.cpp b/webrtc-media/src/main/cpp/src/media/AudioDecoder.cpp similarity index 100% rename from webrtc-java-media/src/main/cpp/src/media/AudioDecoder.cpp rename to webrtc-media/src/main/cpp/src/media/AudioDecoder.cpp diff --git a/webrtc-java-media/src/main/cpp/src/media/ErrorText.cpp b/webrtc-media/src/main/cpp/src/media/ErrorText.cpp similarity index 100% rename from webrtc-java-media/src/main/cpp/src/media/ErrorText.cpp rename to webrtc-media/src/main/cpp/src/media/ErrorText.cpp diff --git a/webrtc-java-media/src/main/cpp/src/media/HardwareFault.cpp b/webrtc-media/src/main/cpp/src/media/HardwareFault.cpp similarity index 100% rename from webrtc-java-media/src/main/cpp/src/media/HardwareFault.cpp rename to webrtc-media/src/main/cpp/src/media/HardwareFault.cpp diff --git a/webrtc-java-media/src/main/cpp/src/media/JavaPlayerObserver.cpp b/webrtc-media/src/main/cpp/src/media/JavaPlayerObserver.cpp similarity index 100% rename from webrtc-java-media/src/main/cpp/src/media/JavaPlayerObserver.cpp rename to webrtc-media/src/main/cpp/src/media/JavaPlayerObserver.cpp diff --git a/webrtc-java-media/src/main/cpp/src/media/JavaRecorderObserver.cpp b/webrtc-media/src/main/cpp/src/media/JavaRecorderObserver.cpp similarity index 100% rename from webrtc-java-media/src/main/cpp/src/media/JavaRecorderObserver.cpp rename to webrtc-media/src/main/cpp/src/media/JavaRecorderObserver.cpp diff --git a/webrtc-java-media/src/main/cpp/src/media/MediaPacer.cpp b/webrtc-media/src/main/cpp/src/media/MediaPacer.cpp similarity index 100% rename from webrtc-java-media/src/main/cpp/src/media/MediaPacer.cpp rename to webrtc-media/src/main/cpp/src/media/MediaPacer.cpp diff --git a/webrtc-java-media/src/main/cpp/src/media/MediaPlayer.cpp b/webrtc-media/src/main/cpp/src/media/MediaPlayer.cpp similarity index 100% rename from webrtc-java-media/src/main/cpp/src/media/MediaPlayer.cpp rename to webrtc-media/src/main/cpp/src/media/MediaPlayer.cpp diff --git a/webrtc-java-media/src/main/cpp/src/media/MediaReader.cpp b/webrtc-media/src/main/cpp/src/media/MediaReader.cpp similarity index 100% rename from webrtc-java-media/src/main/cpp/src/media/MediaReader.cpp rename to webrtc-media/src/main/cpp/src/media/MediaReader.cpp diff --git a/webrtc-java-media/src/main/cpp/src/media/MediaRecorder.cpp b/webrtc-media/src/main/cpp/src/media/MediaRecorder.cpp similarity index 100% rename from webrtc-java-media/src/main/cpp/src/media/MediaRecorder.cpp rename to webrtc-media/src/main/cpp/src/media/MediaRecorder.cpp diff --git a/webrtc-java-media/src/main/cpp/src/media/RecorderTrack.cpp b/webrtc-media/src/main/cpp/src/media/RecorderTrack.cpp similarity index 100% rename from webrtc-java-media/src/main/cpp/src/media/RecorderTrack.cpp rename to webrtc-media/src/main/cpp/src/media/RecorderTrack.cpp diff --git a/webrtc-java-media/src/main/cpp/src/media/VideoDecoder.cpp b/webrtc-media/src/main/cpp/src/media/VideoDecoder.cpp similarity index 100% rename from webrtc-java-media/src/main/cpp/src/media/VideoDecoder.cpp rename to webrtc-media/src/main/cpp/src/media/VideoDecoder.cpp diff --git a/webrtc-java-media/src/main/java/dev/onvoid/webrtc/media/player/FFmpeg.java b/webrtc-media/src/main/java/dev/onvoid/webrtc/media/player/FFmpeg.java similarity index 100% rename from webrtc-java-media/src/main/java/dev/onvoid/webrtc/media/player/FFmpeg.java rename to webrtc-media/src/main/java/dev/onvoid/webrtc/media/player/FFmpeg.java diff --git a/webrtc-java-media/src/main/java/dev/onvoid/webrtc/media/player/MediaFileSource.java b/webrtc-media/src/main/java/dev/onvoid/webrtc/media/player/MediaFileSource.java similarity index 100% rename from webrtc-java-media/src/main/java/dev/onvoid/webrtc/media/player/MediaFileSource.java rename to webrtc-media/src/main/java/dev/onvoid/webrtc/media/player/MediaFileSource.java diff --git a/webrtc-java-media/src/main/java/dev/onvoid/webrtc/media/player/MediaInfo.java b/webrtc-media/src/main/java/dev/onvoid/webrtc/media/player/MediaInfo.java similarity index 100% rename from webrtc-java-media/src/main/java/dev/onvoid/webrtc/media/player/MediaInfo.java rename to webrtc-media/src/main/java/dev/onvoid/webrtc/media/player/MediaInfo.java diff --git a/webrtc-java-media/src/main/java/dev/onvoid/webrtc/media/player/MediaPlayer.java b/webrtc-media/src/main/java/dev/onvoid/webrtc/media/player/MediaPlayer.java similarity index 100% rename from webrtc-java-media/src/main/java/dev/onvoid/webrtc/media/player/MediaPlayer.java rename to webrtc-media/src/main/java/dev/onvoid/webrtc/media/player/MediaPlayer.java diff --git a/webrtc-java-media/src/main/java/dev/onvoid/webrtc/media/player/MediaPlayerListener.java b/webrtc-media/src/main/java/dev/onvoid/webrtc/media/player/MediaPlayerListener.java similarity index 100% rename from webrtc-java-media/src/main/java/dev/onvoid/webrtc/media/player/MediaPlayerListener.java rename to webrtc-media/src/main/java/dev/onvoid/webrtc/media/player/MediaPlayerListener.java diff --git a/webrtc-java-media/src/main/java/dev/onvoid/webrtc/media/player/MediaPlayerState.java b/webrtc-media/src/main/java/dev/onvoid/webrtc/media/player/MediaPlayerState.java similarity index 100% rename from webrtc-java-media/src/main/java/dev/onvoid/webrtc/media/player/MediaPlayerState.java rename to webrtc-media/src/main/java/dev/onvoid/webrtc/media/player/MediaPlayerState.java diff --git a/webrtc-java-media/src/main/java/dev/onvoid/webrtc/media/player/MediaReader.java b/webrtc-media/src/main/java/dev/onvoid/webrtc/media/player/MediaReader.java similarity index 100% rename from webrtc-java-media/src/main/java/dev/onvoid/webrtc/media/player/MediaReader.java rename to webrtc-media/src/main/java/dev/onvoid/webrtc/media/player/MediaReader.java diff --git a/webrtc-java-media/src/main/java/dev/onvoid/webrtc/media/recorder/MediaRecorder.java b/webrtc-media/src/main/java/dev/onvoid/webrtc/media/recorder/MediaRecorder.java similarity index 100% rename from webrtc-java-media/src/main/java/dev/onvoid/webrtc/media/recorder/MediaRecorder.java rename to webrtc-media/src/main/java/dev/onvoid/webrtc/media/recorder/MediaRecorder.java diff --git a/webrtc-java-media/src/main/java/dev/onvoid/webrtc/media/recorder/MediaRecorderListener.java b/webrtc-media/src/main/java/dev/onvoid/webrtc/media/recorder/MediaRecorderListener.java similarity index 100% rename from webrtc-java-media/src/main/java/dev/onvoid/webrtc/media/recorder/MediaRecorderListener.java rename to webrtc-media/src/main/java/dev/onvoid/webrtc/media/recorder/MediaRecorderListener.java diff --git a/webrtc-java-media/src/main/java/dev/onvoid/webrtc/media/recorder/MediaRecorderState.java b/webrtc-media/src/main/java/dev/onvoid/webrtc/media/recorder/MediaRecorderState.java similarity index 100% rename from webrtc-java-media/src/main/java/dev/onvoid/webrtc/media/recorder/MediaRecorderState.java rename to webrtc-media/src/main/java/dev/onvoid/webrtc/media/recorder/MediaRecorderState.java diff --git a/webrtc-java-media/src/main/java/module-info.java b/webrtc-media/src/main/java/module-info.java similarity index 100% rename from webrtc-java-media/src/main/java/module-info.java rename to webrtc-media/src/main/java/module-info.java diff --git a/webrtc-java-media/src/test/java/dev/onvoid/webrtc/media/player/ClientApiMediaFileTest.java b/webrtc-media/src/test/java/dev/onvoid/webrtc/media/player/ClientApiMediaFileTest.java similarity index 100% rename from webrtc-java-media/src/test/java/dev/onvoid/webrtc/media/player/ClientApiMediaFileTest.java rename to webrtc-media/src/test/java/dev/onvoid/webrtc/media/player/ClientApiMediaFileTest.java diff --git a/webrtc-java-media/src/test/java/dev/onvoid/webrtc/media/player/FFmpegTest.java b/webrtc-media/src/test/java/dev/onvoid/webrtc/media/player/FFmpegTest.java similarity index 100% rename from webrtc-java-media/src/test/java/dev/onvoid/webrtc/media/player/FFmpegTest.java rename to webrtc-media/src/test/java/dev/onvoid/webrtc/media/player/FFmpegTest.java diff --git a/webrtc-java-media/src/test/java/dev/onvoid/webrtc/media/player/HardwareDecodingTest.java b/webrtc-media/src/test/java/dev/onvoid/webrtc/media/player/HardwareDecodingTest.java similarity index 100% rename from webrtc-java-media/src/test/java/dev/onvoid/webrtc/media/player/HardwareDecodingTest.java rename to webrtc-media/src/test/java/dev/onvoid/webrtc/media/player/HardwareDecodingTest.java diff --git a/webrtc-java-media/src/test/java/dev/onvoid/webrtc/media/player/HardwareFault.java b/webrtc-media/src/test/java/dev/onvoid/webrtc/media/player/HardwareFault.java similarity index 100% rename from webrtc-java-media/src/test/java/dev/onvoid/webrtc/media/player/HardwareFault.java rename to webrtc-media/src/test/java/dev/onvoid/webrtc/media/player/HardwareFault.java diff --git a/webrtc-java-media/src/test/java/dev/onvoid/webrtc/media/player/MediaFileSourceTest.java b/webrtc-media/src/test/java/dev/onvoid/webrtc/media/player/MediaFileSourceTest.java similarity index 100% rename from webrtc-java-media/src/test/java/dev/onvoid/webrtc/media/player/MediaFileSourceTest.java rename to webrtc-media/src/test/java/dev/onvoid/webrtc/media/player/MediaFileSourceTest.java diff --git a/webrtc-java-media/src/test/java/dev/onvoid/webrtc/media/player/MediaPlayerTest.java b/webrtc-media/src/test/java/dev/onvoid/webrtc/media/player/MediaPlayerTest.java similarity index 100% rename from webrtc-java-media/src/test/java/dev/onvoid/webrtc/media/player/MediaPlayerTest.java rename to webrtc-media/src/test/java/dev/onvoid/webrtc/media/player/MediaPlayerTest.java diff --git a/webrtc-java-media/src/test/java/dev/onvoid/webrtc/media/player/MediaReaderTest.java b/webrtc-media/src/test/java/dev/onvoid/webrtc/media/player/MediaReaderTest.java similarity index 100% rename from webrtc-java-media/src/test/java/dev/onvoid/webrtc/media/player/MediaReaderTest.java rename to webrtc-media/src/test/java/dev/onvoid/webrtc/media/player/MediaReaderTest.java diff --git a/webrtc-java-media/src/test/java/dev/onvoid/webrtc/media/player/RtspStreamTest.java b/webrtc-media/src/test/java/dev/onvoid/webrtc/media/player/RtspStreamTest.java similarity index 100% rename from webrtc-java-media/src/test/java/dev/onvoid/webrtc/media/player/RtspStreamTest.java rename to webrtc-media/src/test/java/dev/onvoid/webrtc/media/player/RtspStreamTest.java diff --git a/webrtc-java-media/src/test/java/dev/onvoid/webrtc/media/player/TestMedia.java b/webrtc-media/src/test/java/dev/onvoid/webrtc/media/player/TestMedia.java similarity index 100% rename from webrtc-java-media/src/test/java/dev/onvoid/webrtc/media/player/TestMedia.java rename to webrtc-media/src/test/java/dev/onvoid/webrtc/media/player/TestMedia.java diff --git a/webrtc-java-media/src/test/java/dev/onvoid/webrtc/media/player/TestRtspServer.java b/webrtc-media/src/test/java/dev/onvoid/webrtc/media/player/TestRtspServer.java similarity index 100% rename from webrtc-java-media/src/test/java/dev/onvoid/webrtc/media/player/TestRtspServer.java rename to webrtc-media/src/test/java/dev/onvoid/webrtc/media/player/TestRtspServer.java diff --git a/webrtc-java-media/src/test/java/dev/onvoid/webrtc/media/recorder/ClientApiRecorderTest.java b/webrtc-media/src/test/java/dev/onvoid/webrtc/media/recorder/ClientApiRecorderTest.java similarity index 100% rename from webrtc-java-media/src/test/java/dev/onvoid/webrtc/media/recorder/ClientApiRecorderTest.java rename to webrtc-media/src/test/java/dev/onvoid/webrtc/media/recorder/ClientApiRecorderTest.java diff --git a/webrtc-java-media/src/test/java/dev/onvoid/webrtc/media/recorder/MediaRecorderTest.java b/webrtc-media/src/test/java/dev/onvoid/webrtc/media/recorder/MediaRecorderTest.java similarity index 100% rename from webrtc-java-media/src/test/java/dev/onvoid/webrtc/media/recorder/MediaRecorderTest.java rename to webrtc-media/src/test/java/dev/onvoid/webrtc/media/recorder/MediaRecorderTest.java diff --git a/webrtc-java-media/src/test/java/dev/onvoid/webrtc/media/recorder/TestCall.java b/webrtc-media/src/test/java/dev/onvoid/webrtc/media/recorder/TestCall.java similarity index 100% rename from webrtc-java-media/src/test/java/dev/onvoid/webrtc/media/recorder/TestCall.java rename to webrtc-media/src/test/java/dev/onvoid/webrtc/media/recorder/TestCall.java diff --git a/webrtc-java-media/src/test/resources/media-test-av1-1080p.mkv b/webrtc-media/src/test/resources/media-test-av1-1080p.mkv similarity index 100% rename from webrtc-java-media/src/test/resources/media-test-av1-1080p.mkv rename to webrtc-media/src/test/resources/media-test-av1-1080p.mkv diff --git a/webrtc-java-media/src/test/resources/media-test-av1.mkv b/webrtc-media/src/test/resources/media-test-av1.mkv similarity index 100% rename from webrtc-java-media/src/test/resources/media-test-av1.mkv rename to webrtc-media/src/test/resources/media-test-av1.mkv diff --git a/webrtc-java-media/src/test/resources/media-test-coarse.mkv b/webrtc-media/src/test/resources/media-test-coarse.mkv similarity index 100% rename from webrtc-java-media/src/test/resources/media-test-coarse.mkv rename to webrtc-media/src/test/resources/media-test-coarse.mkv diff --git a/webrtc-java-media/src/test/resources/media-test-h264-1080p.mkv b/webrtc-media/src/test/resources/media-test-h264-1080p.mkv similarity index 100% rename from webrtc-java-media/src/test/resources/media-test-h264-1080p.mkv rename to webrtc-media/src/test/resources/media-test-h264-1080p.mkv diff --git a/webrtc-java-media/src/test/resources/media-test-h264-10bit.mkv b/webrtc-media/src/test/resources/media-test-h264-10bit.mkv similarity index 100% rename from webrtc-java-media/src/test/resources/media-test-h264-10bit.mkv rename to webrtc-media/src/test/resources/media-test-h264-10bit.mkv diff --git a/webrtc-java-media/src/test/resources/media-test-h264-1366.mkv b/webrtc-media/src/test/resources/media-test-h264-1366.mkv similarity index 100% rename from webrtc-java-media/src/test/resources/media-test-h264-1366.mkv rename to webrtc-media/src/test/resources/media-test-h264-1366.mkv diff --git a/webrtc-java-media/src/test/resources/media-test-h264-444.mkv b/webrtc-media/src/test/resources/media-test-h264-444.mkv similarity index 100% rename from webrtc-java-media/src/test/resources/media-test-h264-444.mkv rename to webrtc-media/src/test/resources/media-test-h264-444.mkv diff --git a/webrtc-java-media/src/test/resources/media-test-h264-4k.mkv b/webrtc-media/src/test/resources/media-test-h264-4k.mkv similarity index 100% rename from webrtc-java-media/src/test/resources/media-test-h264-4k.mkv rename to webrtc-media/src/test/resources/media-test-h264-4k.mkv diff --git a/webrtc-java-media/src/test/resources/media-test-h264.mkv b/webrtc-media/src/test/resources/media-test-h264.mkv similarity index 100% rename from webrtc-java-media/src/test/resources/media-test-h264.mkv rename to webrtc-media/src/test/resources/media-test-h264.mkv diff --git a/webrtc-java-media/src/test/resources/media-test-hevc-1080p.luma.txt b/webrtc-media/src/test/resources/media-test-hevc-1080p.luma.txt similarity index 100% rename from webrtc-java-media/src/test/resources/media-test-hevc-1080p.luma.txt rename to webrtc-media/src/test/resources/media-test-hevc-1080p.luma.txt diff --git a/webrtc-java-media/src/test/resources/media-test-hevc-1080p.mkv b/webrtc-media/src/test/resources/media-test-hevc-1080p.mkv similarity index 100% rename from webrtc-java-media/src/test/resources/media-test-hevc-1080p.mkv rename to webrtc-media/src/test/resources/media-test-hevc-1080p.mkv diff --git a/webrtc-java-media/src/test/resources/media-test-hevc.luma.txt b/webrtc-media/src/test/resources/media-test-hevc.luma.txt similarity index 100% rename from webrtc-java-media/src/test/resources/media-test-hevc.luma.txt rename to webrtc-media/src/test/resources/media-test-hevc.luma.txt diff --git a/webrtc-java-media/src/test/resources/media-test-hevc.mkv b/webrtc-media/src/test/resources/media-test-hevc.mkv similarity index 100% rename from webrtc-java-media/src/test/resources/media-test-hevc.mkv rename to webrtc-media/src/test/resources/media-test-hevc.mkv diff --git a/webrtc-java-media/src/test/resources/media-test-vp9-1080p.webm b/webrtc-media/src/test/resources/media-test-vp9-1080p.webm similarity index 100% rename from webrtc-java-media/src/test/resources/media-test-vp9-1080p.webm rename to webrtc-media/src/test/resources/media-test-vp9-1080p.webm diff --git a/webrtc-java-media/src/test/resources/media-test-vp9-444.webm b/webrtc-media/src/test/resources/media-test-vp9-444.webm similarity index 100% rename from webrtc-java-media/src/test/resources/media-test-vp9-444.webm rename to webrtc-media/src/test/resources/media-test-vp9-444.webm diff --git a/webrtc-java-media/src/test/resources/media-test-vp9.webm b/webrtc-media/src/test/resources/media-test-vp9.webm similarity index 100% rename from webrtc-java-media/src/test/resources/media-test-vp9.webm rename to webrtc-media/src/test/resources/media-test-vp9.webm diff --git a/webrtc-java-media/src/test/resources/media-test.avi b/webrtc-media/src/test/resources/media-test.avi similarity index 100% rename from webrtc-java-media/src/test/resources/media-test.avi rename to webrtc-media/src/test/resources/media-test.avi diff --git a/webrtc-java-media/src/test/resources/media-test.webm b/webrtc-media/src/test/resources/media-test.webm similarity index 100% rename from webrtc-java-media/src/test/resources/media-test.webm rename to webrtc-media/src/test/resources/media-test.webm diff --git a/webrtc-java-media/third-party/dav1d b/webrtc-media/third-party/dav1d similarity index 100% rename from webrtc-java-media/third-party/dav1d rename to webrtc-media/third-party/dav1d diff --git a/webrtc-java-media/third-party/ffmpeg b/webrtc-media/third-party/ffmpeg similarity index 100% rename from webrtc-java-media/third-party/ffmpeg rename to webrtc-media/third-party/ffmpeg diff --git a/webrtc/pom.xml b/webrtc/pom.xml index e12917587..5c6de9328 100644 --- a/webrtc/pom.xml +++ b/webrtc/pom.xml @@ -125,7 +125,7 @@ build jobs. Maven Central publishes a version as one atomic bundle, hence all classifiers must be attached to a single deployment. - Run with: mvn deploy -pl .,webrtc,webrtc-java-media -Prelease -Dnatives.dir=/abs/path + Run with: mvn deploy -pl .,webrtc,webrtc-media -Prelease -Dnatives.dir=/abs/path --> attach-natives-all