Philippe Coval [Tue, 13 Jan 2015 10:09:57 +0000 (11:09 +0100)]
VPP: Fix Coverity alert on unitialized vpp_kernels
uninit_use_in_call: Using unitialized value vpp_kernels
when calling *vpp_gpe_ctx->gpe_load_kernels
Change-Id: Id02c018db996e5fed7b5b573baa6425968060152
Bug-Tizen: TC-2098/part
Forwarded: https://bugs.freedesktop.org/show_bug.cgi?id=88362
Signed-off-by: Philippe Coval <philippe.coval@open.eurogiciel.org>
Gwenole Beauchesne [Mon, 8 Sep 2014 17:06:21 +0000 (19:06 +0200)]
vpp: expose BGRA surface formats on Ivybridge and Haswell.
Allow for vaQuerySurfaceAttributes() to return BGRA and BGRX formats
for VPP on Ivybridge and Haswell. This is supported as both source
and target surface formats.
This fixes VA/EGL interop on Gen7 processors when a BGR[AX] surface
is exported into an EGLImage.
Change-Id: I94f0b174223f94b0a1155e32a17bb23ffb2792cf
Signed-off-by: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
Bug-Tizen: TC-1195/related
Philippe Coval [Thu, 13 Nov 2014 16:54:09 +0000 (17:54 +0100)]
Revert "add LockBuffer support for VAImage/VASurface"
This reverts commit
9dbdd5c26b4a47f0edab79b86ba8d46d8a0c8bd4.
Change-Id: I23eeb6b1a4889cc97d13d3ddcb6b9d3cd6eb570b
Bug-Tizen: TC-1195/related
Philippe Coval [Thu, 13 Nov 2014 16:40:43 +0000 (17:40 +0100)]
packaging: Bump to 1.4.1
Bug-Tizen: TC-1195/related
Change-Id: I276818de14727594d0aff64bcf806d6f3097c0a8
Signed-off-by: Philippe Coval <philippe.coval@open.eurogiciel.org>
Philippe Coval [Mon, 16 Jun 2014 09:02:54 +0000 (11:02 +0200)]
packaging: Bump to 1.3.2
Change-Id: I8b05b3c43315a818502eb17afd25703fa0f0b4b7
Signed-off-by: Philippe Coval <philippe.coval@open.eurogiciel.org>
Philippe Coval [Fri, 16 May 2014 11:35:25 +0000 (13:35 +0200)]
packaging: Bump to 1.3.1
Change-Id: I65b47c1deb23e6d699efc1b7f195529d5a81736c
Signed-off-by: Philippe Coval <philippe.coval@open.eurogiciel.org>
Philippe Coval [Tue, 29 Apr 2014 14:28:43 +0000 (16:28 +0200)]
packaging: Bump to 1.3.0
Change-Id: I99c20e476ed296cfa39b91e259878427825b00c9
Signed-off-by: Philippe Coval <philippe.coval@open.eurogiciel.org>
Philippe Coval [Tue, 29 Apr 2014 14:24:58 +0000 (16:24 +0200)]
packaging: use upstream tags
Change-Id: I6ef7c1c8016a9aa459968719de5795cdad7dc5cb
Signed-off-by: Philippe Coval <philippe.coval@open.eurogiciel.org>
Ed Bartosh [Tue, 10 Jun 2014 11:33:29 +0000 (14:33 +0300)]
Build only for Intel architectures
This change should fix unresolvable state of the package
for arm targets. As libva builds exclusively for Intel archs
it's not availabe on arm and turns this package into
unresolvable state.
Change-Id: I4971c8dfab6eb4c4b99346b31de8977e8d013110
Signed-off-by: Ed Bartosh <eduard.bartosh@intel.com>
Ronan Le Martret [Thu, 30 Jan 2014 13:46:22 +0000 (14:46 +0100)]
Allow "libva-intel-driver" to build into pure Wayland profile.
Change-Id: I47b05a505e83f9bcf7840c95ec7bd369140a4ecf
Zhao, Halley [Mon, 17 Feb 2014 17:29:34 +0000 (01:29 +0800)]
changelog: update version to 1.2.2
Change-Id: I196c61f5534e704ee5049b89edd288347515c158
Zhao, Halley [Sun, 16 Feb 2014 19:43:51 +0000 (03:43 +0800)]
add LockBuffer support for VAImage/VASurface
Zhao, Halley [Sun, 16 Feb 2014 19:06:43 +0000 (03:06 +0800)]
packaging: Intial packaging for tizen (on 1.2.0pre)
Change-Id: Ic82a374fabfcbda5a0057d359189c8612ce76dd4
Xiang, Haihao [Fri, 24 Oct 2014 07:03:46 +0000 (15:03 +0800)]
Intel driver 1.4.1
Signed-off-by: Xiang, Haihao <haihao.xiang@intel.com>
Xiang, Haihao [Fri, 10 Oct 2014 07:19:24 +0000 (15:19 +0800)]
Update NEWS & version for 1.4.1 pre1
Signed-off-by: Xiang, Haihao <haihao.xiang@intel.com>
Gwenole Beauchesne [Tue, 9 Sep 2014 13:04:43 +0000 (15:04 +0200)]
build: fix make dist for packaging.
If the intel-gen4asm tool is not available, ship with the pre-built
EU kernels instead of trying to regenerate them. In particular, just
don't expose the build rules if intel-gen4asm is not installed.
Signed-off-by: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
(cherry picked from commit
238d8077705711036d62a6d536311def3ef35035)
Zhao Yakui [Wed, 8 Oct 2014 00:23:34 +0000 (08:23 +0800)]
Encoding: Add one hook callback function to detect encoding capabilitiy on Haswell
Some Haswell machine doesn't support the encoding. So it should be disabled.
Otherwise the driver can't report the supported capability correctly.
V2->V3:Based on the Matt Turner's suggestion the __cpuid defined in GCC
cpuid.h is called directly, which is helpful to handle the PIC issue on
32-bit. And unsigned data type is updated to uint32_t.
V1->V2: Minor update based on comment from Gwenole Beauchesne. For example:
use the bool tye and remove the hardcoded value
Signed-off-by: Zhao Yakui <yakui.zhao@intel.com>
Zhao Yakui [Wed, 8 Oct 2014 00:23:30 +0000 (08:23 +0800)]
change the attribute of hw_codec_info so that it can be updated dynamically
Signed-off-by: Zhao Yakui <yakui.zhao@intel.com>
Zhao Yakui [Wed, 8 Oct 2014 00:23:26 +0000 (08:23 +0800)]
Add one callback function for hw_codec_info to initialize hw_codec_info
V1->V2: Refine the call back function name from hw_codec_hook to preinit_hw_codec
And it is called after VADriverContext is fully initialized. This is based on the comment
from Gwenole Beauchesne.
Signed-off-by: Zhao Yakui <yakui.zhao@intel.com>
Xiang, Haihao [Tue, 30 Sep 2014 03:02:34 +0000 (11:02 +0800)]
Intel driver 1.4.0
Signed-off-by: Xiang, Haihao <haihao.xiang@intel.com>
Zhao, Yakui [Thu, 25 Sep 2014 02:17:45 +0000 (10:17 +0800)]
Driver 1.4.0.pre2
Sean V Kelley [Wed, 20 Aug 2014 20:03:52 +0000 (13:03 -0700)]
CHV: Add PCIID placeholders for CHV
Pending branding and differentiation by stepping. CHV is used generically
to match libdrm and mesa identification.
Signed-off-by: Sean V Kelley <sean.v.kelley@intel.com>
Zhao Yakui [Tue, 9 Sep 2014 04:12:46 +0000 (12:12 +0800)]
Init driver 1.4.0.pre1
Signed-off-by: Zhao Yakui <yakui.zhao@intel.com>
Zhao Yakui [Tue, 9 Sep 2014 04:12:41 +0000 (12:12 +0800)]
Update NEWS for 1.4.0
Signed-off-by: Zhao Yakui <yakui.zhao@intel.com>
Zhao, Halley [Tue, 2 Sep 2014 08:28:07 +0000 (02:28 -0600)]
initial export_refcount for obj_buffer
(cherry picked from commit
11d01d01ce7ceedf19c74bdd8a07961b0fd8dd9b)
Gwenole Beauchesne [Wed, 5 Mar 2014 21:54:10 +0000 (22:54 +0100)]
Add support for new VA buffer export APIs.
Implement va{Acquire,Release}BufferHandle() hooks so that to allow
VA surface or VA image buffer sharing with thirdparty APIs like EGL,
OpenCL, etc.
v2: made sure to sync bo before export, improved VA buffer type check.
v3: tracked internal resources on acquire, disposed them on release.
Signed-off-by: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
(cherry picked from commit
483bb130925182f2096cd9e6fa5dbae6a55e7764)
Zhong Li [Fri, 8 Aug 2014 04:05:43 +0000 (22:05 -0600)]
Remove gen7 only limitation for encoding configuration
Since all generations from gen6 can support avc encoding configuration,
remove gen7 only limitation.
MVC also can be support with little change, but it is low priority,
it will be support when necessary and this function is stable.
Signed-off-by: Zhong Li <zhong.li@intel.com>
(cherry picked from commit
f2178e267a67bdecab0a30502804c2ce5bccd0c2)
Zhong Li [Fri, 8 Aug 2014 04:05:42 +0000 (22:05 -0600)]
Enabling BDW avc encoding configuration
Signed-off-by: Zhong Li <zhong.li@intel.com>
(cherry picked from commit
739eb9c0c954eecaf17a24be336ca5054241a338)
Zhong Li [Fri, 8 Aug 2014 04:05:41 +0000 (22:05 -0600)]
Enabling HSW avc encoding configuration
Signed-off-by: Zhong Li <zhong.li@intel.com>
(cherry picked from commit
1239853edc9c344a823d788c6df57da82eda25bf)
Zhong Li [Fri, 8 Aug 2014 04:05:40 +0000 (22:05 -0600)]
Enabling SNB avc encoding configuration
Signed-off-by: Zhong Li <zhong.li@intel.com>
(cherry picked from commit
3e531e7d640ef329151b2205c2e61a67fb80862d)
Zhong Li [Wed, 11 Jun 2014 02:49:21 +0000 (20:49 -0600)]
Add multi quality levels encoding support for GEN7
Two encoding quality levels are support on GEN7.
Default quality level is set to be 1, which has better quality,
but higher gpu usage.
The second quality level is set to be 2, which has worse quality but
it has lower gpu usage.
Other platforms support for multi-quality-level will be added later.
v1->v2: 1. follow haihao's comments to init and check quality_level.
2. remove CBR limitation for low quality level.
(Zhao Yakui helps to merge several patches on staging so that it can
be cherry-picked to master)
Signed-off-by: Zhong Li <zhong.li@intel.com>
Signed-off-by: Zhao Yakui <yakui.zhao@intel.com>
Zhong Li [Wed, 27 Aug 2014 07:04:49 +0000 (01:04 -0600)]
Add phantom slice support on IVB+
HW requires driver to add a phantom slice when FirstMbX and FirstMbY are
not 0, in order to avc decoding error concealment. Otherwise, GPU may hang.
This patch is a workround for bug: https://bugs.freedesktop.org/show_bug.cgi?id=81447
v1->v2: Follow haihao's suggestion to use common funcion of gen6 phantom slice.
v2->v3: Remove an extraneous newline.
Signed-off-by: Zhong Li <zhong.li@intel.com>
Reviewed-by: Xiang Haihao <haihao.xiang@intel.com>
Gwenole Beauchesne <gwenole.beauchesne@intel.com>
(cherry picked from commit
9672c5ab17c32f25ce1bbdb883abda689440b116)
Zhong Li [Wed, 27 Aug 2014 07:04:48 +0000 (01:04 -0600)]
Move gen6 phantom slice function as common
Following haihao's suggestion, make gen6 phantom slice funcion can be
re-used by SNB+.
v1->v2: Remove an unnessary comment.
Signed-off-by: Zhong Li <zhong.li@intel.com>
Reviewed-by: Xiang Haihao <haihao.xiang@intel.com>
Gwenole Beauchesne <gwenole.beauchesne@intel.com>
(cherry picked from commit
5e30cc3093407ca2b4dbefa1da8a1262ff8ae7e9)
Zhao Yakui [Mon, 1 Sep 2014 07:48:42 +0000 (15:48 +0800)]
H264_Encoding: Fix the incorrect Qp setting under CBR when slice_header is passed
Fix the issue in
https://bugs.freedesktop.org/show_bug.cgi?id=83143
Signed-off-by: Zhao Yakui <yakui.zhao@intel.com>
Tested-by: Sreerenj Balachandran <sreerenj.balachandran@intel.com>
(cherry picked from commit
eca8e0065e3a04156e0817d3a5ac14f4df39d603)
Conflicts:
src/gen6_mfc.c
src/gen8_mfc.c
Gwenole Beauchesne [Wed, 18 Jun 2014 11:11:48 +0000 (13:11 +0200)]
decoder: h264: fix RefPicList0/1 without frame in DPB.
Some bitstreams (e.g. truncated, or non conformant), or bugs in codec
layers, would incorrectly make decoders to fill in the RefPicList0/1
lists with surfaces that have not received any content yet.
There is no reason for the driver to crash in such cases.
https://bugs.freedesktop.org/show_bug.cgi?id=82466
Signed-off-by: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
Zhao Yakui [Wed, 23 Jul 2014 05:46:17 +0000 (13:46 +0800)]
Add more check of H264 slice param to avoid GPU hang caused by the incorrect parameter
This is to fix the GPU hang in https://bugs.freedesktop.org/show_bug.cgi?id=76363
V1->V2: Use the new check based on Haihao's comment. Discard the current frame with the error
slice_param instead of smart fix. In such case it can prompt that the error slice_param
can be fixed by the upper-middle.
Signed-off-by: Zhao Yakui <yakui.zhao@intel.com>
Tested-by: ValdikSS <iam@valdikss.org.ru>
Reviewed-by: Xiang Haihao <haihao.xiang@intel.com>
(cherry picked from commit
04202281135149a13a32dfb8a902debfac1331fe)
Zhao, Yakui [Tue, 1 Jul 2014 01:43:56 +0000 (09:43 +0800)]
remove fixed uses of inte-gen4asm tool
In the gen7 and gen8 post processing Makefiles the GEN4ASM
variable is not honored when calling intel-gen4asm. This causes
build errors when GEN4ASM is set to a different value
This was discovered when using intel-gpu-tools version 1.7 where
the shaders are actually compiled.
Signed-off-by: Daniel Charles <daniel.charles@intel.com>
Reviewed-by: Zhao, Yakui <yakui.zhao@intel.com>
(cherry picked from commit
f574f2e8a8da27b96abc3936c5b2372ff2b7eefb)
Zhao, Yakui [Thu, 12 Jun 2014 00:54:41 +0000 (08:54 +0800)]
Encoding: Use the different delimeter to pass packed_rawdata and slice_header based on VAConfigAttribEncPackedHeaders attribute
Currently the packed_slice_header is optional. And it uses the VAEncSliceParameterBuffer
as the delimeter to decide how to insert the packed rawdata/slice_header
for one slice. This is not convenient under some scenario. For example: some
user hope to be more flexible. When the user is responsible for generating the
packed slice_header, it hopes to use the packed slice_header as the delimeter
to determine how to inser the packed rawdata/slice_header for the given slice.
So the VAConfigAttribEncPackedHeaders attriburation of encoding_context is
used to decide which kind of delimeter.
a. When the VAEncPackedSlice is set when calling vaCreateConfig, it will use
the packed slice_header as delimeter. Of course the packed rawdata should be
parsed before the packed slice_header for one given slice. For exmaple:
for the slice 0: the packed rawdata should be parsed before paring the first
packed slice_header. After one packed slice_header is parsed, it will start
to parse the corresponding data for a new slice.
b. When the VAEncPackedSlice is not set when calling vaCreateConfig, it will
use the VAEncSliceParameterBuffer as delimeter.
V1->V2: Return an error instead of only complaining warning message when packed
slice_header is missing for some slice under the VAEncPackedSlice mode. This
is the suggestion from Gwenole and Sreerenj Balachandran.
Signed-off-by: Zhao, Yakui <yakui.zhao@intel.com>
(cherry picked from commit
9d49a6d693aa6c862467a4a879bc86d9cb98dbe5)
Zhao, Yakui [Thu, 12 Jun 2014 00:54:38 +0000 (08:54 +0800)]
Encoding: Update the comment for the data structure about the packed rawdata/slice_header data
Signed-off-by: Zhao Yakui <yakui.zhao@intel.com>
(cherry picked from commit
56715c893fa87e2d3af2938b9202d75cdc79a8fd)
Sreerenj Balachandran [Wed, 28 May 2014 21:02:41 +0000 (15:02 -0600)]
Fix the segfault while encoding multiple slice per frame.
Zero initialize the packed raw data index array and
packed slice header index array during each preallocation.
Signed-off-by: Sreerenj Balachandran <sreerenj.balachandran@intel.com>
Reviewed-by: Zhao, Yakui <yakui.zhao@intel.com>
(cherry picked from commit
fbbe401aa28a0b3859d587ef08f0df15a2f7c8f2)
Sreerenj Balachandran [Tue, 27 May 2014 11:18:05 +0000 (05:18 -0600)]
Fix the segfault while inserting packed slice header
Signed-off-by: Sreerenj Balachandran <sreerenj.balachandran@intel.com>
Reviewed-by: Zhao, Yakui <yakui.zhao@intel.com>
(cherry picked from commit
7c2273f1334d7d45e248d128e17200b7e8beffd1)
Sreerenj Balachandran [Thu, 5 Jun 2014 09:00:49 +0000 (12:00 +0300)]
Fix the GetConfigAttributes() for H264SteroHighProfile
(cherry picked from commit
510b271f912afb35edac1d3fb39354ee98b01711)
Zhao, Yakui [Mon, 26 May 2014 00:40:15 +0000 (08:40 +0800)]
H264_encoding: Don't update the slice qp for CBR mode when finding packed slice_header data
Otherwise the slice qp is inconsistent and the encoding is incorrect.
Signed-off-by: Zhao Yakui <yakui.zhao@intel.com>
(cherry picked from commit
897527c30435202927e6cd05cd5189a710d02c91)
Zhao, Yakui [Mon, 26 May 2014 00:40:15 +0000 (08:40 +0800)]
H264_Encoding: Add the support of packed slice header to be flexible
Under some encoding scenario, the user hopes to generate the packed slice
header data by themself and then the driver can insert the passed slice
header packed data into the coded clip.
1.The VA_ENC_PACKED_HEADER_SLICE flag is exported and it is treated as optional.
This is to say: if packed slice header data is passed, it will be
inserted directly. If no packed slice header data is passed, the driver will
help to generate it.
2.Another restriction is that the packed slice header data is inserted after
the packed rawdata for one slice. That is to say: If it needs to insert the
packed rawdata and slice header data, the packed rawdata will be inserted
firstly(This is handled by the driver).
Signed-off-by: Zhao, Yakui <yakui.zhao@intel.com>
(cherry picked from commit
00111e8a8bfa67b971419b72577eaa1b9f47bc34)
Conflicts:
src/gen75_mfc.c
src/gen8_mfc.c
Zhao, Yakui [Mon, 26 May 2014 00:40:15 +0000 (08:40 +0800)]
H264_encoding: Reset the last_packed_header_type to avoid the unpaired packed header type/data
After adding the support of inserting the packed rawdata, more group of packed header data
can be passed. In order to insert the packed rawdata correctly, the packed header type/
data should be paired.
Signed-off-by: Zhao Yakui <yakui.zhao@intel.com>
(cherry picked from commit
fd78866bd64d7ab57fe8cb0c4b25e8357973b0b1)
Zhao, Yakui [Mon, 26 May 2014 00:40:15 +0000 (08:40 +0800)]
H264_encoding: Add the support of inserting the packed raw data passed from user
Under some encoding scenario, the user-space application hopes that the driver
can insert the passed packed rawdata into the coded clip. This is to allow the
insertion of packed rawdata passed from user. As the position of packed rawdata
is related with the slice. So the following restrictions are added:
1. the packed rawdata header type/data should be paired.
2. the packed rawdata data is inserted by following the passed order
3. the packed rawdata header type/data is split by using VAEncSliceParameterBuffer.
That is to say: The packed rawdata for slice 0 should be passed before the first
VAEncSliceParameterBuffer. After one VAEncSliceParameterBuffer is parsed,
the subseuquent packed rawdata is for another new slice. The subsequent
packed rawdata after the last VAEncSliceParameterBuffer is ignored.
4. it does not change the rule for the packed data of SPS/PPS/MISC type.
Signed-off-by: Zhao Yakui <yakui.zhao@intel.com>
(cherry picked from commit
974597ef64dc9a283d4787e1484a75d1610414f4)
Conflicts:
src/gen75_mfc.c
src/gen8_mfc.c
Zhao, Yakui [Mon, 26 May 2014 00:40:15 +0000 (08:40 +0800)]
H264_Encoding: Prepare some data structures for adding packed raw data
Under some encoding scenario, the user-space application hopes that the driver
can insert the passed packed rawdata into the coded clip. But the insertion of
packed rawdata is related with the slice. So some data structures are added so
that it can store how the packed rawdata is inserted into the coded clip
per-slice.
Signed-off-by: Zhao, Yakui <yakui.zhao@intel.com>
(cherry picked from commit
65727b1868f01d836659396724b83d2992656242)
Zhao, Yakui [Mon, 26 May 2014 00:40:15 +0000 (08:40 +0800)]
H264_Encoding: Parse the packed header data from user to fix the hacked code of HW skip bytes
When the packed header data from user is inserted into the coded clip, it uses
the hacked code to check the number of HW skip emulation bytes. This is wrong.
So fix it.
Of course if the packed header data is generated by the driver, it is
unnecessary to check it and it can still use the pre-defined number of HW
skip bytes.
V1->V2: Based on Gwenole's comment more nal_unit_type is added.
Signed-off-by: Zhao Yakui <yakui.zhao@intel.com>
(cherry picked from commit
cd518563f239cb8523c58010a695098465a4f04e)
Zhao, Yakui [Tue, 10 Jun 2014 06:11:01 +0000 (14:11 +0800)]
Encoding: Reinitialize CBR bit rate-control parameter to support switch of bitrate under CBR
Tested-By: Sean V Kelley <sean.v.kelley@intel.com>
Signed-off-by: Zhao Yakui <yakui.zhao@intel.com>
(cherry picked from commit
929c1446a28dbefd9655774f2db3e10f7b631dcf)
Gwenole Beauchesne [Thu, 5 Jun 2014 19:36:33 +0000 (21:36 +0200)]
decoder: h264: fix frame store logic for MVC.
In strict MVC decoding mode, when only the necessary set of inter-view
reference pictures are passed to the ReferenceFrames array for decoding
the current picture, we should not re-use a frame store id that might
be needed for decoding another view component in the same access unit.
One way to solve this problem is to track when the VA surface in a
specified frame store id was last referenced. So, a "ref_age" field
is introduced to the GenFrameStore struct and is updated whenever
the surface is being referenced.
Additionally, the list of retired refs candidates (free_refs) is kept
ordered by increasing ref_age. That way, we can immediately know what
is the oldest frame store id to recycle.
Let deltaAge = CurrAge - RefAge:
If deltaAge > 1, we know for sure that the VA surface is gone ;
If deltaAge = 1, the surface could be re-used for inter prediction ;
If deltaAge = 0, the surface could be re-used for inter-view prediction.
The ref_age in each Frame Store entry is always current, i.e. it is
the same for all reference frames that intervened in the decoding
process of all inter view components of the previous access unit. The
age tracks access units.
v2: used a more correct representation of age, instead of POC [Yakui]
v3: minor optimization for detecting changes of access unit [Haihao]
Signed-off-by: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
(cherry picked from commit
3b5eb0522fbfe1220dcd0c0bb093a93cfc25e22c)
Gwenole Beauchesne [Wed, 4 Jun 2014 16:25:33 +0000 (18:25 +0200)]
decoder: h264: improve AVC_REF_IDX_STATE for MVC.
Each Reference List Entry has Bit 6 set to one if the reference
picture is to be used as a long-term reference picture. However,
the H.264 standard, and subsequently the VA-API specs, makes it
possible to mark the picture as "used for short-term reference",
as "used for long-term reference", or even none of those flags.
This means we have to handle a minimum of 3 states. This doesn't
fit the range of a single bit. Let's examine how this could be
fixed from known practices.
There are cases where the picture is added to RefPicListX[] even
if it is not marked as "used for short-term reference" or "used
for long-term reference": MVC with inter-view reference components
or inter-view only reference components [H.8.4]. Ultimately, this
has an incidence on the value of colZeroFlag (8.4.1.2.2). Since
there is no way to program that, and that it depends on the picture
to be marked as "used for short-term reference" or not, then it
looks reasonable to imply Bit 6 (LongTermPicFlag) as a picture
that is *not* "used for short-term reference", i.e. thus including
genuine long-term reference pictures, and those that are neither
long-term reference nor short-term reference pictures.
In practice, this fixes MVCNV-2.264.
Signed-off-by: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
(cherry picked from commit
edbdc0e87919d8b7261d882a32b2d3c271660931)
Gwenole Beauchesne [Fri, 9 May 2014 13:08:05 +0000 (15:08 +0200)]
surface: drop SURFACE_DISPLAYED flag.
The optimization by which the VA surface storage is deallocated after
it is displayed and not used for reference or vaDeriveImage() purposes
cannot be implemented safely. We need to honour explicit lifetimes
defined by the upper codec layer.
Signed-off-by: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
(cherry picked from commit
84926ace7a2c5b88df1ada167a1c273128469aad)
Gwenole Beauchesne [Fri, 9 May 2014 12:53:30 +0000 (14:53 +0200)]
render: don't deallocate surface storage of displayed frames.
Keep the VA surface storage live until it is explicitly scheduled
for destruction through vaDestroySurfaces() interface. Otherwise,
subsequent vaPutSurface() calls would have no effect.
This fixes various use cases like: display of interlaced frames
that are not marked for reference, multiple rendering to Pixmap
for EXT_texture_from_pixmap and more precisely interlaced streams.
Signed-off-by: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
(cherry picked from commit
a840e6403071d397a33e127e8058881a3ef50077)
Gwenole Beauchesne [Fri, 9 May 2014 16:52:00 +0000 (18:52 +0200)]
decoder: MVC chroma formats
This is a part of
fa469f74227a7b4e0e6f882c488132eaa9c44417 on staging
Signed-off-by: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
Signed-off-by: Xiang, Haihao <haihao.xiang@intel.com>
Gwenole Beauchesne [Tue, 3 Jun 2014 15:30:11 +0000 (17:30 +0200)]
decoder: h264: expose the set of supported MVC profiles.
H.264 MVC decoding support is defined as follows:
- Stereo High profile on Sandybridge and newer ;
- Multiview High profile on Haswell and newer.
Signed-off-by: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
(cherry picked from commit
1f244834dedb7b46863b315a898d8649d01c5f58)
Conflicts:
src/i965_device_info.c
src/i965_drv_video.c
src/va_backend_compat.h
Gwenole Beauchesne [Mon, 2 Jun 2014 11:08:57 +0000 (13:08 +0200)]
decoder: h264: enable Picture ID Remapping on Haswell and newer.
Fill and submit MFX_AVC_PICID_STATE commands to Gen7.5+ hardware.
This optimizes the management of the DPB as the binding array can
now contain entries in any order. This also makes it possible to
support H.264 MultiView High profiles, with any particular number
of views.
v2: added more comments for clarity, removed an assert [Yakui]
Signed-off-by: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
(cherry picked from commit
8dfdf10612c726b60ecd5b61eee2b7d6a520bb33)
Gwenole Beauchesne [Fri, 16 May 2014 15:04:55 +0000 (17:04 +0200)]
decoder: h264: factor out look ups for VA/H264 picture info.
Add new avc_find_picture() helper function to search for a VAPictureH264
struct based on the supplied VA surface id.
Signed-off-by: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
(cherry picked from commit
3f4f9fc2893af24b7e88f44b6350a5a74d49f0c2)
Gwenole Beauchesne [Sun, 4 May 2014 22:05:06 +0000 (00:05 +0200)]
decoder: h264: fix submission of AVC_REF_IDX_STATE command.
If the RefPicListX[] entry has no valid picture_id associated to it,
then set the resulting state to 0xff. If that entry has no surface
buffer storage either, then compose a valid state that maps to the
first item in the reference frames list, as mandated by the PRM.
v2: dropped the superfluous "found" variable [Yakui]
Signed-off-by: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
(cherry picked from commit
151b8851c3a9309e87712651a3697e20a7bdb6c9)
Gwenole Beauchesne [Tue, 6 May 2014 13:28:29 +0000 (15:28 +0200)]
decoder: h264: simplify and optimize reference frame store updates.
Simplify and optimize the update process of the reference frame store.
Use less iterations to look up existing objects. Use a cache to store
the free'd slots.
Prerequisite: the reference_objects[] array was previously arranged in
a way that the element at index i is exactly the object_surface that
corresponds to the VA surface identified by the VAPictureH264.picture_id
located at index i in the ReferenceFrames[] array.
Theory of operations:
1. Obsolete entries are removed first, i.e. entries in the internal DPB
that no longer have a match in the supplied ReferenceFrames[] array.
That obsolete entry index is stored in a local cache: free_slots[].
2. This cache is completed with entries considered as "invalid" or "not
present", sequentially while traversing the frame store for obsolete
entries. At the end of this removal process, the free_slots[] array
represents all possible indices in there that could be re-used for
new reference frames to track.
3. The list of ReferenceFrames[] objects is traversed for new entries
that are not already in the frame store. If an entry needs to be
added, it is placed at the index obtained from the next free_slots[]
element. There is no need to traverse the frame store array again,
the next available slot can be known from that free_slots[] cache.
v2: dropped the superfluous "found" variable [Yakui]
v3: renamed "free_slots" array to "free_refs", which now holds
GenFrameStore entries
Signed-off-by: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
(cherry picked from commit
70ecad1264255123df99b472891e8ee90399013c)
Gwenole Beauchesne [Tue, 6 May 2014 12:07:30 +0000 (14:07 +0200)]
decoder: h264: allocate reference frames earlier, if needed.
Sometimes, a dummy frame comes from the codec layer and it is used
as a reference, per the comment in the existing code. Even though
this looks suspicious, keep this criterion but make sure to try
allocating the VA surface, if needed, earlier in the function that
sanity checks the parameters for decoding the current frame.
This makes it possible to fail at a much earlier time, and actually
make it possible to return a sensible error code to the upper layer.
Also fix the reference_objects[] array elements to be an exact 1:1
match for ReferenceFrames[] array elements, including possible but
unlikely holes in it. The former array holds object_surface structs
corresponding to the VA surfaces present in the ReferenceFrames[]
array and identified by VAPictureH264.picture_id.
Signed-off-by: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
(cherry picked from commit
5a12ccda3f77d03b6ffa8249d607c03e4dc8161f)
Gwenole Beauchesne [Tue, 6 May 2014 11:08:28 +0000 (13:08 +0200)]
decoder: h264: don't deallocate surface storage of older frames.
Drop the optimization whereby surfaces that are no longer marked as
reference and that were already displayed are to be destroyed. This
is wrong mainly for two reasons:
1. The surface was displayed... once but it may still be needed for
subsequent operations like displaying it again, using it for a
transcode pipeline (encode) for instance, etc.
2. The new set of ReferenceFrames[] correspond to the active set of
reference frames used for decoding the current slice. In presence
of Multiview Coding (MVC), that could correspond to the current
view, in view order index, but the surface may still be needed
for decoding the next view with the same view_id, while also
decoding other views with another set of reference frames for them.
Signed-off-by: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
(cherry picked from commit
77af916b44da04e3424490506a7e5bef39c80c7c)
Li Xiaowei [Thu, 19 Dec 2013 09:51:45 +0000 (17:51 +0800)]
encoder: MVC: Add support for MVC profiles
This is a part of
bd630edd844b88ea543a027654db296ff7da16cd on staging
Signed-off-by: Li Xiaowei <xiaowei.a.li@intel.com>
Signed-off-by: Xiang, Haihao <haihao.xiang@intel.com>
Li Xiaowei [Tue, 10 Dec 2013 02:35:38 +0000 (10:35 +0800)]
MVC: CODEC_H264_MVC defination and relatived properties check
Signed-off-by: Li Xiaowei <xiaowei.a.li@intel.com>
(cherry picked from commit
7d1ddfd3646f35f306f38bfabef6af9b2ebb19f4)
Conflicts:
src/i965_drv_video.c
Gwenole Beauchesne [Tue, 3 Jun 2014 15:30:11 +0000 (17:30 +0200)]
h264: Add the macros for MVC profiles to keep backward compatibility with libva 1.3.1
It is a part of
1f244834dedb7b46863b315a898d8649d01c5f58 on staging
Signed-off-by: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
Signed-off-by: Xiang, Haihao <haihao.xiang@intel.com>
Zhao Yakui [Tue, 4 Mar 2014 08:23:07 +0000 (16:23 +0800)]
Define i965_CreateSurfaces in header file explicitly to avoid multiple declaration
Signed-off-by: Zhao Yakui <yakui.zhao@intel.com>
(cherry picked from commit
8b3945aa5df443e93a3f5e6e97dffb1574e2a936)
Xiang, Haihao [Thu, 27 Feb 2014 06:10:24 +0000 (14:10 +0800)]
Check the pointer against NULL
The issue is reported by Klockwork
Signed-off-by: Xiang, Haihao <haihao.xiang@intel.com>
(cherry picked from commit
80d1f89388c9cb70218cd759592d2167c8845322)
Xiang, Haihao [Mon, 16 Jun 2014 02:27:12 +0000 (10:27 +0800)]
1.3.3.pre1 for development
Signed-off-by: Xiang, Haihao <haihao.xiang@intel.com>
Xiang, Haihao [Mon, 16 Jun 2014 02:21:07 +0000 (10:21 +0800)]
Intel driver 1.3.2
Signed-off-by: Xiang, Haihao <haihao.xiang@intel.com>
Zhao, Yakui [Mon, 9 Jun 2014 04:08:13 +0000 (12:08 +0800)]
Encoding: Fix one type error in intra-prediction shader on BDW
Otherwise it will cause the incorrect intra-prediction for encoding on
Broadwell.
Signed-off-by: Zhao Yakui <yakui.zhao@intel.com>
(cherry picked from commit
20bee4c3cb478702155df1779f24ec483aeab059)
Xiang, Haihao [Mon, 9 Jun 2014 03:26:54 +0000 (11:26 +0800)]
Update NEWS for 1.3.2 pre1
Signed-off-by: Xiang, Haihao <haihao.xiang@intel.com>
Zhao, Halley [Wed, 28 May 2014 08:38:01 +0000 (16:38 +0800)]
debug: add g_intel_debug_option_flags for simple driver debug
VA_INTEL_DEBUG_ASSERT decides assert() is enabled or not
VA_INTEL_DEBUG_BENCH decides skipping swapbuffer in dri output
(cherry picked from commit
60413182f66c44781456e827b439e98f21cfae4c)
Xiang, Haihao [Mon, 26 May 2014 02:14:52 +0000 (10:14 +0800)]
Fix the scaling issue on IVB/HSW/BDW
Scaling is done on each 16x16 block. The shader for scaling
might write pixels out-of-rectangle if the rectangle width/height
isn't aligned to 16.
Signed-off-by: Xiang, Haihao <haihao.xiang@intel.com>
(cherry picked from commit
d560387cc819a31791c2a30026473c9bd8786f07)
Xiang, Haihao [Mon, 26 May 2014 02:14:51 +0000 (10:14 +0800)]
VPP: Simplify surface state setting for csc and scaling on IVB/HSW/BDW
v2: bpp[] is in unit of bits
Signed-off-by: Xiang, Haihao <haihao.xiang@intel.com>
(cherry picked from commit
d415357f25fc01b96592ba29ba95da9d6dc82ff3)
Xiang, Haihao [Sat, 24 May 2014 06:36:12 +0000 (14:36 +0800)]
New structure i965_fourcc_info
and hold all supported fourcc in an array
v2: bpp[] in bit and fix the vertical factor for 411P (Yakui)
Signed-off-by: Xiang, Haihao <haihao.xiang@intel.com>
(cherry picked from commit
1de3a2cdc8c3f8b2f6191c0f114fa1167f40f2ec)
Conflicts:
src/i965_drv_video.c
Xiang, Haihao [Mon, 26 May 2014 02:14:53 +0000 (10:14 +0800)]
mpeg2: calculate the slice data length on IVB
Sometimes pending datas are added in slice data buffer, however
HW requires slice data length excludes pending datas, otherwise
the behavior is undefined
https://bugs.freedesktop.org/show_bug.cgi?id=77041
Signed-off-by: Xiang, Haihao <haihao.xiang@intel.com>
(cherry picked from commit
a9004e6c5c7f33cd1e33e4dab92a5a0017714bbd)
Sebastian Ramacher [Fri, 23 May 2014 00:57:39 +0000 (08:57 +0800)]
Propagate error code
Signed-off-by: Sebastian Ramacher <sramacher@debian.org>
Reviewed-by: Zhao, Yakui <yakui.zhao@intel.com>
(cherry picked from commit
ca1acd54eb59eadabfb40a4b61df2e8968b5e00d)
Sebastian Ramacher [Fri, 23 May 2014 00:57:33 +0000 (08:57 +0800)]
Define i965_proc_picture in header
Signed-off-by: Sebastian Ramacher <sramacher@debian.org>
Reviewed-by: Zhao, Yakui <yakui.zhao@intel.com>
(cherry picked from commit
e9e9b55c769a6c0b90d6af5d89a6baf4c6f742be)
Xiang, Haihao [Mon, 19 May 2014 02:43:33 +0000 (10:43 +0800)]
VPP: MADI on SNB
Set the right surface states for reference, STMM and output surface,
fix the shader as well
Signed-off-by: Xiang, Haihao <haihao.xiang@intel.com>
Tested-By: Simon Farnsworth <simon.farnsworth@onelan.co.uk>
(cherry picked from commit
1d1b8da1284f7f918733db79428f09af38d7e14a)
Conflicts:
src/i965_post_processing.c
Xiang, Haihao [Mon, 26 May 2014 02:36:49 +0000 (10:36 +0800)]
VPP: i965_vpp_clear_surface() is still used for CSC on BDW
https://bugs.freedesktop.org/show_bug.cgi?id=79065
The regression is caused by commit 42258e1
Signed-off-by: Xiang, Haihao <haihao.xiang@intel.com>
(cherry picked from commit
0523c58148e9496927f2c3fa9a641885a0350d0f)
Xiang, Haihao [Fri, 18 Apr 2014 16:12:42 +0000 (00:12 +0800)]
Remove unnecessary check with IS_GEN8()
It is always true or false
Signed-off-by: Xiang, Haihao <haihao.xiang@intel.com>
(cherry picked from commit
42258e128f19b93aa102672d5f61eb73d9f9808f)
Gwenole Beauchesne [Wed, 4 Jun 2014 08:36:28 +0000 (10:36 +0200)]
decoder: h264: don't allocate bottom DMV buffer on Broadwell.
Broadwell now uses a unique DMV buffer, irrespective of any field
coding mode. The dmv_buffer is not used, so it doesn't need to be
allocated at all.
Signed-off-by: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
Gwenole Beauchesne [Wed, 4 Jun 2014 09:17:52 +0000 (11:17 +0200)]
decoder: h264: only allocate tiled surfaces for Sandybridge an newer.
Don't allocate tiled surfaces on Ironlake platforms and earlier, stick
to linear surfaces.
This is a regression from 6d76944.
Reported-by: Haihao Xiang <haihao.xiang@intel.com>
Signed-off-by: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
Gwenole Beauchesne [Fri, 9 May 2014 16:52:00 +0000 (18:52 +0200)]
decoder: h264: optimize support for grayscale surfaces.
Optimize support for grayscale surfaces in two aspects: (i) space
by only allocating the luminance component ; (ii) speed by avoiding
initialization of the (now inexistent) chrominance planes.
Keep backward compatibility with older codec layers that only
supported YUV 4:2:0 and not grayscale formats properly.
v2: fix check for extra H.264 chroma formats [Haihao]
Signed-off-by: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
Gwenole Beauchesne [Wed, 14 May 2014 11:59:25 +0000 (13:59 +0200)]
decoder: h264: factor out allocation of reconstructed surfaces.
Add new avc_ensure_surface_bo() helper function to factor out the
allocatiion and initialization processes of the reconstructed VA
surface buffer stores.
Keep preferred native format (NV12) and initialize chroma values
to 0.0 (0x80) when needed for "fake" grayscale (Y800) surfaces
implemented on top of existing NV12.
Signed-off-by: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
Gwenole Beauchesne [Fri, 9 May 2014 16:15:23 +0000 (18:15 +0200)]
config: fix supported set of chroma formats for JPEG decode.
If the hardware supports JPEG decoding, then we have to expose the
right set of chroma formats for the output (decoded) VA surface. In
particular, we could support YUV 4:0:0, 4:1:0, 4:2:2 and 4:4:4.
v2: export support for YUV 4:0:0 (grayscale) too [Haihao]
Signed-off-by: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
Gwenole Beauchesne [Fri, 9 May 2014 15:55:05 +0000 (17:55 +0200)]
config: fix vaCreateConfig() to not override user chroma format.
Only validate the user-defined chroma format (VAConfigAttribRTFormat)
attribute, if any. Don't override it. i.e. append a pre-defined value
only if it was not defined by the user beforehand.
Propertly return VA_STATUS_ERROR_UNSUPPORTED_RT_FORMAT if the supplied
chroma format is not supported.
Signed-off-by: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
Gwenole Beauchesne [Fri, 9 May 2014 16:30:33 +0000 (18:30 +0200)]
config: fix vaGetConfigAttributes() to validate profile/entrypoint.
Factor out code to validate profile/entrypoint per the underlying
hardware capabilities. Also fix vaGetConfigAttributes() to really
validate the profile/entrypoint pair.
Signed-off-by: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
Gwenole Beauchesne [Wed, 14 May 2014 11:42:51 +0000 (13:42 +0200)]
surface: factor out release of surface buffer storage.
Introduce a new i965_destroy_surface_storage() helper function to
unreference the underlying GEM buffer object, and any associated
private data, if any.
Signed-off-by: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
Gwenole Beauchesne [Wed, 14 May 2014 11:33:07 +0000 (13:33 +0200)]
surface: fix geometry (size, layout) of grayscale surfaces.
Fix size of the allocated buffer used to represent grayscale (Y800)
surfaces. Only the luminance component is needed, thus implying a
single plane.
Likewise, update render routines to only submit the first plane.
The existing render kernels readily only care about that single
plane.
Signed-off-by: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
Xiang, Haihao [Fri, 9 May 2014 08:31:54 +0000 (16:31 +0800)]
mpeg2: check frame_pred_frame_dct instead of progressive_frame
Some MPEG-2 videos set progressive_frame to 1 and set
frame_pred_frame_dct to 0, which is not conformed to MPEG-2 spec.
bottom field may be used to form prediction if frame_pred_frame_dct is
0. Previously the bottom field is excluded from the frame store list
https://bugs.freedesktop.org/show_bug.cgi?id=73424
Signed-off-by: Xiang, Haihao <haihao.xiang@intel.com>
(cherry picked from commit
b3031d16b1ea9ef2ab95bc09e59f0db5214a1125)
Xiang, Haihao [Fri, 9 May 2014 08:16:05 +0000 (16:16 +0800)]
Limit the minimum pitch for linear surface
pitch must be 64 at least for linear surface for most functions on IVB/HSW/BDW
such VEBOX, Data port media read/write
https://bugs.freedesktop.org/show_bug.cgi?id=72522
Signed-off-by: Xiang, Haihao <haihao.xiang@intel.com>
(cherry picked from commit
57db5c2524f4e3cb6ae2301bddfdf1c40cdbb626)
Xiang, Haihao [Thu, 24 Apr 2014 05:39:21 +0000 (13:39 +0800)]
Rename HAS_PP() to HAS_VPP()
Directly check the flag of has_vpp in codec_info
Signed-off-by: Xiang, Haihao <haihao.xiang@intel.com>
(cherry picked from commit
1c4d3468229797e787f4b99b0729baf90a115a1d)
Conflicts:
src/gen8_post_processing.c
src/i965_post_processing.c
Xiang, Haihao [Fri, 18 Apr 2014 16:12:41 +0000 (00:12 +0800)]
posst_processing_context_init()/finalize() callback functions for each platform
It is to reduce the usage of IS_GENxxx() as well.
Signed-off-by: Xiang, Haihao <haihao.xiang@intel.com>
(cherry picked from commit
77b6a72504d917af9335ab94f6ecbefb8b087206)
Xiang, Haihao [Fri, 18 Apr 2014 16:12:40 +0000 (00:12 +0800)]
render_init()/render_terminate() callback functions for each platform
It is to reduce the usage of IS_GENxxx()
Signed-off-by: Xiang, Haihao <haihao.xiang@intel.com>
(cherry picked from commit
f150fbf444ca63b5e9c3e8f7e17aa3386f7061fa)
Xiang, Haihao [Fri, 18 Apr 2014 16:12:39 +0000 (00:12 +0800)]
Simplify some macros
Now it can directly use the information in intel_device_info instead of
checking the pci id.
Signed-off-by: Xiang, Haihao <haihao.xiang@intel.com>
(cherry picked from commit
f1b3f83953cd5f6e39900d98b4858a7cb825dee0)
Conflicts:
src/gen8_post_processing.c
src/i965_post_processing.c
src/intel_driver.h
Xiang, Haihao [Fri, 18 Apr 2014 16:12:38 +0000 (00:12 +0800)]
Remove max_wm_threads from render_state
Instead directly use the value stored in intel_device_info
Signed-off-by: Xiang, Haihao <haihao.xiang@intel.com>
(cherry picked from commit
6ba787b29e4bcebdceda52906e33cb84f24a63b5)
Xiang, Haihao [Fri, 18 Apr 2014 16:12:37 +0000 (00:12 +0800)]
Remove URB_SIZE()
Instead directly use the value stored in intel_device_info
Signed-off-by: Xiang, Haihao <haihao.xiang@intel.com>
(cherry picked from commit
a0fe5a6262f9ff1398a512c83d193556bbd0eae9)
Xiang, Haihao [Fri, 18 Apr 2014 16:12:36 +0000 (00:12 +0800)]
Dump chipset information in the vendor string
Signed-off-by: Xiang, Haihao <haihao.xiang@intel.com>
(cherry picked from commit
2518c1e741cb21c5412a4b5252ebe861a52c2900)
Xiang, Haihao [Fri, 18 Apr 2014 16:12:35 +0000 (00:12 +0800)]
Add a new intel_device_info structure
To store statically known device information
Signed-off-by: Xiang, Haihao <haihao.xiang@intel.com>
(cherry picked from commit
eb014a09fde988ba3ed2d2be6e8d6f0c650d281e)
Xiang, Haihao [Fri, 18 Apr 2014 16:12:34 +0000 (00:12 +0800)]
Move all of PCIIDs and codec info into separated files
The redundant code will be removed soon.
Signed-off-by: Xiang, Haihao <haihao.xiang@intel.com>
(cherry picked from commit
d20db5984989626728f62eb3e02b60093d914d01)
Conflicts:
src/i965_drv_video.c