1 Commits
Author SHA1 Message Date
TheM14 8be8e895c0 Bump foo_input_joc to 0.6.3 and fix long PCM playback
build / windows (push) Canceled after 0s
build / release (push) Canceled after 0s
- Bump JOC_VERSION to 0.6.3.
- Give each PcmSource a unique temp WAV name (PID + serial + tick) so
  info, playback and next-track instances cannot overwrite or delete each
  other's decoded file.
- Cap read() at the decoded file length so the binaural room tail is not
  delivered as extra playback time.
- Reset the emitted-frame counter on seek.
2026-11-13 13:32:47 +08:00
3 changed files with 18 additions and 4 deletions

No files matched your search

+1 -1
View File
@@ -14,7 +14,7 @@
// Kept in one place: the string reported to foobar2000 and written to the log // Kept in one place: the string reported to foobar2000 and written to the log
// must not drift apart. // must not drift apart.
#define JOC_VERSION "0.6.2" #define JOC_VERSION "0.6.3"
DECLARE_COMPONENT_VERSION("JOC decoder (E-AC-3 JOC)", JOC_VERSION, DECLARE_COMPONENT_VERSION("JOC decoder (E-AC-3 JOC)", JOC_VERSION,
"Plays E-AC-3 JOC (Dolby Atmos) files: the JOC objects are " "Plays E-AC-3 JOC (Dolby Atmos) files: the JOC objects are "
+16 -3
View File
@@ -3,6 +3,7 @@
#include <windows.h> #include <windows.h>
#include <algorithm> #include <algorithm>
#include <atomic>
#include <cstring> #include <cstring>
#include <vector> #include <vector>
@@ -16,6 +17,7 @@ namespace {
constexpr std::size_t kFrameSamples = 1536; constexpr std::size_t kFrameSamples = 1536;
constexpr std::uint32_t kRate = 48000; constexpr std::uint32_t kRate = 48000;
std::atomic<std::uint64_t> g_temp_serial{0};
std::uint16_t u16(const unsigned char* data) { std::uint16_t u16(const unsigned char* data) {
return static_cast<std::uint16_t>(data[0] | (data[1] << 8)); return static_cast<std::uint16_t>(data[0] | (data[1] << 8));
@@ -55,6 +57,10 @@ bool Source::decode_temp(const std::string& input_path, const std::string& ffmpe
if (!temp.empty() && temp.back() != L'\\') temp.push_back(L'\\'); if (!temp.empty() && temp.back() != L'\\') temp.push_back(L'\\');
temp += L"foo_input_joc_pcm_"; temp += L"foo_input_joc_pcm_";
temp += std::to_wstring(GetCurrentProcessId()); temp += std::to_wstring(GetCurrentProcessId());
temp += L"_";
temp += std::to_wstring(g_temp_serial.fetch_add(1, std::memory_order_relaxed));
temp += L"_";
temp += std::to_wstring(GetTickCount64());
temp += L".wav"; temp += L".wav";
temp_path_ = joc_path::to_utf8(temp.c_str()); temp_path_ = joc_path::to_utf8(temp.c_str());
DeleteFileW(joc_path::to_wide_extended(temp_path_).c_str()); DeleteFileW(joc_path::to_wide_extended(temp_path_).c_str());
@@ -231,6 +237,7 @@ bool Source::open(const std::string& input_path, const joc_decode::Settings& set
} }
_fseeki64(file_, static_cast<long long>(header_.data_offset), SEEK_SET); _fseeki64(file_, static_cast<long long>(header_.data_offset), SEEK_SET);
frames_read_ = 0; frames_read_ = 0;
emitted_frames_ = 0;
eof_ = false; eof_ = false;
flushed_ = false; flushed_ = false;
return true; return true;
@@ -289,14 +296,17 @@ bool Source::pull(std::size_t frames, float* destination, std::size_t* produced,
std::size_t Source::read(float* destination, std::size_t frames, std::string* error) { std::size_t Source::read(float* destination, std::size_t frames, std::string* error) {
if (stream_ == nullptr || destination == nullptr || frames == 0u) return 0; if (stream_ == nullptr || destination == nullptr || frames == 0u) return 0;
if (emitted_frames_ >= total_frames_) return 0;
const std::size_t wanted = static_cast<std::size_t>(
std::min<std::uint64_t>(frames, total_frames_ - emitted_frames_));
std::size_t written = 0; std::size_t written = 0;
while (written < frames) { while (written < wanted) {
std::size_t produced = 0; std::size_t produced = 0;
if (!pull(frames - written, destination + written * 2u, &produced, error)) { if (!pull(wanted - written, destination + written * 2u, &produced, error)) {
return written; return written;
} }
written += produced; written += produced;
if (written == frames) break; if (written == wanted) break;
if (!eof_) { if (!eof_) {
if (!push_block(error)) return written; if (!push_block(error)) return written;
continue; continue;
@@ -311,6 +321,7 @@ std::size_t Source::read(float* destination, std::size_t frames, std::string* er
} }
break; break;
} }
emitted_frames_ += written;
return written; return written;
} }
@@ -327,6 +338,7 @@ bool Source::seek(double seconds, std::string* error) {
frame * static_cast<std::uint64_t>(channels_) * 4u), frame * static_cast<std::uint64_t>(channels_) * 4u),
SEEK_SET); SEEK_SET);
frames_read_ = frame; frames_read_ = frame;
emitted_frames_ = frame;
eof_ = frames_read_ >= total_frames_; eof_ = frames_read_ >= total_frames_;
flushed_ = false; flushed_ = false;
return true; return true;
@@ -348,6 +360,7 @@ void Source::close() {
} }
feed_.clear(); feed_.clear();
frames_read_ = 0; frames_read_ = 0;
emitted_frames_ = 0;
total_frames_ = 0; total_frames_ = 0;
length_seconds_ = 0.0; length_seconds_ = 0.0;
eof_ = false; eof_ = false;
+1
View File
@@ -58,6 +58,7 @@ private:
std::string temp_path_; std::string temp_path_;
std::vector<float> feed_; std::vector<float> feed_;
std::uint64_t frames_read_ = 0; std::uint64_t frames_read_ = 0;
std::uint64_t emitted_frames_ = 0;
std::uint64_t total_frames_ = 0; std::uint64_t total_frames_ = 0;
double length_seconds_ = 0.0; double length_seconds_ = 0.0;
bool eof_ = false; bool eof_ = false;