Remove the cache lines the decoder was left with
The previous change dropped the SOFA input but left two lines of the old disk cache block inside create(): the stream config was still assigned hrtf_cache_policy, which the kernel no longer has, and the brace that closed the block ended the binaural branch early. Both compilers stopped there, so the Windows and the Android build agreed on the error. The frame-length message in feed() is a size_t and uses %zu now, which the same build reported as a warning.
This commit is contained in:
1 parent
a2471ce502
commit
f555235f2b
1 file changed
+1
-3
@@ -209,7 +209,7 @@ static void feed(struct priv *p, int end_of_stream)
|
|||||||
in.byte_count = (uint32_t)bytes;
|
in.byte_count = (uint32_t)bytes;
|
||||||
uint32_t consumed = 0;
|
uint32_t consumed = 0;
|
||||||
if (joc_stream_push(p->stream, &in, NULL, &consumed) != JOC_OK) {
|
if (joc_stream_push(p->stream, &in, NULL, &consumed) != JOC_OK) {
|
||||||
MP_ERR(p->public.f, "renderer refused an E-AC-3 frame (%u bytes): %s\n",
|
MP_ERR(p->public.f, "renderer refused an E-AC-3 frame (%zu bytes): %s\n",
|
||||||
bytes, joc_last_error_detail());
|
bytes, joc_last_error_detail());
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@@ -779,8 +779,6 @@ static struct mp_decoder *create(struct mp_filter *parent,
|
|||||||
cfg.object_delay_samples = 1473;
|
cfg.object_delay_samples = 1473;
|
||||||
if (binaural) {
|
if (binaural) {
|
||||||
cfg.personalized_headphone_path = hrtf_path;
|
cfg.personalized_headphone_path = hrtf_path;
|
||||||
cfg.hrtf_cache_policy = 1;
|
|
||||||
}
|
|
||||||
} else {
|
} else {
|
||||||
cfg.speaker_layout_name = layout;
|
cfg.speaker_layout_name = layout;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in new issue
Block a user