Hello community, here is the log from the commit of package libva-utils for openSUSE:Factory checked in at 2017-09-05 15:15:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libva-utils (Old) and /work/SRC/openSUSE:Factory/.libva-utils.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libva-utils" Tue Sep 5 15:15:06 2017 rev:2 rq:519525 version:1.8.3 Changes: -------- --- /work/SRC/openSUSE:Factory/libva-utils/libva-utils.changes 2017-08-24 18:46:25.583877752 +0200 +++ /work/SRC/openSUSE:Factory/.libva-utils.new/libva-utils.changes 2017-09-05 15:15:09.173804711 +0200 @@ -1,0 +2,17 @@ +Tue Aug 29 14:30:24 UTC 2017 - sndir...@suse.com + +- removed putsurface_wayland from filelist (now requires wayland- + enabled -devel package) + +------------------------------------------------------------------- +Wed Aug 16 17:27:10 UTC 2017 - ch...@computersalat.de + +- Version 1.8.3 - 28.Jun.2017 + * Bump version to 1.8.3 + * Switch AC_PROG_LIBTOOL to LT_INIT + * putsurface: include wayland-client.h instead of wayland-server.h + * avcenc: add AUD NAL unit at the beginning of pic + * avcenc: enable direct_spatial_mv_pred_flag for B frame + * avcenc: add the frame number as the command line input parameter + +------------------------------------------------------------------- Old: ---- libva-utils-1.8.2.tar.bz2 libva-utils-1.8.2.tar.bz2.sha1sum New: ---- libva-utils-1.8.3.tar.bz2 libva-utils-1.8.3.tar.bz2.sha1sum ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libva-utils.spec ++++++ --- /var/tmp/diff_new_pack.Gw0pDU/_old 2017-09-05 15:15:10.281648989 +0200 +++ /var/tmp/diff_new_pack.Gw0pDU/_new 2017-09-05 15:15:10.285648427 +0200 @@ -17,7 +17,7 @@ Name: libva-utils -Version: 1.8.2 +Version: 1.8.3 Release: 0 Summary: A collection of utilities and examples to exercise VA-API License: MIT and EPL-1.0 @@ -52,7 +52,7 @@ %{_bindir}/h264encode %{_bindir}/mpeg2vaenc %{_bindir}/mpeg2vldemo -%{_bindir}/putsurface_wayland +#%{_bindir}/putsurface_wayland %{_bindir}/loadjpeg %{_bindir}/jpegenc ++++++ libva-utils-1.8.2.tar.bz2 -> libva-utils-1.8.3.tar.bz2 ++++++ ++++ 2214 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libva-utils-1.8.2/NEWS new/libva-utils-1.8.3/NEWS --- old/libva-utils-1.8.2/NEWS 2017-05-22 17:32:39.000000000 +0200 +++ new/libva-utils-1.8.3/NEWS 2017-06-28 02:30:40.000000000 +0200 @@ -1,6 +1,14 @@ -libva-utils NEWS -- summary of changes. 2017-05-22 +libva-utils NEWS -- summary of changes. 2017-06-28 Copyright (C) 2009-2017 Intel Corporation +Version 1.8.3 - 28.Jun.2017 +* Bump version to 1.8.3 +* Switch AC_PROG_LIBTOOL to LT_INIT +* putsurface: include wayland-client.h instead of wayland-server.h +* avcenc: add AUD NAL unit at the beginning of pic +* avcenc: enable direct_spatial_mv_pred_flag for B frame +* avcenc: add the frame number as the command line input parameter + Version 1.8.2 - 22.May.2017 * Bump version to 1.8.2 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libva-utils-1.8.2/compile new/libva-utils-1.8.3/compile --- old/libva-utils-1.8.2/compile 2017-03-01 03:30:12.000000000 +0100 +++ new/libva-utils-1.8.3/compile 2017-06-16 03:51:10.000000000 +0200 @@ -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 <tro...@cygnus.com>. # # This program is free software; you can redistribute it and/or modify diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libva-utils-1.8.2/configure.ac new/libva-utils-1.8.3/configure.ac --- old/libva-utils-1.8.2/configure.ac 2017-05-22 17:32:50.000000000 +0200 +++ new/libva-utils-1.8.3/configure.ac 2017-06-28 02:30:50.000000000 +0200 @@ -30,7 +30,7 @@ # - pre version is libva_pre_version, usually development version m4_define([libva_utils_major_version], [1]) m4_define([libva_utils_minor_version], [8]) -m4_define([libva_utils_micro_version], [2]) +m4_define([libva_utils_micro_version], [3]) m4_define([libva_utils_pre_version], [0]) m4_define([libva_utils_version], @@ -95,8 +95,8 @@ [], [enable_tests="no"]) +LT_INIT AC_DISABLE_STATIC -AC_PROG_LIBTOOL AC_PROG_CC AC_PROG_CXX AM_PROG_CC_C_O diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libva-utils-1.8.2/encode/avcenc.c new/libva-utils-1.8.3/encode/avcenc.c --- old/libva-utils-1.8.2/encode/avcenc.c 2017-05-22 17:32:27.000000000 +0200 +++ new/libva-utils-1.8.3/encode/avcenc.c 2017-06-23 02:32:04.000000000 +0200 @@ -57,7 +57,9 @@ #define NAL_IDR 5 #define NAL_SPS 7 #define NAL_PPS 8 -#define NAL_SEI 6 +#define NAL_SEI 6 +#define NAL_DELIMITER 9 + #define SLICE_TYPE_P 0 #define SLICE_TYPE_B 1 @@ -92,6 +94,7 @@ static int frame_rate = 30; static int ip_period = 1; static int roi_test_enable = 0; +static int aud_nal_enable = 1; static VAEntrypoint select_entrypoint = VAEntrypointEncSlice; @@ -108,6 +111,7 @@ {"mode", required_argument, 0, 3}, {"low-power", no_argument, 0, 4}, {"roi-test", no_argument, 0, 5}, + {"frames", required_argument, 0, 6}, { NULL, 0, NULL, 0} }; @@ -117,6 +121,9 @@ static int build_packed_seq_buffer(unsigned char **header_buffer); +static int +build_nal_delimiter(unsigned char **header_buffer); + static int build_packed_sei_pic_timing(unsigned int cpb_removal_length, unsigned int dpb_output_length, @@ -157,6 +164,8 @@ VABufferID packed_sei_buf_id; VABufferID misc_parameter_hrd_buf_id; VABufferID misc_parameter_roi_buf_id; + VABufferID packed_aud_header_param_buf_id; + VABufferID packed_aud_buf_id; int num_slices; int codedbuf_i_size; @@ -634,7 +643,7 @@ slice_param->num_macroblocks = picture_height_in_mbs * picture_width_in_mbs; slice_param->pic_parameter_set_id = 0; slice_param->slice_type = slice_type; - slice_param->direct_spatial_mv_pred_flag = 0; + slice_param->direct_spatial_mv_pred_flag = 1; slice_param->num_ref_idx_l0_active_minus1 = 0; /* FIXME: ??? */ slice_param->num_ref_idx_l1_active_minus1 = 0; slice_param->cabac_init_idc = 0; @@ -754,6 +763,32 @@ else avcenc_context.current_input_surface = SID_INPUT_PICTURE_0; + if(aud_nal_enable) { + VAEncPackedHeaderParameterBuffer packed_header_param_buffer; + unsigned int length_in_bits; + unsigned char *packed_buffer = NULL; + + length_in_bits = build_nal_delimiter(&packed_buffer); + packed_header_param_buffer.type = VAEncPackedHeaderRawData; + packed_header_param_buffer.bit_length = length_in_bits; + packed_header_param_buffer.has_emulation_bytes = 1; + va_status = vaCreateBuffer(va_dpy, + avcenc_context.context_id, + VAEncPackedHeaderParameterBufferType, + sizeof(packed_header_param_buffer), 1, &packed_header_param_buffer, + &avcenc_context.packed_aud_header_param_buf_id); + CHECK_VASTATUS(va_status,"vaCreateBuffer"); + + va_status = vaCreateBuffer(va_dpy, + avcenc_context.context_id, + VAEncPackedHeaderDataBufferType, + (length_in_bits + 7) / 8, 1, packed_buffer, + &avcenc_context.packed_aud_buf_id); + CHECK_VASTATUS(va_status,"vaCreateBuffer"); + + free(packed_buffer); + } + if (is_idr) { VAEncPackedHeaderParameterBuffer packed_header_param_buffer; unsigned int length_in_bits; @@ -901,6 +936,12 @@ unsigned int num_va_buffers = 0; int i; + if (avcenc_context.packed_aud_header_param_buf_id != VA_INVALID_ID) + va_buffers[num_va_buffers++] = avcenc_context.packed_aud_header_param_buf_id; + + if (avcenc_context.packed_aud_buf_id != VA_INVALID_ID) + va_buffers[num_va_buffers++] = avcenc_context.packed_aud_buf_id; + va_buffers[num_va_buffers++] = avcenc_context.seq_param_buf_id; va_buffers[num_va_buffers++] = avcenc_context.pic_param_buf_id; @@ -928,6 +969,7 @@ if (avcenc_context.misc_parameter_roi_buf_id != VA_INVALID_ID) va_buffers[num_va_buffers++] = avcenc_context.misc_parameter_roi_buf_id; + va_status = vaBeginPicture(va_dpy, avcenc_context.context_id, surface_ids[avcenc_context.current_input_surface]); @@ -985,6 +1027,8 @@ avcenc_destroy_buffers(&avcenc_context.codedbuf_buf_id, 1); avcenc_destroy_buffers(&avcenc_context.misc_parameter_hrd_buf_id, 1); avcenc_destroy_buffers(&avcenc_context.misc_parameter_roi_buf_id, 1); + avcenc_destroy_buffers(&avcenc_context.packed_aud_header_param_buf_id, 1); + avcenc_destroy_buffers(&avcenc_context.packed_aud_buf_id, 1); memset(avcenc_context.slice_param, 0, sizeof(avcenc_context.slice_param)); avcenc_context.num_slices = 0; @@ -1320,6 +1364,34 @@ } #endif +static void nal_delimiter(bitstream *bs,int slice_type) +{ + if(slice_type == SLICE_TYPE_I || slice_type == FRAME_IDR) + bitstream_put_ui(bs, 0, 3); + else if(slice_type == SLICE_TYPE_P) + bitstream_put_ui(bs, 1, 3); + else if(slice_type == SLICE_TYPE_B) + bitstream_put_ui(bs, 2, 3); + else + assert(0); + bitstream_put_ui(bs, 1, 1); + bitstream_put_ui(bs, 0, 4); +} + +static int build_nal_delimiter(unsigned char **header_buffer) +{ + bitstream bs; + + bitstream_start(&bs); + nal_start_code_prefix(&bs); + nal_header(&bs, NAL_REF_IDC_NONE, NAL_DELIMITER); + nal_delimiter(&bs,current_frame_type); + bitstream_end(&bs); + *header_buffer = (unsigned char *)bs.buffer; + return bs.bit_offset; +} + + static int build_packed_pic_buffer(unsigned char **header_buffer) { @@ -1774,7 +1846,7 @@ static void show_help() { - printf("Usage: avnenc <width> <height> <input_yuvfile> <output_avcfile> [--qp=qpvalue|--fb=framebitrate] [--mode=0(I frames only)/1(I and P frames)/2(I, P and B frames)] [--low-power] [--roi-test]\n"); + printf("Usage: avnenc <width> <height> <input_yuvfile> <output_avcfile> [--qp=qpvalue|--fb=framebitrate] [--mode=0(I frames only)/1(I and P frames)/2(I, P and B frames)] [--low-power] [--roi-test] [--frames=0(ignore when < 0)/N(number)] \n"); } static void avcenc_context_seq_param_init(VAEncSequenceParameterBufferH264 *seq_param, @@ -1915,6 +1987,8 @@ avcenc_context.packed_sei_header_param_buf_id = VA_INVALID_ID; avcenc_context.packed_sei_buf_id = VA_INVALID_ID; avcenc_context.misc_parameter_roi_buf_id = VA_INVALID_ID; + avcenc_context.packed_aud_header_param_buf_id = VA_INVALID_ID; + avcenc_context.packed_aud_buf_id = VA_INVALID_ID; if (qp_value == -1) avcenc_context.rate_control_method = VA_RC_CBR; @@ -1944,6 +2018,7 @@ int mode_value; struct timeval tpstart,tpend; float timeuse; + int frame_num_value = 0; va_init_display_args(&argc, argv); @@ -2014,6 +2089,9 @@ roi_test_enable = 1; break; + case 6: // Frames number + frame_num_value = atoi(optarg); + break; default: show_help(); return -1; @@ -2051,7 +2129,10 @@ alloc_encode_resource(yuv_fp); enc_frame_number = 0; - for ( f = 0; f < frame_number; f++) { //picture level loop + if(frame_num_value <= 0) + frame_num_value = frame_number; + + for ( f = 0; f < frame_num_value; f++) { //picture level loop unsigned long long next_frame_display; int next_frame_type; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libva-utils-1.8.2/m4/libtool.m4 new/libva-utils-1.8.3/m4/libtool.m4 --- old/libva-utils-1.8.2/m4/libtool.m4 2017-05-22 17:43:51.000000000 +0200 +++ new/libva-utils-1.8.3/m4/libtool.m4 2017-06-16 03:51:04.000000000 +0200 @@ -728,7 +728,6 @@ cat <<_LT_EOF >> "$cfgfile" #! $SHELL # Generated automatically by $as_me ($PACKAGE) $VERSION -# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: # NOTE: Changes made to this file will be lost: look at ltmain.sh. # Provide generalized library-building support services. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libva-utils-1.8.2/m4/ltsugar.m4 new/libva-utils-1.8.3/m4/ltsugar.m4 --- old/libva-utils-1.8.2/m4/ltsugar.m4 2017-03-01 03:30:09.000000000 +0100 +++ new/libva-utils-1.8.3/m4/ltsugar.m4 2017-06-16 03:51:04.000000000 +0200 @@ -1,6 +1,7 @@ # ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*- # -# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc. +# Copyright (C) 2004-2005, 2007-2008, 2011-2015 Free Software +# Foundation, Inc. # Written by Gary V. Vaughan, 2004 # # This file is free software; the Free Software Foundation gives @@ -33,7 +34,7 @@ # ------------ # Manipulate m4 lists. # These macros are necessary as long as will still need to support -# Autoconf-2.59 which quotes differently. +# Autoconf-2.59, which quotes differently. m4_define([lt_car], [[$1]]) m4_define([lt_cdr], [m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])], @@ -44,7 +45,7 @@ # lt_append(MACRO-NAME, STRING, [SEPARATOR]) # ------------------------------------------ -# Redefine MACRO-NAME to hold its former content plus `SEPARATOR'`STRING'. +# Redefine MACRO-NAME to hold its former content plus 'SEPARATOR''STRING'. # Note that neither SEPARATOR nor STRING are expanded; they are appended # to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked). # No SEPARATOR is output if MACRO-NAME was previously undefined (different diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libva-utils-1.8.2/m4/lt~obsolete.m4 new/libva-utils-1.8.3/m4/lt~obsolete.m4 --- old/libva-utils-1.8.2/m4/lt~obsolete.m4 2017-03-01 03:30:09.000000000 +0100 +++ new/libva-utils-1.8.3/m4/lt~obsolete.m4 2017-06-16 03:51:04.000000000 +0200 @@ -1,6 +1,7 @@ # lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*- # -# Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc. +# Copyright (C) 2004-2005, 2007, 2009, 2011-2015 Free Software +# Foundation, Inc. # Written by Scott James Remnant, 2004. # # This file is free software; the Free Software Foundation gives @@ -11,7 +12,7 @@ # These exist entirely to fool aclocal when bootstrapping libtool. # -# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN) +# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN), # which have later been changed to m4_define as they aren't part of the # exported API, or moved to Autoconf or Automake where they belong. # @@ -25,7 +26,7 @@ # included after everything else. This provides aclocal with the # AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything # because those macros already exist, or will be overwritten later. -# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6. +# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6. # # Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here. # Yes, that means every name once taken will need to remain here until diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libva-utils-1.8.2/missing new/libva-utils-1.8.3/missing --- old/libva-utils-1.8.2/missing 2017-03-01 03:30:12.000000000 +0100 +++ new/libva-utils-1.8.3/missing 2017-06-16 03:51:10.000000000 +0200 @@ -3,7 +3,7 @@ scriptversion=2013-10-28.13; # UTC -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard <pin...@iro.umontreal.ca>, 1996. # This program is free software; you can redistribute it and/or modify diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/libva-utils-1.8.2/putsurface/putsurface_wayland.c new/libva-utils-1.8.3/putsurface/putsurface_wayland.c --- old/libva-utils-1.8.2/putsurface/putsurface_wayland.c 2017-05-22 17:32:27.000000000 +0200 +++ new/libva-utils-1.8.3/putsurface/putsurface_wayland.c 2017-06-28 02:30:24.000000000 +0200 @@ -31,7 +31,7 @@ #else # include <va/va_wayland.h> #endif -#include <wayland-server.h> +#include <wayland-client.h> static void *open_display(void); static void close_display(void *win_display); ++++++ libva-utils-1.8.2.tar.bz2.sha1sum -> libva-utils-1.8.3.tar.bz2.sha1sum ++++++ --- /work/SRC/openSUSE:Factory/libva-utils/libva-utils-1.8.2.tar.bz2.sha1sum 2017-08-24 18:46:25.539883947 +0200 +++ /work/SRC/openSUSE:Factory/.libva-utils.new/libva-utils-1.8.3.tar.bz2.sha1sum 2017-09-05 15:15:08.161946942 +0200 @@ -1 +1 @@ -4cddc6ad67f8d3a0b903e06f34f8ca2da53b4f1d libva-utils-1.8.2.tar.bz2 +8684aa2b28fc08bf62b1fa5acf95d23fab5faf9a libva-utils-1.8.3.tar.bz2