Skip to content

Commit a8cfa44

Browse files
committed
Update README.md
Delete gmf_examples/basic_examples/pipeline_play_http_music/dependencies.lock Delete gmf_examples/basic_examples/pipeline_play_http_music/sdkconfig Update README.md Update README.md Update README_CN.md Update README_CN.md Update CMakeLists.txt Update pytest_pipeline_play_http_music.py Update sdkconfig.defaults Update sdkconfig.defaults Update play_http_music.c Update sdkconfig.defaults Update sdkconfig.defaults
1 parent 048a67d commit a8cfa44

File tree

8 files changed

+18
-3202
lines changed

8 files changed

+18
-3202
lines changed

gmf_examples/basic_examples/pipeline_play_http_music/README.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
# Play multiple format music from microSD card
2+
# Play multiple format music from HTTP
33

44
- [中文版](./README_CN.md)
55

@@ -15,10 +15,8 @@ This example supports IDF release/v5.3 and later branches.
1515

1616
### Configuration
1717

18-
1918
This example requires prior configuration of Wi-Fi connection settings. Please specify the `Wi-Fi SSID` and `Wi-Fi Password` by navigating to `menuconfig > Example Configuration`.
2019

21-
2220
### Build and Flash
2321

2422
Before compiling this example, ensure that the ESP-IDF environment is properly configured. If it is already set up, you can proceed to the next configuration step. If not, run the following script in the root directory of ESP-IDF to set up the build environment. For detailed steps on configuring and using ESP-IDF, please refer to the [ESP-IDF Programming Guide](https://docs.espressif.com/projects/esp-idf/en/latest/esp32s3/index.html)
@@ -45,7 +43,8 @@ idf.py set-target esp32s3
4543

4644
```
4745
idf.py menuconfig
48-
In 'menuconfig', select 'GMF APP Configuration' -> 'Audio Board' -> 'ESP32-S3-Korvo V2', and then save and exit
46+
In 'menuconfig', select 'GMF APP Configuration' -> 'Audio Board' -> 'ESP32-S3-Korvo V2',
47+
specify 'Example Configuration' -> '(myssid) WiFi SSID' -> '(myssid) WiFi Password', and then save and exit.
4948
```
5049

5150
- Build the Example

gmf_examples/basic_examples/pipeline_play_http_music/README_CN.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
## 例程简介
66

7-
本例程介绍了使用 HTTP IO 获取在线HTTP流传输的MP3格式音乐,然后经过 decoder 元素解码,解码后数据进行音频效果处理后用 CODEC_DEV_TX IO 输出音乐。
7+
本例程介绍了使用 HTTP IO 获取在线 HTTP 流传输的 MP3 格式音乐,然后经过 decoder 元素解码,解码后数据进行音频效果处理后用 CODEC_DEV_TX IO 输出音乐。
88

99
## 示例创建
1010

@@ -42,7 +42,8 @@ idf.py set-target esp32s3
4242

4343
```
4444
idf.py menuconfig
45-
在 `menuconfig` 中选择 `GMF APP Configuration` -> `Audio Board` -> `ESP32-S3-Korvo V2`,然后保存退出
45+
在 `menuconfig` 中选择 `GMF APP Configuration` -> `Audio Board` -> `ESP32-S3-Korvo V2`,
46+
设定 'Example Configuration' -> '(myssid) WiFi SSID' -> '(myssid) WiFi Password', 然后保存退出
4647
```
4748

4849
- 编译例子程序

gmf_examples/basic_examples/pipeline_play_http_music/dependencies.lock

Lines changed: 0 additions & 259 deletions
This file was deleted.
Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,2 @@
1-
21
idf_component_register(SRC_DIRS "./"
32
INCLUDE_DIRS "./")

gmf_examples/basic_examples/pipeline_play_http_music/main/play_http_music.c

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
static const char *TAG = "PLAY_HTTP_MUSIC";
2525

2626
#define PIPELINE_BLOCK_BIT BIT(0)
27+
#define URI_HTTP "https://dl.espressif.com/dl/audio/ff-16b-2c-44100hz.mp3"
2728

2829

2930
esp_err_t _pipeline_event(esp_gmf_event_pkt_t *event, void *ctx)
@@ -71,11 +72,11 @@ void app_main(void)
7172
esp_gmf_io_codec_dev_set_dev(ESP_GMF_PIPELINE_GET_OUT_INSTANCE(pipe), esp_gmf_app_get_playback_handle());
7273

7374
ESP_LOGI(TAG, "[ 4.1 ] Set audio url to play");
74-
esp_gmf_pipeline_set_in_uri(pipe, "https://dl.espressif.com/dl/audio/ff-16b-2c-44100hz.mp3");
75+
esp_gmf_pipeline_set_in_uri(pipe, URI_HTTP);
7576
esp_gmf_element_handle_t dec_el = NULL;
7677
esp_gmf_pipeline_get_el_by_name(pipe, "aud_dec", &dec_el);
7778
esp_gmf_info_sound_t info = {0};
78-
esp_gmf_audio_helper_get_audio_type_by_uri("https://dl.espressif.com/dl/audio/ff-16b-2c-44100hz.mp3", &info.format_id);
79+
esp_gmf_audio_helper_get_audio_type_by_uri(URI_HTTP, &info.format_id);
7980
esp_gmf_audio_dec_reconfig_by_sound_info(dec_el, &info);
8081

8182
ESP_LOGI(TAG, "[ 5 ] Create gmf task, bind task to pipeline and load linked element jobs to the bind task");
@@ -110,4 +111,4 @@ void app_main(void)
110111
esp_gmf_pool_deinit(pool);
111112
esp_gmf_app_wifi_disconnect();
112113
esp_gmf_app_teardown_codec_dev();
113-
}
114+
}

gmf_examples/basic_examples/pipeline_play_http_music/pytest_pipeline_play_http_music.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import os
77

88
from pytest_embedded import Dut
9-
from audio_test_package.audio_recorder.recorder_stream import Recorder
109

1110
@pytest.mark.esp32
1211
@pytest.mark.esp32s3

0 commit comments

Comments
 (0)