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

get_video_desc_from_string: fixed mode parse

Browse Source 
fixed parsing of mode `uv -t testcard:m=2160p25` where it was incorrectly
returned FPS 60 (fixed FPS offset 2 bytes pointing to 21_60_p)
This commit is contained in:
Martin Pulec
2023-10-10 09:20:24 +02:00
parent 2a73855c05
commit 61544172c5
2 changed files with 43 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/rtp/rtp_types.h
View File

@@ -163,3 +163,7 @@ typedef uint32_t crypto_payload_hdr_t[1];
#define PT_VIDEO_IS_ENCRYPTED(pt) (pt == PT_ENCRYPT_VIDEO || pt == PT_ENCRYPT_VIDEO_LDGM || pt == PT_ENCRYPT_VIDEO_RS)
#define BUFNUM_BITS 22U
enum {
FPS_MAX = 1024, ///< given by UG RTP payload header
};

49
src/video.cpp
View File

@@ -46,6 +46,7 @@
#endif // HAVE_CONFIG_H
#include "debug.h"
#include "rtp/rtp_types.h" // FPS_MAX
#include "utils/macros.h"
#include "video.h"
@@ -53,6 +54,8 @@
#include <sstream>
#include <map>
#define MOD_NAME "[video] "
using namespace std;
typedef struct {
@@ -242,6 +245,37 @@ const char *video_desc_to_string(struct video_desc d)
return desc_str.c_str();
}
static double
parse_fps(const char *string, bool interlaced)
{
const char *fps_str = strpbrk(string, "dikp") + 1;
assert(fps_str != nullptr);
char *endptr = nullptr;
const long fps_l = strtol(fps_str, &endptr, 10);
if (fps_l <= 0 || fps_l > FPS_MAX || *endptr != '\0') {
MSG(ERROR, "Wrong mode specification: %s\n", string);
return 0.0;
}
double fps = 0;
// adjust FPS (Hi29 has FPS 29.97)
switch (fps_l) {
case 23:
fps = 23.98;
break;
case 29:
fps = 29.97;
break;
case 59:
fps = 59.94;
break;
default:
fps = (double) fps_l;
break;
}
// convert field per sec to FPS if needed (interlaced)
return interlaced ? fps / 2.0 : fps;
}
/**
* @returns video description according to the configuration string, allowing
* BMD-like FourCC (pal, ntsc, Hi59 etc.)
@@ -291,7 +325,7 @@ struct video_desc get_video_desc_from_string(const char *string)
return map[i].desc;
}
}
// BMD-like syntax
// BMD-like syntax (+ line-counted syntax like 1080p<FPS>)
struct video_desc ret{};
ret.color_spec = UYVY;
ret.tile_count = 1;
@@ -318,15 +352,10 @@ struct video_desc get_video_desc_from_string(const char *string)
if (ret.width == 0) {
return {};
}
string += 2;
ret.fps = atoi(string);
switch ((int) ret.fps) {
case 23: ret.fps = 23.98; break;
case 29: ret.fps = 29.97; break;
case 59: ret.fps = 59.94; break;
}
if (ret.interlacing == INTERLACED_MERGED) {
ret.fps /= 2;
ret.fps = parse_fps(string, ret.interlacing == INTERLACED_MERGED);
if (ret.fps == 0.0) {
return {};
}
return ret;
}