Commit 503cf1df49d816e3ff7f3884b2c613906e3422b9 - intel-vaapi-driver-shaders

New upstream snapshot. Debian Janitor 2 years ago

9 changed file(s) with 60 addition(s) and 105 deletion(s). Raw diff Collapse all Expand all

-36

~~.gitignore~~ less more

0		*~
1		*.o
2		*.lo
3		*.la
4		*.orig
5		*.rej
6		*.loT
7		*.bin
8		*.pc
9		*.g[4-9]s
10		*.gen[4-9].asm
11		*.gen75.asm
12		.deps
13		.libs
14		install-sh
15		libtool
16		ltmain.sh
17		compile
18		missing
19		Makefile
20		Makefile.in
21		config.h
22		config.h.in
23		stamp-h1
24		aclocal.m4
25		autom4te.cache
26		config.guess
27		config.log
28		config.status
29		config.sub
30		configure
31		depcomp
32		TAGS
33		/src/intel_version.h
34		/src/wayland-drm-client-protocol.h
35		.VERSION*

-17

NEWS less more

0		intel-vaapi-driver NEWS -- summary of changes. 2020-06-01
1		Copyright (C) 2009-2019 Intel Corporation
2
3		Version 2.4.1 - 01.Jun.2020
4		* Bump version to 2.4.1 for maintenance release
5		* Fix compiler errors with gcc 10
6		* Relax the compressed frames minimum size restriction for VP9 encoder
7
8		Version 2.4.0 - 06.Dec.2019
9		* Bump version to 2.4.0 for maintenance release
10		* Fix the dependency on libEGL
11		* Fix ROI support
12		* Fix FD leaks on Wayland
13		* Fix BRC setting
14		* Fix VP8 encoder
15		* Fix VP9 encoder
16		* Fix meson build
	0	intel-vaapi-driver NEWS -- summary of changes. 2018-12-10
	1	Copyright (C) 2009-2018 Intel Corporation
17	2
18	3	Version 2.3.0 - 10.Dec.2018
19	4	* Bump version to 2.3.0

-1

README.md less more

0	0	[![Stories in Ready](https://badge.waffle.io/intel/intel-vaapi-driver.png?label=ready&title=Ready)](http://waffle.io/intel/intel-vaapi-driver)
1	1	[![Build Status](https://travis-ci.org/intel/intel-vaapi-driver.svg?branch=master)](https://travis-ci.org/intel/intel-vaapi-driver)
2		[![Coverity Scan Build Status](https://scan.coverity.com/projects/11612/badge.svg)](https://scan.coverity.com/projects/intel-intel-vaapi-driver)
	2	[![Coverity Scan Build Status](https://scan.coverity.com/projects/11612/badge.svg)](https://scan.coverity.com/projects/01org-intel-vaapi-driver)
3	3
4	4	# Intel-vaapi-driver Project
5	5

-2

configure.ac less more

0	0	# intel-vaapi-driver package version number
1	1	m4_define([intel_vaapi_driver_major_version], [2])
2	2	m4_define([intel_vaapi_driver_minor_version], [4])
3		m4_define([intel_vaapi_driver_micro_version], [1])
4		m4_define([intel_vaapi_driver_pre_version], [0])
	3	m4_define([intel_vaapi_driver_micro_version], [0])
	4	m4_define([intel_vaapi_driver_pre_version], [1])
5	5	m4_define([intel_vaapi_driver_version],
6	6	[intel_vaapi_driver_major_version.intel_vaapi_driver_minor_version.intel_vaapi_driver_micro_version])
7	7	m4_if(intel_vaapi_driver_pre_version, [0], [], [

-0

debian/changelog less more

	0	intel-vaapi-driver-shaders (2.4.1+git20200819.1.d87db21-1) UNRELEASED; urgency=low
	1
	2	* New upstream snapshot.
	3
	4	-- Debian Janitor <janitor@jelmer.uk> Wed, 21 Jul 2021 21:03:43 -0000
	5
0	6	intel-vaapi-driver-shaders (2.4.1-1) unstable; urgency=medium
1	7
2	8	* New upstream release

-1

meson.build less more

0	0	project(
1	1	'intel-vaapi-driver', 'c',
2		version : '2.4.1.0',
	2	version : '2.4.0.1',
3	3	meson_version : '>= 0.43.0',
4	4	default_options : [ 'warning_level=1',
5	5	'buildtype=debugoptimized' ])

+12

-12

src/gen8_post_processing.c less more

1908	1908	fourcc == VA_FOURCC_BGRA) {
1909	1909	/* nothing to do here */
1910	1910	} else if (fourcc == VA_FOURCC_P010 \|\| fourcc == VA_FOURCC_NV12) {
1911		width[1] = width[0] / 2;
1912		height[1] = height[0] / 2;
	1911	width[1] = ALIGN(width[0], 2) / 2;
	1912	height[1] = ALIGN(height[0], 2) / 2;
1913	1913	pitch[1] = obj_surface->cb_cr_pitch;
1914	1914	bo_offset[1] = obj_surface->width * obj_surface->y_cb_offset;
1915	1915	} else {
1916		width[1] = width[0] / 2;
1917		height[1] = height[0] / 2;
	1916	width[1] = ALIGN(width[0], 2) / 2;
	1917	height[1] = ALIGN(height[0], 2) / 2;
1918	1918	pitch[1] = obj_surface->cb_cr_pitch;
1919	1919	bo_offset[1] = obj_surface->width * obj_surface->y_cb_offset;
1920		width[2] = width[0] / 2;
1921		height[2] = height[0] / 2;
	1920	width[2] = ALIGN(width[0], 2) / 2;
	1921	height[2] = ALIGN(height[0], 2) / 2;
1922	1922	pitch[2] = obj_surface->cb_cr_pitch;
1923	1923	bo_offset[2] = obj_surface->width * obj_surface->y_cr_offset;
1924	1924	}

1939	1939	fourcc == VA_FOURCC_BGRA) {
1940	1940	/* nothing to do here */
1941	1941	} else if (fourcc == VA_FOURCC_P010 \|\| fourcc == VA_FOURCC_NV12) {
1942		width[1] = width[0] / 2;
1943		height[1] = height[0] / 2;
	1942	width[1] = ALIGN(width[0], 2) / 2;
	1943	height[1] = ALIGN(height[0], 2) / 2;
1944	1944	pitch[1] = obj_image->image.pitches[1];
1945	1945	bo_offset[1] = obj_image->image.offsets[1];
1946	1946	} else {

1949	1949	if (fourcc == VA_FOURCC_YV12 \|\| fourcc == VA_FOURCC_IMC1)
1950	1950	u = 2, v = 1;
1951	1951
1952		width[1] = width[0] / 2;
1953		height[1] = height[0] / 2;
	1952	width[1] = ALIGN(width[0], 2) / 2;
	1953	height[1] = ALIGN(height[0], 2) / 2;
1954	1954	pitch[1] = obj_image->image.pitches[u];
1955	1955	bo_offset[1] = obj_image->image.offsets[u];
1956		width[2] = width[0] / 2;
1957		height[2] = height[0] / 2;
	1956	width[2] = ALIGN(width[0], 2) / 2;
	1957	height[2] = ALIGN(height[0], 2) / 2;
1958	1958	pitch[2] = obj_image->image.pitches[v];
1959	1959	bo_offset[2] = obj_image->image.offsets[v];
1960	1960	}

+12

-12

src/gen9_post_processing.c less more

730	730	fourcc == VA_FOURCC_BGRA) {
731	731	/* nothing to do here */
732	732	} else if (fourcc == VA_FOURCC_P010 \|\| fourcc == VA_FOURCC_NV12) {
733		width[1] = width[0] / 2;
734		height[1] = height[0] / 2;
	733	width[1] = ALIGN(width[0], 2) / 2;
	734	height[1] = ALIGN(height[0], 2) / 2;
735	735	pitch[1] = obj_surface->cb_cr_pitch;
736	736	bo_offset[1] = obj_surface->width * obj_surface->y_cb_offset;
737	737	} else if (fourcc == VA_FOURCC_YUY2 \|\| fourcc == VA_FOURCC_UYVY) {
738	738	/* nothing to do here */
739	739	} else {
740		width[1] = width[0] / 2;
741		height[1] = height[0] / 2;
	740	width[1] = ALIGN(width[0], 2) / 2;
	741	height[1] = ALIGN(height[0], 2) / 2;
742	742	pitch[1] = obj_surface->cb_cr_pitch;
743	743	bo_offset[1] = obj_surface->width * obj_surface->y_cb_offset;
744		width[2] = width[0] / 2;
745		height[2] = height[0] / 2;
	744	width[2] = ALIGN(width[0], 2) / 2;
	745	height[2] = ALIGN(height[0], 2) / 2;
746	746	pitch[2] = obj_surface->cb_cr_pitch;
747	747	bo_offset[2] = obj_surface->width * obj_surface->y_cr_offset;
748	748	}

763	763	fourcc == VA_FOURCC_BGRA) {
764	764	/* nothing to do here */
765	765	} else if (fourcc == VA_FOURCC_P010 \|\| fourcc == VA_FOURCC_NV12) {
766		width[1] = width[0] / 2;
767		height[1] = height[0] / 2;
	766	width[1] = ALIGN(width[0], 2) / 2;
	767	height[1] = ALIGN(height[0], 2) / 2;
768	768	pitch[1] = obj_image->image.pitches[1];
769	769	bo_offset[1] = obj_image->image.offsets[1];
770	770	} else if (fourcc == VA_FOURCC_YUY2 \|\| fourcc == VA_FOURCC_UYVY) {

775	775	if (fourcc == VA_FOURCC_YV12 \|\| fourcc == VA_FOURCC_IMC1)
776	776	u = 2, v = 1;
777	777
778		width[1] = width[0] / 2;
779		height[1] = height[0] / 2;
	778	width[1] = ALIGN(width[0], 2) / 2;
	779	height[1] = ALIGN(height[0], 2) / 2;
780	780	pitch[1] = obj_image->image.pitches[u];
781	781	bo_offset[1] = obj_image->image.offsets[u];
782		width[2] = width[0] / 2;
783		height[2] = height[0] / 2;
	782	width[2] = ALIGN(width[0], 2) / 2;
	783	height[2] = ALIGN(height[0], 2) / 2;
784	784	pitch[2] = obj_image->image.pitches[v];
785	785	bo_offset[2] = obj_image->image.offsets[v];
786	786	}

+24

-24

src/i965_drv_video.c less more

1724	1724	obj_surface->subsampling = SUBSAMPLE_YUV420;
1725	1725	obj_surface->y_cb_offset = obj_surface->height;
1726	1726	obj_surface->y_cr_offset = obj_surface->height;
1727		obj_surface->cb_cr_width = obj_surface->orig_width / 2;
1728		obj_surface->cb_cr_height = obj_surface->orig_height / 2;
	1727	obj_surface->cb_cr_width = ALIGN(obj_surface->orig_width, 2) / 2;
	1728	obj_surface->cb_cr_height = ALIGN(obj_surface->orig_height, 2) / 2;
1729	1729	obj_surface->cb_cr_pitch = memory_attibute->pitches[1];
1730	1730	if (tiling)
1731	1731	ASSERT_RET(IS_ALIGNED(obj_surface->cb_cr_pitch, 128), VA_STATUS_ERROR_INVALID_PARAMETER);

1742	1742	obj_surface->subsampling = SUBSAMPLE_YUV420;
1743	1743	obj_surface->y_cr_offset = obj_surface->height;
1744	1744	obj_surface->y_cb_offset = memory_attibute->offsets[2] / obj_surface->width;
1745		obj_surface->cb_cr_width = obj_surface->orig_width / 2;
1746		obj_surface->cb_cr_height = obj_surface->orig_height / 2;
	1745	obj_surface->cb_cr_width = ALIGN(obj_surface->orig_width, 2) / 2;
	1746	obj_surface->cb_cr_height = ALIGN(obj_surface->orig_height, 2) / 2;
1747	1747	obj_surface->cb_cr_pitch = memory_attibute->pitches[1];
1748	1748
1749	1749	if (tiling)

1763	1763	obj_surface->subsampling = SUBSAMPLE_YUV420;
1764	1764	obj_surface->y_cb_offset = obj_surface->height;
1765	1765	obj_surface->y_cr_offset = memory_attibute->offsets[2] / obj_surface->width;
1766		obj_surface->cb_cr_width = obj_surface->orig_width / 2;
1767		obj_surface->cb_cr_height = obj_surface->orig_height / 2;
	1766	obj_surface->cb_cr_width = ALIGN(obj_surface->orig_width, 2) / 2;
	1767	obj_surface->cb_cr_height = ALIGN(obj_surface->orig_height, 2) / 2;
1768	1768	obj_surface->cb_cr_pitch = memory_attibute->pitches[1];
1769	1769	if (tiling)
1770	1770	ASSERT_RET(IS_ALIGNED(obj_surface->cb_cr_pitch, 128), VA_STATUS_ERROR_INVALID_PARAMETER);

1836	1836	obj_surface->subsampling = SUBSAMPLE_YUV422H;
1837	1837	obj_surface->y_cb_offset = obj_surface->height;
1838	1838	obj_surface->y_cr_offset = memory_attibute->offsets[2] / obj_surface->width;
1839		obj_surface->cb_cr_width = obj_surface->orig_width / 2;
	1839	obj_surface->cb_cr_width = ALIGN(obj_surface->orig_width, 2) / 2;
1840	1840	obj_surface->cb_cr_height = obj_surface->orig_height;
1841	1841	obj_surface->cb_cr_pitch = memory_attibute->pitches[1];
1842	1842	if (tiling)

1853	1853	obj_surface->subsampling = SUBSAMPLE_YUV422H;
1854	1854	obj_surface->y_cr_offset = memory_attibute->offsets[1] / obj_surface->width;
1855	1855	obj_surface->y_cb_offset = memory_attibute->offsets[2] / obj_surface->width;
1856		obj_surface->cb_cr_width = obj_surface->orig_width / 2;
	1856	obj_surface->cb_cr_width = ALIGN(obj_surface->orig_width, 2) / 2;
1857	1857	obj_surface->cb_cr_height = obj_surface->orig_height;
1858	1858	obj_surface->cb_cr_pitch = memory_attibute->pitches[1];
1859	1859	ASSERT_RET(IS_ALIGNED(obj_surface->cb_cr_pitch, i965->codec_info->min_linear_wpitch), VA_STATUS_ERROR_INVALID_PARAMETER);

1868	1868	obj_surface->y_cb_offset = obj_surface->height;
1869	1869	obj_surface->y_cr_offset = memory_attibute->offsets[2] / obj_surface->width;
1870	1870	obj_surface->cb_cr_width = obj_surface->orig_width;
1871		obj_surface->cb_cr_height = obj_surface->orig_height / 2;
	1871	obj_surface->cb_cr_height = ALIGN(obj_surface->orig_height, 2) / 2;
1872	1872	obj_surface->cb_cr_pitch = memory_attibute->pitches[1];
1873	1873	if (tiling)
1874	1874	ASSERT_RET(IS_ALIGNED(obj_surface->cb_cr_pitch, 128), VA_STATUS_ERROR_INVALID_PARAMETER);

4525	4525	case VA_FOURCC_P010:
4526	4526	assert(subsampling == SUBSAMPLE_YUV420);
4527	4527	obj_surface->cb_cr_pitch = obj_surface->width;
4528		obj_surface->cb_cr_width = obj_surface->orig_width / 2;
4529		obj_surface->cb_cr_height = obj_surface->orig_height / 2;
	4528	obj_surface->cb_cr_width = ALIGN(obj_surface->orig_width, 2) / 2;
	4529	obj_surface->cb_cr_height = ALIGN(obj_surface->orig_height, 2) / 2;
4530	4530	obj_surface->y_cb_offset = obj_surface->height;
4531	4531	obj_surface->y_cr_offset = obj_surface->height;
4532	4532	region_width = obj_surface->width;

4537	4537	case VA_FOURCC_IMC1:
4538	4538	assert(subsampling == SUBSAMPLE_YUV420);
4539	4539	obj_surface->cb_cr_pitch = obj_surface->width;
4540		obj_surface->cb_cr_width = obj_surface->orig_width / 2;
4541		obj_surface->cb_cr_height = obj_surface->orig_height / 2;
	4540	obj_surface->cb_cr_width = ALIGN(obj_surface->orig_width, 2) / 2;
	4541	obj_surface->cb_cr_height = ALIGN(obj_surface->orig_height, 2) / 2;
4542	4542	obj_surface->y_cr_offset = obj_surface->height;
4543	4543	obj_surface->y_cb_offset = obj_surface->y_cr_offset + ALIGN(obj_surface->cb_cr_height, 32);
4544	4544	region_width = obj_surface->width;

4549	4549	case VA_FOURCC_IMC3:
4550	4550	assert(subsampling == SUBSAMPLE_YUV420);
4551	4551	obj_surface->cb_cr_pitch = obj_surface->width;
4552		obj_surface->cb_cr_width = obj_surface->orig_width / 2;
4553		obj_surface->cb_cr_height = obj_surface->orig_height / 2;
	4552	obj_surface->cb_cr_width = ALIGN(obj_surface->orig_width, 2) / 2;
	4553	obj_surface->cb_cr_height = ALIGN(obj_surface->orig_height, 2) / 2;
4554	4554	obj_surface->y_cb_offset = obj_surface->height;
4555	4555	obj_surface->y_cr_offset = obj_surface->y_cb_offset + ALIGN(obj_surface->cb_cr_height, 32);
4556	4556	region_width = obj_surface->width;

4561	4561	case VA_FOURCC_422H:
4562	4562	assert(subsampling == SUBSAMPLE_YUV422H);
4563	4563	obj_surface->cb_cr_pitch = obj_surface->width;
4564		obj_surface->cb_cr_width = obj_surface->orig_width / 2;
	4564	obj_surface->cb_cr_width = ALIGN(obj_surface->orig_width, 2) / 2;
4565	4565	obj_surface->cb_cr_height = obj_surface->orig_height;
4566	4566	obj_surface->y_cb_offset = obj_surface->height;
4567	4567	obj_surface->y_cr_offset = obj_surface->y_cb_offset + ALIGN(obj_surface->cb_cr_height, 32);

4574	4574	assert(subsampling == SUBSAMPLE_YUV422V);
4575	4575	obj_surface->cb_cr_pitch = obj_surface->width;
4576	4576	obj_surface->cb_cr_width = obj_surface->orig_width;
4577		obj_surface->cb_cr_height = obj_surface->orig_height / 2;
	4577	obj_surface->cb_cr_height = ALIGN(obj_surface->orig_height, 2) / 2;
4578	4578	obj_surface->y_cb_offset = obj_surface->height;
4579	4579	obj_surface->y_cr_offset = obj_surface->y_cb_offset + ALIGN(obj_surface->cb_cr_height, 32);
4580	4580	region_width = obj_surface->width;

4662	4662	case VA_FOURCC_P010:
4663	4663	obj_surface->y_cb_offset = obj_surface->height;
4664	4664	obj_surface->y_cr_offset = obj_surface->height;
4665		obj_surface->cb_cr_width = obj_surface->orig_width / 2;
	4665	obj_surface->cb_cr_width = ALIGN(obj_surface->orig_width, 2) / 2;
4666	4666	obj_surface->width = ALIGN(obj_surface->cb_cr_width * 2, i965->codec_info->min_linear_wpitch) *
4667	4667	bpp_1stplane;
4668		obj_surface->cb_cr_height = obj_surface->orig_height / 2;
	4668	obj_surface->cb_cr_height = ALIGN(obj_surface->orig_height, 2) / 2;
4669	4669	obj_surface->cb_cr_pitch = obj_surface->width;
4670	4670	region_width = obj_surface->width;
4671	4671	region_height = obj_surface->height + obj_surface->height / 2;
4672	4672	break;
4673	4673
4674	4674	case VA_FOURCC_YV16:
4675		obj_surface->cb_cr_width = obj_surface->orig_width / 2;
	4675	obj_surface->cb_cr_width = ALIGN(obj_surface->orig_width, 2) / 2;
4676	4676	obj_surface->width = ALIGN(obj_surface->cb_cr_width, i965->codec_info->min_linear_wpitch) * 2;
4677	4677	obj_surface->cb_cr_height = obj_surface->orig_height;
4678	4678	obj_surface->y_cr_offset = obj_surface->height;

4693	4693	obj_surface->y_cr_offset = obj_surface->height + obj_surface->height / 4;
4694	4694	}
4695	4695
4696		obj_surface->cb_cr_width = obj_surface->orig_width / 2;
	4696	obj_surface->cb_cr_width = ALIGN(obj_surface->orig_width, 2) / 2;
4697	4697	obj_surface->width = ALIGN(obj_surface->cb_cr_width, i965->codec_info->min_linear_wpitch) * 2;
4698		obj_surface->cb_cr_height = obj_surface->orig_height / 2;
	4698	obj_surface->cb_cr_height = ALIGN(obj_surface->orig_height, 2) / 2;
4699	4699	obj_surface->cb_cr_pitch = obj_surface->width / 2;
4700	4700	region_width = obj_surface->width;
4701	4701	region_height = obj_surface->height + obj_surface->height / 2;

4704	4704	case VA_FOURCC_I010:
4705	4705	obj_surface->y_cb_offset = obj_surface->height;
4706	4706	obj_surface->y_cr_offset = obj_surface->height + obj_surface->height / 4;
4707		obj_surface->cb_cr_width = obj_surface->orig_width / 2;
	4707	obj_surface->cb_cr_width = ALIGN(obj_surface->orig_width, 2) / 2;
4708	4708	obj_surface->width = ALIGN(obj_surface->cb_cr_width * 2, i965->codec_info->min_linear_wpitch) * 2;
4709		obj_surface->cb_cr_height = obj_surface->orig_height / 2;
	4709	obj_surface->cb_cr_height =ALIGN(obj_surface->orig_height, 2) / 2;
4710	4710	obj_surface->cb_cr_pitch = obj_surface->width / 2;
4711	4711	region_width = obj_surface->width;
4712	4712	region_height = obj_surface->height + obj_surface->height / 2;