Remove libvpx submodule

We will be using upstream codecparsers always.
No more internal libvpx !

diff --git a/.gitmodules b/.gitmodules
index bb34d0d..a72ea38 100644 (file)
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,3 @@
 [submodule "ext/codecparsers"]
        path = ext/codecparsers
        url = https://github.com/01org/gstreamer-codecparsers.git
-[submodule "ext/libvpx/upstream"]
-       path = ext/libvpx/upstream
-       url = https://chromium.googlesource.com/webm/libvpx

diff --git a/autogen.sh b/autogen.sh
index b36c8dc..245970a 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -26,7 +26,6 @@ else
             submodule_init="yes"
         fi
     done
-    [ -f ext/libvpx/upstream/configure ] || submodule_init="yes"
     if test "$submodule_init" = "yes"; then
         $GIT submodule init
     fi

diff --git a/configure.ac b/configure.ac
index 861b5cf..734e1cf 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -113,11 +113,6 @@ AC_ARG_ENABLE(builtin_codecparsers,
                    [enable built-in codecparsers @<:@default=yes@:>@]),
     [], [enable_builtin_codecparsers="yes"])
 
-AC_ARG_ENABLE(builtin_libvpx,
-    AS_HELP_STRING([--enable-builtin-libvpx],
-                   [enable built-in libvpx @<:@default=yes@:>@]),
-    [], [enable_builtin_libvpx="yes"])
-
 AC_ARG_ENABLE([encoders],
     AS_HELP_STRING([--enable-encoders],
                    [enable video encoders @<:@default=yes@:>@]),
@@ -153,14 +148,6 @@ AC_ARG_WITH([glapi],
         [build with the specified OpenGL APIs @<:@default=default_glapi@:>@]),
     [GLAPI="$with_glapi"], [GLAPI=default_glapi])
 
-
-dnl Check fr YASM
-AC_ARG_VAR([YASM], [Path to yasm program, if any])
-AC_PATH_PROG([YASM], [yasm])
-if test -z "$YASM" -a "$enable_builtin_libvpx" = "yes"; then
-    AC_MSG_ERROR([yasm is needed to build libvpx sources])
-fi
-
 dnl Check for PATCH
 AC_ARG_VAR([PATCH], [Path to patch program, if any])
 AC_PATH_PROG([PATCH], [patch])
@@ -378,9 +365,6 @@ AM_CONDITIONAL([USE_LOCAL_CODEC_PARSERS_JPEG],
     [test "$ac_cv_have_gst_jpeg_parser" != "yes"])
 
 dnl ... VP8 parser, not upstream yet
-if test "$enable_builtin_libvpx" = "yes"; then
-    ac_cv_have_gst_vp8_parser="no"
-fi
 AC_CACHE_CHECK([for VP8 parser],
     ac_cv_have_gst_vp8_parser, [
     saved_CPPFLAGS="$CPPFLAGS"
@@ -399,7 +383,6 @@ AC_CACHE_CHECK([for VP8 parser],
 ])
 AM_CONDITIONAL([USE_LOCAL_CODEC_PARSERS_VP8],
     [test "$ac_cv_have_gst_vp8_parser" != "yes"])
-AM_CONDITIONAL([USE_BUILTIN_LIBVPX], [test "$enable_builtin_libvpx" = "yes"])
 
 dnl ... VP9 parser, with required extensions
 AC_CACHE_CHECK([for VP9 parser],
@@ -1142,7 +1125,6 @@ debian.upstream/libgstvaapi-x11.install.in
     docs/reference/plugins/Makefile
     docs/reference/plugins/plugins-docs.xml
     ext/Makefile
-    ext/libvpx/Makefile
     gst-libs/Makefile
     gst-libs/gst/Makefile
     gst-libs/gst/base/Makefile

diff --git a/debian.upstream/libgstvaapi.install.in b/debian.upstream/libgstvaapi.install.in
index afb5221..f719a6f 100644 (file)
--- a/debian.upstream/libgstvaapi.install.in
+++ b/debian.upstream/libgstvaapi.install.in
@@ -1,2 +1 @@
-debian/tmp/usr/lib/libgstcodecparsers_vpx.so.*
 debian/tmp/usr/lib/libgstvaapi-@GST_API_VERSION@.so.*

diff --git a/ext/Makefile.am b/ext/Makefile.am
index 7a9a147..b639f03 100644 (file)
--- a/ext/Makefile.am
+++ b/ext/Makefile.am
@@ -1,5 +1,3 @@
-SUBDIRS = libvpx
-
 EXTRA_DIST =
 
 codecparsers_srcdir = \

diff --git a/ext/libvpx/Makefile.am b/ext/libvpx/Makefile.am
deleted file mode 100644 (file)
index d8ff808..0000000
--- a/ext/libvpx/Makefile.am
+++ /dev/null
@@ -1,160 +0,0 @@
-# Makefile.am - Rules for the built-in libvpx sources
-#
-# Copyright (C) 2014 Intel Corporation
-#   Author: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Library General Public
-# License as published by the Free Software Foundation; either
-# version 2 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Library General Public License for more details.
-#
-# You should have received a copy of the GNU Library General Public
-# License along with this library; if not, write to the
-# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
-# Boston, MA 02110-1301, USA.
-
-lib_LTLIBRARIES =
-if USE_BUILTIN_LIBVPX
-lib_LTLIBRARIES += libgstcodecparsers_vpx.la
-endif
-
-gst_vpx_source_c = gstlibvpx.c
-gst_vpx_source_h = gstlibvpx.h
-
-vpx_upstream   = upstream
-vpx_srcdir     = $(srcdir)/$(vpx_upstream)
-vpx_builddir   = $(builddir)/$(vpx_upstream)
-vpx_versions   = libgstcodecparsers_vpx.vers
-
-vpx_cflags = \
-       -I$(vpx_srcdir) \
-       -I$(vpx_builddir) \
-       $(NULL)
-
-vpx_libs = \
-       -Wl,-Bsymbolic \
-       -Wl,--whole-archive \
-       -Wl,$(vpx_builddir)/libvpx.a \
-       -Wl,--no-whole-archive \
-       -Wl,--version-script,$(srcdir)/$(vpx_versions) \
-       -Wl,-lpthread \
-       -Wl,-lm \
-       $(NULL)
-
-libgstcodecparsers_vpx_la_SOURCES              = $(gst_vpx_source_c)
-libgstcodecparsers_vpx_la_CFLAGS               = $(vpx_cflags)
-libgstcodecparsers_vpx_la_DEPENDENCIES         = vpx.build
-libgstcodecparsers_vpx_la_LINK                 = $(LINK) $(vpx_libs)
-EXTRA_libgstcodecparsers_vpx_la_DEPENDENCIES   = $(srcdir)/$(vpx_versions)
-
-VPX_DEBUG      = yes
-
-# Codecs
-VP8_DECODER    = enable
-VP8_ENCODER    = disable
-VP9_DECODER    = disable
-VP9_ENCODER    = disable
-
-clean-local: vpx.clean
-maintainer-clean-local: vpx.maintainer.clean
-
-vpx.build: vpx.configure.stamp
-       @$(MAKE) -C $(vpx_builddir)
-
-vpx.clean:
-       @[ -d $(vpx_builddir) ] && \
-       $(MAKE) -C $(vpx_builddir) clean || :
-       rm -f vpx.configure.stamp
-
-vpx.maintainer.clean: vpx.clean
-       rm -rf $(vpx_builddir)
-
-DISTCLEANFILES = \
-       $(vpx_builddir)/config.mk                       \
-       $(vpx_builddir)/config.log                      \
-       $(vpx_builddir)/libs-x86_64-linux-gcc.mk        \
-       $(vpx_builddir)/Makefile                        \
-       $(vpx_builddir)/vpx_config.c                    \
-       $(vpx_builddir)/vpx_config.h                    \
-       $(vpx_builddir)/vpx_config.asm                  \
-       $(NULL)
-
-vpx.configure.stamp:
-       @[ -d $(vpx_builddir) ] || mkdir $(vpx_builddir);                \
-       cd $(vpx_builddir)                                              ;  \
-       test "$(VPX_DEBUG)" = "yes"                                     && \
-       CONFIGURE_FLAGS="$$CONFIGURE_FLAGS --enable-debug"              ; \
-       $(abs_srcdir)/$(vpx_upstream)/configure $$CONFIGURE_FLAGS       \
-               --enable-static                                         \
-               --enable-pic                                            \
-               --disable-shared                                        \
-               --$(VP8_DECODER)-vp8-decoder                            \
-               --$(VP8_ENCODER)-vp8-encoder                            \
-               --$(VP9_DECODER)-vp9-decoder                            \
-               --$(VP9_ENCODER)-vp9-encoder                            \
-               --enable-runtime-cpu-detect                             \
-               --disable-examples                                      \
-               --disable-docs                                          \
-               --disable-unit-tests                                    && \
-       cd ..                                                           && \
-       touch $@
-
-$(gst_vpx_source_c): vpx.build
-
-CLEANFILES = vpx.configure.stamp
-
-# Files for packaging
-include $(srcdir)/sources.frag
-
-vpx_sources = \
-       $(vpx_srcdir)/AUTHORS \
-       $(vpx_srcdir)/CHANGELOG \
-       $(vpx_srcdir)/LICENSE \
-       $(vpx_srcdir)/PATENTS \
-       $(vpx_srcdir)/build/make/ads2armasm_ms.pl \
-       $(vpx_srcdir)/build/make/ads2gas_apple.pl \
-       $(vpx_srcdir)/build/make/ads2gas.pl \
-       $(vpx_srcdir)/build/make/Android.mk \
-       $(vpx_srcdir)/build/make/armlink_adapter.sh \
-       $(vpx_srcdir)/build/make/configure.sh \
-       $(vpx_srcdir)/build/make/gen_asm_deps.sh \
-       $(vpx_srcdir)/build/make/gen_msvs_def.sh \
-       $(vpx_srcdir)/build/make/gen_msvs_proj.sh \
-       $(vpx_srcdir)/build/make/gen_msvs_sln.sh \
-       $(vpx_srcdir)/build/make/gen_msvs_vcxproj.sh \
-       $(vpx_srcdir)/build/make/iosbuild.sh \
-       $(vpx_srcdir)/build/make/Makefile \
-       $(vpx_srcdir)/build/make/msvs_common.sh \
-       $(vpx_srcdir)/build/make/rtcd.pl \
-       $(vpx_srcdir)/build/make/thumb.pm \
-       $(vpx_srcdir)/build/make/version.sh \
-       $(vpx_srcdir)/configure \
-       $(vpx_source_mak:%.mk=$(vpx_srcdir)/%.mk) \
-       $(vpx_source_c:%.c=$(vpx_srcdir)/%.c) \
-       $(vpx_source_h:%.h=$(vpx_srcdir)/%.h) \
-       $(NULL)
-
-EXTRA_DIST = \
-       sources.frag            \
-       $(gst_vpx_source_h)     \
-       $(vpx_sources)          \
-       $(vpx_versions)         \
-       $(NULL)
-
-# Avoid implicit rule that tries to compile .asm.o to .asm
-dist-hook:
-       for f in $(vpx_source_asm); do                                  \
-         mkdir -p $(distdir)/$(vpx_upstream)/$$(dirname $$f);          \
-         cp -fpR $(vpx_srcdir)/$$f $(distdir)/$(vpx_upstream)/$$f;     \
-       done
-
--include $(top_srcdir)/git.mk
-
-# Tell version 3.79 and up of GNU make to not build goals in this
-# directory in parallel.
-.NOTPARALLEL:

diff --git a/ext/libvpx/gstlibvpx.c b/ext/libvpx/gstlibvpx.c
deleted file mode 100644 (file)
index fc376e1..0000000
--- a/ext/libvpx/gstlibvpx.c
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
- * gstlibvpx.c - GStreamer/libvpx glue
- *
- * Use of this source code is governed by a BSD-style license
- * that can be found in the LICENSE file in the root of the source
- * tree. An additional intellectual property rights grant can be found
- * in the file PATENTS.  All contributing project authors may
- * be found in the AUTHORS file in the root of the source tree.
- */
-
-#include <string.h>
-#include <assert.h>
-#include <vp8/common/entropy.h>
-#include <vp8/common/entropymv.h>
-#include <vp8/common/default_coef_probs.h>
-#include <vp8/decoder/dboolhuff.h>
-#include "gstlibvpx.h"
-
-#define BOOL_DECODER_CAST(bd) \
-  ((BOOL_DECODER *)(&(bd)->private[1]))
-
-bool
-vp8_bool_decoder_init (vp8_bool_decoder * bd, const uint8_t * buf,
-    unsigned int buf_size)
-{
-  assert ((sizeof (*bd) - sizeof (bd->private[0])) >= sizeof (BOOL_DECODER));
-
-  bd->private[0] = (uintptr_t)buf;
-  return vp8dx_start_decode (BOOL_DECODER_CAST (bd), buf, buf_size,
-              NULL, NULL) == 0;
-}
-
-int
-vp8_bool_decoder_read (vp8_bool_decoder * bd, uint8_t prob)
-{
-  return vp8dx_decode_bool (BOOL_DECODER_CAST (bd), prob);
-}
-
-int
-vp8_bool_decoder_read_literal (vp8_bool_decoder * bd, int bits)
-{
-  return vp8_decode_value (BOOL_DECODER_CAST (bd), bits);
-}
-
-unsigned int
-vp8_bool_decoder_get_pos (vp8_bool_decoder * bd_)
-{
-  BOOL_DECODER *const bd = BOOL_DECODER_CAST (bd_);
-
-  return ((uintptr_t)bd->user_buffer - bd_->private[0]) * 8 - (8 + bd->count);
-}
-
-void
-vp8_bool_decoder_get_state (vp8_bool_decoder * bd_,
-    vp8_bool_decoder_state * state)
-{
-  BOOL_DECODER *const bd = BOOL_DECODER_CAST (bd_);
-
-  if (bd->count < 0)
-    vp8dx_bool_decoder_fill (bd);
-
-  state->range = bd->range;
-  state->value = (uint8_t) ((bd->value) >> (VP8_BD_VALUE_SIZE - 8));
-  state->count = (8 + bd->count) % 8;
-}
-
-void
-vp8_init_token_update_probs (uint8_t
-    probs[BLOCK_TYPES][COEF_BANDS][PREV_COEF_CONTEXTS][ENTROPY_NODES])
-{
-  memcpy (probs, vp8_coef_update_probs, sizeof (vp8_coef_update_probs));
-}
-
-void
-vp8_init_default_token_probs (uint8_t
-    probs[BLOCK_TYPES][COEF_BANDS][PREV_COEF_CONTEXTS][ENTROPY_NODES])
-{
-  memcpy (probs, default_coef_probs, sizeof (default_coef_probs));
-}
-
-void
-vp8_init_mv_update_probs (uint8_t probs[2][MVPcount])
-{
-  memcpy (probs[0], vp8_mv_update_probs[0].prob,
-      sizeof (vp8_mv_update_probs[0].prob));
-  memcpy (probs[1], vp8_mv_update_probs[1].prob,
-      sizeof (vp8_mv_update_probs[1].prob));
-}
-
-void
-vp8_init_default_mv_probs (uint8_t probs[2][MVPcount])
-{
-  memcpy (probs[0], vp8_default_mv_context[0].prob,
-      sizeof (vp8_default_mv_context[0].prob));
-  memcpy (probs[1], vp8_default_mv_context[1].prob,
-      sizeof (vp8_default_mv_context[1].prob));
-}
-
-void
-vp8_init_default_intra_mode_probs (uint8_t y_probs[VP8_YMODES-1],
-    uint8_t uv_probs[VP8_UV_MODES-1])
-{
-  extern const uint8_t vp8_kf_ymode_prob[VP8_YMODES-1];
-  extern const uint8_t vp8_kf_uv_mode_prob[VP8_UV_MODES-1];
-
-  memcpy (y_probs, vp8_kf_ymode_prob, sizeof (vp8_kf_ymode_prob));
-  memcpy (uv_probs, vp8_kf_uv_mode_prob, sizeof (vp8_kf_uv_mode_prob));
-}
-
-void
-vp8_init_default_inter_mode_probs (uint8_t y_probs[VP8_YMODES-1],
-    uint8_t uv_probs[VP8_UV_MODES-1])
-{
-  extern const uint8_t vp8_ymode_prob[VP8_YMODES-1];
-  extern const uint8_t vp8_uv_mode_prob[VP8_UV_MODES-1];
-
-  memcpy (y_probs, vp8_ymode_prob, sizeof (vp8_ymode_prob));
-  memcpy (uv_probs, vp8_uv_mode_prob, sizeof (vp8_uv_mode_prob));
-}

diff --git a/ext/libvpx/gstlibvpx.h b/ext/libvpx/gstlibvpx.h
deleted file mode 100644 (file)
index d4bd784..0000000
--- a/ext/libvpx/gstlibvpx.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * gstlibvpx.h - GStreamer/libvpx glue
- *
- * Use of this source code is governed by a BSD-style license
- * that can be found in the LICENSE file in the root of the source
- * tree. An additional intellectual property rights grant can be found
- * in the file PATENTS.  All contributing project authors may
- * be found in the AUTHORS file in the root of the source tree.
- */
-
-#ifndef GST_LIBVPX_H
-#define GST_LIBVPX_H
-
-#include <stdint.h>
-#include <stdbool.h>
-
-typedef struct _vp8_bool_decoder        vp8_bool_decoder;
-typedef struct _vp8_bool_decoder_state  vp8_bool_decoder_state;
-
-struct _vp8_bool_decoder {
-    uintptr_t   private[16];
-};
-
-struct _vp8_bool_decoder_state {
-    uint8_t     range; /* Current "range" value (<= 255) */
-    uint8_t     value; /* Current "value" value */
-    uint8_t     count; /* Number of bits shifted out of value (<= 7) */
-};
-
-bool
-vp8_bool_decoder_init (vp8_bool_decoder * bd, const uint8_t * buf,
-    unsigned int buf_size);
-
-int
-vp8_bool_decoder_read (vp8_bool_decoder * bd, uint8_t prob);
-
-int
-vp8_bool_decoder_read_literal (vp8_bool_decoder * bd, int bits);
-
-unsigned int
-vp8_bool_decoder_get_pos (vp8_bool_decoder * bd);
-
-void
-vp8_bool_decoder_get_state (vp8_bool_decoder * bd,
-    vp8_bool_decoder_state * state);
-
-void
-vp8_init_token_update_probs (uint8_t probs[4][8][3][11]);
-
-void
-vp8_init_default_token_probs (uint8_t probs[4][8][3][11]);
-
-void
-vp8_init_mv_update_probs (uint8_t probs[2][19]);
-
-void
-vp8_init_default_mv_probs (uint8_t probs[2][19]);
-
-void
-vp8_init_default_intra_mode_probs (uint8_t y_probs[4], uint8_t uv_probs[3]);
-
-void
-vp8_init_default_inter_mode_probs (uint8_t y_probs[4], uint8_t uv_probs[3]);
-
-#endif /* GST_LIBVPX_H */

diff --git a/ext/libvpx/libgstcodecparsers_vpx.vers b/ext/libvpx/libgstcodecparsers_vpx.vers
deleted file mode 100644 (file)
index 6c178e7..0000000
--- a/ext/libvpx/libgstcodecparsers_vpx.vers
+++ /dev/null
@@ -1,16 +0,0 @@
-GSTREAMER {
-global:
-    vp8_bool_decoder_init;
-    vp8_bool_decoder_read;
-    vp8_bool_decoder_read_literal;
-    vp8_bool_decoder_get_pos;
-    vp8_bool_decoder_get_state;
-    vp8_init_token_update_probs;
-    vp8_init_default_token_probs;
-    vp8_init_mv_update_probs;
-    vp8_init_default_mv_probs;
-    vp8_init_default_intra_mode_probs;
-    vp8_init_default_inter_mode_probs;
-local:
-    *;
-};

diff --git a/ext/libvpx/sources.frag b/ext/libvpx/sources.frag
deleted file mode 100644 (file)
index a6feeca..0000000
--- a/ext/libvpx/sources.frag
+++ /dev/null
@@ -1,717 +0,0 @@
-# sources.frag - Generated list of source files for libvpx (-*- makefile -*-)
-#
-# Copyright (C) 2014 Intel Corporation
-#   Author: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Library General Public
-# License as published by the Free Software Foundation; either
-# version 2 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Library General Public License for more details.
-#
-# You should have received a copy of the GNU Library General Public
-# License along with this library; if not, write to the
-# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
-# Boston, MA 02110-1301, USA.
-
-vpx_source_mak = \
-       build/make/Android.mk \
-       docs.mk \
-       examples.mk \
-       libs.mk \
-       solution.mk \
-       test/android/Android.mk \
-       test/test-data.mk \
-       test/test.mk \
-       third_party/googletest/gtest.mk \
-       third_party/libwebm/Android.mk \
-       vp8/vp8_common.mk \
-       vp8/vp8cx_arm.mk \
-       vp8/vp8cx.mk \
-       vp8/vp8dx.mk \
-       vp9/vp9_common.mk \
-       vp9/vp9cx.mk \
-       vp9/vp9dx.mk \
-       vpx_mem/vpx_mem.mk \
-       vpx_ports/vpx_ports.mk \
-       vpx_scale/vpx_scale.mk \
-       vpx/vpx_codec.mk \
-       $(NULL)
-
-vpx_source_c = \
-       args.c \
-       examples/decode_to_md5.c \
-       examples/decode_with_drops.c \
-       examples/postproc.c \
-       examples/resize_util.c \
-       examples/set_maps.c \
-       examples/simple_decoder.c \
-       examples/simple_encoder.c \
-       examples/twopass_encoder.c \
-       examples/vp8cx_set_ref.c \
-       examples/vp8_multi_resolution_encoder.c \
-       examples/vp9_lossless_encoder.c \
-       examples/vp9_spatial_svc_encoder.c \
-       examples/vpx_temporal_svc_encoder.c \
-       ivfdec.c \
-       ivfenc.c \
-       md5_utils.c \
-       rate_hist.c \
-       tools_common.c \
-       video_reader.c \
-       video_writer.c \
-       vp8/common/alloccommon.c \
-       vp8/common/arm/armv6/idct_blk_v6.c \
-       vp8/common/arm/bilinearfilter_arm.c \
-       vp8/common/arm/dequantize_arm.c \
-       vp8/common/arm/filter_arm.c \
-       vp8/common/arm/loopfilter_arm.c \
-       vp8/common/arm/neon/bilinearpredict_neon.c \
-       vp8/common/arm/neon/copymem_neon.c \
-       vp8/common/arm/neon/dc_only_idct_add_neon.c \
-       vp8/common/arm/neon/dequant_idct_neon.c \
-       vp8/common/arm/neon/dequantizeb_neon.c \
-       vp8/common/arm/neon/idct_blk_neon.c \
-       vp8/common/arm/neon/idct_dequant_0_2x_neon.c \
-       vp8/common/arm/neon/idct_dequant_full_2x_neon.c \
-       vp8/common/arm/neon/iwalsh_neon.c \
-       vp8/common/arm/neon/loopfilter_neon.c \
-       vp8/common/arm/neon/loopfiltersimplehorizontaledge_neon.c \
-       vp8/common/arm/neon/loopfiltersimpleverticaledge_neon.c \
-       vp8/common/arm/neon/mbloopfilter_neon.c \
-       vp8/common/arm/neon/reconintra_neon.c \
-       vp8/common/arm/neon/sad_neon.c \
-       vp8/common/arm/neon/shortidct4x4llm_neon.c \
-       vp8/common/arm/neon/sixtappredict_neon.c \
-       vp8/common/arm/neon/variance_neon.c \
-       vp8/common/arm/neon/vp8_subpixelvariance_neon.c \
-       vp8/common/arm/variance_arm.c \
-       vp8/common/blockd.c \
-       vp8/common/context.c \
-       vp8/common/debugmodes.c \
-       vp8/common/dequantize.c \
-       vp8/common/entropy.c \
-       vp8/common/entropymode.c \
-       vp8/common/entropymv.c \
-       vp8/common/extend.c \
-       vp8/common/filter.c \
-       vp8/common/findnearmv.c \
-       vp8/common/generic/systemdependent.c \
-       vp8/common/idct_blk.c \
-       vp8/common/idctllm.c \
-       vp8/common/loopfilter.c \
-       vp8/common/loopfilter_filters.c \
-       vp8/common/mbpitch.c \
-       vp8/common/mfqe.c \
-       vp8/common/mips/dspr2/dequantize_dspr2.c \
-       vp8/common/mips/dspr2/filter_dspr2.c \
-       vp8/common/mips/dspr2/idct_blk_dspr2.c \
-       vp8/common/mips/dspr2/idctllm_dspr2.c \
-       vp8/common/mips/dspr2/loopfilter_filters_dspr2.c \
-       vp8/common/mips/dspr2/reconinter_dspr2.c \
-       vp8/common/modecont.c \
-       vp8/common/postproc.c \
-       vp8/common/ppc/loopfilter_altivec.c \
-       vp8/common/ppc/systemdependent.c \
-       vp8/common/quant_common.c \
-       vp8/common/reconinter.c \
-       vp8/common/reconintra4x4.c \
-       vp8/common/reconintra.c \
-       vp8/common/rtcd.c \
-       vp8/common/sad_c.c \
-       vp8/common/setupintrarecon.c \
-       vp8/common/swapyv12buffer.c \
-       vp8/common/textblit.c \
-       vp8/common/treecoder.c \
-       vp8/common/variance_c.c \
-       vp8/common/x86/filter_x86.c \
-       vp8/common/x86/idct_blk_mmx.c \
-       vp8/common/x86/idct_blk_sse2.c \
-       vp8/common/x86/loopfilter_x86.c \
-       vp8/common/x86/recon_wrapper_sse2.c \
-       vp8/common/x86/variance_mmx.c \
-       vp8/common/x86/variance_sse2.c \
-       vp8/common/x86/variance_ssse3.c \
-       vp8/common/x86/vp8_asm_stubs.c \
-       vp8/decoder/dboolhuff.c \
-       vp8/decoder/decodeframe.c \
-       vp8/decoder/decodemv.c \
-       vp8/decoder/detokenize.c \
-       vp8/decoder/error_concealment.c \
-       vp8/decoder/onyxd_if.c \
-       vp8/decoder/threading.c \
-       vp8/encoder/arm/dct_arm.c \
-       vp8/encoder/arm/neon/denoising_neon.c \
-       vp8/encoder/arm/neon/fastquantizeb_neon.c \
-       vp8/encoder/arm/neon/shortfdct_neon.c \
-       vp8/encoder/arm/neon/subtract_neon.c \
-       vp8/encoder/arm/neon/vp8_mse16x16_neon.c \
-       vp8/encoder/arm/neon/vp8_shortwalsh4x4_neon.c \
-       vp8/encoder/bitstream.c \
-       vp8/encoder/boolhuff.c \
-       vp8/encoder/dct.c \
-       vp8/encoder/denoising.c \
-       vp8/encoder/encodeframe.c \
-       vp8/encoder/encodeintra.c \
-       vp8/encoder/encodemb.c \
-       vp8/encoder/encodemv.c \
-       vp8/encoder/ethreading.c \
-       vp8/encoder/firstpass.c \
-       vp8/encoder/lookahead.c \
-       vp8/encoder/mcomp.c \
-       vp8/encoder/modecosts.c \
-       vp8/encoder/mr_dissim.c \
-       vp8/encoder/onyx_if.c \
-       vp8/encoder/pickinter.c \
-       vp8/encoder/picklpf.c \
-       vp8/encoder/ppc/csystemdependent.c \
-       vp8/encoder/quantize.c \
-       vp8/encoder/ratectrl.c \
-       vp8/encoder/rdopt.c \
-       vp8/encoder/segmentation.c \
-       vp8/encoder/ssim.c \
-       vp8/encoder/temporal_filter.c \
-       vp8/encoder/tokenize.c \
-       vp8/encoder/treewriter.c \
-       vp8/encoder/x86/denoising_sse2.c \
-       vp8/encoder/x86/quantize_sse2.c \
-       vp8/encoder/x86/quantize_sse4.c \
-       vp8/encoder/x86/quantize_ssse3.c \
-       vp8/encoder/x86/vp8_enc_stubs_mmx.c \
-       vp8/encoder/x86/vp8_enc_stubs_sse2.c \
-       vp8/vp8_cx_iface.c \
-       vp8/vp8_dx_iface.c \
-       vp9/common/arm/neon/vp9_avg_neon.c \
-       vp9/common/arm/neon/vp9_convolve8_avg_neon.c \
-       vp9/common/arm/neon/vp9_convolve8_neon.c \
-       vp9/common/arm/neon/vp9_convolve_neon.c \
-       vp9/common/arm/neon/vp9_copy_neon.c \
-       vp9/common/arm/neon/vp9_idct16x16_1_add_neon.c \
-       vp9/common/arm/neon/vp9_idct16x16_add_neon.c \
-       vp9/common/arm/neon/vp9_idct16x16_neon.c \
-       vp9/common/arm/neon/vp9_idct32x32_1_add_neon.c \
-       vp9/common/arm/neon/vp9_idct32x32_add_neon.c \
-       vp9/common/arm/neon/vp9_idct4x4_1_add_neon.c \
-       vp9/common/arm/neon/vp9_idct4x4_add_neon.c \
-       vp9/common/arm/neon/vp9_idct8x8_1_add_neon.c \
-       vp9/common/arm/neon/vp9_idct8x8_add_neon.c \
-       vp9/common/arm/neon/vp9_iht4x4_add_neon.c \
-       vp9/common/arm/neon/vp9_iht8x8_add_neon.c \
-       vp9/common/arm/neon/vp9_loopfilter_16_neon.c \
-       vp9/common/arm/neon/vp9_loopfilter_4_neon.c \
-       vp9/common/arm/neon/vp9_loopfilter_8_neon.c \
-       vp9/common/arm/neon/vp9_loopfilter_neon.c \
-       vp9/common/arm/neon/vp9_reconintra_neon.c \
-       vp9/common/mips/dspr2/vp9_convolve2_avg_dspr2.c \
-       vp9/common/mips/dspr2/vp9_convolve2_avg_horiz_dspr2.c \
-       vp9/common/mips/dspr2/vp9_convolve2_dspr2.c \
-       vp9/common/mips/dspr2/vp9_convolve2_horiz_dspr2.c \
-       vp9/common/mips/dspr2/vp9_convolve2_vert_dspr2.c \
-       vp9/common/mips/dspr2/vp9_convolve8_avg_dspr2.c \
-       vp9/common/mips/dspr2/vp9_convolve8_avg_horiz_dspr2.c \
-       vp9/common/mips/dspr2/vp9_convolve8_dspr2.c \
-       vp9/common/mips/dspr2/vp9_convolve8_horiz_dspr2.c \
-       vp9/common/mips/dspr2/vp9_convolve8_vert_dspr2.c \
-       vp9/common/mips/dspr2/vp9_intrapred16_dspr2.c \
-       vp9/common/mips/dspr2/vp9_intrapred4_dspr2.c \
-       vp9/common/mips/dspr2/vp9_intrapred8_dspr2.c \
-       vp9/common/mips/dspr2/vp9_itrans16_dspr2.c \
-       vp9/common/mips/dspr2/vp9_itrans32_cols_dspr2.c \
-       vp9/common/mips/dspr2/vp9_itrans32_dspr2.c \
-       vp9/common/mips/dspr2/vp9_itrans4_dspr2.c \
-       vp9/common/mips/dspr2/vp9_itrans8_dspr2.c \
-       vp9/common/mips/dspr2/vp9_loopfilter_filters_dspr2.c \
-       vp9/common/mips/dspr2/vp9_mbloop_loopfilter_dspr2.c \
-       vp9/common/mips/dspr2/vp9_mblpf_horiz_loopfilter_dspr2.c \
-       vp9/common/mips/dspr2/vp9_mblpf_vert_loopfilter_dspr2.c \
-       vp9/common/vp9_alloccommon.c \
-       vp9/common/vp9_blockd.c \
-       vp9/common/vp9_common_data.c \
-       vp9/common/vp9_convolve.c \
-       vp9/common/vp9_debugmodes.c \
-       vp9/common/vp9_entropy.c \
-       vp9/common/vp9_entropymode.c \
-       vp9/common/vp9_entropymv.c \
-       vp9/common/vp9_filter.c \
-       vp9/common/vp9_frame_buffers.c \
-       vp9/common/vp9_idct.c \
-       vp9/common/vp9_loopfilter.c \
-       vp9/common/vp9_loopfilter_filters.c \
-       vp9/common/vp9_mfqe.c \
-       vp9/common/vp9_mvref_common.c \
-       vp9/common/vp9_postproc.c \
-       vp9/common/vp9_pred_common.c \
-       vp9/common/vp9_prob.c \
-       vp9/common/vp9_quant_common.c \
-       vp9/common/vp9_reconinter.c \
-       vp9/common/vp9_reconintra.c \
-       vp9/common/vp9_rtcd.c \
-       vp9/common/vp9_scale.c \
-       vp9/common/vp9_scan.c \
-       vp9/common/vp9_seg_common.c \
-       vp9/common/vp9_textblit.c \
-       vp9/common/vp9_thread.c \
-       vp9/common/vp9_thread_common.c \
-       vp9/common/vp9_tile_common.c \
-       vp9/common/x86/vp9_asm_stubs.c \
-       vp9/common/x86/vp9_high_loopfilter_intrin_sse2.c \
-       vp9/common/x86/vp9_idct_intrin_sse2.c \
-       vp9/common/x86/vp9_idct_intrin_ssse3.c \
-       vp9/common/x86/vp9_loopfilter_intrin_avx2.c \
-       vp9/common/x86/vp9_loopfilter_intrin_sse2.c \
-       vp9/common/x86/vp9_subpixel_8t_intrin_avx2.c \
-       vp9/common/x86/vp9_subpixel_8t_intrin_ssse3.c \
-       vp9/decoder/vp9_decodeframe.c \
-       vp9/decoder/vp9_decodemv.c \
-       vp9/decoder/vp9_decoder.c \
-       vp9/decoder/vp9_detokenize.c \
-       vp9/decoder/vp9_dsubexp.c \
-       vp9/decoder/vp9_dthread.c \
-       vp9/decoder/vp9_read_bit_buffer.c \
-       vp9/decoder/vp9_reader.c \
-       vp9/encoder/arm/neon/vp9_avg_neon.c \
-       vp9/encoder/arm/neon/vp9_dct_neon.c \
-       vp9/encoder/arm/neon/vp9_quantize_neon.c \
-       vp9/encoder/arm/neon/vp9_sad4d_neon.c \
-       vp9/encoder/arm/neon/vp9_sad_neon.c \
-       vp9/encoder/arm/neon/vp9_subtract_neon.c \
-       vp9/encoder/arm/neon/vp9_variance_neon.c \
-       vp9/encoder/vp9_aq_complexity.c \
-       vp9/encoder/vp9_aq_cyclicrefresh.c \
-       vp9/encoder/vp9_aq_variance.c \
-       vp9/encoder/vp9_avg.c \
-       vp9/encoder/vp9_bitstream.c \
-       vp9/encoder/vp9_context_tree.c \
-       vp9/encoder/vp9_cost.c \
-       vp9/encoder/vp9_dct.c \
-       vp9/encoder/vp9_denoiser.c \
-       vp9/encoder/vp9_encodeframe.c \
-       vp9/encoder/vp9_encodemb.c \
-       vp9/encoder/vp9_encodemv.c \
-       vp9/encoder/vp9_encoder.c \
-       vp9/encoder/vp9_ethread.c \
-       vp9/encoder/vp9_extend.c \
-       vp9/encoder/vp9_firstpass.c \
-       vp9/encoder/vp9_lookahead.c \
-       vp9/encoder/vp9_mbgraph.c \
-       vp9/encoder/vp9_mcomp.c \
-       vp9/encoder/vp9_picklpf.c \
-       vp9/encoder/vp9_pickmode.c \
-       vp9/encoder/vp9_quantize.c \
-       vp9/encoder/vp9_ratectrl.c \
-       vp9/encoder/vp9_rd.c \
-       vp9/encoder/vp9_rdopt.c \
-       vp9/encoder/vp9_resize.c \
-       vp9/encoder/vp9_sad.c \
-       vp9/encoder/vp9_segmentation.c \
-       vp9/encoder/vp9_skin_detection.c \
-       vp9/encoder/vp9_speed_features.c \
-       vp9/encoder/vp9_ssim.c \
-       vp9/encoder/vp9_subexp.c \
-       vp9/encoder/vp9_svc_layercontext.c \
-       vp9/encoder/vp9_temporal_filter.c \
-       vp9/encoder/vp9_tokenize.c \
-       vp9/encoder/vp9_treewriter.c \
-       vp9/encoder/vp9_variance.c \
-       vp9/encoder/vp9_write_bit_buffer.c \
-       vp9/encoder/vp9_writer.c \
-       vp9/encoder/x86/vp9_avg_intrin_sse2.c \
-       vp9/encoder/x86/vp9_dct32x32_avx2.c \
-       vp9/encoder/x86/vp9_dct32x32_sse2.c \
-       vp9/encoder/x86/vp9_dct_avx2.c \
-       vp9/encoder/x86/vp9_dct_impl_sse2.c \
-       vp9/encoder/x86/vp9_dct_sse2.c \
-       vp9/encoder/x86/vp9_dct_ssse3.c \
-       vp9/encoder/x86/vp9_denoiser_sse2.c \
-       vp9/encoder/x86/vp9_error_intrin_avx2.c \
-       vp9/encoder/x86/vp9_highbd_block_error_intrin_sse2.c \
-       vp9/encoder/x86/vp9_highbd_quantize_intrin_sse2.c \
-       vp9/encoder/x86/vp9_highbd_variance_sse2.c \
-       vp9/encoder/x86/vp9_quantize_sse2.c \
-       vp9/encoder/x86/vp9_sad4d_intrin_avx2.c \
-       vp9/encoder/x86/vp9_sad_intrin_avx2.c \
-       vp9/encoder/x86/vp9_subpel_variance_impl_intrin_avx2.c \
-       vp9/encoder/x86/vp9_variance_avx2.c \
-       vp9/encoder/x86/vp9_variance_impl_intrin_avx2.c \
-       vp9/encoder/x86/vp9_variance_sse2.c \
-       vp9/vp9_cx_iface.c \
-       vp9/vp9_dx_iface.c \
-       vpxdec.c \
-       vpxenc.c \
-       vpx_mem/memory_manager/hmm_alloc.c \
-       vpx_mem/memory_manager/hmm_base.c \
-       vpx_mem/memory_manager/hmm_dflt_abort.c \
-       vpx_mem/memory_manager/hmm_grow.c \
-       vpx_mem/memory_manager/hmm_largest.c \
-       vpx_mem/memory_manager/hmm_resize.c \
-       vpx_mem/memory_manager/hmm_shrink.c \
-       vpx_mem/memory_manager/hmm_true.c \
-       vpx_mem/vpx_mem.c \
-       vpx_mem/vpx_mem_tracker.c \
-       vpx_ports/arm_cpudetect.c \
-       vpx_scale/generic/gen_scalers.c \
-       vpx_scale/generic/vpx_scale.c \
-       vpx_scale/generic/yv12config.c \
-       vpx_scale/generic/yv12extend.c \
-       vpx_scale/mips/dspr2/yv12extend_dspr2.c \
-       vpx_scale/vpx_scale_rtcd.c \
-       vpx_scale/win32/scaleopt.c \
-       vpx/src/svc_encodeframe.c \
-       vpx/src/vpx_codec.c \
-       vpx/src/vpx_decoder.c \
-       vpx/src/vpx_encoder.c \
-       vpx/src/vpx_image.c \
-       vpx/src/vpx_psnr.c \
-       vpxstats.c \
-       warnings.c \
-       y4menc.c \
-       y4minput.c \
-       $(NULL)
-
-vpx_source_h = \
-       args.h \
-       ivfdec.h \
-       ivfenc.h \
-       md5_utils.h \
-       rate_hist.h \
-       vp8_rtcd.h \
-       test/acm_random.h \
-       test/clear_system_state.h \
-       test/codec_factory.h \
-       test/decode_test_driver.h \
-       test/encode_test_driver.h \
-       test/i420_video_source.h \
-       test/ivf_video_source.h \
-       test/md5_helper.h \
-       test/register_state_check.h \
-       test/test_vectors.h \
-       test/util.h \
-       test/video_source.h \
-       test/webm_video_source.h \
-       test/y4m_video_source.h \
-       test/yuv_video_source.h \
-       third_party/googletest/src/include/gtest/gtest.h \
-       third_party/libyuv/include/libyuv/basic_types.h \
-       third_party/libyuv/include/libyuv/compare.h \
-       third_party/libyuv/include/libyuv/convert_argb.h \
-       third_party/libyuv/include/libyuv/convert_from_argb.h \
-       third_party/libyuv/include/libyuv/convert_from.h \
-       third_party/libyuv/include/libyuv/convert.h \
-       third_party/libyuv/include/libyuv/cpu_id.h \
-       third_party/libyuv/include/libyuv/mjpeg_decoder.h \
-       third_party/libyuv/include/libyuv/planar_functions.h \
-       third_party/libyuv/include/libyuv/rotate_argb.h \
-       third_party/libyuv/include/libyuv/rotate.h \
-       third_party/libyuv/include/libyuv/row.h \
-       third_party/libyuv/include/libyuv/scale_argb.h \
-       third_party/libyuv/include/libyuv/scale.h \
-       third_party/libyuv/include/libyuv/scale_row.h \
-       third_party/libyuv/include/libyuv/version.h \
-       third_party/libyuv/include/libyuv/video_common.h \
-       tools_common.h \
-       video_common.h \
-       video_reader.h \
-       video_writer.h \
-       vp8/common/alloccommon.h \
-       vp8/common/arm/bilinearfilter_arm.h \
-       vp8/common/blockd.h \
-       vp8/common/coefupdateprobs.h \
-       vp8/common/common.h \
-       vp8/common/default_coef_probs.h \
-       vp8/common/entropy.h \
-       vp8/common/entropymode.h \
-       vp8/common/entropymv.h \
-       vp8/common/extend.h \
-       vp8/common/filter.h \
-       vp8/common/findnearmv.h \
-       vp8/common/header.h \
-       vp8/common/invtrans.h \
-       vp8/common/loopfilter.h \
-       vp8/common/modecont.h \
-       vp8/common/mv.h \
-       vp8/common/onyxc_int.h \
-       vp8/common/onyxd.h \
-       vp8/common/onyx.h \
-       vp8/common/postproc.h \
-       vp8/common/ppflags.h \
-       vp8/common/quant_common.h \
-       vp8/common/reconinter.h \
-       vp8/common/reconintra4x4.h \
-       vp8/common/setupintrarecon.h \
-       vp8/common/swapyv12buffer.h \
-       vp8/common/systemdependent.h \
-       vp8/common/threading.h \
-       vp8/common/treecoder.h \
-       vp8/common/variance.h \
-       vp8/common/vp8_entropymodedata.h \
-       vp8/common/x86/filter_x86.h \
-       vp8/decoder/dboolhuff.h \
-       vp8/decoder/decodemv.h \
-       vp8/decoder/decoderthreading.h \
-       vp8/decoder/detokenize.h \
-       vp8/decoder/ec_types.h \
-       vp8/decoder/error_concealment.h \
-       vp8/decoder/onyxd_int.h \
-       vp8/decoder/treereader.h \
-       vp8/encoder/bitstream.h \
-       vp8/encoder/block.h \
-       vp8/encoder/boolhuff.h \
-       vp8/encoder/dct_value_cost.h \
-       vp8/encoder/dct_value_tokens.h \
-       vp8/encoder/defaultcoefcounts.h \
-       vp8/encoder/denoising.h \
-       vp8/encoder/encodeframe.h \
-       vp8/encoder/encodeintra.h \
-       vp8/encoder/encodemb.h \
-       vp8/encoder/encodemv.h \
-       vp8/encoder/firstpass.h \
-       vp8/encoder/lookahead.h \
-       vp8/encoder/mcomp.h \
-       vp8/encoder/modecosts.h \
-       vp8/encoder/mr_dissim.h \
-       vp8/encoder/onyx_int.h \
-       vp8/encoder/pickinter.h \
-       vp8/encoder/quantize.h \
-       vp8/encoder/ratectrl.h \
-       vp8/encoder/rdopt.h \
-       vp8/encoder/segmentation.h \
-       vp8/encoder/tokenize.h \
-       vp8/encoder/treewriter.h \
-       vp9/common/mips/dspr2/vp9_common_dspr2.h \
-       vp9/common/mips/dspr2/vp9_loopfilter_filters_dspr2.h \
-       vp9/common/mips/dspr2/vp9_loopfilter_macros_dspr2.h \
-       vp9/common/mips/dspr2/vp9_loopfilter_masks_dspr2.h \
-       vp9/common/vp9_alloccommon.h \
-       vp9/common/vp9_blockd.h \
-       vp9/common/vp9_common_data.h \
-       vp9/common/vp9_common.h \
-       vp9/common/vp9_convolve.h \
-       vp9/common/vp9_entropy.h \
-       vp9/common/vp9_entropymode.h \
-       vp9/common/vp9_entropymv.h \
-       vp9/common/vp9_enums.h \
-       vp9/common/vp9_filter.h \
-       vp9/common/vp9_frame_buffers.h \
-       vp9/common/vp9_idct.h \
-       vp9/common/vp9_loopfilter.h \
-       vp9/common/vp9_mfqe.h \
-       vp9/common/vp9_mv.h \
-       vp9/common/vp9_mvref_common.h \
-       vp9/common/vp9_onyxc_int.h \
-       vp9/common/vp9_postproc.h \
-       vp9/common/vp9_ppflags.h \
-       vp9/common/vp9_pred_common.h \
-       vp9/common/vp9_prob.h \
-       vp9/common/vp9_quant_common.h \
-       vp9/common/vp9_reconinter.h \
-       vp9/common/vp9_reconintra.h \
-       vp9/common/vp9_scale.h \
-       vp9/common/vp9_scan.h \
-       vp9/common/vp9_seg_common.h \
-       vp9/common/vp9_systemdependent.h \
-       vp9/common/vp9_textblit.h \
-       vp9/common/vp9_thread_common.h \
-       vp9/common/vp9_thread.h \
-       vp9/common/vp9_tile_common.h \
-       vp9/common/x86/vp9_idct_intrin_sse2.h \
-       vp9/decoder/vp9_decodeframe.h \
-       vp9/decoder/vp9_decodemv.h \
-       vp9/decoder/vp9_decoder.h \
-       vp9/decoder/vp9_detokenize.h \
-       vp9/decoder/vp9_dsubexp.h \
-       vp9/decoder/vp9_dthread.h \
-       vp9/decoder/vp9_read_bit_buffer.h \
-       vp9/decoder/vp9_reader.h \
-       vp9/encoder/vp9_aq_complexity.h \
-       vp9/encoder/vp9_aq_cyclicrefresh.h \
-       vp9/encoder/vp9_aq_variance.h \
-       vp9/encoder/vp9_bitstream.h \
-       vp9/encoder/vp9_block.h \
-       vp9/encoder/vp9_context_tree.h \
-       vp9/encoder/vp9_cost.h \
-       vp9/encoder/vp9_dct.h \
-       vp9/encoder/vp9_denoiser.h \
-       vp9/encoder/vp9_encodeframe.h \
-       vp9/encoder/vp9_encodemb.h \
-       vp9/encoder/vp9_encodemv.h \
-       vp9/encoder/vp9_encoder.h \
-       vp9/encoder/vp9_ethread.h \
-       vp9/encoder/vp9_extend.h \
-       vp9/encoder/vp9_firstpass.h \
-       vp9/encoder/vp9_lookahead.h \
-       vp9/encoder/vp9_mbgraph.h \
-       vp9/encoder/vp9_mcomp.h \
-       vp9/encoder/vp9_picklpf.h \
-       vp9/encoder/vp9_pickmode.h \
-       vp9/encoder/vp9_quantize.h \
-       vp9/encoder/vp9_ratectrl.h \
-       vp9/encoder/vp9_rd.h \
-       vp9/encoder/vp9_rdopt.h \
-       vp9/encoder/vp9_resize.h \
-       vp9/encoder/vp9_segmentation.h \
-       vp9/encoder/vp9_skin_detection.h \
-       vp9/encoder/vp9_speed_features.h \
-       vp9/encoder/vp9_ssim.h \
-       vp9/encoder/vp9_subexp.h \
-       vp9/encoder/vp9_svc_layercontext.h \
-       vp9/encoder/vp9_temporal_filter.h \
-       vp9/encoder/vp9_tokenize.h \
-       vp9/encoder/vp9_treewriter.h \
-       vp9/encoder/vp9_variance.h \
-       vp9/encoder/vp9_write_bit_buffer.h \
-       vp9/encoder/vp9_writer.h \
-       vp9/encoder/x86/vp9_dct_sse2.h \
-       vp9/vp9_iface_common.h \
-       vpxenc.h \
-       vpx/internal/vpx_codec_internal.h \
-       vpx/internal/vpx_psnr.h \
-       vpx_mem/include/vpx_mem_intrnl.h \
-       vpx_mem/include/vpx_mem_tracker.h \
-       vpx_mem/memory_manager/include/cavl_if.h \
-       vpx_mem/memory_manager/include/cavl_impl.h \
-       vpx_mem/memory_manager/include/heapmm.h \
-       vpx_mem/memory_manager/include/hmm_cnfg.h \
-       vpx_mem/memory_manager/include/hmm_intrnl.h \
-       vpx_mem/vpx_mem.h \
-       vpx_ports/arm.h \
-       vpx_ports/config.h \
-       vpx_ports/emmintrin_compat.h \
-       vpx_ports/mem.h \
-       vpx_ports/mem_ops_aligned.h \
-       vpx_ports/mem_ops.h \
-       vpx_ports/vpx_once.h \
-       vpx_ports/vpx_timer.h \
-       vpx_ports/x86.h \
-       vpx_scale/vpx_scale.h \
-       vpx_scale/yv12config.h \
-       vpxstats.h \
-       vpx/svc_context.h \
-       vpx/vp8cx.h \
-       vpx/vp8dx.h \
-       vpx/vp8.h \
-       vpx/vpx_codec.h \
-       vpx/vpx_decoder.h \
-       vpx/vpx_encoder.h \
-       vpx/vpx_frame_buffer.h \
-       vpx/vpx_image.h \
-       vpx/vpx_integer.h \
-       vpx_scale_rtcd.h \
-       warnings.h \
-       webmdec.h \
-       webmenc.h \
-       y4menc.h \
-       y4minput.h \
-       $(NULL)
-
-vpx_source_asm = \
-       third_party/libyuv/source/row_x86.asm \
-       third_party/libyuv/source/x86inc.asm \
-       third_party/x86inc/x86inc.asm \
-       vp8/common/arm/armv6/bilinearfilter_v6.asm \
-       vp8/common/arm/armv6/copymem16x16_v6.asm \
-       vp8/common/arm/armv6/copymem8x4_v6.asm \
-       vp8/common/arm/armv6/copymem8x8_v6.asm \
-       vp8/common/arm/armv6/dc_only_idct_add_v6.asm \
-       vp8/common/arm/armv6/dequant_idct_v6.asm \
-       vp8/common/arm/armv6/dequantize_v6.asm \
-       vp8/common/arm/armv6/filter_v6.asm \
-       vp8/common/arm/armv6/idct_v6.asm \
-       vp8/common/arm/armv6/intra4x4_predict_v6.asm \
-       vp8/common/arm/armv6/iwalsh_v6.asm \
-       vp8/common/arm/armv6/loopfilter_v6.asm \
-       vp8/common/arm/armv6/simpleloopfilter_v6.asm \
-       vp8/common/arm/armv6/sixtappredict8x4_v6.asm \
-       vp8/common/arm/armv6/vp8_sad16x16_armv6.asm \
-       vp8/common/arm/armv6/vp8_variance16x16_armv6.asm \
-       vp8/common/arm/armv6/vp8_variance8x8_armv6.asm \
-       vp8/common/arm/armv6/vp8_variance_halfpixvar16x16_h_armv6.asm \
-       vp8/common/arm/armv6/vp8_variance_halfpixvar16x16_hv_armv6.asm \
-       vp8/common/arm/armv6/vp8_variance_halfpixvar16x16_v_armv6.asm \
-       vp8/common/ppc/copy_altivec.asm \
-       vp8/common/ppc/filter_altivec.asm \
-       vp8/common/ppc/filter_bilinear_altivec.asm \
-       vp8/common/ppc/idctllm_altivec.asm \
-       vp8/common/ppc/loopfilter_filters_altivec.asm \
-       vp8/common/ppc/platform_altivec.asm \
-       vp8/common/ppc/recon_altivec.asm \
-       vp8/common/ppc/sad_altivec.asm \
-       vp8/common/ppc/variance_altivec.asm \
-       vp8/common/ppc/variance_subpixel_altivec.asm \
-       vp8/common/x86/dequantize_mmx.asm \
-       vp8/common/x86/idctllm_mmx.asm \
-       vp8/common/x86/idctllm_sse2.asm \
-       vp8/common/x86/iwalsh_mmx.asm \
-       vp8/common/x86/iwalsh_sse2.asm \
-       vp8/common/x86/loopfilter_block_sse2_x86_64.asm \
-       vp8/common/x86/loopfilter_mmx.asm \
-       vp8/common/x86/loopfilter_sse2.asm \
-       vp8/common/x86/mfqe_sse2.asm \
-       vp8/common/x86/postproc_mmx.asm \
-       vp8/common/x86/postproc_sse2.asm \
-       vp8/common/x86/recon_mmx.asm \
-       vp8/common/x86/recon_sse2.asm \
-       vp8/common/x86/sad_mmx.asm \
-       vp8/common/x86/sad_sse2.asm \
-       vp8/common/x86/sad_sse3.asm \
-       vp8/common/x86/sad_sse4.asm \
-       vp8/common/x86/sad_ssse3.asm \
-       vp8/common/x86/subpixel_mmx.asm \
-       vp8/common/x86/subpixel_sse2.asm \
-       vp8/common/x86/subpixel_ssse3.asm \
-       vp8/common/x86/variance_impl_mmx.asm \
-       vp8/common/x86/variance_impl_sse2.asm \
-       vp8/common/x86/variance_impl_ssse3.asm \
-       vp8/encoder/arm/armv6/vp8_mse16x16_armv6.asm \
-       vp8/encoder/arm/armv6/vp8_short_fdct4x4_armv6.asm \
-       vp8/encoder/arm/armv6/walsh_v6.asm \
-       vp8/encoder/ppc/encodemb_altivec.asm \
-       vp8/encoder/ppc/fdct_altivec.asm \
-       vp8/encoder/ppc/rdopt_altivec.asm \
-       vp8/encoder/x86/dct_mmx.asm \
-       vp8/encoder/x86/dct_sse2.asm \
-       vp8/encoder/x86/encodeopt.asm \
-       vp8/encoder/x86/fwalsh_sse2.asm \
-       vp8/encoder/x86/quantize_mmx.asm \
-       vp8/encoder/x86/ssim_opt_x86_64.asm \
-       vp8/encoder/x86/subtract_mmx.asm \
-       vp8/encoder/x86/subtract_sse2.asm \
-       vp8/encoder/x86/temporal_filter_apply_sse2.asm \
-       vp9/common/arm/neon/vp9_avg_neon_asm.asm \
-       vp9/common/arm/neon/vp9_convolve8_avg_neon_asm.asm \
-       vp9/common/arm/neon/vp9_convolve8_neon_asm.asm \
-       vp9/common/arm/neon/vp9_copy_neon_asm.asm \
-       vp9/common/arm/neon/vp9_idct16x16_1_add_neon_asm.asm \
-       vp9/common/arm/neon/vp9_idct16x16_add_neon_asm.asm \
-       vp9/common/arm/neon/vp9_idct32x32_1_add_neon_asm.asm \
-       vp9/common/arm/neon/vp9_idct32x32_add_neon_asm.asm \
-       vp9/common/arm/neon/vp9_idct4x4_1_add_neon_asm.asm \
-       vp9/common/arm/neon/vp9_idct4x4_add_neon_asm.asm \
-       vp9/common/arm/neon/vp9_idct8x8_1_add_neon_asm.asm \
-       vp9/common/arm/neon/vp9_idct8x8_add_neon_asm.asm \
-       vp9/common/arm/neon/vp9_loopfilter_16_neon_asm.asm \
-       vp9/common/arm/neon/vp9_loopfilter_4_neon_asm.asm \
-       vp9/common/arm/neon/vp9_loopfilter_8_neon_asm.asm \
-       vp9/common/arm/neon/vp9_mb_lpf_neon.asm \
-       vp9/common/arm/neon/vp9_reconintra_neon_asm.asm \
-       vp9/common/arm/neon/vp9_save_reg_neon.asm \
-       vp9/common/x86/vp9_copy_sse2.asm \
-       vp9/common/x86/vp9_high_intrapred_sse2.asm \
-       vp9/common/x86/vp9_high_subpixel_8t_sse2.asm \
-       vp9/common/x86/vp9_high_subpixel_bilinear_sse2.asm \
-       vp9/common/x86/vp9_idct_ssse3_x86_64.asm \
-       vp9/encoder/x86/vp9_sad4d_sse2.asm \
-       vp9/encoder/x86/vp9_sad_sse2.asm \
-       vp9/encoder/x86/vp9_sad_sse3.asm \
-       vp9/encoder/x86/vp9_sad_sse4.asm \
-       vp9/encoder/x86/vp9_sad_ssse3.asm \
-       vp9/encoder/x86/vp9_ssim_opt_x86_64.asm \
-       vp9/encoder/x86/vp9_subpel_variance.asm \
-       vp9/encoder/x86/vp9_subtract_sse2.asm \
-       vp9/encoder/x86/vp9_temporal_filter_apply_sse2.asm \
-       vpx_ports/emms.asm \
-       vpx_ports/x86_abi_support.asm \
-       $(NULL)

diff --git a/ext/libvpx/upstream b/ext/libvpx/upstream
deleted file mode 160000 (submodule)
index c74bf6d..0000000
--- a/ext/libvpx/upstream
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit c74bf6d889992c3cabe017ec353ca85c323107cd

diff --git a/gst-libs/gst/codecparsers/Makefile.am b/gst-libs/gst/codecparsers/Makefile.am
index 9f07940..ac1654d 100644 (file)
--- a/gst-libs/gst/codecparsers/Makefile.am
+++ b/gst-libs/gst/codecparsers/Makefile.am
@@ -43,23 +43,8 @@ gen_source_h += gsth264parser.h
 endif
 
 if USE_LOCAL_CODEC_PARSERS_VP8
-gen_source_c += gstvp8parser.c
-gen_source_h += gstvp8parser.h gstvp8rangedecoder.h vp8utils.h
-
-if USE_BUILTIN_LIBVPX
-add_source_c += gstvaapilibvpx.c
-
-libgstvaapi_codecparsers_cflags += \
-       -I$(top_srcdir)/ext/libvpx \
-       -I$(top_srcdir)/ext/libvpx/upstream \
-       -I$(top_builddir)/ext/libvpx/upstream
-
-libgstvaapi_codecparsers_libs += \
-       $(top_builddir)/ext/libvpx/libgstcodecparsers_vpx.la
-else
-gen_source_c += dboolhuff.c gstvp8rangedecoder.c vp8utils.c
-gen_source_h += dboolhuff.h
-endif
+gen_source_c += gstvp8parser.c dboolhuff.c gstvp8rangedecoder.c vp8utils.c
+gen_source_h += gstvp8parser.h gstvp8rangedecoder.h vp8utils.h dboolhuff.h
 endif
 
 if USE_LOCAL_CODEC_PARSERS_VP9
@@ -105,10 +90,6 @@ $(gen_source_c): %.c: $(local_codecparsers_srcdir)/%.c $(gen_source_h)
        $(LN_S) -f $< $@
 $(gen_source_h): %.h: $(local_codecparsers_srcdir)/%.h
        $(LN_S) -f $< $@
-$(top_builddir)/ext/libvpx/libgstcodecparsers_vpx.la:
-       $(MAKE) -C $(top_builddir)/ext/libvpx
-
-EXTRA_DIST = gstvaapilibvpx.c
 
 DISTCLEANFILES = $(GENFILES) .timestamp.symlinks
 

diff --git a/gst-libs/gst/codecparsers/gstvaapilibvpx.c b/gst-libs/gst/codecparsers/gstvaapilibvpx.c
deleted file mode 100644 (file)
index 81baeb0..0000000
--- a/gst-libs/gst/codecparsers/gstvaapilibvpx.c
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * gstvaapilibvpx.c - libvpx wrapper for gstreamer-vaapi
- *
- * Copyright (C) 2014 Intel Corporation
- *   Author: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
- * Boston, MA 02110-1301, USA.
- */
-
-#include "gstvp8rangedecoder.h"
-#include "vp8utils.h"
-#include "gstlibvpx.h"
-
-#define BOOL_DECODER_CAST(rd) \
-  ((vp8_bool_decoder *)(&(rd)->_gst_reserved[0]))
-
-#define BOOL_DECODER_STATE_CAST(s) \
-  ((vp8_bool_decoder_state *)(s))
-
-gboolean
-gst_vp8_range_decoder_init (GstVp8RangeDecoder * rd, const guchar * buf,
-    guint buf_size)
-{
-  vp8_bool_decoder *const bd = BOOL_DECODER_CAST (rd);
-
-  g_return_val_if_fail (sizeof (rd->_gst_reserved) >= sizeof (*bd), FALSE);
-
-  rd->buf = buf;
-  rd->buf_size = buf_size;
-  return vp8_bool_decoder_init (bd, buf, buf_size);
-}
-
-gint
-gst_vp8_range_decoder_read (GstVp8RangeDecoder * rd, guint8 prob)
-{
-  return vp8_bool_decoder_read (BOOL_DECODER_CAST (rd), prob);
-}
-
-gint
-gst_vp8_range_decoder_read_literal (GstVp8RangeDecoder * rd, gint bits)
-{
-  return vp8_bool_decoder_read_literal (BOOL_DECODER_CAST (rd), bits);
-}
-
-guint
-gst_vp8_range_decoder_get_pos (GstVp8RangeDecoder * rd)
-{
-  return vp8_bool_decoder_get_pos (BOOL_DECODER_CAST (rd));
-}
-
-void
-gst_vp8_range_decoder_get_state (GstVp8RangeDecoder * rd,
-    GstVp8RangeDecoderState * state)
-{
-  vp8_bool_decoder_get_state (BOOL_DECODER_CAST (rd),
-      BOOL_DECODER_STATE_CAST (state));
-}
-
-void
-gst_vp8_token_update_probs_init (GstVp8TokenProbs * probs)
-{
-  vp8_init_token_update_probs (probs->prob);
-}
-
-void
-gst_vp8_token_probs_init_defaults (GstVp8TokenProbs * probs)
-{
-  vp8_init_default_token_probs (probs->prob);
-}
-
-void
-gst_vp8_mv_update_probs_init (GstVp8MvProbs * probs)
-{
-  vp8_init_mv_update_probs (probs->prob);
-}
-
-void
-gst_vp8_mv_probs_init_defaults (GstVp8MvProbs * probs)
-{
-  vp8_init_default_mv_probs (probs->prob);
-}
-
-void
-gst_vp8_mode_probs_init_defaults (GstVp8ModeProbs * probs, gboolean key_frame)
-{
-  if (key_frame) {
-    vp8_init_default_intra_mode_probs (probs->y_prob, probs->uv_prob);
-  } else {
-    vp8_init_default_inter_mode_probs (probs->y_prob, probs->uv_prob);
-  }
-}