Changeset 5624 for pjproject


Ignore:
Timestamp:
Jul 7, 2017 8:40:04 AM (2 years ago)
Author:
nanang
Message:

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.

Location:
pjproject/trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • pjproject/trunk/aconfigure

    r5622 r5624  
    65176517        fi 
    65186518        if test "$ac_pjmedia_video_has_vtoolbox" = "yes"; then 
    6519           ac_darwin_cflags+=" -DPJMEDIA_HAS_VID_TOOLBOX_CODEC=1" 
     6519          #ac_darwin_cflags+=" -DPJMEDIA_HAS_VID_TOOLBOX_CODEC=1" 
    65206520          LIBS="$LIBS -framework VideoToolbox" 
    65216521          { $as_echo "$as_me:${as_lineno-$LINENO}: result: Checking if VideoToolbox framework is available... yes" >&5 
  • pjproject/trunk/aconfigure.ac

    r5622 r5624  
    838838        fi 
    839839        if test "$ac_pjmedia_video_has_vtoolbox" = "yes"; then 
    840           ac_darwin_cflags+=" -DPJMEDIA_HAS_VID_TOOLBOX_CODEC=1" 
     840          #ac_darwin_cflags+=" -DPJMEDIA_HAS_VID_TOOLBOX_CODEC=1" 
    841841          LIBS="$LIBS -framework VideoToolbox" 
    842842          AC_MSG_RESULT([Checking if VideoToolbox framework is available... yes]) 
  • pjproject/trunk/pjmedia/include/pjmedia-codec/config.h

    r5304 r5624  
    501501 * Enable FFMPEG H264 codec (requires libx264). 
    502502 * 
    503  * Default: 0 
     503 * Default: disabled when OpenH264 is used, otherwise it is set to 
     504 * PJMEDIA_HAS_FFMPEG_VID_CODEC 
    504505 */ 
    505506#ifndef PJMEDIA_HAS_FFMPEG_CODEC_H264 
    506 #   define PJMEDIA_HAS_FFMPEG_CODEC_H264        PJMEDIA_HAS_FFMPEG_VID_CODEC 
     507#   if defined(PJMEDIA_HAS_OPENH264_CODEC) && PJMEDIA_HAS_OPENH264_CODEC != 0 
     508#       define PJMEDIA_HAS_FFMPEG_CODEC_H264    0 
     509#   else 
     510#       define PJMEDIA_HAS_FFMPEG_CODEC_H264    PJMEDIA_HAS_FFMPEG_VID_CODEC 
     511#   endif 
    507512#endif 
    508513 
Note: See TracChangeset for help on using the changeset viewer.