Meson and Makefile changes to search for libmebo, aom related libs

Author: pradkrni

Makefile.am

@@ -38,6 +38,34 @@ if ENABLE_TESTS
 SUBDIRS += test
 endif
 
+#libmebo and libaom_av1_rc support
+if ENABLE_MEBO
+MEBO_SUPPORT = yes
+endif
+
+if ENABLE_AOM_AV1_RC
+AOM_AV1_RC_SUPPORT = yes
+endif
+
+if ENABLE_BRC
+BRC_SUPPORT = yes
+endif
+
+if ENABLE_BRC_CONTROLLER
+BRC_CONTROLLER_SUPPORT = yes
+endif
+
+export DL_LIBS
+
+MEBO_LOCAL_PATH = $(abs_top_srcdir)/encode/libmebo/libs
+AOM_AV1_RC_LOCAL_PATH = $(abs_top_srcdir)/encode/aom_libs/
+SYSTEM_LIBS_DIR = /usr/local/lib/x86_64-linux-gnu/
+
+export MEBO_LOCAL_PATH
+export AOM_AV1_RC_LOCAL_PATH
+export SYSTEM_LIBS_DIR
+
+
 # Extra clean files so that maintainer-clean removes *everything*
 MAINTAINERCLEANFILES = \
 	aclocal.m4 compile config.guess config.sub \

configure.ac

@@ -93,6 +93,156 @@ AC_ARG_ENABLE([tests],
                     [build unit tests @<:@default=no@:>@])],
     [], [enable_tests="no"])
 
+AC_ARG_ENABLE(mebo,
+    [AC_HELP_STRING([--enable-mebo],
+                    [Enable LibMebo Support @<:@default=yes@:>@])],
+    [], [enable_mebo="yes"])
+
+AC_ARG_ENABLE(aom_av1_rc,
+    [AC_HELP_STRING([--enable-aom_av1_rc],
+                    [Enable AOM AV1 RC Support @<:@default=yes@:>@])],
+    [], [enable_aom_av1_rc="yes"])
+
+AC_ARG_ENABLE(brc,
+    [AC_HELP_STRING([--enable-brc],
+                    [Enable Bitrate RC for VP9,VP8 Support 
+                    @<:@default=yes@:>@])],
+    [], [enable_brc="yes"])
+
+AC_ARG_ENABLE(brc_controller,
+    [AC_HELP_STRING([--enable-brc_controller],
+                    [Enable Bitrate RC_controller 
+                    to support libmebo @<:@default=yes@:>@])],
+    [], [enable_brc_controller="yes"])
+
+#check for LibMebo library
+MEBO_LIBDIR=""
+abs_srcdir="$(cd "$srcdir" && pwd)"
+if test "x$enable_mebo" != "xno" ; then
+      #local path
+      if test -f "$srcdir/encode/libmebo/libs/libmebo.so"; then
+        MEBO_LIBDIR="${abs_srcdir}/encode/libmebo/libs"
+        AC_DEFINE([HAVE_MEBO], [1], [Define if MEBO is available])
+        AC_MSG_NOTICE([MEBO LIB INSTALLED in local path])
+      else
+        AC_MSG_NOTICE([Mebo LIB NOT INSTALLED in local path])
+      #system path
+        if test -f "/usr/local/lib/x86_64-linux-gnu/libmebo.so" ; then
+            MEBO_LIBDIR="/usr/local/lib/x86_64-linux-gnu"
+            AC_DEFINE([HAVE_MEBO], [1], [Define if MEBO is available])
+            AC_MSG_NOTICE([MEBO LIB INSTALLED in SYSTEM path])
+        else
+            AC_MSG_NOTICE([Mebo LIB NOT INSTALLED in system path])
+            if test "x$enable_mebo"="xyes"; then
+                AC_MSG_ERROR(
+                    [LibMebo NOT installed in local path nor in system paths])
+            fi
+        fi
+    fi
+fi
+AC_SUBST([MEBO_LIBDIR])
+
+#CHECK FOR AOM AV1 RC library
+AOM_AV1_RC_LIBDIR=""
+if test "x$enable_aom_av1_rc" != "xno" ; then
+      #local path
+      if test -f "$srcdir/encode/libmebo/libs/aom_libs/libaom_av1_rc.so"; then
+        AOM_AV1_RC_LIBDIR="${abs_srcdir}/encode/libmebo/libs/aom_libs/"
+        AC_DEFINE([HAVE_AOM_AV1_RC], [1], [Define if AOM AV1 RC is available])
+        AC_MSG_NOTICE([AOM AV1 RC LIB INSTALLED in local path])
+      else
+        AC_MSG_NOTICE([AOM AV1 RC LIB NOT INSTALLED in local path])
+      #system path
+        if test -f "/usr/local/lib/x86_64-linux-gnu/libaom_av1_rc.so" ; then
+            AOM_AV1_RC_LIBDIR="/usr/local/lib/x86_64-linux-gnu"
+            AC_DEFINE([HAVE_AOM_AV1_RC], [1], [Define if AOM AV1 RC
+                       is available])
+            AC_MSG_NOTICE([AOM AV1 RC LIB INSTALLED in SYSTEM path])
+      else
+        AC_MSG_NOTICE([AOM AV1 RC LIB NOT INSTALLED in system path])
+        if test "x$enable_aom_av1_rc"="xyes"; then
+            AC_MSG_ERROR(
+                [AOM AV1 RC NOT installed in local path nor in system paths])
+        fi
+    fi
+    fi
+fi
+AC_SUBST([AOM_AV1_RC_LIBDIR])
+
+
+#Check for brc library
+BRC_LIBDIR=""
+if test "x$enable_brc" != "xno" ; then
+      #local path
+      if test -f "$srcdir/encode/libmebo/libs/libbrc.so"; then
+        BRC_LIBDIR="${abs_srcdir}/encode/libmebo/libs"
+        AC_DEFINE([HAVE_BRC], [1], [Define if BRC is available])
+        AC_MSG_NOTICE([BRC LIB INSTALLED in local path])
+      else
+        AC_MSG_NOTICE([BRC LIB NOT INSTALLED in local path])
+      #system path
+        if test -f "/usr/local/lib/x86_64-linux-gnu/libbrc.so" ; then
+            BRC_LIBDIR="/usr/local/lib/x86_64-linux-gnu"
+            AC_DEFINE([HAVE_BRC], [1], [Define if BRC is available])
+            AC_MSG_NOTICE([BRC LIB INSTALLED in SYSTEM path])
+        else
+            AC_MSG_NOTICE([BRC LIB NOT INSTALLED in system path])
+            if test "x$enable_brc"="xyes"; then
+                AC_MSG_ERROR(
+                    [BRC NOT installed in local path nor in system paths])
+            fi
+        fi
+    fi
+fi
+AC_SUBST([BRC_LIBDIR])
+
+#Check for brc_controller library
+BRC_CONTROLLER_LIBDIR=""
+if test "x$enable_brc_controller" != "xno" ; then
+      #local path
+      if test -f "$srcdir/encode/libmebo/libs/libbrc_controller.so"; then
+        BRC_CONTROLLER_LIBDIR="${abs_srcdir}/encode/libmebo/libs"
+        AC_DEFINE([HAVE_BRC_CONTROLLER], [1], [Define if BRC_CONTROLLER 
+                                                is available])
+        AC_MSG_NOTICE([BRC_CONTROLLER LIB INSTALLED in local path])
+      else
+        AC_MSG_NOTICE([BRC_CONTROLLER LIB NOT INSTALLED in local path])
+      #system path
+        if test -f "/usr/local/lib/x86_64-linux-gnu/libbrc_controller.so" ; then
+            BRC_CONTROLLER_LIBDIR="/usr/local/lib/x86_64-linux-gnu"
+            AC_DEFINE([HAVE_BRC_CONTROLLER], [1], [Define if BRC_CONTROLLER 
+                                                      is available])
+            AC_MSG_NOTICE([BRC_CONTROLLER LIB INSTALLED in SYSTEM path])
+        else
+            AC_MSG_NOTICE([BRC LIB NOT INSTALLED in system path])
+            if test "x$enable_brc_controller"="xyes"; then
+                AC_MSG_ERROR(
+                    [BRC_CONTROLLER NOT installed in local path nor 
+                                                          in system paths])
+            fi
+        fi
+    fi
+fi
+AC_SUBST([BRC_CONTROLLER_LIBDIR])
+
+# configure for ldl lib
+AC_CHECK_LIB([dl], [dlopen],
+             [DL_LIBS= "-ldl",
+             AC_DEFINE([HAVE_DLOPEN], [1], [Define if dlopen is available])],
+             [AC_MSG_ERROR([Unable to find library support dlopen, dlsym])])
+AC_SUBST([DL_LIBS])
+
+#libs path
+AC_MSG_NOTICE([LIBRARY PATHS ARE set to])
+AC_MSG_NOTICE([MEBO_LIBDIR is set to  :${MEBO_LIBDIR}])
+AC_MSG_NOTICE([AOM_AV1_RC_LIBDIR is set to  :${AOM_AV1_RC_LIBDIR}])
+AC_MSG_NOTICE([BRC_LIBDIR is set to  :${BRC_LIBDIR}])
+AC_MSG_NOTICE([BRC_CONTROLLER is set to  :${BRC_CONTROLLER_LIBDIR}])
+
+AM_CONDITIONAL([ENABLE_MEBO], [test "x$MEBO_LIBDIR"!="x"])
+AM_CONDITIONAL([ENABLE_AOM_AV1_RC], [test "x$AOM_AV1_RC_LIBDIR"!="x"])
+AM_CONDITIONAL([ENABLE_BRC], [test "x$BRC_LIBDIR"!="x"])
+AM_CONDITIONAL([ENABLE_BRC_CONTROLLER], [test "x$BRC_CONTROLLER_LIBDIR"!="x"])
 
 LT_INIT
 AC_DISABLE_STATIC

encode/Makefile.am

@@ -89,16 +89,22 @@ vp8enc_LDADD       = \
 	$(top_builddir)/common/libva-display.la \
 	-lpthread -lm
 
+AUTOMAKE_OPTIONS =subdir-objects
+
 av1encode_SOURCES	= av1encode.c
 av1encode_SOURCES   += libmebo/libmebo_interface.cc
 av1encode_CFLAGS	= -I$(top_srcdir)/common -g
 av1encode_LDADD	= \
        	$(LIBVA_LIBS) \
 	$(top_builddir)/common/libva-display.la \
 	-lpthread -lm \
-	-ldl \
-	-lmebo \
-	-laom_av1_rc
+	-L$(MEBO_LIBDIR)-lmebo \
+	-L$(BRC_LIBDIR)-lbrc \
+	-L$(BRC_CONTROLLER_LIBDIR)-lbrc_controller \
+	-L$(AOM_AV1_RC_LIBDIR)-laom_av1_rc \
+	-ldl
+
+	
 
 valgrind:	$(bin_PROGRAMS) $(noinst_PROGRAMS)
 	for a in $(bin_PROGRAMS) $(noinst_PROGRAMS); do \

encode/av1encode.c

@@ -58,8 +58,6 @@
  * */
 #define BITSTREAM_ALLOCATE_STEPPING 1024 // in byte
 
-#define SWBRC 1
-
 struct __bitstream {
     uint8_t *buffer; // managed by u8 to avoid swap every 4byte
     int bit_offset;

encode/meson.build

@@ -28,18 +28,30 @@ executable('vp8enc', [ 'vp8enc.c' ],
 c_compiler = meson.get_compiler('c')
 cpp_compiler = meson.get_compiler('cpp')
 
-mebo_cpp = cpp_compiler.find_library('mebo')
-aom_av1_rc_cpp = cpp_compiler.find_library('aom_av1_rc')
-
-mebo_c = c_compiler.find_library('mebo')
-aom_av1_rc_c = c_compiler.find_library('aom_av1_rc')
-
 dl = c.find_library('dl')
 dl_dep_cpp = cpp_compiler.find_library('dl', required:true)
 
+
 if libva_dep.version().version_compare('>= 1.14.0')
+
+    av1_deps = [libva_display_dep, threads, m, dl, dl_dep_cpp]
+    if use_mebo and mebo_dep.found()
+        av1_deps += mebo_dep
+    endif
+
+    if use_aom_av1_rc and aom_av1_rc_dep.found()
+        av1_deps += aom_av1_rc_dep
+    endif
+
+    if use_brc and brc_dep.found()
+        av1_deps += brc_dep
+    endif
+
+    if use_brc_controller and brc_controller_dep.found()
+        av1_deps += brc_controller_dep
+    endif
+
     executable('av1encode', [ 'av1encode.c', 'libmebo/libmebo_interface.cc'  ],
-            dependencies: [ libva_display_dep, threads, m, dl, dl_dep_cpp,
-                            mebo_cpp, mebo_c, aom_av1_rc_cpp, aom_av1_rc_c],
+            dependencies: av1_deps,
             install: true)
 endif

meson.build

@@ -19,6 +19,108 @@ libva_utils_flags = [ '-Wno-unused-parameter',
 
 backends = ''
 
+c_compiler = meson.get_compiler('c')
+cpp_compiler = meson.get_compiler('cpp')
+
+#Add Mebo support
+use_mebo = false
+if get_option('mebo') != 'disabled'
+  require_mebo = get_option('mebo') == 'enabled'
+  local_mebo_path = join_paths(meson.current_source_dir(),
+                               'encode', 'libmebo', 'libs')
+  mebo_dep = cpp_compiler.find_library('mebo',
+                                      dirs :[local_mebo_path,
+                                            '/usr/local/lib/x86_64-linux-gnu'],
+                                      required:false)
+  if not mebo_dep.found() and require_mebo
+     error('''LibMebo library not installed in local path or system:
+            local path=/encode/libmebo/libs''')
+  endif
+
+  if mebo_dep.found()
+        use_mebo = true
+        message('mebo library found')
+        libva_utils_flags += ['-DHAVE_MEBO=1']
+    endif
+  if not mebo_dep.found()
+    error('LibMebo not installed')
+  endif
+endif
+
+use_brc = false
+if get_option('brc') != 'disabled'
+  require_brc = get_option('brc') == 'enabled'
+  local_brc_path = join_paths(meson.current_source_dir(),
+                               'encode', 'libmebo', 'libs')
+  brc_dep = cpp_compiler.find_library('brc',
+                                      dirs :[local_brc_path,
+                                            '/usr/local/lib/x86_64-linux-gnu'],
+                                      required:false)
+  if not brc_dep.found() and require_brc
+     error('''Libbrc library not installed in local path or system:
+            local path=/encode/libmebo/libs''')
+  endif
+
+  if brc_dep.found()
+        use_brc = true
+        message('brc library found')
+        libva_utils_flags += ['-DHAVE_BRC=1']
+    endif
+  if not brc_dep.found()
+    error('LIBBRC not installed')
+  endif
+endif
+
+use_brc_controller = false
+if get_option('brc_controller') != 'disabled'
+  require_brc_controller = get_option('brc_controller') == 'enabled'
+  local_brc_controller_path = join_paths(meson.current_source_dir(),
+                               'encode', 'libmebo', 'libs')
+  brc_controller_dep = cpp_compiler.find_library('brc_controller',
+                                      dirs :[local_brc_controller_path,
+                                            '/usr/local/lib/x86_64-linux-gnu'],
+                                      required:false)
+  if not brc_controller_dep.found() and require_brc_controller
+     error('Libbrc_controller library not installed in local path or system:
+            local path=/encode/libmebo/libs')
+  endif
+
+  if brc_controller_dep.found()
+        use_brc_controller = true
+        message('Libbrc_controller library found')
+        libva_utils_flags += ['-DHAVE_BRC=1']
+    endif
+  if not brc_controller_dep.found()
+    error('Libbrc_controller not installed')
+  endif
+endif
+
+#Add AOM_AV1_RC support
+use_aom_av1_rc = false
+if get_option('aom_av1_rc') != 'disabled'
+  require_aom_av1_rc = get_option('aom_av1_rc') == 'enabled'
+  local_aom_av1_rc_path = join_paths(meson.current_source_dir(),
+                                    'encode', 'libs', 'aom_libs')
+  aom_av1_rc_dep = cpp_compiler.find_library('aom_av1_rc',
+                                      dirs :[local_aom_av1_rc_path,
+                                      '/usr/local/lib/x86_64-linux-gnu'],
+                                      required:false)
+  if not aom_av1_rc_dep.found() and require_aom_av1_rc
+     error('''libaom_av1_rc.so not installed in local path or system: 
+                                 local path= encode/libmebo/libs/aom_libs''')
+  endif
+
+  if aom_av1_rc_dep.found()
+        use_aom_av1_rc = true
+        message('aom_av1_rc library found ')
+        libva_utils_flags += ['-DHAVE_AOM_AV1_RC=1']
+    endif
+
+  if not aom_av1_rc_dep.found()
+    error('Lib AOM AV1 RC not installed')
+  endif
+endif
+
 # DRM
 use_drm = false
 drm_deps=[]

meson_options.txt

@@ -17,3 +17,14 @@ option('win32',
 option('tests',
        type : 'boolean',
        value : false)
+option ('mebo', type: 'feature', value: 'enabled',
+         description: 'Enable LibMebo library support')
+
+option ('aom_av1_rc', type: 'feature', value: 'enabled',
+         description: 'Enable AV1 software BRC from AOM library')
+
+option ('brc', type: 'feature', value: 'enabled',
+         description: 'Enable brc to support libmebo library ')
+
+option ('brc_controller', type: 'feature', value: 'enabled',
+         description: 'Enable brc_controller to support libmebo')