-
Notifications
You must be signed in to change notification settings - Fork 170
[mosq]: Add support for esp-peer in brokerless example #840
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
david-cermak
merged 1 commit into
espressif:master
from
david-cermak:feat/mosq_esp_peer
Jul 18, 2025
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
28 changes: 28 additions & 0 deletions
28
...mosquitto/examples/serverless_mqtt/esp_peer_setup/Remove-deprecated-freeRTOS-header.patch
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| From cdc43a56f5ea1ab1935f55f47f8644f5dd30825e Mon Sep 17 00:00:00 2001 | ||
| From: David Cermak <[email protected]> | ||
| Date: Thu, 10 Jul 2025 11:09:57 +0200 | ||
| Subject: [PATCH] fix(media_lib): Remove deprecated freeRTOS header | ||
|
|
||
| --- | ||
| components/media_lib_sal/port/media_lib_os_freertos.c | 4 ++++ | ||
| 1 file changed, 4 insertions(+) | ||
|
|
||
| diff --git a/components/media_lib_sal/port/media_lib_os_freertos.c b/components/media_lib_sal/port/media_lib_os_freertos.c | ||
| index d248d59..aea0527 100644 | ||
| --- a/components/media_lib_sal/port/media_lib_os_freertos.c | ||
| +++ b/components/media_lib_sal/port/media_lib_os_freertos.c | ||
| @@ -40,8 +40,12 @@ | ||
| #include "esp_idf_version.h" | ||
|
|
||
| #if CONFIG_FREERTOS_ENABLE_TASK_SNAPSHOT | ||
| +#if (ESP_IDF_VERSION >= ESP_IDF_VERSION_VAL(5, 2, 0)) | ||
| +#include "esp_private/freertos_debug.h" | ||
| +#else | ||
| #include "freertos/task_snapshot.h" | ||
| #endif | ||
| +#endif | ||
|
|
||
| #ifdef __XTENSA__ | ||
| #include "esp_debug_helpers.h" | ||
| -- | ||
| 2.43.0 |
27 changes: 27 additions & 0 deletions
27
components/mosquitto/examples/serverless_mqtt/esp_peer_setup/install.sh
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| #!/usr/bin/env bash | ||
| set -e | ||
| echo "bin_dir: $1" | ||
|
|
||
| bin_dir="$1" | ||
| THIS_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" | ||
| ESP_PEER_VERSION="ccff3bd65cea750bf6c0abcf9d95b931ba9329f0" | ||
|
|
||
| ESP_PEER_URL="https://github.com/espressif/esp-webrtc-solution/archive/${ESP_PEER_VERSION}.zip" | ||
| ESP_PEER_DIR="${bin_dir}/esp-peer" | ||
| ZIP_PATH="${bin_dir}/esp-peer.zip" | ||
| EXTRACTED_DIR="${ESP_PEER_DIR}/esp-webrtc-solution-${ESP_PEER_VERSION}" | ||
| COMPONENTS_SRC="${EXTRACTED_DIR}/components" | ||
| COMPONENTS_DST="${ESP_PEER_DIR}/components" | ||
| PATCH_FILE_1="${THIS_DIR}/Remove-deprecated-freeRTOS-header.patch" | ||
| PATCH_FILE_2="${THIS_DIR}/libpeer-Add-direct-dependency-to-libsrtp.patch" | ||
|
|
||
| # Download if not exists | ||
| if [ ! -d "$EXTRACTED_DIR" ]; then | ||
| echo "Downloading esp-peer ${ESP_PEER_VERSION}..." | ||
| wget -O "$ZIP_PATH" "$ESP_PEER_URL" | ||
| unzip -o "$ZIP_PATH" -d "$ESP_PEER_DIR" | ||
| patch -p1 -d "$EXTRACTED_DIR" < "$PATCH_FILE_1" | ||
| patch -p1 -d "$EXTRACTED_DIR" < "$PATCH_FILE_2" | ||
| mv ${EXTRACTED_DIR}/components ${ESP_PEER_DIR} | ||
| mv ${ESP_PEER_DIR}/components/esp_webrtc/impl/peer_default ${ESP_PEER_DIR}/components | ||
| fi |
23 changes: 23 additions & 0 deletions
23
...to/examples/serverless_mqtt/esp_peer_setup/libpeer-Add-direct-dependency-to-libsrtp.patch
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| From 695e057000698f4897b6c5802851499842e2fe31 Mon Sep 17 00:00:00 2001 | ||
| From: David Cermak <[email protected]> | ||
| Date: Fri, 11 Jul 2025 16:59:21 +0200 | ||
| Subject: [PATCH] fix(libpeer): Add direct dependency to libsrtp | ||
|
|
||
| --- | ||
| components/esp_webrtc/impl/peer_default/CMakeLists.txt | 2 +- | ||
| 1 file changed, 1 insertion(+), 1 deletion(-) | ||
|
|
||
| diff --git a/components/esp_webrtc/impl/peer_default/CMakeLists.txt b/components/esp_webrtc/impl/peer_default/CMakeLists.txt | ||
| index 2af35cf..3fb4615 100644 | ||
| --- a/components/esp_webrtc/impl/peer_default/CMakeLists.txt | ||
| +++ b/components/esp_webrtc/impl/peer_default/CMakeLists.txt | ||
| @@ -2,6 +2,6 @@ idf_component_register(INCLUDE_DIRS ./include) | ||
|
|
||
| get_filename_component(BASE_DIR ${CMAKE_CURRENT_SOURCE_DIR} NAME) | ||
| add_prebuilt_library(${BASE_DIR} "${CMAKE_CURRENT_SOURCE_DIR}/libs/${IDF_TARGET}/libpeer_default.a" | ||
| - PRIV_REQUIRES ${BASE_DIR} esp_timer) | ||
| + PRIV_REQUIRES ${BASE_DIR} esp_timer espressif__esp_libsrtp) | ||
| target_link_libraries(${COMPONENT_LIB} INTERFACE "-L ${CMAKE_CURRENT_SOURCE_DIR}/libs/${IDF_TARGET}") | ||
| target_link_libraries(${COMPONENT_LIB} INTERFACE peer_default) | ||
| -- | ||
| 2.43.0 |
10 changes: 10 additions & 0 deletions
10
components/mosquitto/examples/serverless_mqtt/main/CMakeLists.txt
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,14 @@ | ||
| if(CONFIG_EXAMPLE_PEER_LIB_ESP_PEER) | ||
| set(PEER_BACKEND_SRC "peer_impl_webrtc.c") | ||
| else() | ||
| set(PEER_BACKEND_SRC "peer_impl_juice.c") | ||
| endif() | ||
|
|
||
| idf_component_register(SRCS "serverless_mqtt.c" | ||
| "wifi_connect.c" | ||
| "${PEER_BACKEND_SRC}" | ||
| INCLUDE_DIRS "." | ||
| REQUIRES libjuice nvs_flash mqtt json esp_wifi) | ||
| if(CONFIG_EXAMPLE_PEER_LIB_ESP_PEER) | ||
| idf_component_optional_requires(PUBLIC media_lib_sal esp_webrtc peer_default) | ||
| endif() |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.