Merge branch 'features/brillcodec_2i' into 'tizen_next'

Conflicts:
	configure
	package/changelog
	package/pkginfo.manifest
	target-i386/hax-all.c
	tizen/src/Makefile
	tizen/src/display/maru_display.c
	tizen/src/display/maru_sdl.c
	tizen/src/display/maru_shm.c
	tizen/src/display/maru_shm.h
	tizen/src/eventcast/encode_fb.c
	tizen/src/eventcast/encode_fb.h
	tizen/src/eventcast/touch.c
	tizen/src/eventcast/touch.h
	tizen/src/hw/pci/Makefile.objs
	tizen/src/hw/pci/maru_brillcodec.c
	tizen/src/hw/pci/maru_brillcodec.h
	tizen/src/hw/pci/maru_brillcodec_device.c
	tizen/src/tethering/Makefile.objs
	tizen/src/tethering/common.c
	tizen/src/util/new_debug_ch.c
	tizen/src/util/osutil.h
	vl.c

Change-Id: Iab1486003ec796882e52647d08518624db664cdc

diff --combined configure
index b4feed2,20925ef..a88fa73
--- 1/configure
--- 2/configure
+++ b/configure
@@@ -325,8 -325,6 +325,8 @@@ maru="no
  shm="no"
  libav="no"
  libpng="no"
 +dxva2="no"
 +vaapi="no"
  #
  glusterfs=""
  glusterfs_discard="no"
@@@ -1107,10 -1105,6 +1107,10 @@@ for opt d
    ;;
    --enable-libpng) libpng="yes"
    ;;
 +  --enable-dxva2) dxva2="yes"
 +  ;;
 +  --enable-vaapi) vaapi="yes"
 +  ;;
  #
    --disable-glusterfs) glusterfs="no"
    ;;
@@@ -1427,8 -1421,6 +1427,8 @@@ TIZEN-maru options
    --enable-libav           enable libav library
    --disable-libav          disable libav library
    --enable-libpng          enable png library
 +  --enable-dxva2           enable dxva2 support
 +  --enable-vaapi           enable vaapi support
  
  NOTE: The object files are built at the place where configure is launched
  EOF
@@@ -3984,53 -3976,6 +3984,53 @@@ if compile_prog "" "" ; the
      getauxval=yes
  fi
  
 +########################################
 +# check if dxva2 is available.
 +
 +if test "$dxva2" = "yes" ; then
 +    dxva2="no"
 +if test "$mingw32" = "yes" ; then
 +cat > $TMPC << EOF
 +#include <d3d9.h>
 +#include <dxva2api.h>
 +int main(void) {
 +#if !defined(IDirect3D9_CreateDevice) || \
 +    !defined(IDirect3DDeviceManager9_ResetDevice)
 +#error No DXVA2 support
 +#endif
 +    return 0;
 +}
 +EOF
 +if compile_prog "" "" ; then
 +    dxva2="yes"
 +fi
 +else
 +    error_exit "DXVA2 is supported only on Windows"
 +fi
 +fi
 +
 +########################################
 +# check if vaapi is available.
 +
 +if test "$vaapi" = "yes" ; then
 +    vaapi="no"
 +if test "$linux" = "yes" ; then
 +    if $pkg_config libva --exists; then
 +    if $pkg_config libva-x11 --exists; then
 +        libva_cflags=`$pkg_config --cflags libva`
 +        libva_libs=`$pkg_config --libs libva`
 +        libva_x11_cflags=`$pkg_config --cflags libva-x11`
 +        libva_x11_libs=`$pkg_config --libs libva-x11`
 +
 +        libs_softmmu="$libva_libs $libva_x11_libs $libs_softmmu"
 +        vaapi="yes"
 +    fi
 +    fi
 +else
 +    error_exit "VAAPI is supported only on Linux"
 +fi
 +fi
 +
  ##########################################
  # libav probe
  
@@@ -4409,8 -4354,6 +4409,8 @@@ echo "TIZEN-maru support $maru
  echo "TIZEN-maru shared framebuffer support $shm"
  echo "TIZEN-maru libav support $libav"
  echo "TIZEN-maru libpng support $libpng"
 +echo "TIZEN-maru DXVA2 support $dxva2"
 +echo "TIZEN-maru vaapi support $vaapi"
  #
  
  if test "$sdl_too_old" = "yes"; then
@@@ -4905,13 -4848,6 +4905,13 @@@ if test "$libpng" = "yes" ; the
    echo "CONFIG_PNG=y" >> $config_host_mak
    echo "LIBPNG_CFLAGS=$libpng_cflags" >> $config_host_mak
  fi
 +if test "$dxva2" = "yes" ; then
 +  echo "CONFIG_DXVA2=y" >> $config_host_mak
 +fi
 +if test "$vaapi" = "yes" ; then
 +  echo "CONFIG_VAAPI=y" >> $config_host_mak
 +  echo "LIBVA_CFLAGS=$libva_cflags $libva_x11_cflags" >> $config_host_mak
 +fi
  
  # TPM passthrough support?
  if test "$tpm" = "yes"; then
@@@ -4958,15 -4894,6 +4958,6 @@@ echo "CONFIG_TRACE_FILE=$trace_file" >
  if test "$trace_default" = "yes"; then
    echo "CONFIG_TRACE_DEFAULT=y" >> $config_host_mak
  fi
- if test "$hax" = "yes" ; then
-   if test "$mingw32" = "yes" ; then
-     echo "CONFIG_HAX_BACKEND=y" >> $config_host_mak
-   elif test "$darwin" = "yes" ; then
-     echo "CONFIG_HAX_BACKEND=y" >> $config_host_mak
-   else
-     hax="no"
-   fi
- fi
  
  if test "$rdma" = "yes" ; then
    echo "CONFIG_RDMA=y" >> $config_host_mak

diff --combined tizen/emulator_configure.sh
index b56cff0,8c6913d..e562fa8
--- 1/tizen/emulator_configure.sh
--- 2/tizen/emulator_configure.sh
+++ b/tizen/emulator_configure.sh
@@@ -218,11 -218,9 +218,10 @@@ exec ./configure 
   --extra-cflags=-Wno-error=redundant-decls \
   --extra-ldflags=-Wl,--large-address-aware \
   --cc=gcc \
-  --disable-coroutine-pool \
   --audio-drv-list=winwave \
   --enable-hax \
   --disable-vnc \
 + --enable-dxva2 \
   $CONFIGURE_APPEND \
  ;;
  Darwin*)

diff --combined tizen/src/Makefile
index 9a66868,273bb8c..b62b05b
--- 1/tizen/src/Makefile
--- 2/tizen/src/Makefile
+++ b/tizen/src/Makefile
@@@ -4,6 -4,11 +4,11 @@@ DIBS_ARM_DIR=../ar
  DIBS_COMMON_DIR=../common
  DIBS_SWT_DIR=-Dclasspath.dibs=$(ROOTDIR)/tools/emulator/bin
  
+ ifeq ($(CC),"")
+       @echo "cc does not exist"
+       @exit 1
+ endif
+ 
  ifndef TIZEN_SDK_DEV_PATH
  TIZEN_SDK_DEV_PATH=${HOME}/tizen-sdk-dev
  endif
@@@ -19,10 -24,8 +24,10 @@@ ifndef CONFIG_LINU
  TARGET_EXE += util/check-hax$(EXESUF)
  endif
  
 -all: qemu skin_client $(TARGET_EXE)
 -qemu: $(TARGET_EXE) build_info
 +TARGET_DSO +=
 +
 +all: qemu skin_client $(TARGET_EXE) $(TARGET_DSO)
 +qemu: $(TARGET_EXE) $(TARGET_DSO) build_info
        cd ../../ && $(MAKE)
  qemu_clean:
        cd ../../ && $(MAKE) clean
@@@ -48,9 -51,9 +53,9 @@@ CHECK_GL_LDFLAGS += -mmacosx-version-mi
  endif
  
  util/check-gl$(EXESUF): $(CHECK_GL_OBJS)
-       gcc $(CHECK_GL_OBJS) $(CHECK_GL_LDFLAGS) -o $@
+       $(CC) $(CHECK_GL_OBJS) $(CHECK_GL_LDFLAGS) -o $@
  $(CHECK_GL_OBJS): %.o: %.c
-       gcc $< $(CHECK_GL_CFLAGS) -o $@
+       $(CC) $< $(CHECK_GL_CFLAGS) -o $@
  
  # Building check-cam
  CHECK_CAM_CFLAGS = -c

diff --combined tizen/src/hw/pci/Makefile.objs
index 511f6ae,f816976..408a68c
--- 1/tizen/src/hw/pci/Makefile.objs
--- 2/tizen/src/hw/pci/Makefile.objs
+++ b/tizen/src/hw/pci/Makefile.objs
@@@ -1,10 -1,5 +1,10 @@@
- obj-y += maru_brillcodec_device.o
+ obj-$(CONFIG_LIBAV) += maru_brillcodec_device.o
+ obj-$(CONFIG_LIBAV) += maru_brillcodec.o
 +ifdef CONFIG_LINUX
 +LIBS += -ldl
 +endif
- obj-y += maru_brillcodec.o
 +obj-$(CONFIG_DXVA2) += maru_dxva2_plugin.o
 +obj-$(CONFIG_VAAPI) += maru_brillcodec_vaapi.o
  
  obj-y += maru_brightness.o
  
@@@ -25,11 -20,5 +25,11 @@@ LIBS += -framework Cocoa -framework QTK
  LIBS += -framework AppKit
  endif
  
- maru_brillcodec.o-cflags := $(LIBAV_CFLAGS)
  maru_brillcodec_device.o-cflags := $(LIBAV_CFLAGS)
+ maru_brillcodec.o-cflags := $(LIBAV_CFLAGS)
 +ifdef CONFIG_DXVA2
 +maru_dxva2_plugin.o-cflags := $(LIBAV_CFLAGS)
 +endif
 +ifdef CONFIG_VAAPI
 +maru_brillcodec_vaapi.o-cflags := $(LIBAV_CFLAGS) $(LIBVA_CFLAGS)
 +endif