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

import: accept video.info written by Win in *nix

Browse Source 
In MSW it seems like the video.info is written in text mode, so that line
ending is CRLF. When read in POSIX systems, \r is not consumated so that
expect it can be present.
This commit is contained in:
Martin Pulec
2024-10-07 09:10:35 +02:00
parent 5471e80497
commit 22e9b7cfee
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/video_capture/import.c
View File

@@ -288,13 +288,14 @@ static struct video_desc parse_video_desc_info(FILE *info, long *video_frame_cou
desc.height = val;
items_found |= 1U<<2U;
} else if(strncmp(line, "fourcc ", strlen("fourcc ")) == 0) {
char *ptr = line + strlen("fourcc ");
if(strlen(ptr) != 5) { // including '\n'
char fcc[6];
sscanf(line + strlen("fourcc "), "%5[^\r\n]", fcc);
if (strlen(fcc) != 4) {
log_msg(LOG_LEVEL_ERROR, MOD_NAME "cannot read video FourCC tag.\n");
return (struct video_desc) { 0 };
}
uint32_t fourcc = 0U;
memcpy((void *) &fourcc, ptr, sizeof(fourcc));
memcpy((void *) &fourcc, fcc, sizeof(fourcc));
desc.color_spec = get_codec_from_fcc(fourcc);
if(desc.color_spec == VIDEO_CODEC_NONE) {
log_msg(LOG_LEVEL_ERROR, MOD_NAME "Requested codec not known.\n");