1
0
Fork 0
mirror of https://github.com/albfan/miraclecast.git synced 2025-03-09 23:38:56 +00:00

Use resolution provided to resize viewer

This commit is contained in:
albfan 2016-07-23 19:15:38 +02:00
parent 3f2266e254
commit 412ce067b6
2 changed files with 19 additions and 19 deletions

View file

@ -19,12 +19,14 @@ Gst.init(None)
class Player(object): class Player(object):
def __init__(self, **kwargs): def __init__(self, **kwargs):
resolution = kwargs.get("resolution")
if resolution:
split = resolution.split("x")
self.width = int(split[0])
self.height = int(split[1])
scale = kwargs.get("scale") scale = kwargs.get("scale")
#scale = "1080x1920" if scale:
if not scale:
self.width = 800
self.height = 600
else:
split = scale.split("x") split = scale.split("x")
self.width = int(split[0]) self.width = int(split[0])
self.height = int(split[1]) self.height = int(split[1])

View file

@ -389,7 +389,6 @@ void launch_player(struct ctl_sink *s) {
int i = 0; int i = 0;
char* player; char* player;
if (uibc) { if (uibc) {
// player = "gstplayer";
player = "uibc-viewer"; player = "uibc-viewer";
} else { } else {
player = "miracle-gst"; player = "miracle-gst";
@ -400,27 +399,26 @@ void launch_player(struct ctl_sink *s) {
argv[i++] = s->target; argv[i++] = s->target;
sprintf(uibc_portStr, "%d", uibc_port); sprintf(uibc_portStr, "%d", uibc_port);
argv[i++] = uibc_portStr; argv[i++] = uibc_portStr;
// argv[i++] = "--daemon";
} }
if (cli_max_sev >= 7) if (cli_max_sev >= 7)
argv[i++] = "-d 3"; argv[i++] = "-d 3";
if (gst_audio_en) if (gst_audio_en)
argv[i++] = "-a"; argv[i++] = "-a";
if (gst_scale_res) { if (gst_scale_res) {
argv[i++] = "-s"; argv[i++] = "-s";
argv[i++] = gst_scale_res; argv[i++] = gst_scale_res;
} }
argv[i++] = "-p"; argv[i++] = "-p";
sprintf(port, "%d", rstp_port); sprintf(port, "%d", rstp_port);
argv[i++] = port; argv[i++] = port;
if (s->hres && s->vres) { if (s->hres && s->vres) {
sprintf(resolution, "%dx%d", s->hres, s->vres); sprintf(resolution, "%dx%d", s->hres, s->vres);
argv[i++] = "-r"; argv[i++] = "-r";
argv[i++] = resolution; argv[i++] = resolution;
} }
argv[i] = NULL; argv[i] = NULL;
i = 0; i = 0;
int size = 0; int size = 0;