Commit ac936061 authored by Sebastian Ramacher's avatar Sebastian Ramacher

New upstream version 2.4.0+ds1

parent ea03b3c8
......@@ -24,7 +24,7 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
AUTOMAKE_OPTIONS = foreign
SUBDIRS = common decode encode vainfo videoprocess
SUBDIRS = common decode encode vainfo videoprocess vendor/intel vendor/intel/sfcsample
if USE_X11
SUBDIRS += putsurface
......
# Makefile.in generated by automake 1.15 from Makefile.am.
# Makefile.in generated by automake 1.15.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# Copyright (C) 1994-2017 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -184,8 +184,8 @@ am__define_uniq_tagged_files = \
ETAGS = etags
CTAGS = ctags
CSCOPE = cscope
DIST_SUBDIRS = common decode encode vainfo videoprocess putsurface \
test
DIST_SUBDIRS = common decode encode vainfo videoprocess vendor/intel \
vendor/intel/sfcsample 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
......@@ -377,8 +377,9 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
AUTOMAKE_OPTIONS = foreign
SUBDIRS = common decode encode vainfo videoprocess $(am__append_1) \
$(am__append_2) $(am__append_3)
SUBDIRS = common decode encode vainfo videoprocess vendor/intel \
vendor/intel/sfcsample $(am__append_1) $(am__append_2) \
$(am__append_3)
# Extra clean files so that maintainer-clean removes *everything*
MAINTAINERCLEANFILES = \
......@@ -623,7 +624,7 @@ distdir: $(DISTFILES)
! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
|| chmod -R a+r "$(distdir)"
dist-gzip: distdir
tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
tardir=$(distdir) && $(am__tar) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).tar.gz
$(am__post_remove_distdir)
dist-bzip2: distdir
tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
......@@ -648,7 +649,7 @@ dist-shar: distdir
@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
shar $(distdir) | eval GZIP= gzip $(GZIP_ENV) -c >$(distdir).shar.gz
$(am__post_remove_distdir)
dist-zip: distdir
......@@ -666,7 +667,7 @@ dist dist-all:
distcheck: dist
case '$(DIST_ARCHIVES)' in \
*.tar.gz*) \
GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\
eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).tar.gz | $(am__untar) ;;\
*.tar.bz2*) \
bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
*.tar.lz*) \
......@@ -676,7 +677,7 @@ distcheck: dist
*.tar.Z*) \
uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
*.shar.gz*) \
GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\
eval GZIP= gzip $(GZIP_ENV) -dc $(distdir).shar.gz | unshar ;;\
*.zip*) \
unzip $(distdir).zip ;;\
esac
......
libva-utils NEWS -- summary of changes. 2018-07-11
libva-utils NEWS -- summary of changes. 2018-09-30
Copyright (C) 2009-2018 Intel Corporation
Version 2.4.0 - 1.Feb.2019
fix make dist issue caused by decode streamout sample
add VP sample for Blending.
add VP seperate sample for scaling,csc,sharpness,denoise,chromasitting.
Version 2.2.0 - 11.Jul.2018
Version 2.3.0 - 30.Sep.2018
add HEVC encode sample code
Add sample code for avc decode streamout
Add VP8 sample encoder application (SVCT supported)
Version 2.2.0 - DD.Jul.2018
* Bump version to 2.2.0
* Add meson build
* Add vainfo support in Android
......
# generated automatically by aclocal 1.15 -*- Autoconf -*-
# generated automatically by aclocal 1.15.1 -*- Autoconf -*-
# Copyright (C) 1996-2014 Free Software Foundation, Inc.
# Copyright (C) 1996-2017 Free Software Foundation, Inc.
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -296,7 +296,7 @@ AS_VAR_COPY([$1], [pkg_cv_][$1])
AS_VAR_IF([$1], [""], [$5], [$4])dnl
])dnl PKG_CHECK_VAR
# Copyright (C) 2002-2014 Free Software Foundation, Inc.
# Copyright (C) 2002-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -311,7 +311,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
[am__api_version='1.15'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
m4_if([$1], [1.15], [],
m4_if([$1], [1.15.1], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])
......@@ -327,14 +327,14 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
[AM_AUTOMAKE_VERSION([1.15])dnl
[AM_AUTOMAKE_VERSION([1.15.1])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
# AM_AUX_DIR_EXPAND -*- Autoconf -*-
# Copyright (C) 2001-2014 Free Software Foundation, Inc.
# Copyright (C) 2001-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -386,7 +386,7 @@ am_aux_dir=`cd "$ac_aux_dir" && pwd`
# AM_CONDITIONAL -*- Autoconf -*-
# Copyright (C) 1997-2014 Free Software Foundation, Inc.
# Copyright (C) 1997-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -417,7 +417,7 @@ AC_CONFIG_COMMANDS_PRE(
Usually this means the macro was only invoked conditionally.]])
fi])])
# Copyright (C) 1999-2014 Free Software Foundation, Inc.
# Copyright (C) 1999-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -608,7 +608,7 @@ _AM_SUBST_NOTMAKE([am__nodep])dnl
# Generate code to set up dependency tracking. -*- Autoconf -*-
# Copyright (C) 1999-2014 Free Software Foundation, Inc.
# Copyright (C) 1999-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -684,7 +684,7 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
# Do all the work for Automake. -*- Autoconf -*-
# Copyright (C) 1996-2014 Free Software Foundation, Inc.
# Copyright (C) 1996-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -881,7 +881,7 @@ for _am_header in $config_headers :; do
done
echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
# Copyright (C) 2001-2014 Free Software Foundation, Inc.
# Copyright (C) 2001-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -902,7 +902,7 @@ if test x"${install_sh+set}" != xset; then
fi
AC_SUBST([install_sh])])
# Copyright (C) 2003-2014 Free Software Foundation, Inc.
# Copyright (C) 2003-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -923,7 +923,7 @@ AC_SUBST([am__leading_dot])])
# Check to see how 'make' treats includes. -*- Autoconf -*-
# Copyright (C) 2001-2014 Free Software Foundation, Inc.
# Copyright (C) 2001-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -973,7 +973,7 @@ rm -f confinc confmf
# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*-
# Copyright (C) 1997-2014 Free Software Foundation, Inc.
# Copyright (C) 1997-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -1012,7 +1012,7 @@ fi
# Helper functions for option handling. -*- Autoconf -*-
# Copyright (C) 2001-2014 Free Software Foundation, Inc.
# Copyright (C) 2001-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -1041,7 +1041,7 @@ AC_DEFUN([_AM_SET_OPTIONS],
AC_DEFUN([_AM_IF_OPTION],
[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
# Copyright (C) 1999-2014 Free Software Foundation, Inc.
# Copyright (C) 1999-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -1088,7 +1088,7 @@ AC_LANG_POP([C])])
# For backward compatibility.
AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])])
# Copyright (C) 2001-2014 Free Software Foundation, Inc.
# Copyright (C) 2001-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -1107,7 +1107,7 @@ AC_DEFUN([AM_RUN_LOG],
# Check to make sure that the build environment is sane. -*- Autoconf -*-
# Copyright (C) 1996-2014 Free Software Foundation, Inc.
# Copyright (C) 1996-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -1188,7 +1188,7 @@ AC_CONFIG_COMMANDS_PRE(
rm -f conftest.file
])
# Copyright (C) 2009-2014 Free Software Foundation, Inc.
# Copyright (C) 2009-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -1248,7 +1248,7 @@ AC_SUBST([AM_BACKSLASH])dnl
_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl
])
# Copyright (C) 2001-2014 Free Software Foundation, Inc.
# Copyright (C) 2001-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -1276,7 +1276,7 @@ fi
INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
AC_SUBST([INSTALL_STRIP_PROGRAM])])
# Copyright (C) 2006-2014 Free Software Foundation, Inc.
# Copyright (C) 2006-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......@@ -1295,7 +1295,7 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
# Check how to create a tarball. -*- Autoconf -*-
# Copyright (C) 2004-2014 Free Software Foundation, Inc.
# Copyright (C) 2004-2017 Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......
# Makefile.in generated by automake 1.15 from Makefile.am.
# Makefile.in generated by automake 1.15.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# Copyright (C) 1994-2017 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......
This diff is collapsed.
This diff is collapsed.
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for libva_utils 2.2.0.
# Generated by GNU Autoconf 2.69 for libva_utils 2.4.0.
#
# Report bugs to <https://github.com/intel/libva-utils/issues/new>.
#
......@@ -590,8 +590,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='libva_utils'
PACKAGE_TARNAME='libva-utils'
PACKAGE_VERSION='2.2.0'
PACKAGE_STRING='libva_utils 2.2.0'
PACKAGE_VERSION='2.4.0'
PACKAGE_STRING='libva_utils 2.4.0'
PACKAGE_BUGREPORT='https://github.com/intel/libva-utils/issues/new'
PACKAGE_URL='https://github.com/intel/libva-utils'
......@@ -1384,7 +1384,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures libva_utils 2.2.0 to adapt to many kinds of systems.
\`configure' configures libva_utils 2.4.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
......@@ -1455,7 +1455,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of libva_utils 2.2.0:";;
short | recursive ) echo "Configuration of libva_utils 2.4.0:";;
esac
cat <<\_ACEOF
......@@ -1594,7 +1594,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
libva_utils configure 2.2.0
libva_utils configure 2.4.0
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
......@@ -1993,7 +1993,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by libva_utils $as_me 2.2.0, which was
It was created by libva_utils $as_me 2.4.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
......@@ -2858,7 +2858,7 @@ fi
# Define the identity of the package.
PACKAGE='libva-utils'
VERSION='2.2.0'
VERSION='2.4.0'
cat >>confdefs.h <<_ACEOF
......@@ -2998,9 +2998,9 @@ TODAY="`LC_ALL=C date +'%a, %d %b %Y %X %z'`"
LIBVA_UTILS_MAJOR_VERSION=2
LIBVA_UTILS_MINOR_VERSION=2
LIBVA_UTILS_MINOR_VERSION=4
LIBVA_UTILS_MICRO_VERSION=0
LIBVA_UTILS_VERSION=2.2.0
LIBVA_UTILS_VERSION=2.4.0
......@@ -17650,7 +17650,7 @@ else
fi
ac_config_files="$ac_config_files Makefile common/Makefile test/Makefile vainfo/Makefile encode/Makefile decode/Makefile putsurface/Makefile videoprocess/Makefile"
ac_config_files="$ac_config_files Makefile common/Makefile test/Makefile vainfo/Makefile encode/Makefile decode/Makefile putsurface/Makefile videoprocess/Makefile vendor/intel/Makefile vendor/intel/sfcsample/Makefile"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
......@@ -18206,7 +18206,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by libva_utils $as_me 2.2.0, which was
This file was extended by libva_utils $as_me 2.4.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
......@@ -18273,7 +18273,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
libva_utils config.status 2.2.0
libva_utils config.status 2.4.0
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
......@@ -18794,6 +18794,8 @@ do
"decode/Makefile") CONFIG_FILES="$CONFIG_FILES decode/Makefile" ;;
"putsurface/Makefile") CONFIG_FILES="$CONFIG_FILES putsurface/Makefile" ;;
"videoprocess/Makefile") CONFIG_FILES="$CONFIG_FILES videoprocess/Makefile" ;;
"vendor/intel/Makefile") CONFIG_FILES="$CONFIG_FILES vendor/intel/Makefile" ;;
"vendor/intel/sfcsample/Makefile") CONFIG_FILES="$CONFIG_FILES vendor/intel/sfcsample/Makefile" ;;
*) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
esac
......
......@@ -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], [2])
m4_define([libva_utils_minor_version], [4])
m4_define([libva_utils_micro_version], [0])
m4_define([libva_utils_pre_version], [0])
......@@ -215,6 +215,8 @@ AC_OUTPUT([
decode/Makefile
putsurface/Makefile
videoprocess/Makefile
vendor/intel/Makefile
vendor/intel/sfcsample/Makefile
])
......
# Makefile.in generated by automake 1.15 from Makefile.am.
# Makefile.in generated by automake 1.15.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# Copyright (C) 1994-2017 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......
#! /bin/sh
# depcomp - compile a program generating dependencies as side-effects
scriptversion=2013-05-30.07; # UTC
scriptversion=2016-01-11.22; # UTC
# Copyright (C) 1999-2014 Free Software Foundation, Inc.
# Copyright (C) 1999-2017 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
......@@ -786,6 +786,6 @@ exit 0
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
# time-stamp-time-zone: "UTC"
# time-stamp-time-zone: "UTC0"
# time-stamp-end: "; # UTC"
# End:
......@@ -7,7 +7,7 @@
# distribute, sub license, and/or sell copies of the Software, and to
# permit persons to whom the Software is furnished to do so, subject to
# the following conditions:
#
#
# The above copyright notice and this permission notice (including the
# next paragraph) shall be included in all copies or substantial portions
# of the Software.
......@@ -20,7 +20,7 @@
# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
bin_PROGRAMS = avcenc mpeg2vaenc h264encode jpegenc vp9enc
bin_PROGRAMS = avcenc mpeg2vaenc h264encode jpegenc vp9enc vp8enc hevcencode
noinst_PROGRAMS = svctenc
AM_CPPFLAGS = \
......@@ -36,6 +36,14 @@ h264encode_LDADD = \
$(top_builddir)/common/libva-display.la \
-lpthread -lm
hevcencode_SOURCES = hevcencode.c
hevcencode_CFLAGS = -I$(top_srcdir)/common -g
hevcencode_LDADD = \
$(LIBVA_LIBS) \
$(top_builddir)/common/libva-display.la \
-lpthread -lm
avcenc_SOURCES = avcenc.c
avcenc_CFLAGS = -I$(top_srcdir)/common -g
avcenc_LDADD = \
......@@ -71,6 +79,13 @@ vp9enc_LDADD = \
$(top_builddir)/common/libva-display.la \
-lpthread -lm
vp8enc_SOURCES = vp8enc.c
vp8enc_CFLAGS = -I$(top_srcdir)/common -g
vp8enc_LDADD = \
$(LIBVA_LIBS) \
$(top_builddir)/common/libva-display.la \
-lpthread -lm
valgrind: $(bin_PROGRAMS) $(noinst_PROGRAMS)
for a in $(bin_PROGRAMS) $(noinst_PROGRAMS); do \
valgrind --leak-check=full --show-reachable=yes .libs/$$a; \
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
# Makefile.in generated by automake 1.15 from Makefile.am.
# Makefile.in generated by automake 1.15.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# Copyright (C) 1994-2017 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......
# Makefile.in generated by automake 1.15 from Makefile.am.
# Makefile.in generated by automake 1.15.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# Copyright (C) 1994-2017 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......
# Makefile.in generated by automake 1.15 from Makefile.am.
# Makefile.in generated by automake 1.15.1 from Makefile.am.
# @configure_input@
# Copyright (C) 1994-2014 Free Software Foundation, Inc.
# Copyright (C) 1994-2017 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
# gives unlimited permission to copy and/or distribute it,
......
# Copyright (c) 2018 Intel Corporation. All Rights Reserved.
#
# Permission is hereby granted, free of charge, to any person obtaining a
# copy of this software and associated documentation files (the
# "Software"), to deal in the Software without restriction, including
# without limitation the rights to use, copy, modify, merge, publish,
# distribute, sub license, and/or sell copies of the Software, and to
# permit persons to whom the Software is furnished to do so, subject to
# the following conditions:
#
# The above copyright notice and this permission notice (including the
# next paragraph) shall be included in all copies or substantial portions
# of the Software.
#
# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
# IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
# ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
bin_PROGRAMS = avcstreamoutdemo
AM_CPPFLAGS = \
-Wall \
-fstack-protector \
$(LIBVA_CFLAGS) \
-I$(top_srcdir)/common \
-I$(top_srcdir)/vendor/intel \
$(NULL)
TEST_LIBS = \
$(LIBVA_LIBS) \
$(top_builddir)/common/libva-display.la \
$(NULL)
avcstreamoutdemo_LDADD = $(TEST_LIBS)
avcstreamoutdemo_SOURCES = avcstreamoutdemo.c
valgrind: $(bin_PROGRAMS)
for a in $(bin_PROGRAMS); do \
valgrind --leak-check=full --show-reachable=yes .libs/$$a; \
done
EXTRA_DIST = \
avcstreamoutdemo.h \
$(NULL)
This diff is collapsed.
This diff is collapsed.
/*
* Copyright (c) 2018 Intel Corporation. All Rights Reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the
* "Software"), to deal in the Software without restriction, including
* without limitation the rights to use, copy, modify, merge, publish,
* distribute, sub license, and/or sell copies of the Software, and to
* permit persons to whom the Software is furnished to do so, subject to
* the following conditions:
*
* The above copyright notice and this permission notice (including the
* next paragraph) shall be included in all copies or substantial portions
* of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
* OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT.
* IN NO EVENT SHALL PRECISION INSIGHT AND/OR ITS SUPPLIERS BE LIABLE FOR
* ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
/**
* \file avcstreamoutdemo.h
*
* This file contains the decode streamout layout.
*/
#ifndef _AVC_STREAMOUT_DEMO_H_
#define _AVC_STREAMOUT_DEMO_H_
typedef signed dw;
/*
* avc streamout layout
*/
typedef struct {
// dw 0
union
{
struct
{
dw InterMbMode : 2; // Valid only if IntraMbFlag is inter.
dw MbSkipFlag : 1; // Cuurently always set to 0
dw : 1; // MBZ
dw IntraMbMode : 2; // Valid for Inter MB, Used in conjunction with MbType
dw : 1; // MBZ
dw MbPolarity : 1; // FieldMB polarity
dw MbType5Bits : 5; // Matches best MB mode. In H.264 spec: Table 7-11 for Intra; Table 7-14 for Inter.
dw IntraMbFlag : 1; // Set if MB is intra, unset if MB is inter
dw MbFieldFlag : 1; // Set if field MB, unset if frame MB
dw Transform8x8Flag : 1; // Set if current MB uses 8x8 transforms
dw : 1; // MBZ
dw CodedPatternDC : 3; // AVC Only. Indicates whether DC coeffs are sent. Y is most significant bit.
dw EdgeFilterFlag : 3; // AVC.
dw : 1; // MBZ
dw PackedMvNum : 8; // Debug only. Specifies number of MVs in packed motion vector form
};
struct
{
dw Value;
};
} DW0;
// dw 1
union
{
struct
{
dw MbXCnt : 16; // Horizontal Origin of MB in dest piture in units of MBs
dw MbYCnt : 16; // Vertical Origin of MB in dest piture in units of MBs
};
struct
{
dw Value;
};
} DW1;
// dw 2
union
{
struct
{
dw CbpAcY : 16; // Coded block pattern for Y.
dw CbpAcU : 4; // Coded block pattern for U
dw CbpAcV : 4; // Coded block pattern for V
dw : 6; // Reserved
dw LastMBOfSliceFlag : 1; // Indicates current MB is last in slice. Data not right
dw ConcealMBFlag : 1; // Specifies in MB is a conceal MB.
};
struct
{
dw Value;
};
} DW2;
// dw 3
union
{
struct
{
dw QpPrimeY : 7; // AVC: Per-MB QP for luma.
dw QScaleType : 1; // MPEG2 only
dw MbClock16 : 8; // MB compute clocks in 16-clock units
dw NzCoefCountMB : 9; // All coded coefficients in MB
dw : 3; // Reserved
dw Skip8x8Pattern : 4; // AVC Only. Indicates which of the 8x8 sub-blocks uses predicted MVs
};
struct
{
dw Value;
};
} DW3;
// dw 4
union
{
struct
{
dw LumaIntraPredModes0 : 16; // AVC only
dw LumaIntraPredModes1 : 16; // AVC only
} Intra;
struct
{
dw SubMbShape : 8; // Indicates sub-block partitioning for each 8x8 sub-block
dw SubMbPredModes : 8; // Indicates prediction mode for each 8x8 sub-block
dw : 16; // Reserved
} Inter;
struct
{
dw Value;
};
} DW4;
// dw 5
union
{
struct
{
dw LumaIntraPredModes2 : 16; // AVC only
dw LumaIntraPredModes3 : 16; // AVC only
} Intra;
struct
{
dw FrameStorIDL0_0 : 8;
dw FrameStorIDL0_1 : 8;
dw FrameStorIDL0_2 : 8;
dw FrameStorIDL0_3 : 8;
} Inter;
struct
{
dw Value;
};
} DW5;
// dw 6
union
{
struct
{
dw MbIntraStruct : 8; // Indicates which neighbours can be used for intra-prediction
dw : 24; // Reserved
} Intra;
struct
{
dw FrameStorIDL1_0 : 8;
dw FrameStorIDL1_1 : 8;
dw FrameStorIDL1_2 : 8;
dw FrameStorIDL1_3 : 8;
} Inter;
struct
{
dw Value;
};
} DW6;
// dw 7
union
{
struct
{
dw SubBlockCodeTypeY0 : 2; // VC-1. Specifies if 8x8, 8x4, 4x8, 4x4
dw SubBlockCodeTypeY1 : 2; // VC-1. Specifies if 8x8, 8x4, 4x8, 4x4
dw SubBlockCodeTypeY2 : 2; // VC-1. Specifies if 8x8, 8x4, 4x8, 4x4
dw SubBlockCodeTypeY3 : 2; // VC-1. Specifies if 8x8, 8x4, 4x8, 4x4
dw SubBlockCodeTypeU : 2; // VC-1. Specifies if 8x8, 8x4, 4x8, 4x4
dw SubBlockCodeTypeV : 2; // VC-1. Specifies if 8x8, 8x4, 4x8, 4x4
dw : 8;