Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* C8 conversion * C8 conversion * C8 support * C8 support * C8 support * C8 support * Don't auto-convert GPS C8 files * C8 support * C8 support * C8 support * Remove hang workaround (different PR) * Comment change * Clang * Clang * Clang * Merged change from PR #1287 * C8 support * C8 support * Improve bandwidth display * Merged minor optimization from PR 1289 * Merge change from PR 1289 * Use complex types for C8/C16 conversion * C8 support * C8 support * C8 support * C8 support * Roll back changes * Roll back C8 changes * C8 support * C8 support * C8 support * C8 support * C8 support * Don't transmit samples past EOF * Don't transmit samples past EOF * Clang * Clang attempt * Clang attempt * C8 support * Clang
- Loading branch information
1 parent
8eafe27
commit d6b0173
Showing
14 changed files
with
302 additions
and
46 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,119 @@ | ||
| /* | ||
| * Copyright (C) 2023 Mark Thompson | ||
| * | ||
| * This file is part of PortaPack. | ||
| * | ||
| * This program is free software; you can redistribute it and/or modify | ||
| * it under the terms of the GNU General Public License as published by | ||
| * the Free Software Foundation; either version 2, or (at your option) | ||
| * any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU General Public License | ||
| * along with this program; see the file COPYING. If not, write to | ||
| * the Free Software Foundation, Inc., 51 Franklin Street, | ||
| * Boston, MA 02110-1301, USA. | ||
| */ | ||
|
|
||
| #include "io_convert.hpp" | ||
| #include "complex.hpp" | ||
|
|
||
| namespace fs = std::filesystem; | ||
| static const fs::path c8_ext = u".C8"; | ||
| static const fs::path c32_ext = u".C32"; | ||
|
|
||
| namespace file_convert { | ||
|
|
||
| // Convert buffer contents from c16 to c8. | ||
| // Same buffer used for input & output; input size is bytes; output size is bytes/2. | ||
| void c16_to_c8(const void* buffer, File::Size bytes) { | ||
| complex16_t* src = (complex16_t*)buffer; | ||
| complex8_t* dest = (complex8_t*)buffer; | ||
|
|
||
| for (File::Size i = 0; i < bytes / sizeof(complex16_t); i++) { | ||
| auto re_out = src[i].real() >> 8; | ||
| auto im_out = src[i].imag() >> 8; | ||
| dest[i] = {(int8_t)re_out, (int8_t)im_out}; | ||
| } | ||
| } | ||
|
|
||
| // Convert c8 buffer to c16 buffer. | ||
| // Same buffer used for input & output; input size is bytes; output size is 2*bytes. | ||
| void c8_to_c16(const void* buffer, File::Size bytes) { | ||
| complex8_t* src = (complex8_t*)buffer; | ||
| complex16_t* dest = (complex16_t*)buffer; | ||
| uint32_t i = bytes / sizeof(complex8_t); | ||
|
|
||
| if (i != 0) { | ||
| do { | ||
| i--; | ||
| auto re_out = (int16_t)src[i].real() * 256; // C8 to C16 conversion; | ||
| auto im_out = (int16_t)src[i].imag() * 256; // Can't shift signed numbers left, so using multiply | ||
| dest[i] = {(int16_t)re_out, (int16_t)im_out}; | ||
| } while (i != 0); | ||
| } | ||
| } | ||
|
|
||
| // Convert c32 buffer to c16 buffer. | ||
| // Same buffer used for input & output; input size is bytes; output size is bytes/2. | ||
| void c32_to_c16(const void* buffer, File::Size bytes) { | ||
| complex32_t* src = (complex32_t*)buffer; | ||
| complex16_t* dest = (complex16_t*)buffer; | ||
|
|
||
| for (File::Size i = 0; i < bytes / sizeof(complex32_t); i++) { | ||
| auto re_out = src[i].real() >> 16; | ||
| auto im_out = src[i].imag() >> 16; | ||
| dest[i] = {(int8_t)re_out, (int8_t)im_out}; | ||
| } | ||
| } | ||
|
|
||
| } /* namespace file_convert */ | ||
|
|
||
| // Automatically enables C8/C16 or C32/C16 conversion based on file extension | ||
| Optional<File::Error> FileConvertReader::open(const std::filesystem::path& filename) { | ||
| convert_c8_to_c16 = path_iequal(filename.extension(), c8_ext); | ||
| convert_c32_to_c16 = path_iequal(filename.extension(), c32_ext); | ||
| return file_.open(filename); | ||
| } | ||
|
|
||
| // If C8 conversion enabled, half the number of bytes are read from the file & expanded to fill the whole buffer. | ||
| // If C32 conversion enabled, the full byte count is read from the file, and compressed to half the buffer size. | ||
| File::Result<File::Size> FileConvertReader::read(void* const buffer, const File::Size bytes) { | ||
| auto read_result = file_.read(buffer, convert_c8_to_c16 ? bytes / 2 : bytes); | ||
| if (read_result.is_ok()) { | ||
| if (convert_c8_to_c16) { | ||
| file_convert::c8_to_c16(buffer, read_result.value()); | ||
| read_result = read_result.value() * 2; | ||
| } else if (convert_c32_to_c16) { | ||
| file_convert::c32_to_c16(buffer, read_result.value()); | ||
| read_result = read_result.value() / 2; | ||
| } | ||
| bytes_read_ += read_result.value(); | ||
| } | ||
| return read_result; | ||
| } | ||
|
|
||
| // Automatically enables C8/C16 conversion based on file extension | ||
| Optional<File::Error> FileConvertWriter::create(const std::filesystem::path& filename) { | ||
| convert_c16_to_c8 = path_iequal(filename.extension(), c8_ext); | ||
| return file_.create(filename); | ||
| } | ||
|
|
||
| // If C8 conversion is enabled, half the number of bytes are written to the file. | ||
| File::Result<File::Size> FileConvertWriter::write(const void* const buffer, const File::Size bytes) { | ||
| if (convert_c16_to_c8) { | ||
| file_convert::c16_to_c8(buffer, bytes); | ||
| } | ||
| auto write_result = file_.write(buffer, convert_c16_to_c8 ? bytes / 2 : bytes); | ||
| if (write_result.is_ok()) { | ||
| if (convert_c16_to_c8) { | ||
| write_result = write_result.value() * 2; | ||
| } | ||
| bytes_written_ += write_result.value(); | ||
| } | ||
| return write_result; | ||
| } |
Oops, something went wrong.