summaryrefslogtreecommitdiff
path: root/pjmedia/src
diff options
context:
space:
mode:
authorBenny Prijono <bennylp@teluu.com>2011-09-19 08:26:35 +0000
committerBenny Prijono <bennylp@teluu.com>2011-09-19 08:26:35 +0000
commit1e1b229434f1fc558c0aa26746334186c97c80fe (patch)
treea6bfd3f2b579defcddc18f1f47e2eba20d9ba64e /pjmedia/src
parent62bf8d3a35a49a55c97eaf50d71241ee512d1282 (diff)
Implemented native video preview support. This closes #1340
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@3756 74dad513-b988-da41-8d7b-12977e46ad98
Diffstat (limited to 'pjmedia/src')
-rw-r--r--pjmedia/src/pjmedia-videodev/videodev.c6
-rw-r--r--pjmedia/src/pjmedia/vid_tee.c6
2 files changed, 9 insertions, 3 deletions
diff --git a/pjmedia/src/pjmedia-videodev/videodev.c b/pjmedia/src/pjmedia-videodev/videodev.c
index e06152fc..a88e91c4 100644
--- a/pjmedia/src/pjmedia-videodev/videodev.c
+++ b/pjmedia/src/pjmedia-videodev/videodev.c
@@ -40,10 +40,11 @@ static struct cap_info
{
DEFINE_CAP("format", "Video format"),
DEFINE_CAP("scale", "Input dimension"),
- DEFINE_CAP("window", "Renderer window"),
+ DEFINE_CAP("window", "Window handle"),
DEFINE_CAP("resize", "Renderer resize"),
DEFINE_CAP("position", "Renderer position"),
DEFINE_CAP("hide", "Renderer hide"),
+ DEFINE_CAP("preview", "Input preview"),
};
@@ -175,6 +176,9 @@ static pj_status_t get_cap_pointer(const pjmedia_vid_dev_param *param,
case PJMEDIA_VID_DEV_CAP_OUTPUT_HIDE:
FIELD_INFO(window_hide);
break;
+ case PJMEDIA_VID_DEV_CAP_INPUT_PREVIEW:
+ FIELD_INFO(native_preview);
+ break;
default:
return PJMEDIA_EVID_INVCAP;
}
diff --git a/pjmedia/src/pjmedia/vid_tee.c b/pjmedia/src/pjmedia/vid_tee.c
index 21d0cec5..9df31d8a 100644
--- a/pjmedia/src/pjmedia/vid_tee.c
+++ b/pjmedia/src/pjmedia/vid_tee.c
@@ -30,6 +30,7 @@
#define TEE_PORT_NAME "vid_tee"
#define TEE_PORT_SIGN PJMEDIA_SIG_PORT_VID_TEE
+#define THIS_FILE "vid_tee.c"
typedef struct vid_tee_dst_port
{
@@ -316,8 +317,9 @@ static pj_status_t tee_put_frame(pjmedia_port *port, pjmedia_frame *frame)
status = pjmedia_converter_convert(tee->tee_conv[i].conv,
frame, &frame_);
if (status != PJ_SUCCESS) {
- PJ_LOG(3, ("", "Failed to convert frame for destination"
- "port %d (%.*s)", i,
+ PJ_LOG(3, (THIS_FILE,
+ "Failed to convert frame for destination"
+ " port %d (%.*s)", i,
tee->dst_ports[i].dst->info.name.slen,
tee->dst_ports[i].dst->info.name.ptr));
continue;