Changeset 3457 for pjproject/branches/projects/2.0-dev/build.mak.in

Timestamp:

Mar 17, 2011 4:34:43 AM (14 years ago)

Author:

bennylp

Message:

Modifications in PJSUA-LIB to support multiple media streams (multiple audio and/or video) and dynamic creation of media transports. This closed #1185 and closed #1201.

1185: Dynamic creation of media transports
============================================
Done:

• media transports are created on demand now

Todo:

• media transport creation is still blocking

1201: Video support in PJSUA-LIB
===================================
Done:

• call now supports N media (N audio and M video)
• number of audio/video streams is configurable per acc
• extra audio stream info in pjsua_call_info to support multiple audio streams

in one call

• video subsys and ffmpeg initialization in PJSUA-LIB
• ability to offer and create video SDP answer
• "dq" for more than 1 audio streams
• introducing pjsua_state and pjsua_get_state()

API change:

• on_stream_created() and on_stream_destroyed() callbacks: changed session to

stream

Todo:

• many others features are disabled, just search for DISABLED_FOR_TICKET_1185

macro (these have also been added to ticket #1193 (Issues & Todos)). Notable
missing features are:

• creation of duplicate SDP m= lines for optional SRTP
• mm.. that's it?

• whole lot of testings

pjsua:
===============

• Added --extra-audio and --video options. Specify these more than once and

each time an extra audio/video streams will be added. :)

File:

• pjproject/branches/projects/2.0-dev/build.mak.in (modified) (3 diffs)

pjproject/branches/projects/2.0-dev/build.mak.in

@@ -59 +59 @@
 @ac_build_mak_vars@
 
+#
+# Video
+# Note: there are duplicated macros in pjmedia/os-auto.mak.in (and that's not
+#       good!
+
+# SDL flags
+SDL_CFLAGS = @ac_sdl_cflags@
+SDL_LDFLAGS = @ac_sdl_ldflags@
+
+# FFMPEG dlags
+FFMPEG_CFLAGS = @ac_ffmpeg_cflags@ 
+FFMPEG_LDFLAGS =  @ac_ffmpeg_ldflags@
+
+# Video4Linux2
+V4L2_CFLAGS = @ac_v4l2_cflags@
+V4L2_LDFLAGS = @ac_v4l2_ldflags@
+
+# QT
+AC_PJMEDIA_VIDEO_HAS_QT = @ac_pjmedia_video_has_qt@
+QT_CFLAGS = @ac_qt_cflags@
+
+# iOS
+IOS_CFLAGS = @ac_ios_cflags@
+
+# PJMEDIA features exclusion
+PJ_VIDEO_CFLAGS += $(SDL_CFLAGS) $(FFMPEG_CFLAGS) $(V4L2_CFLAGS) $(QT_CFLAGS) \
+                   $(IOS_CFLAGS)
+PJ_VIDEO_LDFLAGS += $(SDL_LDFLAGS) $(FFMPEG_LDFLAGS) $(V4L2_LDFLAGS)
+
+
 # CFLAGS, LDFLAGS, and LIBS to be used by applications
 export PJDIR := @ac_pjdir@
@@ -65 +95 @@
 export APP_CFLAGS := -DPJ_AUTOCONF=1\
         @CFLAGS@\
+        $(PJ_VIDEO_CFLAGS) \
         -I$(PJDIR)/pjlib/include\
         -I$(PJDIR)/pjlib-util/include\
@@ -77 +108 @@
         -L$(PJDIR)/pjsip/lib\
         -L$(PJDIR)/third_party/lib\
+        $(PJ_VIDEO_LDFLAGS) \
         @LDFLAGS@
 export APP_LDLIBS := -lpjsua-$(TARGET_NAME)\