Commit 8f3e15e7 authored by Sebastian Ramacher's avatar Sebastian Ramacher

New upstream version 2.1.0+ds1

parent b18c5c2e
# Makefile.in generated by automake 1.14.1 from Makefile.am.
# Makefile.in generated by automake 1.15 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -36,7 +36,17 @@
# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
VPATH = @srcdir@
am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
am__is_gnu_make = { \
if test -z '$(MAKELEVEL)'; then \
false; \
elif test -n '$(MAKE_HOST)'; then \
true; \
elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
true; \
else \
false; \
fi; \
}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
......@@ -103,14 +113,15 @@ host_triplet = @host@
@USE_WAYLAND_TRUE@@USE_X11_FALSE@am__append_2 = putsurface
@ENABLE_TESTS_TRUE@am__append_3 = test
subdir = .
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(top_srcdir)/configure $(am__configure_deps) \
$(srcdir)/config.h.in COPYING INSTALL NEWS compile \
config.guess config.sub depcomp install-sh missing ltmain.sh
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \
$(am__configure_deps) $(am__DIST_COMMON)
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
configure.lineno config.status.lineno
mkinstalldirs = $(install_sh) -d
......@@ -175,6 +186,9 @@ CTAGS = ctags
CSCOPE = cscope
DIST_SUBDIRS = common decode encode vainfo videoprocess putsurface \
test
am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in COPYING \
INSTALL NEWS compile config.guess config.sub install-sh \
ltmain.sh missing
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
distdir = $(PACKAGE)-$(VERSION)
top_distdir = $(distdir)
......@@ -272,6 +286,7 @@ LIBVA_VERSION = @LIBVA_VERSION@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
MAKEINFO = @MAKEINFO@
MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
......@@ -351,6 +366,7 @@ pkgconfigdir = @pkgconfigdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
......@@ -393,7 +409,6 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --foreign Makefile
.PRECIOUS: Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
......@@ -623,15 +638,15 @@ dist-xz: distdir
$(am__post_remove_distdir)
dist-tarZ: distdir
@echo WARNING: "Support for shar distribution archives is" \
"deprecated." >&2
@echo WARNING: "Support for distribution archives compressed with" \
"legacy program 'compress' is deprecated." >&2
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
$(am__post_remove_distdir)
dist-shar: distdir
@echo WARNING: "Support for distribution archives compressed with" \
"legacy program 'compress' is deprecated." >&2
@echo WARNING: "Support for shar distribution archives is" \
"deprecated." >&2
@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
$(am__post_remove_distdir)
......@@ -667,17 +682,17 @@ distcheck: dist
esac
chmod -R a-w $(distdir)
chmod u+w $(distdir)
mkdir $(distdir)/_build $(distdir)/_inst
mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst
chmod a-w $(distdir)
test -d $(distdir)/_build || exit 0; \
dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
&& dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
&& am__cwd=`pwd` \
&& $(am__cd) $(distdir)/_build \
&& ../configure \
&& $(am__cd) $(distdir)/_build/sub \
&& ../../configure \
$(AM_DISTCHECK_CONFIGURE_FLAGS) \
$(DISTCHECK_CONFIGURE_FLAGS) \
--srcdir=.. --prefix="$$dc_install_base" \
--srcdir=../.. --prefix="$$dc_install_base" \
&& $(MAKE) $(AM_MAKEFLAGS) \
&& $(MAKE) $(AM_MAKEFLAGS) dvi \
&& $(MAKE) $(AM_MAKEFLAGS) check \
......@@ -855,6 +870,8 @@ uninstall-am:
mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
uninstall-am
.PRECIOUS: Makefile
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
......
libva-utils NEWS -- summary of changes. 2017-10-21
Copyright (C) 2009-2017 Intel Corporation
libva-utils NEWS -- summary of changes. 2018-02-12
Copyright (C) 2009-2018 Intel Corporation
Version 2.1.0 - 12.Feb.2018
* Bump version to 2.1.0
* Refine gtest conformance cases
* vp9enc: add support low power mode
* vavpp: add support for RGBA/RGBX surface
* vainfo: add support new profile/entrypoint pairs
Version 2.0.0 - 21.Oct.2017
* Bump version to 2.0.0
......
This diff is collapsed.
# Makefile.in generated by automake 1.14.1 from Makefile.am.
# Makefile.in generated by automake 1.15 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -38,7 +38,17 @@
VPATH = @srcdir@
am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
am__is_gnu_make = { \
if test -z '$(MAKELEVEL)'; then \
false; \
elif test -n '$(MAKE_HOST)'; then \
true; \
elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
true; \
else \
false; \
fi; \
}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
......@@ -111,12 +121,15 @@ host_triplet = @host@
@USE_WAYLAND_TRUE@am__append_8 = $(WAYLAND_CFLAGS) $(LIBVA_WAYLAND_CFLAGS)
@USE_WAYLAND_TRUE@am__append_9 = $(WAYLAND_LIBS) $(LIBVA_WAYLAND_LIBS)
subdir = common
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(top_srcdir)/depcomp $(noinst_HEADERS)
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
DIST_COMMON = $(srcdir)/Makefile.am $(noinst_HEADERS) \
$(am__DIST_COMMON)
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
......@@ -209,6 +222,7 @@ am__define_uniq_tagged_files = \
done | $(am__uniquify_input)`
ETAGS = etags
CTAGS = ctags
am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
......@@ -265,6 +279,7 @@ LIBVA_VERSION = @LIBVA_VERSION@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
MAKEINFO = @MAKEINFO@
MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
......@@ -344,6 +359,7 @@ pkgconfigdir = @pkgconfigdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
......@@ -385,10 +401,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
exit 1;; \
esac; \
done; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign common/Makefile'; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu common/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --foreign common/Makefile
.PRECIOUS: Makefile
$(AUTOMAKE) --gnu common/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
......@@ -691,6 +706,8 @@ uninstall-am:
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
tags tags-am uninstall uninstall-am
.PRECIOUS: Makefile
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
......
......@@ -32,16 +32,12 @@
#include <va/va.h>
#include "va_display.h"
extern const VADisplayHooks va_display_hooks_android;
extern const VADisplayHooks va_display_hooks_wayland;
extern const VADisplayHooks va_display_hooks_x11;
extern const VADisplayHooks va_display_hooks_drm;
static const VADisplayHooks *g_display_hooks;
static const VADisplayHooks *g_display_hooks_available[] = {
#ifdef ANDROID
&va_display_hooks_android,
#else
#ifdef HAVE_VA_WAYLAND
&va_display_hooks_wayland,
#endif
......@@ -50,7 +46,6 @@ static const VADisplayHooks *g_display_hooks_available[] = {
#endif
#ifdef HAVE_VA_DRM
&va_display_hooks_drm,
#endif
#endif
NULL
};
......@@ -124,7 +119,6 @@ void
va_init_display_args(int *argc, char *argv[])
{
const char *display_name;
const char *device_name;
display_name = get_display_name(*argc, argv);
if (display_name && strcmp(display_name, "help") == 0) {
......
......@@ -127,6 +127,11 @@ va_close_display_wayland(VADisplay va_dpy)
d->compositor = NULL;
}
if (d->registry) {
wl_registry_destroy(d->registry);
d->registry = NULL;
}
if (d->display) {
wl_display_disconnect(d->display);
d->display = NULL;
......
......@@ -3,7 +3,7 @@
scriptversion=2012-10-14.11; # UTC
# Copyright (C) 1999-2013 Free Software Foundation, Inc.
# Copyright (C) 1999-2014 Free Software Foundation, Inc.
# Written by Tom Tromey <tromey@cygnus.com>.
#
# This program is free software; you can redistribute it and/or modify
......
This diff is collapsed.
......@@ -42,8 +42,7 @@
/* Defined to 1 if VA/X11 API is supported */
#undef HAVE_VA_X11
/* Define to the sub-directory in which libtool stores uninstalled libraries.
*/
/* Define to the sub-directory where libtool stores uninstalled libraries. */
#undef LT_OBJDIR
/* Name of package */
......
This diff is collapsed.
This diff is collapsed.
......@@ -29,7 +29,7 @@
# - micro version is libva_micro_version
# - pre version is libva_pre_version, usually development version
m4_define([libva_utils_major_version], [2])
m4_define([libva_utils_minor_version], [0])
m4_define([libva_utils_minor_version], [1])
m4_define([libva_utils_micro_version], [0])
m4_define([libva_utils_pre_version], [0])
......@@ -41,7 +41,7 @@ m4_append([libva_utils_version], libva_utils_pre_version, [.pre])
# libva minimum version requirement, at this released version
# libva-utils was created
m4_define([libva_api_min_version], [1.0.0])
m4_define([libva_api_min_version], [1.1.0])
# libdrm minimun version requirement
m4_define([libdrm_version], [2.4])
......@@ -210,7 +210,6 @@ AC_OUTPUT([
Makefile
common/Makefile
test/Makefile
test/va_version.h
vainfo/Makefile
encode/Makefile
decode/Makefile
......
# Makefile.in generated by automake 1.14.1 from Makefile.am.
# Makefile.in generated by automake 1.15 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -37,7 +37,17 @@
# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
VPATH = @srcdir@
am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
am__is_gnu_make = { \
if test -z '$(MAKELEVEL)'; then \
false; \
elif test -n '$(MAKE_HOST)'; then \
true; \
elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
true; \
else \
false; \
fi; \
}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
......@@ -102,12 +112,14 @@ build_triplet = @build@
host_triplet = @host@
bin_PROGRAMS = mpeg2vldemo$(EXEEXT) loadjpeg$(EXEEXT)
subdir = decode
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(top_srcdir)/depcomp
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
......@@ -205,6 +217,7 @@ am__define_uniq_tagged_files = \
done | $(am__uniquify_input)`
ETAGS = etags
CTAGS = ctags
am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
......@@ -261,6 +274,7 @@ LIBVA_VERSION = @LIBVA_VERSION@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
MAKEINFO = @MAKEINFO@
MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
......@@ -340,6 +354,7 @@ pkgconfigdir = @pkgconfigdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
......@@ -380,10 +395,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
exit 1;; \
esac; \
done; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign decode/Makefile'; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu decode/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --foreign decode/Makefile
.PRECIOUS: Makefile
$(AUTOMAKE) --gnu decode/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
......@@ -722,6 +736,8 @@ uninstall-am: uninstall-binPROGRAMS
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
tags tags-am uninstall uninstall-am uninstall-binPROGRAMS
.PRECIOUS: Makefile
valgrind: $(bin_PROGRAMS)
for a in $(bin_PROGRAMS); do \
......
......@@ -65,6 +65,7 @@ int convert_one_image(const char *infilename)
unsigned int width, height;
unsigned char *buf;
struct jdec_private *jdec;
size_t n_items;
/* Load the Jpeg into memory */
fp = fopen(infilename, "rb");
......@@ -74,8 +75,12 @@ int convert_one_image(const char *infilename)
buf = (unsigned char *)malloc(length_of_file + 4);
if (buf == NULL)
exitmessage("Not enough memory for loading file\n");
fread(buf, length_of_file, 1, fp);
n_items = fread(buf, length_of_file, 1, fp);
fclose(fp);
if (n_items != 1) {
free(buf);
exitmessage("Reading file fail\n");
}
/* Decompress it */
jdec = tinyjpeg_init();
......
......@@ -85,14 +85,14 @@ static int next_image_found=0;
/* Global variable to return the last error found while deconding */
static char error_string[256];
static VAHuffmanTableBufferJPEGBaseline default_huffman_table_param={
huffman_table:
.huffman_table =
{
// lumiance component
{
num_dc_codes:{0,1,5,1,1,1,1,1,1,0,0,0}, // 12 bits is ok for baseline profile
dc_values:{0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0a,0x0b},
num_ac_codes:{0,2,1,3,3,2,4,3,5,5,4,4,0,0,1,125},
ac_values:{
.num_dc_codes = {0,1,5,1,1,1,1,1,1,0,0,0}, // 12 bits is ok for baseline profile
.dc_values = {0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0a,0x0b},
.num_ac_codes = {0,2,1,3,3,2,4,3,5,5,4,4,0,0,1,125},
.ac_values = {
0x01, 0x02, 0x03, 0x00, 0x04, 0x11, 0x05, 0x12,
0x21, 0x31, 0x41, 0x06, 0x13, 0x51, 0x61, 0x07,
0x22, 0x71, 0x14, 0x32, 0x81, 0x91, 0xa1, 0x08,
......@@ -118,10 +118,10 @@ static VAHuffmanTableBufferJPEGBaseline default_huffman_table_param={
},
// chrom component
{
num_dc_codes:{0,3,1,1,1,1,1,1,1,1,1,0}, // 12 bits is ok for baseline profile
dc_values:{0,1,2,3,4,5,6,7,8,9,0xa,0xb},
num_ac_codes:{0,2,1,2,4,4,3,4,7,5,4,4,0,1,2,119},
ac_values:{
.num_dc_codes = {0,3,1,1,1,1,1,1,1,1,1,0}, // 12 bits is ok for baseline profile
.dc_values = {0,1,2,3,4,5,6,7,8,9,0xa,0xb},
.num_ac_codes = {0,2,1,2,4,4,3,4,7,5,4,4,0,1,2,119},
.ac_values = {
0x00, 0x01, 0x02, 0x03, 0x11, 0x04, 0x05, 0x21,
0x31, 0x06, 0x12, 0x41, 0x51, 0x07, 0x61, 0x71,
0x13, 0x22, 0x32, 0x81, 0x08, 0x14, 0x42, 0x91,
......@@ -329,10 +329,10 @@ static int parse_DHT(struct jdec_private *priv, const unsigned char *stream)
Tc = index & 0xf0; // it is not important to <<4
Th = index & 0x0f;
if (Tc) {
memcpy(priv->HTAC[index & 0xf].bits, stream, 16);
memcpy(priv->HTAC[Th].bits, stream, 16);
}
else {
memcpy(priv->HTDC[index & 0xf].bits, stream, 16);
memcpy(priv->HTDC[Th].bits, stream, 16);
}
count = 0;
......@@ -343,18 +343,18 @@ static int parse_DHT(struct jdec_private *priv, const unsigned char *stream)
#if SANITY_CHECK
if (count >= HUFFMAN_BITS_SIZE)
error("No more than %d bytes is allowed to describe a huffman table", HUFFMAN_BITS_SIZE);
if ( (index &0xf) >= HUFFMAN_TABLES)
error("No more than %d Huffman tables is supported (got %d)\n", HUFFMAN_TABLES, index&0xf);
trace("Huffman table %s[%d] length=%d\n", (index&0xf0)?"AC":"DC", index&0xf, count);
if (Th >= HUFFMAN_TABLES)
error("No more than %d Huffman tables is supported (got %d)\n", HUFFMAN_TABLES, Th);
trace("Huffman table %s[%d] length=%d\n", Tc ? "AC":"DC", Th, count);
#endif
if (Tc) {
memcpy(priv->HTAC[index & 0xf].values, stream, count);
priv->HTAC_valid[index & 0xf] = 1;
memcpy(priv->HTAC[Th].values, stream, count);
priv->HTAC_valid[Th] = 1;
}
else {
memcpy(priv->HTDC[index & 0xf].values, stream, count);
priv->HTDC_valid[index & 0xf] = 1;
memcpy(priv->HTDC[Th].values, stream, count);
priv->HTDC_valid[Th] = 1;
}
length -= 1;
......@@ -861,7 +861,6 @@ int tinyjpeg_decode(struct jdec_private *priv)
const char *tinyjpeg_get_errorstring(struct jdec_private *priv)
{
/* FIXME: the error string must be store in the context */
priv = priv;
return error_string;
}
void tinyjpeg_get_size(struct jdec_private *priv, unsigned int *width, unsigned int *height)
......
......@@ -3,7 +3,7 @@
scriptversion=2013-05-30.07; # UTC
# Copyright (C) 1999-2013 Free Software Foundation, Inc.
# Copyright (C) 1999-2014 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
......
# Makefile.in generated by automake 1.14.1 from Makefile.am.
# Makefile.in generated by automake 1.15 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -37,7 +37,17 @@
# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
VPATH = @srcdir@
am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
am__is_gnu_make = { \
if test -z '$(MAKELEVEL)'; then \
false; \
elif test -n '$(MAKE_HOST)'; then \
true; \
elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \
true; \
else \
false; \
fi; \
}
am__make_running_with_option = \
case $${target_option-} in \
?) ;; \
......@@ -104,12 +114,14 @@ bin_PROGRAMS = avcenc$(EXEEXT) mpeg2vaenc$(EXEEXT) h264encode$(EXEEXT) \
jpegenc$(EXEEXT) vp9enc$(EXEEXT)
noinst_PROGRAMS = svctenc$(EXEEXT)
subdir = encode
DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(top_srcdir)/depcomp
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
$(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON)
mkinstalldirs = $(install_sh) -d
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
......@@ -226,6 +238,7 @@ am__define_uniq_tagged_files = \
done | $(am__uniquify_input)`
ETAGS = etags
CTAGS = ctags
am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
......@@ -282,6 +295,7 @@ LIBVA_VERSION = @LIBVA_VERSION@
LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
LT_SYS_LIBRARY_PATH = @LT_SYS_LIBRARY_PATH@
MAKEINFO = @MAKEINFO@
MANIFEST_TOOL = @MANIFEST_TOOL@
MKDIR_P = @MKDIR_P@
......@@ -361,6 +375,7 @@ pkgconfigdir = @pkgconfigdir@
prefix = @prefix@
program_transform_name = @program_transform_name@
psdir = @psdir@
runstatedir = @runstatedir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
srcdir = @srcdir@
......@@ -433,10 +448,9 @@ $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps)
exit 1;; \
esac; \
done; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign encode/Makefile'; \
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu encode/Makefile'; \
$(am__cd) $(top_srcdir) && \
$(AUTOMAKE) --foreign encode/Makefile
.PRECIOUS: Makefile
$(AUTOMAKE) --gnu encode/Makefile
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
@case '$?' in \
*config.status*) \
......@@ -868,6 +882,8 @@ uninstall-am: uninstall-binPROGRAMS
mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
tags tags-am uninstall uninstall-am uninstall-binPROGRAMS
.PRECIOUS: Makefile
valgrind: $(bin_PROGRAMS) $(noinst_PROGRAMS)
for a in $(bin_PROGRAMS) $(noinst_PROGRAMS); do \
......
......@@ -659,7 +659,7 @@ static void avcenc_update_slice_parameter(int slice_type)
slice_param->RefPicList0[0] = RefPicList0[0];
}
if ((slice_type == SLICE_TYPE_B)) {
if (slice_type == SLICE_TYPE_B) {
memset(slice_param->RefPicList1, 0xFF, 32 * sizeof(VAPictureH264));
slice_param->RefPicList1[0] = RefPicList1[0];
}
......@@ -1011,7 +1011,7 @@ static int avcenc_destroy_buffers(VABufferID *va_buffers, unsigned int num_va_bu
return 0;
}
static void end_picture()
static void end_picture(void)
{
update_ReferenceFrames();
......@@ -1841,7 +1841,7 @@ encode_picture(FILE *yuv_fp, FILE *avc_fp,
ret = store_coded_buffer(avc_fp, slice_type);
} while (ret);
end_picture(slice_type, next_is_bpic);
end_picture();
}
static void show_help()
......
......@@ -441,7 +441,7 @@ int build_packed_jpeg_header_buffer(unsigned char **header_buffer, YUVComponentS
bitstream_put_ui(&bs, acHuffSectionHdr.Vij[j], 8);
}
if((yuvComp.fourcc_val == VA_FOURCC_Y800) )
if(yuvComp.fourcc_val == VA_FOURCC_Y800)
break;
}
......
......@@ -1962,7 +1962,7 @@ svcenc_update_slice_parameter_buffer(struct svcenc_context *ctx,
num_ref_idx_active_override_flag = 1;
}
if ((slice_type == SLICE_TYPE_B)) {
if (slice_type == SLICE_TYPE_B) {
int j;
num_ref_l1 = MIN((pic_param->num_ref_idx_l1_active_minus1 + 1), ctx->num_ref_frames);
......
......@@ -118,6 +118,13 @@ static int rc_default_mode[4] = {
VA_RC_NONE
};
static int vp9enc_entrypoint_lists[2] = {
VAEntrypointEncSlice,
VAEntrypointEncSliceLP
};
static int select_entrypoint = -1;
static const struct option long_opts[] = {
{"help", no_argument, NULL, 0 },
{"rcmode", required_argument, NULL, 1 },
......@@ -129,6 +136,7 @@ static const struct option long_opts[] = {
{"hrd_win", required_argument, NULL, 8},
{"vbr_max", required_argument, NULL, 9},
{"fn_num", required_argument, NULL, 10},
{"low_power", required_argument, NULL, 11},
{NULL, no_argument, NULL, 0 }
};
......@@ -650,6 +658,7 @@ vp9enc_create_encode_pipe(FILE *yuv_fp)
VAConfigAttrib attrib[2];
int major_ver, minor_ver;
VAStatus va_status;
int i;
va_dpy = va_open_display();
va_status = vaInitialize(va_dpy, &major_ver, &minor_ver);
......@@ -658,9 +667,24 @@ vp9enc_create_encode_pipe(FILE *yuv_fp)
vaQueryConfigEntrypoints(va_dpy, vp9enc_context.profile, entrypoints,
&num_entrypoints);
for (slice_entrypoint = 0; slice_entrypoint < num_entrypoints; slice_entrypoint++)
if (entrypoints[slice_entrypoint] == VAEntrypointEncSlice)
break;
for (slice_entrypoint = 0; slice_entrypoint < num_entrypoints; slice_entrypoint++) {
if (select_entrypoint == -1) {
for (i = 0; i < 2; i++) {
if (entrypoints[slice_entrypoint] == vp9enc_entrypoint_lists[i])
break;
}
if (i < 2) {
select_entrypoint = i;
break;
}
} else {
assert(select_entrypoint == 0 || select_entrypoint == 1);
if (entrypoints[slice_entrypoint] == vp9enc_entrypoint_lists[select_entrypoint])
break;
}
}
if (slice_entrypoint == num_entrypoints) {
/* not find Slice entry point */
......@@ -670,7 +694,7 @@ vp9enc_create_encode_pipe(FILE *yuv_fp)
/* find out the format for the render target, and rate control mode */
attrib[0].type = VAConfigAttribRTFormat;
attrib[1].type = VAConfigAttribRateControl;