Aurelien
/
xf86-video-intel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sna/video: Expose NV12 support for the textured Xv adaptor on gen4+ 

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
This commit is contained in:
Ville Syrjälä 2017-06-09 18:15:11 +03:00 committed by Chris Wilson
parent 8906d8b0e2
commit 291fdcdc09
2 changed files with 36 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/sna/sna_video.h
View File

@ -70,6 +70,15 @@ THE USE OR OTHER DEALINGS IN THE SOFTWARE.
XvTopToBottom \
}
/* no standard define for this */
#define XVIMAGE_NV12 { \
FOURCC_NV12, XvYUV, LSBFirst, \
{'N','V','1','2', 0x00,0x00,0x00,0x10,0x80,0x00,0x00,0xAA,0x00,0x38,0x9B,0x71}, \
12, XvPlanar, 2, 0, 0, 0, 0, 8, 8, 8, 1, 2, 2, 1, 2, 2, \
{'Y','U','V', 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, \
XvTopToBottom \
}
struct sna_video {
struct sna *sna;

28
src/sna/sna_video_textured.c
View File

@ -61,6 +61,15 @@ static const XvImageRec gen3_Images[] = {
XVMC_YUV,
};
static const XvImageRec gen4_Images[] = {
XVIMAGE_YUY2,
XVIMAGE_YV12,
XVIMAGE_I420,
XVIMAGE_NV12,
XVIMAGE_UYVY,
XVMC_YUV,
};
static int sna_video_textured_stop(ddStopVideo_ARGS)
{
struct sna_video *video = port->devPriv.ptr;
@ -298,6 +307,20 @@ sna_video_textured_query(ddQueryImageAttributes_ARGS)
offsets[2] = size;
size += tmp;
break;
case FOURCC_NV12:
*h = (*h + 1) & ~1;
size = (*w + 3) & ~3;
if (pitches)
pitches[0] = size;
size *= *h;
if (offsets)
offsets[1] = size;
tmp = (*w + 3) & ~3;
if (pitches)
pitches[1] = tmp;
tmp *= (*h >> 1);
size += tmp;
break;
case FOURCC_UYVY:
case FOURCC_YUY2:
default:
@ -374,9 +397,12 @@ void sna_video_textured_setup(struct sna *sna, ScreenPtr screen)
if (sna->kgem.gen < 030) {
adaptor->nImages = ARRAY_SIZE(gen2_Images);
adaptor->pImages = (XvImageRec *)gen2_Images;
} else {
} else if (sna->kgem.gen < 040) {
adaptor->nImages = ARRAY_SIZE(gen3_Images);
adaptor->pImages = (XvImageRec *)gen3_Images;
} else {
adaptor->nImages = ARRAY_SIZE(gen4_Images);
adaptor->pImages = (XvImageRec *)gen4_Images;
}
#if XORG_XV_VERSION < 2
adaptor->ddAllocatePort = sna_xv_alloc_port;