Skip to content

Commit 3a52782

Browse files
committed
Merge branch 'bugfix/fix_build_err_of_dependency_lib' into 'main'
Fix build error for dependency lib compatible issue See merge request adf/esp-webrtc-solution!21
2 parents 1b2955d + aaa91c3 commit 3a52782

File tree

7 files changed

+49
-3
lines changed

7 files changed

+49
-3
lines changed

solutions/doorbell_demo/README.md

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ wifi ssid psw
3636

3737
Once connected to Wi-Fi, the board will automatically try to join a room generated from its MAC address. The room name will appear in the console:
3838
```
39-
W (9801) Webrtc_Test: Please use browser to join in espxxxxxx on https://webrtc.espressif.cn/doorbell
39+
W (9801) Webrtc_Test: Please use browser to join in espxxxxxx on https://webrtc.espressif.com/doorbell
4040
```
4141
User also can use `leave` command leave the room and use the `join` command to join other random room. Make sure the room is empty before entering:
4242
```
@@ -47,7 +47,7 @@ If you're the first to join, you’ll see:
4747
Initials set to 1
4848
```
4949

50-
Then, use a Chrome/Edge browser to enter the same room at [DoorBellDemo](https://webrtc.espressif.cn/doorbell).
50+
Then, use a Chrome/Edge browser to enter the same room at [DoorBellDemo](https://webrtc.espressif.com/doorbell).
5151

5252
### Interactions
5353

@@ -76,4 +76,10 @@ All other steps follow the typical call flow of `esp_webrtc`. For more details o
7676
### QA
7777
- If the board unexpectedly leaves the room, fail to re-enter same room.
7878
Server will keep the room for 1-2 minutes before timing out. The user must wait for the timeout to expire before retrying.
79+
Or `leave` room firstly then `join` a random room id.
80+
81+
- If user want to change cn server can use following command before enter `join`
82+
```
83+
server 1
84+
```
7985

solutions/doorbell_demo/main/idf_component.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,11 @@ dependencies:
1616
path: ../../../components/esp_webrtc/impl/peer_default
1717
render_impl:
1818
path: ../../../components/av_render/render_impl
19+
espressif/esp_h264:
20+
version: "1.0.4"
21+
rules:
22+
- if: target in [esp32p4, esp32s3]
23+
espressif/esp_video:
24+
version: "^0.8.0"
25+
rules:
26+
- if: target in [esp32p4]

solutions/doorbell_demo/main/main.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ static int network_event_handler(bool connected)
243243
snprintf(room_url, sizeof(room_url), "%s/join/%s", server_url, room);
244244
ESP_LOGI(TAG, "Start to join in room %s", room);
245245
if (start_webrtc(room_url) == 0) {
246-
ESP_LOGW(TAG, "Please use browser to join in %s on %s/webrtc.espressif.cn/doorbell", server_url, room);
246+
ESP_LOGW(TAG, "Please use browser to join in %s on %s/doorbell", room, server_url);
247247
}
248248
});
249249
} else {

solutions/openai_demo/main/idf_component.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,11 @@ dependencies:
1111
path: ../../../components/esp_webrtc/impl/peer_default
1212
render_impl:
1313
path: ../../../components/av_render/render_impl
14+
espressif/esp_h264:
15+
version: "1.0.4"
16+
rules:
17+
- if: target in [esp32p4, esp32s3]
18+
espressif/esp_video:
19+
version: "^0.8.0"
20+
rules:
21+
- if: target in [esp32p4]

solutions/peer_demo/main/idf_component.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,11 @@ dependencies:
55
version: '>=5.0'
66
peer_default:
77
path: ../../../components/esp_webrtc/impl/peer_default
8+
espressif/esp_h264:
9+
version: "1.0.4"
10+
rules:
11+
- if: target in [esp32p4, esp32s3]
12+
espressif/esp_video:
13+
version: "^0.8.0"
14+
rules:
15+
- if: target in [esp32p4]

solutions/videocall_demo/main/idf_component.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,11 @@ dependencies:
1515
path: ../../../components/esp_webrtc/impl/peer_default
1616
render_impl:
1717
path: ../../../components/av_render/render_impl
18+
espressif/esp_h264:
19+
version: "1.0.4"
20+
rules:
21+
- if: target in [esp32p4, esp32s3]
22+
espressif/esp_video:
23+
version: "^0.8.0"
24+
rules:
25+
- if: target in [esp32p4]

solutions/whip_demo/main/idf_component.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,11 @@ dependencies:
1515
path: ../../../components/esp_webrtc/impl/peer_default
1616
render_impl:
1717
path: ../../../components/av_render/render_impl
18+
espressif/esp_h264:
19+
version: "1.0.4"
20+
rules:
21+
- if: target in [esp32p4, esp32s3]
22+
espressif/esp_video:
23+
version: "^0.8.0"
24+
rules:
25+
- if: target in [esp32p4]

0 commit comments

Comments
 (0)