From 63509409e6a4ddfe2241190a480ebdccb891359e Mon Sep 17 00:00:00 2001 From: Victor Gaydov Date: Thu, 16 Nov 2023 19:02:40 +0400 Subject: [PATCH] gh-608 Cleanup pcm funcs --- src/internal_modules/roc_audio/pcm_format.h | 4 +- src/internal_modules/roc_audio/pcm_funcs.h | 210 +++++++++++------- .../roc_audio/pcm_funcs_gen.py | 100 +++++---- src/internal_modules/roc_audio/pcm_mapper.cpp | 4 +- 4 files changed, 191 insertions(+), 127 deletions(-) diff --git a/src/internal_modules/roc_audio/pcm_format.h b/src/internal_modules/roc_audio/pcm_format.h index 7218ec5025..72058c5dbb 100644 --- a/src/internal_modules/roc_audio/pcm_format.h +++ b/src/internal_modules/roc_audio/pcm_format.h @@ -54,7 +54,9 @@ enum PcmCode { enum PcmEndian { PcmEndian_Native, //!< Endian native to current CPU. PcmEndian_Big, //!< Big endian. - PcmEndian_Little //!< Little endian. + PcmEndian_Little, //!< Little endian. + + PcmEndian_Max //!< Maximum value. }; //! PCM format description. diff --git a/src/internal_modules/roc_audio/pcm_funcs.h b/src/internal_modules/roc_audio/pcm_funcs.h index c2c80712f8..fa8d55f9f4 100644 --- a/src/internal_modules/roc_audio/pcm_funcs.h +++ b/src/internal_modules/roc_audio/pcm_funcs.h @@ -12736,178 +12736,182 @@ struct pcm_mapper { } }; -// Sample mapping function -typedef void (*pcm_mapper_func_t)( +// Mapping function +typedef void (*pcm_map_func_t)( const uint8_t* in_data, size_t& in_bit_off, uint8_t* out_data, size_t& out_bit_off, size_t n_samples); -// Select mapper function +// Select mapping function template -pcm_mapper_func_t pcm_mapper_func() { +pcm_map_func_t pcm_map_func() { return &pcm_mapper::map; } -// Select mapper function +// Select mapping function template -pcm_mapper_func_t pcm_mapper_func(PcmEndian out_endian) { +pcm_map_func_t pcm_map_func(PcmEndian out_endian) { switch (out_endian) { case PcmEndian_Native: #if ROC_CPU_ENDIAN == ROC_CPU_BE - return pcm_mapper_func(); + return pcm_map_func(); #else - return pcm_mapper_func(); + return pcm_map_func(); #endif case PcmEndian_Big: - return pcm_mapper_func(); + return pcm_map_func(); case PcmEndian_Little: - return pcm_mapper_func(); + return pcm_map_func(); + case PcmEndian_Max: + break; } return NULL; } -// Select mapper function +// Select mapping function template -pcm_mapper_func_t pcm_mapper_func(PcmEndian in_endian, PcmEndian out_endian) { +pcm_map_func_t pcm_map_func(PcmEndian in_endian, PcmEndian out_endian) { switch (in_endian) { case PcmEndian_Native: #if ROC_CPU_ENDIAN == ROC_CPU_BE - return pcm_mapper_func(out_endian); + return pcm_map_func(out_endian); #else - return pcm_mapper_func(out_endian); + return pcm_map_func(out_endian); #endif case PcmEndian_Big: - return pcm_mapper_func(out_endian); + return pcm_map_func(out_endian); case PcmEndian_Little: - return pcm_mapper_func(out_endian); + return pcm_map_func(out_endian); + case PcmEndian_Max: + break; } return NULL; } -// Select mapper function +// Select mapping function template -inline pcm_mapper_func_t pcm_mapper_func(PcmCode out_code, - PcmEndian in_endian, - PcmEndian out_endian) { +inline pcm_map_func_t pcm_map_func(PcmCode out_code, + PcmEndian in_endian, + PcmEndian out_endian) { switch (out_code) { case PcmCode_SInt8: - return pcm_mapper_func(in_endian, out_endian); + return pcm_map_func(in_endian, out_endian); case PcmCode_UInt8: - return pcm_mapper_func(in_endian, out_endian); + return pcm_map_func(in_endian, out_endian); case PcmCode_SInt16: - return pcm_mapper_func(in_endian, out_endian); + return pcm_map_func(in_endian, out_endian); case PcmCode_UInt16: - return pcm_mapper_func(in_endian, out_endian); + return pcm_map_func(in_endian, out_endian); case PcmCode_SInt18: - return pcm_mapper_func(in_endian, out_endian); + return pcm_map_func(in_endian, out_endian); case PcmCode_UInt18: - return pcm_mapper_func(in_endian, out_endian); + return pcm_map_func(in_endian, out_endian); case PcmCode_SInt18_3: - return pcm_mapper_func(in_endian, out_endian); + return pcm_map_func(in_endian, out_endian); case PcmCode_UInt18_3: - return pcm_mapper_func(in_endian, out_endian); + return pcm_map_func(in_endian, out_endian); case PcmCode_SInt18_4: - return pcm_mapper_func(in_endian, out_endian); + return pcm_map_func(in_endian, out_endian); case PcmCode_UInt18_4: - return pcm_mapper_func(in_endian, out_endian); + return pcm_map_func(in_endian, out_endian); case PcmCode_SInt20: - return pcm_mapper_func(in_endian, out_endian); + return pcm_map_func(in_endian, out_endian); case PcmCode_UInt20: - return pcm_mapper_func(in_endian, out_endian); + return pcm_map_func(in_endian, out_endian); case PcmCode_SInt20_3: - return pcm_mapper_func(in_endian, out_endian); + return pcm_map_func(in_endian, out_endian); case PcmCode_UInt20_3: - return pcm_mapper_func(in_endian, out_endian); + return pcm_map_func(in_endian, out_endian); case PcmCode_SInt20_4: - return pcm_mapper_func(in_endian, out_endian); + return pcm_map_func(in_endian, out_endian); case PcmCode_UInt20_4: - return pcm_mapper_func(in_endian, out_endian); + return pcm_map_func(in_endian, out_endian); case PcmCode_SInt24: - return pcm_mapper_func(in_endian, out_endian); + return pcm_map_func(in_endian, out_endian); case PcmCode_UInt24: - return pcm_mapper_func(in_endian, out_endian); + return pcm_map_func(in_endian, out_endian); case PcmCode_SInt24_4: - return pcm_mapper_func(in_endian, out_endian); + return pcm_map_func(in_endian, out_endian); case PcmCode_UInt24_4: - return pcm_mapper_func(in_endian, out_endian); + return pcm_map_func(in_endian, out_endian); case PcmCode_SInt32: - return pcm_mapper_func(in_endian, out_endian); + return pcm_map_func(in_endian, out_endian); case PcmCode_UInt32: - return pcm_mapper_func(in_endian, out_endian); + return pcm_map_func(in_endian, out_endian); case PcmCode_SInt64: - return pcm_mapper_func(in_endian, out_endian); + return pcm_map_func(in_endian, out_endian); case PcmCode_UInt64: - return pcm_mapper_func(in_endian, out_endian); + return pcm_map_func(in_endian, out_endian); case PcmCode_Float32: - return pcm_mapper_func(in_endian, out_endian); + return pcm_map_func(in_endian, out_endian); case PcmCode_Float64: - return pcm_mapper_func(in_endian, out_endian); + return pcm_map_func(in_endian, out_endian); case PcmCode_Max: break; } return NULL; } -// Select mapper function -inline pcm_mapper_func_t pcm_mapper_func(PcmCode in_code, - PcmCode out_code, - PcmEndian in_endian, - PcmEndian out_endian) { +// Select mapping function +inline pcm_map_func_t pcm_map_func(PcmCode in_code, + PcmCode out_code, + PcmEndian in_endian, + PcmEndian out_endian) { switch (in_code) { case PcmCode_SInt8: - return pcm_mapper_func(out_code, in_endian, out_endian); + return pcm_map_func(out_code, in_endian, out_endian); case PcmCode_UInt8: - return pcm_mapper_func(out_code, in_endian, out_endian); + return pcm_map_func(out_code, in_endian, out_endian); case PcmCode_SInt16: - return pcm_mapper_func(out_code, in_endian, out_endian); + return pcm_map_func(out_code, in_endian, out_endian); case PcmCode_UInt16: - return pcm_mapper_func(out_code, in_endian, out_endian); + return pcm_map_func(out_code, in_endian, out_endian); case PcmCode_SInt18: - return pcm_mapper_func(out_code, in_endian, out_endian); + return pcm_map_func(out_code, in_endian, out_endian); case PcmCode_UInt18: - return pcm_mapper_func(out_code, in_endian, out_endian); + return pcm_map_func(out_code, in_endian, out_endian); case PcmCode_SInt18_3: - return pcm_mapper_func(out_code, in_endian, out_endian); + return pcm_map_func(out_code, in_endian, out_endian); case PcmCode_UInt18_3: - return pcm_mapper_func(out_code, in_endian, out_endian); + return pcm_map_func(out_code, in_endian, out_endian); case PcmCode_SInt18_4: - return pcm_mapper_func(out_code, in_endian, out_endian); + return pcm_map_func(out_code, in_endian, out_endian); case PcmCode_UInt18_4: - return pcm_mapper_func(out_code, in_endian, out_endian); + return pcm_map_func(out_code, in_endian, out_endian); case PcmCode_SInt20: - return pcm_mapper_func(out_code, in_endian, out_endian); + return pcm_map_func(out_code, in_endian, out_endian); case PcmCode_UInt20: - return pcm_mapper_func(out_code, in_endian, out_endian); + return pcm_map_func(out_code, in_endian, out_endian); case PcmCode_SInt20_3: - return pcm_mapper_func(out_code, in_endian, out_endian); + return pcm_map_func(out_code, in_endian, out_endian); case PcmCode_UInt20_3: - return pcm_mapper_func(out_code, in_endian, out_endian); + return pcm_map_func(out_code, in_endian, out_endian); case PcmCode_SInt20_4: - return pcm_mapper_func(out_code, in_endian, out_endian); + return pcm_map_func(out_code, in_endian, out_endian); case PcmCode_UInt20_4: - return pcm_mapper_func(out_code, in_endian, out_endian); + return pcm_map_func(out_code, in_endian, out_endian); case PcmCode_SInt24: - return pcm_mapper_func(out_code, in_endian, out_endian); + return pcm_map_func(out_code, in_endian, out_endian); case PcmCode_UInt24: - return pcm_mapper_func(out_code, in_endian, out_endian); + return pcm_map_func(out_code, in_endian, out_endian); case PcmCode_SInt24_4: - return pcm_mapper_func(out_code, in_endian, out_endian); + return pcm_map_func(out_code, in_endian, out_endian); case PcmCode_UInt24_4: - return pcm_mapper_func(out_code, in_endian, out_endian); + return pcm_map_func(out_code, in_endian, out_endian); case PcmCode_SInt32: - return pcm_mapper_func(out_code, in_endian, out_endian); + return pcm_map_func(out_code, in_endian, out_endian); case PcmCode_UInt32: - return pcm_mapper_func(out_code, in_endian, out_endian); + return pcm_map_func(out_code, in_endian, out_endian); case PcmCode_SInt64: - return pcm_mapper_func(out_code, in_endian, out_endian); + return pcm_map_func(out_code, in_endian, out_endian); case PcmCode_UInt64: - return pcm_mapper_func(out_code, in_endian, out_endian); + return pcm_map_func(out_code, in_endian, out_endian); case PcmCode_Float32: - return pcm_mapper_func(out_code, in_endian, out_endian); + return pcm_map_func(out_code, in_endian, out_endian); case PcmCode_Float64: - return pcm_mapper_func(out_code, in_endian, out_endian); + return pcm_map_func(out_code, in_endian, out_endian); case PcmCode_Max: break; } @@ -13169,6 +13173,8 @@ inline const char* pcm_to_str(PcmCode code, PcmEndian endian) { return "s8_be"; case PcmEndian_Little: return "s8_le"; + case PcmEndian_Max: + break; } break; case PcmCode_UInt8: @@ -13179,6 +13185,8 @@ inline const char* pcm_to_str(PcmCode code, PcmEndian endian) { return "u8_be"; case PcmEndian_Little: return "u8_le"; + case PcmEndian_Max: + break; } break; case PcmCode_SInt16: @@ -13189,6 +13197,8 @@ inline const char* pcm_to_str(PcmCode code, PcmEndian endian) { return "s16_be"; case PcmEndian_Little: return "s16_le"; + case PcmEndian_Max: + break; } break; case PcmCode_UInt16: @@ -13199,6 +13209,8 @@ inline const char* pcm_to_str(PcmCode code, PcmEndian endian) { return "u16_be"; case PcmEndian_Little: return "u16_le"; + case PcmEndian_Max: + break; } break; case PcmCode_SInt18: @@ -13209,6 +13221,8 @@ inline const char* pcm_to_str(PcmCode code, PcmEndian endian) { return "s18_be"; case PcmEndian_Little: return "s18_le"; + case PcmEndian_Max: + break; } break; case PcmCode_UInt18: @@ -13219,6 +13233,8 @@ inline const char* pcm_to_str(PcmCode code, PcmEndian endian) { return "u18_be"; case PcmEndian_Little: return "u18_le"; + case PcmEndian_Max: + break; } break; case PcmCode_SInt18_3: @@ -13229,6 +13245,8 @@ inline const char* pcm_to_str(PcmCode code, PcmEndian endian) { return "s18_3be"; case PcmEndian_Little: return "s18_3le"; + case PcmEndian_Max: + break; } break; case PcmCode_UInt18_3: @@ -13239,6 +13257,8 @@ inline const char* pcm_to_str(PcmCode code, PcmEndian endian) { return "u18_3be"; case PcmEndian_Little: return "u18_3le"; + case PcmEndian_Max: + break; } break; case PcmCode_SInt18_4: @@ -13249,6 +13269,8 @@ inline const char* pcm_to_str(PcmCode code, PcmEndian endian) { return "s18_4be"; case PcmEndian_Little: return "s18_4le"; + case PcmEndian_Max: + break; } break; case PcmCode_UInt18_4: @@ -13259,6 +13281,8 @@ inline const char* pcm_to_str(PcmCode code, PcmEndian endian) { return "u18_4be"; case PcmEndian_Little: return "u18_4le"; + case PcmEndian_Max: + break; } break; case PcmCode_SInt20: @@ -13269,6 +13293,8 @@ inline const char* pcm_to_str(PcmCode code, PcmEndian endian) { return "s20_be"; case PcmEndian_Little: return "s20_le"; + case PcmEndian_Max: + break; } break; case PcmCode_UInt20: @@ -13279,6 +13305,8 @@ inline const char* pcm_to_str(PcmCode code, PcmEndian endian) { return "u20_be"; case PcmEndian_Little: return "u20_le"; + case PcmEndian_Max: + break; } break; case PcmCode_SInt20_3: @@ -13289,6 +13317,8 @@ inline const char* pcm_to_str(PcmCode code, PcmEndian endian) { return "s20_3be"; case PcmEndian_Little: return "s20_3le"; + case PcmEndian_Max: + break; } break; case PcmCode_UInt20_3: @@ -13299,6 +13329,8 @@ inline const char* pcm_to_str(PcmCode code, PcmEndian endian) { return "u20_3be"; case PcmEndian_Little: return "u20_3le"; + case PcmEndian_Max: + break; } break; case PcmCode_SInt20_4: @@ -13309,6 +13341,8 @@ inline const char* pcm_to_str(PcmCode code, PcmEndian endian) { return "s20_4be"; case PcmEndian_Little: return "s20_4le"; + case PcmEndian_Max: + break; } break; case PcmCode_UInt20_4: @@ -13319,6 +13353,8 @@ inline const char* pcm_to_str(PcmCode code, PcmEndian endian) { return "u20_4be"; case PcmEndian_Little: return "u20_4le"; + case PcmEndian_Max: + break; } break; case PcmCode_SInt24: @@ -13329,6 +13365,8 @@ inline const char* pcm_to_str(PcmCode code, PcmEndian endian) { return "s24_be"; case PcmEndian_Little: return "s24_le"; + case PcmEndian_Max: + break; } break; case PcmCode_UInt24: @@ -13339,6 +13377,8 @@ inline const char* pcm_to_str(PcmCode code, PcmEndian endian) { return "u24_be"; case PcmEndian_Little: return "u24_le"; + case PcmEndian_Max: + break; } break; case PcmCode_SInt24_4: @@ -13349,6 +13389,8 @@ inline const char* pcm_to_str(PcmCode code, PcmEndian endian) { return "s24_4be"; case PcmEndian_Little: return "s24_4le"; + case PcmEndian_Max: + break; } break; case PcmCode_UInt24_4: @@ -13359,6 +13401,8 @@ inline const char* pcm_to_str(PcmCode code, PcmEndian endian) { return "u24_4be"; case PcmEndian_Little: return "u24_4le"; + case PcmEndian_Max: + break; } break; case PcmCode_SInt32: @@ -13369,6 +13413,8 @@ inline const char* pcm_to_str(PcmCode code, PcmEndian endian) { return "s32_be"; case PcmEndian_Little: return "s32_le"; + case PcmEndian_Max: + break; } break; case PcmCode_UInt32: @@ -13379,6 +13425,8 @@ inline const char* pcm_to_str(PcmCode code, PcmEndian endian) { return "u32_be"; case PcmEndian_Little: return "u32_le"; + case PcmEndian_Max: + break; } break; case PcmCode_SInt64: @@ -13389,6 +13437,8 @@ inline const char* pcm_to_str(PcmCode code, PcmEndian endian) { return "s64_be"; case PcmEndian_Little: return "s64_le"; + case PcmEndian_Max: + break; } break; case PcmCode_UInt64: @@ -13399,6 +13449,8 @@ inline const char* pcm_to_str(PcmCode code, PcmEndian endian) { return "u64_be"; case PcmEndian_Little: return "u64_le"; + case PcmEndian_Max: + break; } break; case PcmCode_Float32: @@ -13409,6 +13461,8 @@ inline const char* pcm_to_str(PcmCode code, PcmEndian endian) { return "f32_be"; case PcmEndian_Little: return "f32_le"; + case PcmEndian_Max: + break; } break; case PcmCode_Float64: @@ -13419,6 +13473,8 @@ inline const char* pcm_to_str(PcmCode code, PcmEndian endian) { return "f64_be"; case PcmEndian_Little: return "f64_le"; + case PcmEndian_Max: + break; } break; case PcmCode_Max: diff --git a/src/internal_modules/roc_audio/pcm_funcs_gen.py b/src/internal_modules/roc_audio/pcm_funcs_gen.py index 41ff268550..a8508e766c 100755 --- a/src/internal_modules/roc_audio/pcm_funcs_gen.py +++ b/src/internal_modules/roc_audio/pcm_funcs_gen.py @@ -812,69 +812,73 @@ def nth_chars(codes, prefix=()): } }; -// Sample mapping function -typedef void (*pcm_mapper_func_t)( +// Mapping function +typedef void (*pcm_map_func_t)( const uint8_t* in_data, size_t& in_bit_off, uint8_t* out_data, size_t& out_bit_off, size_t n_samples); -// Select mapper function +// Select mapping function template -pcm_mapper_func_t pcm_mapper_func() { +pcm_map_func_t pcm_map_func() { return &pcm_mapper::map; } -// Select mapper function +// Select mapping function template -pcm_mapper_func_t pcm_mapper_func(PcmEndian out_endian) { +pcm_map_func_t pcm_map_func(PcmEndian out_endian) { switch (out_endian) { -{% for e in ENDIANS %} - case PcmEndian_{{ e }}: -{% if e == 'Native' %} +{% for endian in ENDIANS %} + case PcmEndian_{{ endian }}: +{% if endian == 'Native' %} #if ROC_CPU_ENDIAN == ROC_CPU_BE - return pcm_mapper_func(); + return pcm_map_func(); #else - return pcm_mapper_func(); + return pcm_map_func(); #endif {% else %} - return pcm_mapper_func(); + return pcm_map_func(); {% endif %} {% endfor %} + case PcmEndian_Max: + break; } return NULL; } -// Select mapper function +// Select mapping function template -pcm_mapper_func_t pcm_mapper_func(PcmEndian in_endian, PcmEndian out_endian) { +pcm_map_func_t pcm_map_func(PcmEndian in_endian, PcmEndian out_endian) { switch (in_endian) { -{% for e in ENDIANS %} - case PcmEndian_{{ e }}: -{% if e == 'Native' %} +{% for endian in ENDIANS %} + case PcmEndian_{{ endian }}: +{% if endian == 'Native' %} #if ROC_CPU_ENDIAN == ROC_CPU_BE - return pcm_mapper_func(out_endian); + return pcm_map_func(out_endian); #else - return pcm_mapper_func(out_endian); + return pcm_map_func(out_endian); #endif {% else %} - return pcm_mapper_func(out_endian); + return pcm_map_func(out_endian); {% endif %} {% endfor %} + case PcmEndian_Max: + break; } return NULL; } -// Select mapper function +// Select mapping function template -inline pcm_mapper_func_t pcm_mapper_func(PcmCode out_code, - PcmEndian in_endian, - PcmEndian out_endian) { +inline pcm_map_func_t pcm_map_func(PcmCode out_code, + PcmEndian in_endian, + PcmEndian out_endian) { switch (out_code) { -{% for e in CODES %} - case PcmCode_{{ e.code }}: - return pcm_mapper_func(in_endian, out_endian); +{% for code in CODES %} + case PcmCode_{{ code.code }}: + return pcm_map_func(in_endian, out_endian); {% endfor %} case PcmCode_Max: break; @@ -882,15 +886,15 @@ def nth_chars(codes, prefix=()): return NULL; } -// Select mapper function -inline pcm_mapper_func_t pcm_mapper_func(PcmCode in_code, - PcmCode out_code, - PcmEndian in_endian, - PcmEndian out_endian) { +// Select mapping function +inline pcm_map_func_t pcm_map_func(PcmCode in_code, + PcmCode out_code, + PcmEndian in_endian, + PcmEndian out_endian) { switch (in_code) { -{% for e in CODES %} - case PcmCode_{{ e.code }}: - return pcm_mapper_func(out_code, \ +{% for code in CODES %} + case PcmCode_{{ code.code }}: + return pcm_map_func(out_code, \ in_endian, out_endian); {% endfor %} case PcmCode_Max: @@ -902,9 +906,9 @@ def nth_chars(codes, prefix=()): // Get number of meaningful bits per sample inline size_t pcm_bit_depth(PcmCode code) { switch (code) { -{% for e in CODES %} - case PcmCode_{{ e.code }}: - return {{ e.width }}; +{% for code in CODES %} + case PcmCode_{{ code.code }}: + return {{ code.width }}; {% endfor %} case PcmCode_Max: break; @@ -915,9 +919,9 @@ def nth_chars(codes, prefix=()): // Get number of total bits per sample inline size_t pcm_bit_width(PcmCode code) { switch (code) { -{% for e in CODES %} - case PcmCode_{{ e.code }}: - return {{ e.packed_width }}; +{% for code in CODES %} + case PcmCode_{{ code.code }}: + return {{ code.packed_width }}; {% endfor %} case PcmCode_Max: break; @@ -928,9 +932,9 @@ def nth_chars(codes, prefix=()): // Check if code is integer inline size_t pcm_is_integer(PcmCode code) { switch (code) { -{% for e in CODES %} - case PcmCode_{{ e.code }}: - return {{ str(e.is_integer).lower() }}; +{% for code in CODES %} + case PcmCode_{{ code.code }}: + return {{ str(code.is_integer).lower() }}; {% endfor %} case PcmCode_Max: break; @@ -941,9 +945,9 @@ def nth_chars(codes, prefix=()): // Check if code is signed inline size_t pcm_is_signed(PcmCode code) { switch (code) { -{% for e in CODES %} - case PcmCode_{{ e.code }}: - return {{ str(e.is_signed).lower() }}; +{% for code in CODES %} + case PcmCode_{{ code.code }}: + return {{ str(code.is_signed).lower() }}; {% endfor %} case PcmCode_Max: break; @@ -961,6 +965,8 @@ def nth_chars(codes, prefix=()): case PcmEndian_{{ endian }}: return "{{ short_name(code, endian) }}"; {% endfor %} + case PcmEndian_Max: + break; } break; {% endfor %} diff --git a/src/internal_modules/roc_audio/pcm_mapper.cpp b/src/internal_modules/roc_audio/pcm_mapper.cpp index 6171abb0e7..7d863ba1ca 100644 --- a/src/internal_modules/roc_audio/pcm_mapper.cpp +++ b/src/internal_modules/roc_audio/pcm_mapper.cpp @@ -19,10 +19,10 @@ PcmMapper::PcmMapper(const PcmFormat& input_fmt, const PcmFormat& output_fmt) , output_fmt_(output_fmt) , input_sample_bits_(pcm_bit_width(input_fmt.code)) , output_sample_bits_(pcm_bit_width(output_fmt.code)) - , map_func_(pcm_mapper_func( + , map_func_(pcm_map_func( input_fmt_.code, output_fmt_.code, input_fmt_.endian, output_fmt_.endian)) { if (!map_func_) { - roc_panic("pcm mapper: unable to select mapper function"); + roc_panic("pcm mapper: unable to select mapping function"); } }