unsigned last_width[MAX_CARDS], last_height[MAX_CARDS];
bool last_interlaced[MAX_CARDS];
+ unsigned last_frame_rate_nom[MAX_CARDS], last_frame_rate_den[MAX_CARDS];
};
InputStateInfo::InputStateInfo(const InputState &input_state)
last_width[signal_num] = userdata->last_width[frame.field_number];
last_height[signal_num] = userdata->last_height[frame.field_number];
last_interlaced[signal_num] = userdata->last_interlaced;
+ last_frame_rate_nom[signal_num] = userdata->last_frame_rate_nom;
+ last_frame_rate_den[signal_num] = userdata->last_frame_rate_den;
}
}
return 1;
}
+int InputStateInfo_get_frame_rate_nom(lua_State* L)
+{
+ assert(lua_gettop(L) == 2);
+ InputStateInfo *input_state_info = get_input_state_info(L, 1);
+ Theme *theme = get_theme_updata(L);
+ int signal_num = theme->map_signal(luaL_checknumber(L, 2));
+ lua_pushnumber(L, input_state_info->last_frame_rate_nom[signal_num]);
+ return 1;
+}
+
+int InputStateInfo_get_frame_rate_den(lua_State* L)
+{
+ assert(lua_gettop(L) == 2);
+ InputStateInfo *input_state_info = get_input_state_info(L, 1);
+ Theme *theme = get_theme_updata(L);
+ int signal_num = theme->map_signal(luaL_checknumber(L, 2));
+ lua_pushnumber(L, input_state_info->last_frame_rate_den[signal_num]);
+ return 1;
+}
+
int Effect_set_float(lua_State *L)
{
assert(lua_gettop(L) == 3);
{ "get_width", InputStateInfo_get_width },
{ "get_height", InputStateInfo_get_height },
{ "get_interlaced", InputStateInfo_get_interlaced },
+ { "get_frame_rate_nom", InputStateInfo_get_frame_rate_nom },
+ { "get_frame_rate_den", InputStateInfo_get_frame_rate_den },
{ NULL, NULL }
};
return 4
end
--- Helper function to write e.g. “720p”.
+-- Helper function to write e.g. “60” or “59.94”.
+function get_frame_rate(signal_num)
+ local nom = last_resolution[signal_num].frame_rate_nom
+ local den = last_resolution[signal_num].frame_rate_den
+ if last_resolution[signal_num].interlaced then
+ nom = nom * 2
+ end
+ if nom % den == 0 then
+ return nom / den
+ else
+ return string.format("%.2f", num / den)
+ end
+end
+
+-- Helper function to write e.g. “720p60”.
function get_channel_resolution(signal_num)
if last_resolution[signal_num] then
if last_resolution[signal_num].height == 0 or
last_resolution[signal_num].height == 525 then
return "no signal"
elseif last_resolution[signal_num].interlaced then
- return (last_resolution[signal_num].height * 2) .. "i"
+ return (last_resolution[signal_num].height * 2) .. "i" .. get_frame_rate(signal_num)
else
- return last_resolution[signal_num].height .. "p"
+ return last_resolution[signal_num].height .. "p" .. get_frame_rate(signal_num)
end
else
return "no signal"
last_resolution[signal_num] = {
width = signals:get_width(signal_num),
height = signals:get_height(signal_num),
- interlaced = signals:get_interlaced(signal_num)
+ interlaced = signals:get_interlaced(signal_num),
+ frame_rate_nom = signals:get_frame_rate_nom(signal_num),
+ frame_rate_den = signals:get_frame_rate_den(signal_num)
}
end