sysmocom
/
pjproject
11
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Misc (re #1994): Rearrange H264 default backend priority to avoid multiple H264 backends. Currently OpenH264 has higher priority than FFmpeg, and VideoToolBox (for MacOS/iOS) should be manually enabled. 

git-svn-id: https://svn.pjsip.org/repos/pjproject/trunk@5624 74dad513-b988-da41-8d7b-12977e46ad98
This commit is contained in:
Nanang Izzuddin 2017-07-07 08:40:04 +00:00
parent c259fa68b2
commit af17b763fc
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
aconfigure
View File

@ -6516,7 +6516,7 @@ $as_echo "Checking if AVFoundation framework is available... yes" >&6; }
$as_echo "Checking if AVFoundation framework is available... no" >&6; }
fi
if test "$ac_pjmedia_video_has_vtoolbox" = "yes"; then
ac_darwin_cflags+=" -DPJMEDIA_HAS_VID_TOOLBOX_CODEC=1"
#ac_darwin_cflags+=" -DPJMEDIA_HAS_VID_TOOLBOX_CODEC=1"
LIBS="$LIBS -framework VideoToolbox"
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking if VideoToolbox framework is available... yes" >&5
$as_echo "Checking if VideoToolbox framework is available... yes" >&6; }

2
aconfigure.ac
View File

@ -837,7 +837,7 @@ else
AC_MSG_RESULT([Checking if AVFoundation framework is available... no])
fi
if test "$ac_pjmedia_video_has_vtoolbox" = "yes"; then
ac_darwin_cflags+=" -DPJMEDIA_HAS_VID_TOOLBOX_CODEC=1"
#ac_darwin_cflags+=" -DPJMEDIA_HAS_VID_TOOLBOX_CODEC=1"
LIBS="$LIBS -framework VideoToolbox"
AC_MSG_RESULT([Checking if VideoToolbox framework is available... yes])
else

9
pjmedia/include/pjmedia-codec/config.h
View File

@ -500,10 +500,15 @@
/**
* Enable FFMPEG H264 codec (requires libx264).
*
* Default: 0
* Default: disabled when OpenH264 is used, otherwise it is set to
* PJMEDIA_HAS_FFMPEG_VID_CODEC
*/
#ifndef PJMEDIA_HAS_FFMPEG_CODEC_H264
# define PJMEDIA_HAS_FFMPEG_CODEC_H264 PJMEDIA_HAS_FFMPEG_VID_CODEC
# if defined(PJMEDIA_HAS_OPENH264_CODEC) && PJMEDIA_HAS_OPENH264_CODEC != 0
# define PJMEDIA_HAS_FFMPEG_CODEC_H264 0
# else
# define PJMEDIA_HAS_FFMPEG_CODEC_H264 PJMEDIA_HAS_FFMPEG_VID_CODEC
# endif
#endif
/**