Skip to content

Commit

Permalink
Merge branch 'bugfix/break_change_add_esp_rtc_v1.2.0' into 'master'
Browse files Browse the repository at this point in the history
esp_rtc: Add esp_rtc v1.2.0 (break change)

See merge request adf/esp-adf-internal!1320
  • Loading branch information
jason-mao committed Aug 7, 2024
2 parents 759a3d7 + 10540a4 commit 5478bce
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion components/esp-adf-libs
Submodule esp-adf-libs updated 86 files
+42 −0 esp_audio_codec/CHANGELOG.md
+21 −4 esp_audio_codec/CMakeLists.txt
+131 −0 esp_audio_codec/Kconfig
+1 −1 esp_audio_codec/LICENSE
+188 −298 esp_audio_codec/README.md
+6 −5 esp_audio_codec/idf_component.yml
+187 −0 esp_audio_codec/include/decoder/esp_audio_dec.h
+65 −0 esp_audio_codec/include/decoder/esp_audio_dec_default.h
+96 −0 esp_audio_codec/include/decoder/esp_audio_dec_reg.h
+118 −0 esp_audio_codec/include/decoder/impl/esp_aac_dec.h
+116 −0 esp_audio_codec/include/decoder/impl/esp_adpcm_dec.h
+112 −0 esp_audio_codec/include/decoder/impl/esp_alac_dec.h
+104 −0 esp_audio_codec/include/decoder/impl/esp_amrnb_dec.h
+104 −0 esp_audio_codec/include/decoder/impl/esp_amrwb_dec.h
+104 −0 esp_audio_codec/include/decoder/impl/esp_flac_dec.h
+157 −0 esp_audio_codec/include/decoder/impl/esp_g711_dec.h
+105 −0 esp_audio_codec/include/decoder/impl/esp_mp3_dec.h
+116 −0 esp_audio_codec/include/decoder/impl/esp_opus_dec.h
+117 −0 esp_audio_codec/include/decoder/impl/esp_vorbis_dec.h
+149 −0 esp_audio_codec/include/encoder/esp_audio_enc.h
+62 −0 esp_audio_codec/include/encoder/esp_audio_enc_default.h
+102 −0 esp_audio_codec/include/encoder/esp_audio_enc_reg.h
+148 −0 esp_audio_codec/include/encoder/impl/esp_aac_enc.h
+128 −0 esp_audio_codec/include/encoder/impl/esp_adpcm_enc.h
+133 −0 esp_audio_codec/include/encoder/impl/esp_alac_enc.h
+149 −0 esp_audio_codec/include/encoder/impl/esp_amrnb_enc.h
+151 −0 esp_audio_codec/include/encoder/impl/esp_amrwb_enc.h
+157 −0 esp_audio_codec/include/encoder/impl/esp_g711_enc.h
+60 −56 esp_audio_codec/include/encoder/impl/esp_opus_enc.h
+134 −0 esp_audio_codec/include/encoder/impl/esp_pcm_enc.h
+0 −144 esp_audio_codec/include/esp_aac_enc.h
+0 −123 esp_audio_codec/include/esp_adpcm_enc.h
+0 −143 esp_audio_codec/include/esp_amrnb_enc.h
+0 −145 esp_audio_codec/include/esp_amrwb_enc.h
+24 −20 esp_audio_codec/include/esp_audio_codec_version.h
+0 −140 esp_audio_codec/include/esp_audio_enc.h
+0 −80 esp_audio_codec/include/esp_audio_enc_def.h
+41 −29 esp_audio_codec/include/esp_audio_types.h
+0 −147 esp_audio_codec/include/esp_g711_enc.h
+0 −128 esp_audio_codec/include/esp_pcm_enc.h
+166 −0 esp_audio_codec/include/simple_dec/esp_audio_simple_dec.h
+62 −0 esp_audio_codec/include/simple_dec/esp_audio_simple_dec_default.h
+81 −0 esp_audio_codec/include/simple_dec/esp_audio_simple_dec_reg.h
+216 −0 esp_audio_codec/include/simple_dec/esp_es_parse_types.h
+136 −0 esp_audio_codec/include/simple_dec/impl/esp_m4a_dec.h
+75 −0 esp_audio_codec/include/simple_dec/impl/esp_m4a_parse.h
+135 −0 esp_audio_codec/include/simple_dec/impl/esp_ts_dec.h
+65 −0 esp_audio_codec/include/simple_dec/impl/esp_ts_parse.h
+105 −0 esp_audio_codec/include/simple_dec/impl/esp_wav_dec.h
+66 −0 esp_audio_codec/include/simple_dec/impl/esp_wav_parse.h
+ esp_audio_codec/lib/esp32/libesp_audio_codec.a
+ esp_audio_codec/lib/esp32/libesp_audio_simple_dec.a
+ esp_audio_codec/lib/esp32c3/libesp_audio_codec.a
+ esp_audio_codec/lib/esp32c3/libesp_audio_simple_dec.a
+ esp_audio_codec/lib/esp32c6/libesp_audio_codec.a
+ esp_audio_codec/lib/esp32c6/libesp_audio_simple_dec.a
+ esp_audio_codec/lib/esp32p4/libesp_audio_codec.a
+ esp_audio_codec/lib/esp32p4/libesp_audio_simple_dec.a
+ esp_audio_codec/lib/esp32s2/libesp_audio_codec.a
+ esp_audio_codec/lib/esp32s2/libesp_audio_simple_dec.a
+ esp_audio_codec/lib/esp32s3/libesp_audio_codec.a
+ esp_audio_codec/lib/esp32s3/libesp_audio_simple_dec.a
+116 −0 esp_audio_codec/src/audio_decoder_reg.c
+100 −0 esp_audio_codec/src/audio_encoder_reg.c
+58 −0 esp_audio_codec/src/simple_decoder_reg.c
+11 −0 esp_audio_codec/test_apps/audio_codec_test/CMakeLists.txt
+11 −0 esp_audio_codec/test_apps/audio_codec_test/main/CMakeLists.txt
+396 −0 esp_audio_codec/test_apps/audio_codec_test/main/audio_codec_test.c
+116 −0 esp_audio_codec/test_apps/audio_codec_test/main/audio_codec_test.h
+344 −0 esp_audio_codec/test_apps/audio_codec_test/main/audio_decoder_test.c
+318 −0 esp_audio_codec/test_apps/audio_codec_test/main/audio_encoder_test.c
+6 −0 esp_audio_codec/test_apps/audio_codec_test/main/idf_component.yml
+344 −0 esp_audio_codec/test_apps/audio_codec_test/main/simple_decoder_test.c
+ esp_audio_codec/test_apps/audio_codec_test/main/test.flac
+ esp_audio_codec/test_apps/audio_codec_test/main/test.mp3
+5 −0 esp_audio_codec/test_apps/audio_codec_test/sdkconfig.defaults
+12 −0 esp_audio_codec/test_apps/audio_codec_test/sdkconfig.defaults.esp32s3
+10 −4 esp_media_protocols/include/esp_rtc.h
+10 −3 esp_media_protocols/include/esp_rtc_version.h
+4 −2 esp_media_protocols/include/esp_upnp_service.h
+ esp_media_protocols/lib/esp32/libesp_media_protocols.a
+ esp_media_protocols/lib/esp32c3/libesp_media_protocols.a
+ esp_media_protocols/lib/esp32c6/libesp_media_protocols.a
+ esp_media_protocols/lib/esp32p4/libesp_media_protocols.a
+ esp_media_protocols/lib/esp32s2/libesp_media_protocols.a
+ esp_media_protocols/lib/esp32s3/libesp_media_protocols.a
4 changes: 2 additions & 2 deletions examples/protocols/esp-rtc/main/rtc_service.c
Original file line number Diff line number Diff line change
Expand Up @@ -167,13 +167,13 @@ esp_rtc_handle_t rtc_service_start(av_stream_handle_t av_stream, const char *uri
.event_handler = _esp_rtc_event_handler,
};

return esp_rtc_init(&rtc_service_config);
return esp_rtc_service_init(&rtc_service_config);
}

int rtc_service_stop(esp_rtc_handle_t esp_rtc)
{
if (esp_rtc) {
return esp_rtc_deinit(esp_rtc);
return esp_rtc_service_deinit(esp_rtc);
}
return ESP_FAIL;
}
4 changes: 2 additions & 2 deletions examples/protocols/voip/main/sip_service.c
Original file line number Diff line number Diff line change
Expand Up @@ -123,14 +123,14 @@ esp_rtc_handle_t sip_service_start(av_stream_handle_t av_stream, const char *uri
.event_handler = _esp_sip_event_handler,
};

return esp_rtc_init(&sip_service_config);
return esp_rtc_service_init(&sip_service_config);
}

int sip_service_stop(esp_rtc_handle_t esp_sip)
{
int ret = ESP_FAIL;
if (esp_sip) {
return esp_rtc_deinit(esp_sip);
return esp_rtc_service_deinit(esp_sip);
}
return ret;
}

0 comments on commit 5478bce

Please sign in to comment.