summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
authorAlfred E. Heggestad <alfred.heggestad@gmail.com>2016-12-10 15:59:20 +0100
committerAlfred E. Heggestad <alfred.heggestad@gmail.com>2016-12-10 15:59:20 +0100
commit0a004c758a9fa45682e54b2bb552ad925c56f65c (patch)
treed9278989fcea4198fe1ecc5d7a86519b0c5d5f89 /modules
parent60c4d1193cdae75fe762d0ddaaa54b060cd7be0a (diff)
vidloop: add codec-name as optional parameter
Diffstat (limited to 'modules')
-rw-r--r--modules/vidloop/vidloop.c56
1 files changed, 16 insertions, 40 deletions
diff --git a/modules/vidloop/vidloop.c b/modules/vidloop/vidloop.c
index ec7fb6f..513af7d 100644
--- a/modules/vidloop/vidloop.c
+++ b/modules/vidloop/vidloop.c
@@ -22,12 +22,12 @@
*
* Example usage without codec:
\verbatim
- baresip -ev
+ baresip -e/vidloop
\endverbatim
*
* Example usage with codec:
\verbatim
- baresip -evv
+ baresip -e"/vidloop h264"
\endverbatim
*/
@@ -231,10 +231,9 @@ static void vidloop_destructor(void *arg)
}
-static int enable_codec(struct video_loop *vl)
+static int enable_codec(struct video_loop *vl, const char *name)
{
struct videnc_param prm;
- const char *name = NULL;
int err;
prm.fps = vl->cfg.fps;
@@ -417,12 +416,12 @@ static int video_loop_alloc(struct video_loop **vlp, const struct vidsz *size)
*/
static int vidloop_start(struct re_printf *pf, void *arg)
{
+ const struct cmd_arg *carg = arg;
struct vidsz size;
struct config *cfg = conf_config();
+ const char *codec_name = carg->prm;
int err = 0;
- (void)arg;
-
size.w = cfg->video.width;
size.h = cfg->video.height;
@@ -437,44 +436,22 @@ static int vidloop_start(struct re_printf *pf, void *arg)
err = video_loop_alloc(&gvl, &size);
if (err) {
warning("vidloop: alloc: %m\n", err);
+ return err;
}
- return err;
-}
-
-
-static int vidloop_codec_start(struct re_printf *pf, void *arg)
-{
- struct vidsz size;
- struct config *cfg = conf_config();
- int err = 0;
-
- (void)arg;
-
- size.w = cfg->video.width;
- size.h = cfg->video.height;
-
- if (!gvl) {
- (void)re_hprintf(pf, "Enable video-loop on %s,%s: %u x %u\n",
- cfg->video.src_mod, cfg->video.src_dev,
- size.w, size.h);
+ if (str_isset(codec_name)) {
- err = video_loop_alloc(&gvl, &size);
+ err = enable_codec(gvl, codec_name);
if (err) {
- warning("vidloop: alloc: %m\n", err);
+ gvl = mem_deref(gvl);
+ return err;
}
- }
- err = enable_codec(gvl);
- if (err) {
- gvl = mem_deref(gvl);
- return err;
+ (void)re_hprintf(pf, "%sabled codec: %s\n",
+ gvl->vc_enc ? "En" : "Dis",
+ gvl->vc_enc ? gvl->vc_enc->name : "");
}
- (void)re_hprintf(pf, "%sabled codec: %s\n",
- gvl->vc_enc ? "En" : "Dis",
- gvl->vc_enc ? gvl->vc_enc->name : "");
-
return err;
}
@@ -491,9 +468,8 @@ static int vidloop_stop(struct re_printf *pf, void *arg)
static const struct cmd cmdv[] = {
- {"vidloop", 0, 0, "Start video-loop", vidloop_start },
- {"vidloop_codec",0, 0, "Start codec video-loop", vidloop_codec_start},
- {"vidloop_stop", 0, 0, "Stop video-loop", vidloop_stop },
+ {"vidloop", 0, CMD_PRM, "Start video-loop <codec>", vidloop_start},
+ {"vidloop_stop",0, 0, "Stop video-loop", vidloop_stop },
};
@@ -505,7 +481,7 @@ static int module_init(void)
static int module_close(void)
{
- vidloop_stop(NULL, NULL);
+ gvl = mem_deref(gvl);
cmd_unregister(baresip_commands(), cmdv);
return 0;
}