ZGaetano
2f37119379
Re-engineer the framecache so each video frame carries its own SDI-embedded
audio through ONE transport, eliminating the "audio ahead of video" offset at
the root: there is no longer a second independent audio buffer/FIFO that can
race ahead of video.
slot.h (FC_VERSION 1 -> 2):
- Per ring entry data region is now [video frame_size][audio FC_MAX_AUDIO_BYTES].
- fc_frame_t: the former _pad u32 is REUSED as audio_size (header still 24B).
- Header gains audio_max_bytes / audio_rate / audio_channels (self-describing).
- New fc_entry_stride()/fc_frame_audio() helpers; shm size includes audio.
- Readers/writer check version == FC_VERSION and FAIL SAFE on mismatch so an
old reader against a new writer (or vice-versa) refuses rather than misparses.
slot.c: populate audio header fields; add fc_slot_write_av(); version gate in open.
fc_client.[ch]: fc_frame_ref_t gains audio/audio_size; copy buffer holds
video+audio; both copied from the SAME entry in one read -> frame-locked.
fc_pipe.c: now <slot_id> <wait_ms> <audio_fifo_path>; per ring entry writes
video -> stdout AND that frame's audio -> the audio FIFO IN LOCKSTEP from one
cursor read (no second buffer to drift). Auto-reattaches FIFO on EPIPE.
deltacast-bridge:
- SILENT-AUDIO FIX: audio_extract_init now configures ONLY pAudioChannels[0]
of group 0 as one stereo pair (Mode=STEREO, BufferFormat=AF_16, pData=buf),
leaving pAudioChannels[1] ZEROED, exactly like Deltacast's own FFmpeg fork
(libavdevice/videomaster_common.c init_audio_info). The prior JOINED code
ALSO set channel[1].Mode/BufferFormat=STEREO/AF_16, declaring a second pair
the signal does not carry -> VHD_SlotExtractAudio returned zero samples ->
-91 dB silent audio. DataSize is (re)set to capacity before each extract.
- VHD_SDI_SP_INTERFACE now set from the channel-detected interface
(VHD_SDI_CP_INTERFACE) before StartStream, per the same fork — required for
embedded-audio extraction on JOINED SDI streams.
- fc_writer.[ch]: add fc_writer_write_av(); struct/stride bumped to v2.
- video_thread (framecache path) extracts each frame's audio from the SAME
locked JOINED slot and writes BOTH via fc_writer_write_av. Silence fallback
at the source: a frame with no embedded audio gets one frame-interval of
silence so the audio timeline length always equals the video timeline length.
- The separate audio FIFO + audio_thread + apcm ring are retained ONLY for the
legacy (-DLEGACY_FIFO / framecache-unreachable) fallback; on the primary
framecache path the bridge no longer owns the audio FIFO.
capture-manager.js: deltacast/sdi framecache branch now CREATES the audio FIFO
and passes its path to fc_pipe (argv[3]); ffmpeg keeps two raw inputs
(rawvideo pipe:0 + s16le 48k input 1) but both are now fed frame-locked from
the same ring entry. Stale-audio pre-flush retained as harmless safety.
All changes versioned; mismatched binaries refuse to attach (fail safe).
61 lines
2 KiB
C
61 lines
2 KiB
C
/**
|
|
* fc_writer.h — Lightweight framecache slot writer for deltacast-bridge.
|
|
*
|
|
* Registers a slot with the framecache HTTP API on signal lock, then writes
|
|
* raw UYVY422 frames directly into the shared memory ring buffer.
|
|
*
|
|
* Compile with -DLEGACY_FIFO to disable shm writes and fall back to the
|
|
* original named-FIFO path (useful during transition / on nodes without the
|
|
* framecache container running).
|
|
*/
|
|
#pragma once
|
|
|
|
#include <stdint.h>
|
|
#include <stddef.h>
|
|
|
|
#ifdef __cplusplus
|
|
extern "C" {
|
|
#endif
|
|
|
|
typedef struct fc_writer fc_writer_t;
|
|
|
|
/**
|
|
* Register a slot with the framecache service and open the shm region for
|
|
* writing. fc_url is the HTTP base URL, e.g. "http://localhost:7435".
|
|
* slot_id must be unique per port, e.g. "deltacast-0-3" (device-port).
|
|
*
|
|
* Returns writer handle on success, NULL on failure (falls back to FIFO).
|
|
*/
|
|
fc_writer_t *fc_writer_open(const char *fc_url,
|
|
const char *slot_id,
|
|
uint32_t width, uint32_t height,
|
|
uint32_t fps_num, uint32_t fps_den);
|
|
|
|
/**
|
|
* Write one raw UYVY422 frame into the ring buffer.
|
|
* Non-blocking — slow consumers are skipped, not waited on.
|
|
* pts_us: presentation timestamp in microseconds (0 if unknown).
|
|
*/
|
|
void fc_writer_write(fc_writer_t *w,
|
|
const uint8_t *data, uint32_t size,
|
|
uint64_t pts_us);
|
|
|
|
/**
|
|
* Write one FRAME-COUPLED entry: a video frame plus that frame's SDI-embedded
|
|
* audio (interleaved s16le stereo 48k) into the SAME ring slot. Both are read
|
|
* back together by one consumer iteration, so audio cannot drift from video.
|
|
* audio may be NULL / asize 0 when the frame has no embedded audio.
|
|
*/
|
|
void fc_writer_write_av(fc_writer_t *w,
|
|
const uint8_t *video, uint32_t vsize,
|
|
const uint8_t *audio, uint32_t asize,
|
|
uint64_t pts_us);
|
|
|
|
/**
|
|
* Deregister slot from framecache service and unmap shm.
|
|
*/
|
|
void fc_writer_close(fc_writer_t *w);
|
|
|
|
#ifdef __cplusplus
|
|
}
|
|
#endif
|