scottk/UltraGrid
1
0
Fork 0
mirror of https://github.com/outbackdingo/UltraGrid.git synced 2026-03-22 03:40:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

NDI: Report captured format

Browse Source
This commit is contained in:
Martin Pulec
2019-03-05 23:15:41 +01:00
committed by Martin Pulec
parent 5b8b98dd71
commit 8c5204aab9
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/video_capture/ndi.cpp
View File

@@ -81,6 +81,7 @@ struct vidcap_state_ndi {
array<struct audio_frame, 2> audio;
int audio_buf_idx = 0;
bool capture_audio = false;
struct video_desc last_desc{};
string requested_name; // if not empty recv from requested NDI name
string requested_url; // if not empty recv from requested URL (either addr or addr:port)
@@ -333,6 +334,10 @@ static struct video_frame *vidcap_ndi_grab(void *state, struct audio_frame **aud
static_cast<double>(video_frame.frame_rate_N) / video_frame.frame_rate_D,
video_frame.frame_format_type == NDIlib_frame_format_type_progressive ? PROGRESSIVE : INTERLACED_MERGED,
1};
if (s->last_desc != out_desc) {
LOG(LOG_LEVEL_NOTICE) << "[NDI] Received video changed: " << out_desc << "\n";
s->last_desc = out_desc;
}
if (video_frame.FourCC == NDIlib_FourCC_type_BGRA) { // BGRA -> RGBA
out = vf_alloc_desc_data(out_desc);
auto in_p = reinterpret_cast<uint32_t *>(video_frame.p_data);