summaryrefslogtreecommitdiff
path: root/src/codecs
diff options
context:
space:
mode:
authorjacqueline <me@jacqueline.id.au>2023-09-26 13:36:07 +1000
committerjacqueline <me@jacqueline.id.au>2023-09-26 13:36:07 +1000
commit4d99d22e10a3cb2a421da1618c127128816613c9 (patch)
tree527490a466348e5cf40cf10a8f3768aa5be4e7c1 /src/codecs
parentf6d06421090f88094aba76b72b04d614f54efafa (diff)
downloadtangara-fw-4d99d22e10a3cb2a421da1618c127128816613c9.tar.gz
std::string -> std::pmr::string in psram
Diffstat (limited to 'src/codecs')
-rw-r--r--src/codecs/CMakeLists.txt2
-rw-r--r--src/codecs/include/codec.hpp4
-rw-r--r--src/codecs/opus.cpp2
-rw-r--r--src/codecs/vorbis.cpp2
4 files changed, 6 insertions, 4 deletions
diff --git a/src/codecs/CMakeLists.txt b/src/codecs/CMakeLists.txt
index 2d98198b..748e1440 100644
--- a/src/codecs/CMakeLists.txt
+++ b/src/codecs/CMakeLists.txt
@@ -6,6 +6,6 @@ idf_component_register(
SRCS "codec.cpp" "mad.cpp" "foxenflac.cpp" "opus.cpp" "vorbis.cpp"
"source_buffer.cpp"
INCLUDE_DIRS "include"
- REQUIRES "result" "span" "libmad" "libfoxenflac" "tremor" "opusfile")
+ REQUIRES "result" "span" "libmad" "libfoxenflac" "tremor" "opusfile" "memory")
target_compile_options("${COMPONENT_LIB}" PRIVATE ${EXTRA_WARNINGS})
diff --git a/src/codecs/include/codec.hpp b/src/codecs/include/codec.hpp
index 2f95389c..67358d54 100644
--- a/src/codecs/include/codec.hpp
+++ b/src/codecs/include/codec.hpp
@@ -21,6 +21,8 @@
#include "span.hpp"
#include "types.hpp"
+#include "memory_resource.hpp"
+
namespace codecs {
/*
@@ -69,7 +71,7 @@ class ICodec {
kInternalError,
};
- static auto ErrorString(Error err) -> std::string {
+ static auto ErrorString(Error err) -> std::pmr::string {
switch (err) {
case Error::kOutOfInput:
return "out of input";
diff --git a/src/codecs/opus.cpp b/src/codecs/opus.cpp
index 6e9512b1..448e9eb4 100644
--- a/src/codecs/opus.cpp
+++ b/src/codecs/opus.cpp
@@ -86,7 +86,7 @@ auto XiphOpusDecoder::OpenStream(std::shared_ptr<IStream> input)
opus_ = op_open_callbacks(input.get(), &kCallbacks, nullptr, 0, &res);
if (res < 0) {
- std::string err;
+ std::pmr::string err;
switch (res) {
case OP_EREAD:
err = "OP_EREAD";
diff --git a/src/codecs/vorbis.cpp b/src/codecs/vorbis.cpp
index 750ac9a8..f553bb42 100644
--- a/src/codecs/vorbis.cpp
+++ b/src/codecs/vorbis.cpp
@@ -88,7 +88,7 @@ auto TremorVorbisDecoder::OpenStream(std::shared_ptr<IStream> input)
-> cpp::result<OutputFormat, Error> {
int res = ov_open_callbacks(input.get(), &vorbis_, NULL, 0, kCallbacks);
if (res < 0) {
- std::string err;
+ std::pmr::string err;
switch (res) {
case OV_EREAD:
err = "OV_EREAD";