sna: Added AYUV format support for textured and sprite video adapters.
PATCH v6 1/1 sna: Added AYUV format support for textured and sprite video adapters.
v2: Renamed DRM_FORMAT_XYUV to DRM_FORMAT_XYUV8888.
Added comment about AYUV byte ordering in Gstreamer.
v3: Removed sna_composite_op flags related change to the separate patch.
v4: Fixed review comments, done code refactoring
v5: Fixed following review comments:
- Fixed comment in shader code for ayuv kernel.
- Fixed naming to VIDEO_AYUV_BT601/BT709 for ayuv kernels.
- Removed duplicate gen9_kernel parameter, left from previous patches
- Added colorspace handling for new AYUV kernel
- Fixed naming of sna_copy_packed_data_ayuv to sna_copy_ayuv_data
- Started using standard bswap_32 function for byte swapping in sna_copy_ayuv_data
- Removed redundant code in sna_copy_ayuv_data so that it looks more neat
- Fixed XVIMAGE_AYUV structure initialization to contain proper byte sequence for GST
- Fixed bogus comment about subsampling for DRM_FORMAT_XYUV8888
- Fixed AYUV advertisement for all platforms
- Removed unnecessary RGB888 declaration.
v6:
- Fixed surface format not to use alpha as supposed
- Now doing byte swapping always during copy
- Changed hack, required for GST to work to be at one place
- Fixed invalid sampling values for XVIMAGE_AYUV
- Fixed sprite format checking order and images_ayuv definition.
--- src/render_program/Makefile.am | 2 + .../exa_wm_src_sample_argb_ayuv.g8a | 76 ++++++++++++++++ .../exa_wm_src_sample_argb_ayuv.g8b | 8 ++ src/sna/gen9_render.c | 24 ++++- src/sna/sna_render.h | 3 + src/sna/sna_video.c | 89 ++++++++++++++++++- src/sna/sna_video.h | 20 +++++ src/sna/sna_video_sprite.c | 20 ++++- src/sna/sna_video_textured.c | 7 ++ 9 files changed, 244 insertions(+), 5 deletions(-) create mode 100644 src/render_program/exa_wm_src_sample_argb_ayuv.g8a create mode 100644 src/render_program/exa_wm_src_sample_argb_ayuv.g8b
src/render_program/Makefile.am +2 -0
@@ -196,6 +196,7 @@ INTEL_G7B = \ INTEL_G8A = \ exa_wm_src_affine.g8a \ exa_wm_src_sample_argb.g8a \ + exa_wm_src_sample_argb_ayuv.g8a \ exa_wm_src_sample_nv12.g8a \ exa_wm_src_sample_planar.g8a \ exa_wm_write.g8a \
@@ -205,6 +206,7 @@ INTEL_G8A = \ INTEL_G8B = \ exa_wm_src_affine.g8b \ + exa_wm_src_sample_argb_ayuv.g8b \ exa_wm_src_sample_argb.g8b \ exa_wm_src_sample_nv12.g8b \ exa_wm_src_sample_planar.g8b \
src/render_program/exa_wm_src_sample_argb_ayuv.g8a new file +76 -0
76 lines not on this page · raw message
src/render_program/exa_wm_src_sample_argb_ayuv.g8b new file +8 -0
@@ -0,0 +1,8 @@ + { 0x00000001, 0x2008060c, 0x00000000, 0x00000000 }, + { 0x00600001, 0x28200208, 0x008d0000, 0x00000000 }, + { 0x02800031, 0x21c00a48, 0x06000820, 0x0a8c0001 }, + { 0x00800001, 0x22800208, 0x00200240, 0x00000000 }, + { 0x00800001, 0x22400208, 0x00200200, 0x00000000 }, + { 0x00800001, 0x22000208, 0x002001c0, 0x00000000 }, + { 0x00800001, 0x21c00208, 0x00200280, 0x00000000 }, + { 0x00800001, 0x22803ee8, 0x38000000, 0x3f800000 },
src/sna/gen9_render.c +23 -1
@@ -129,6 +129,20 @@ static const uint32_t ps_kernel_planar_bt709[][4] = {#include "exa_wm_write.g8b" }; +static const uint32_t ps_kernel_ayuv_bt601[][4 ] = { +#include "exa_wm_src_affine.g8b" +#include "exa_wm_src_sample_argb_ayuv.g8b" +#include "exa_wm_yuv_rgb_bt601.g8b" +#include "exa_wm_write.g8b" +}; + +static const uint32_t ps_kernel_ayuv_bt709[][4 ] = { +#include "exa_wm_src_affine.g8b" +#include "exa_wm_src_sample_argb_ayuv.g8b" +#include "exa_wm_yuv_rgb_bt709.g8b" +#include "exa_wm_write.g8b" +}; +static const uint32_t ps_kernel_nv12_bt709[][4 ] = { #include "exa_wm_src_affine.g8b" #include "exa_wm_src_sample_nv12.g8b"
@@ -177,6 +191,8 @@ static const struct wm_kernel_info {KERNEL (VIDEO_PLANAR_BT709 , ps_kernel_planar_bt709,7 ),KERNEL (VIDEO_NV12_BT709 , ps_kernel_nv12_bt709,7 ),KERNEL (VIDEO_PACKED_BT709 , ps_kernel_packed_bt709,2 ), +KERNEL (VIDEO_AYUV_BT601 , ps_kernel_ayuv_bt601,2 ), +KERNEL (VIDEO_AYUV_BT709 , ps_kernel_ayuv_bt709,2 ), KERNEL(VIDEO_RGB, ps_kernel_rgb, 2), #endif };
@@ -2552,7 +2568,6 @@ gen9_render_composite(struct sna *sna, tmp->mask.bo !=NULL , tmp->has_component_alpha, tmp->is_affine); - tmp->blt = gen9_render_composite_blt; tmp->box = gen9_render_composite_box; tmp->boxes = gen9_render_composite_boxes__blt;
@@ -3853,6 +3868,8 @@ static void gen9_emit_video_state(struct sna *sna, src_surf_format[0 ] =SURFACEFORMAT_B8G8R8X8_UNORM ; else if (frame->id == FOURCC_UYVY) src_surf_format[0 ] =SURFACEFORMAT_YCRCB_SWAPY ; + else if (is_ayuv_fourcc(frame->id)) + src_surf_format[0 ] =SURFACEFORMAT_B8G8R8X8_UNORM ; else src_surf_format[0 ] =SURFACEFORMAT_YCRCB_NORMAL ;
@@ -3903,6 +3920,11 @@ static unsigned select_video_kernel(const struct sna_video *video,case FOURCC_RGB565 :return GEN9_WM_KERNEL_VIDEO_RGB ; +case FOURCC_AYUV : +return video->colorspace ? +GEN9_WM_KERNEL_VIDEO_AYUV_BT709 : +GEN9_WM_KERNEL_VIDEO_AYUV_BT601 ; +default :return video->colorspace ? GEN9_WM_KERNEL_VIDEO_PACKED_BT709 :
src/sna/sna_render.h +3 -0
@@ -617,6 +617,9 @@ enum {GEN9_WM_KERNEL_VIDEO_NV12_BT709 ,GEN9_WM_KERNEL_VIDEO_PACKED_BT709 , +GEN9_WM_KERNEL_VIDEO_AYUV_BT601 , +GEN9_WM_KERNEL_VIDEO_AYUV_BT709 , +GEN9_WM_KERNEL_VIDEO_RGB , GEN9_WM_KERNEL_COUNT };
src/sna/sna_video.c +88 -1
119 lines not on this page · raw message
src/sna/sna_video.h +20 -0
@@ -39,6 +39,7 @@ THE USE OR OTHER DEALINGS IN THE SOFTWARE.#define FOURCC_RGB565 ((16 << 24) + ('B' << 16) + ('G' << 8) + 'R')#define FOURCC_RGB888 ((24 << 24) + ('B' << 16) + ('G' << 8) + 'R')#define FOURCC_NV12 (('2' << 24) + ('1' << 16) + ('V' << 8) + 'N') +#define FOURCC_AYUV (('V' << 24) + ('U' << 16) + ('Y' << 8) + 'A')/* * Below, a dummy picture type that is used in XvPutImage
@@ -79,6 +80,15 @@ THE USE OR OTHER DEALINGS IN THE SOFTWARE. XvTopToBottom \ } +#define XVIMAGE_AYUV { \ + FOURCC_AYUV, XvYUV, LSBFirst, \ + {'A', 'Y', 'U', 'V', 0x00, 0x00, 0x00, 0x10, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71}, \ + 32, XvPacked, 1, 0, 0, 0, 0, 8, 8, 8, 1, 1, 1, 1, 1, 1, \ + {'A', '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}, \ + XvTopToBottom \ +} + +struct sna_video {struct sna *sna;
@@ -189,6 +199,16 @@ static inline int is_nv12_fourcc(int id) } } +static inline int is_ayuv_fourcc (int id) +{ +switch (id) { +case FOURCC_AYUV : +return 1 ; +default : +return 0 ; + } +} + bool sna_video_clip_helper(struct sna_video *video, struct sna_video_frame *frame,
src/sna/sna_video_sprite.c +17 -3
@@ -47,7 +47,7 @@#define DRM_FORMAT_YUYV fourcc_code('Y', 'U', 'Y', 'V')/* [31:0] Cr0:Y1:Cb0:Y0 8:8:8:8 little endian */ #define DRM_FORMAT_UYVY fourcc_code('U', 'Y', 'V', 'Y')/* [31:0] Y1:Cr0:Y0:Cb0 8:8:8:8 little endian */ #define DRM_FORMAT_NV12 fourcc_code('N', 'V', '1', '2')/* 2x2 subsampled Cr:Cb plane */ - +#define DRM_FORMAT_XYUV8888 fourcc_code('X', 'Y', 'U', 'V')/* [31:0] x:Y:U:V 8:8:8:8 little endian */ #define has_hw_scaling (sna, video) ((sna)->kgem.gen < 071 || \ (sna)->kgem.gen >= 0110)
@@ -79,6 +79,8 @@ static const XvImageRec images_rgb565[] = { XVIMAGE_YUY2, XVIMAGE_UYVY, XVMC_RGB888, XVMC_RGB565 };static const XvImageRec images_nv12[] = {XVIMAGE_YUY2 ,XVIMAGE_UYVY ,XVIMAGE_NV12 ,XVMC_RGB888 ,XVMC_RGB565 }; +static const XvImageRec images_ayuv[] = {XVIMAGE_AYUV ,XVIMAGE_YUY2 ,XVIMAGE_UYVY , +XVIMAGE_NV12 ,XVMC_RGB888 ,XVMC_RGB565 };static const XvAttributeRec attribs[] = { { XvSettable | XvGettable,0 ,1 , (char *)"XV_COLORSPACE" },/* BT.601, BT.709 */ { XvSettable | XvGettable,0 ,0xffffff , (char *)"XV_COLORKEY" },
@@ -364,6 +366,10 @@ sna_video_sprite_show(struct sna *sna,case FOURCC_UYVY : f.pixel_format =DRM_FORMAT_UYVY ;break ; +case FOURCC_AYUV : +/* i915 doesn't support alpha, so we use XYUV */ + f.pixel_format =DRM_FORMAT_XYUV8888 ; +break ;case FOURCC_YUY2 :default : f.pixel_format =DRM_FORMAT_YUYV ;
@@ -705,7 +711,12 @@ static int sna_video_sprite_query(ddQueryImageAttributes_ARGS) tmp *= (*h >>1 ); size += tmp;break ; - +case FOURCC_AYUV : + tmp = *w <<2 ; +if (pitches) + pitches[0 ] = tmp; + size = *h * tmp; +break ;default : *w = (*w +1 ) & ~1 ; *h = (*h +1 ) & ~1 ;
@@ -805,7 +816,10 @@ void sna_video_sprite_setup(struct sna *sna, ScreenPtr screen) adaptor->nAttributes =ARRAY_SIZE (attribs); adaptor->pAttributes = (XvAttributeRec *)attribs; -if (sna_has_sprite_format (sna,DRM_FORMAT_NV12 )) { +if (sna_has_sprite_format (sna,DRM_FORMAT_XYUV8888 )) { + adaptor->pImages = (XvImageRec *)images_ayuv; + adaptor->nImages =ARRAY_SIZE (images_ayuv); + }else if (sna_has_sprite_format (sna,DRM_FORMAT_NV12 )) { adaptor->pImages = (XvImageRec *)images_nv12; adaptor->nImages =ARRAY_SIZE (images_nv12); }else if (sna_has_sprite_format (sna,DRM_FORMAT_RGB565 )) {
src/sna/sna_video_textured.c +7 -0
@@ -68,6 +68,7 @@ static const XvImageRec gen4_Images[] = {XVIMAGE_I420 ,XVIMAGE_NV12 ,XVIMAGE_UYVY , +XVIMAGE_AYUV , XVMC_YUV, };
@@ -337,6 +338,12 @@ sna_video_textured_query(ddQueryImageAttributes_ARGS) pitches[0 ] = size; size *= *h;break ; +case FOURCC_AYUV : + size = *w <<2 ; +if (pitches) + pitches[0 ] = size; + size *= *h; +break ;case FOURCC_XVMC : *h = (*h +1 ) & ~1 ; size =sizeof (uint32_t );
Signature · 6 lines
2.17.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
On Fri, 2018-11-02 at 12:06 +0200, Stanislav Lisovskiy wrote:
Ping.
Quoted 561 lines
v2: Renamed
DRM_FORMAT_XYUVtoDRM_FORMAT_XYUV8888.
Added comment about AYUV byte ordering in Gstreamer.v3: Removed
sna_composite_opflags related change to the separate patch.v4: Fixed review comments, done code refactoring
v5: Fixed following review comments:
- Fixed comment in shader code for ayuv kernel.
- Fixed naming to VIDEO_AYUV_BT601/BT709 for ayuv kernels.
- Removed duplicategen9_kernelparameter, left from previous
patches
- Added colorspace handling for new AYUV kernel
- Fixed naming ofsna_copy_packed_data_ayuvtosna_copy_ayuv_data
- Started using standardbswap_32function for byte swapping insna_copy_ayuv_data
- Removed redundant code insna_copy_ayuv_dataso that it looks
more neat
- FixedXVIMAGE_AYUVstructure initialization to contain proper
byte sequence for GST
- Fixed bogus comment about subsampling forDRM_FORMAT_XYUV8888
- Fixed AYUV advertisement for all platforms
- Removed unnecessary RGB888 declaration.v6:
- Fixed surface format not to use alpha as supposed
- Now doing byte swapping always during copy
- Changed hack, required for GST to work to be at one place
- Fixed invalid sampling values forXVIMAGE_AYUV
- Fixed sprite format checking order andimages_ayuvdefinition.Signed-off-by Stanislav Lisovskiy <[email protected]>--- src/render_program/Makefile.am | 2 + .../exa_wm_src_sample_argb_ayuv.g8a | 76 ++++++++++++++++ .../exa_wm_src_sample_argb_ayuv.g8b | 8 ++ src/sna/gen9_render.c | 24 ++++- src/sna/sna_render.h | 3 + src/sna/sna_video.c | 89 ++++++++++++++++++- src/sna/sna_video.h | 20 +++++ src/sna/sna_video_sprite.c | 20 ++++- src/sna/sna_video_textured.c | 7 ++ 9 files changed, 244 insertions(+), 5 deletions(-) create mode 100644 src/render_program/exa_wm_src_sample_argb_ayuv.g8a create mode 100644src/render_program/exa_wm_src_sample_argb_ayuv.g8b
src/render_program/Makefile.am +2
-0@@ -196,6 +196,7 @@ INTEL_G7B = \ INTEL_G8A = \ exa_wm_src_affine.g8a \ exa_wm_src_sample_argb.g8a \ + exa_wm_src_sample_argb_ayuv.g8a \ exa_wm_src_sample_nv12.g8a \ exa_wm_src_sample_planar.g8a \ exa_wm_write.g8a \@@ -205,6 +206,7 @@ INTEL_G8A = \ INTEL_G8B = \ exa_wm_src_affine.g8b \ + exa_wm_src_sample_argb_ayuv.g8b \ exa_wm_src_sample_argb.g8b \ exa_wm_src_sample_nv12.g8b \ exa_wm_src_sample_planar.g8b \src/render_program/exa_wm_src_sample_argb_ayuv.g8a new file +4
-0@@ -0,0 +1,76 @@ +/* + * Copyright © 2006 Intel Corporation + * + * Permission is hereby granted, free of charge, to any personobtaining 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, sublicense,
+ * 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 NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS 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.
+ *
+ * Authors:
+ * Wang Zhenyu <[email protected]>
+ * Keith Packard <[email protected]>
+ */src/render_program/exa_wm_src_sample_argb_ayuv.g8a new file +12
-0+ +/* Sample the src surface */ + +include(`exa_wm.g4i') + +undefine(`src_msg') +undefine(`src_msg_ind') + +define(`src_msg', `g65') +define(`src_msg_ind', `65') + +/* prepare sampler read back gX register, which would be writtenback to output */
src/render_program/exa_wm_src_sample_argb_ayuv.g8a new file +7
-0+ +/* use simd16 sampler, param 0 is u, param 1 is v. */ +/* 'payload' loading, assuming tex coord start from g4 */ + +/* load argb */ +mov (1) g0.8<1>UD 0x00000000UD { align1 mask_disable }; +mov (8) src_msg<1>UD g0<8,8,1>UD { align1 }; /* copy to msg startreg*/
src/render_program/exa_wm_src_sample_argb_ayuv.g8a new file +7
-0+ +/* src_msg will be copied with g0, as it contains send desc */ +/* emit sampler 'send' cmd */ +send (16) src_msg_ind /* msg reg index */ + src_sample_base<1>UW /* readback */ + null + sampler (1,0,F) /* sampler message description,(binding_table,sampler_index,datatype)
src/render_program/exa_wm_src_sample_argb_ayuv.g8a new file +1
-0+ /* here(src->dst) we should use
src_samplerandsrc_surface*/src/render_program/exa_wm_src_sample_argb_ayuv.g8a new file +1
-0+ mlen 5 rlen 8 { align1 }; /* required message len 5,readback len 8 */
src/render_program/exa_wm_src_sample_argb_ayuv.g8a new file +22
-0+ +/* + * Have to change bytes order, because the only + * player which supports AYUV format currently is + * Gstreamer and it supports in bad way, even though + * spec says MSB:AYUV, we get the bytes opposite way. + * We swap bytes both for sprite and texture modes during copy. + * So here we get argb which then becomes 1bgr. + */ +mov (16) src_sample_a<1>UD src_sample_b<1>UD { align1 }; +mov (16) src_sample_b<1>UD src_sample_g<1>UD { align1 }; +mov (16) src_sample_g<1>UD src_sample_r<1>UD { align1 }; +mov (16) src_sample_r<1>UD src_sample_a<1>UD { align1 }; +mov (16) src_sample_a<1>F 1.0F; + + + + + + + +src/render_program/exa_wm_src_sample_argb_ayuv.g8b new file +8
-0@@ -0,0 +1,8 @@ + { 0x00000001, 0x2008060c, 0x00000000, 0x00000000 }, + { 0x00600001, 0x28200208, 0x008d0000, 0x00000000 }, + { 0x02800031, 0x21c00a48, 0x06000820, 0x0a8c0001 }, + { 0x00800001, 0x22800208, 0x00200240, 0x00000000 }, + { 0x00800001, 0x22400208, 0x00200200, 0x00000000 }, + { 0x00800001, 0x22000208, 0x002001c0, 0x00000000 }, + { 0x00800001, 0x21c00208, 0x00200280, 0x00000000 }, + { 0x00800001, 0x22803ee8, 0x38000000, 0x3f800000 },src/sna/gen9_render.c +14
-0@@ -129,6 +129,20 @@ static const uint32_t ps_kernel_planar_bt709[][4] = {#include "exa_wm_write.g8b" }; +static const uint32_t ps_kernel_ayuv_bt601[][4 ] = { +#include "exa_wm_src_affine.g8b" +#include "exa_wm_src_sample_argb_ayuv.g8b" +#include "exa_wm_yuv_rgb_bt601.g8b" +#include "exa_wm_write.g8b" +}; + +static const uint32_t ps_kernel_ayuv_bt709[][4 ] = { +#include "exa_wm_src_affine.g8b" +#include "exa_wm_src_sample_argb_ayuv.g8b" +#include "exa_wm_yuv_rgb_bt709.g8b" +#include "exa_wm_write.g8b" +}; +static const uint32_t ps_kernel_nv12_bt709[][4 ] = { #include "exa_wm_src_affine.g8b"#include "exa_wm_src_sample_nv12.g8b"
src/sna/gen9_render.c +2
-1@@ -177,6 +191,8 @@ static const struct wm_kernel_info {KERNEL (VIDEO_PLANAR_BT709 , ps_kernel_planar_bt709,7 ),KERNEL (VIDEO_NV12_BT709 , ps_kernel_nv12_bt709,7 ),KERNEL (VIDEO_PACKED_BT709 , ps_kernel_packed_bt709,2 ), +KERNEL (VIDEO_AYUV_BT601 , ps_kernel_ayuv_bt601,2 ), +KERNEL (VIDEO_AYUV_BT709 , ps_kernel_ayuv_bt709,2 ), KERNEL(VIDEO_RGB, ps_kernel_rgb, 2), #endif };@@ -2552,7 +2568,6 @@ gen9_render_composite(struct sna *sna, tmp- >mask.bo != NULL, tmp- >has_component_alpha, tmp- >is_affine); -src/sna/gen9_render.c +2
-0tmp->blt = gen9_render_composite_blt; tmp->box = gen9_render_composite_box; tmp->boxes = gen9_render_composite_boxes__blt;@@ -3853,6 +3868,8 @@ static void gen9_emit_video_state(struct sna *sna, src_surf_format[0 ] =SURFACEFORMAT_B8G8R8X8_UNORM ; else if (frame->id == FOURCC_UYVY) src_surf_format[0 ] =SURFACEFORMAT_YCRCB_SWAPY ; + else if (is_ayuv_fourcc(frame->id)) + src_surf_format[0] =
SURFACEFORMAT_B8G8R8X8_UNORM;src/sna/gen9_render.c +0
-0else src_surf_format[0] =
SURFACEFORMAT_YCRCB_NORMAL;src/sna/gen9_render.c +5
-0@@ -3903,6 +3920,11 @@ static unsigned select_video_kernel(conststruct sna_video *video, case FOURCC_RGB565: return GEN9_WM_KERNEL_VIDEO_RGB; +case FOURCC_AYUV : +return video->colorspace ? +GEN9_WM_KERNEL_VIDEO_AYUV_BT709 : +GEN9_WM_KERNEL_VIDEO_AYUV_BT601 ; +default : return video->colorspace ?src/sna/gen9_render.c +0
-0GEN9_WM_KERNEL_VIDEO_PACKED_BT709 :src/sna/sna_render.h +3
-0@@ -617,6 +617,9 @@ enum {GEN9_WM_KERNEL_VIDEO_NV12_BT709 ,GEN9_WM_KERNEL_VIDEO_PACKED_BT709 , +GEN9_WM_KERNEL_VIDEO_AYUV_BT601 , +GEN9_WM_KERNEL_VIDEO_AYUV_BT709 , +GEN9_WM_KERNEL_VIDEO_RGB , GEN9_WM_KERNEL_COUNT };src/sna/sna_video.c +2
-0@@ -59,6 +59,7 @@#include "intel_options.h" #include <xf86xv.h> +#include <byteswap.h> #ifdef SNA_XVMC #define _SNA_XVMC_SERVER_@@ -281,6 +282,7 @@ sna_video_frame_set_rotation(struct sna_video *video, }else {switch (frame->id) {case FOURCC_RGB888 : +case FOURCC_AYUV :if (rotation & (RR_Rotate_90 | RR_Rotate_270)) {frame->pitch[0] = ALIGN((height <<
2), align);
frame->size= (int)frame->pitch[0] *
width;src/sna/sna_video.c +36
-0@@ -584,6 +586,89 @@ sna_copy_packed_data(struct sna_video *video, } } +static void +sna_copy_ayuv_data (struct sna_video *video, +const struct sna_video_frame *frame, +const uint8_t *buf, +uint8_t *dst, +bool reverse_bytes) +{ +int pitch = frame->width <<2 ; +const uint8_t *src, *s; +const uint32_t *src_dw; +uint32_t *dst_dw = (uint32_t *)dst; +int x, y, w, h; +int i, j; +uint32_t dw; + +if (video->textured) { +/* XXX support copying cropped extents */ + x = y =0 ; + w = frame->width; + h = frame->height; + }else { + x = frame->image.x1; + y = frame->image.y1; + w = frame->image.x2 - frame->image.x1; + h = frame->image.y2 - frame->image.y1; + } + + src = buf + (y * pitch) + (x <<2 ); + src_dw = (uint32_t *)src; + +if (reverse_bytes) { +/* +* Have to reverse bytes order, because the only +* player which supports AYUV format currently is +* Gstreamer and it supports in bad way, even though +* spec says MSB:AYUV, we get the bytes opposite way.
src/sna/sna_video.c +33
-0+*/ +for (i =0 ; i < h; i++) { +for (j =0 ; j < w; j++) { +uint32_t reverse_dw; + dw = src_dw[i * w + j]; + reverse_dw =bswap_32 (dw); + dst_dw[i * w + j] = reverse_dw; + } + } + } + +switch (frame->rotation) { +case RR_Rotate_0: +for (i =0 ; i < h; i++) { +for (j =0 ; j < w; j++) { + dw = dst_dw[i * w + j]; + dst_dw[i * w + j] = dw; + } + } +break ; +case RR_Rotate_90: +for (i =0 ; i < h; i++) { +for (j =0 ; j < w; j++) { + dw = dst_dw[i * w + j]; + dst_dw[(w - j -1 ) * h + i] = dw; + } + } +break ; +case RR_Rotate_180: +for (i =0 ; i < h; i++) { +for (j =0 ; j < w; j++) { + dw = dst_dw[i * w + j]; + dst_dw[(h - i -1 ) * w + w - j -1 ]= dw;
src/sna/sna_video.c +14
-0+ } + } +break ; +case RR_Rotate_270: +for (i =0 ; i < h; i++) { +for (j =0 ; j < w; j++) { + dw = dst_dw[i * w + j];; + dst_dw[(w - j -1 ) * h + i] = dw; + } + } +break ; + } +} + bool sna_video_copy_data(struct sna_video *video, struct sna_video_frame *frame,@@ -604,7 +689,7 @@ sna_video_copy_data(struct sna_video *video,assert (frame->size);/* In the common case, we can simply the upload in a single pwrite */
src/sna/sna_video.c +1
-1-if (frame->rotation == RR_Rotate_0 && !video->tiled) { + if (frame->rotation == RR_Rotate_0 && !video->tiled &&!is_ayuv_fourcc(frame->id)) {
DBG(("%s: unrotated, untiled fast paths: is-
planar?=%d\n",src/sna/sna_video.c +0
-0__FUNCTION__, is_planar_fourcc(frame->id)));if (is_nv12_fourcc (frame->id)) {@@ -709,6 +794,8 @@ use_gtt: /* copy data, must use GTT so that wekeep the overlay uncached */
src/sna/sna_video.c +2
-0sna_copy_nv12_data (video, frame, buf, dst); else if (is_planar_fourcc(frame->id)) sna_copy_planar_data(video, frame, buf, dst); + else if (is_ayuv_fourcc(frame->id)) + sna_copy_ayuv_data(video, frame, buf, dst, true); elsesna_copy_packed_data (video ,frame ,buf ,dst );src/sna/sna_video.h +10
-0@@ -39,6 +39,7 @@ THE USE OR OTHER DEALINGS IN THE SOFTWARE.#define FOURCC_RGB565 ((16 << 24) + ('B' << 16) + ('G' << 8) + 'R')#define FOURCC_RGB888 ((24 << 24) + ('B' << 16) + ('G' << 8) + 'R')#define FOURCC_NV12 (('2' << 24) + ('1' << 16) + ('V' << 8) + 'N') +#define FOURCC_AYUV (('V' << 24) + ('U' << 16) + ('Y' << 8) + 'A')/* * Below, a dummy picture type that is used in XvPutImage @@ -79,6 +80,15 @@ THE USE OR OTHER DEALINGS IN THE SOFTWARE. XvTopToBottom \ } +#define XVIMAGE_AYUV { \ + FOURCC_AYUV, XvYUV, LSBFirst, \ + {'A', 'Y', 'U', 'V', 0x00, 0x00, 0x00, 0x10, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71}, \ +32 , XvPacked,1 ,0 ,0 ,0 ,0 ,8 ,8 ,8 ,1 ,1 ,1 ,1 ,1 ,1 , \ + {'A', '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}, \ + XvTopToBottom \ +} + + struct sna_video {src/sna/sna_video.h +10
-0struct sna *sna;@@ -189,6 +199,16 @@ static inline int is_nv12_fourcc(int id) } } +static inline int is_ayuv_fourcc (int id) +{ +switch (id) { +case FOURCC_AYUV : +return 1 ; +default : +return 0 ; + } +} + bool sna_video_clip_helper(struct sna_video *video, struct sna_video_frame *frame,src/sna/sna_video_sprite.c +0
-0@@ -47,7 +47,7 @@#define DRM_FORMAT_YUYV fourcc_code('Y', 'U', 'Y', 'V')/* [31:0] Cr0:Y1:Cb0:Y0 8:8:8:8 little endian */
#defineDRM_FORMAT_UYVYfourcc_code('U', 'Y', 'V', 'Y')/*
[31:0] Y1:Cr0:Y0:Cb0 8:8:8:8 little endian */
#defineDRM_FORMAT_NV12fourcc_code('N', 'V', '1', '2')/*
2x2 subsampled Cr:Cb plane */src/sna/sna_video_sprite.c +1
-1- +#define DRM_FORMAT_XYUV8888 fourcc_code('X', 'Y', 'U', 'V')/* [31:0] x:Y:U:V 8:8:8:8 little endian */
#definehas_hw_scaling(sna, video)((sna)->kgem.gen < 071 || \src/sna/sna_video_sprite.c +0
-0(sna)->kgem.gen >= 0110)@@ -79,6 +79,8 @@ static const XvImageRec images_rgb565[] = {XVIMAGE_YUY2 ,XVIMAGE_UYVY ,XVMC_RGB888 ,XVMC_RGB565 };static const XvImageRec images_nv12[] = {XVIMAGE_YUY2 ,XVIMAGE_UYVY , XVIMAGE_NV12, XVMC_RGB888,
XVMC_RGB565};
+static const XvImageRec images_ayuv[] = {XVIMAGE_AYUV,XVIMAGE_YUY2,XVIMAGE_UYVY,src/sna/sna_video_sprite.c +1
-0+ XVIMAGE_NV12, XVMC_RGB888,
XVMC_RGB565};
static const XvAttributeRec attribs[] = {
{ XvSettable | XvGettable, 0, 1, (char *)"XV_COLORSPACE" },
/* BT.601, BT.709 */
{ XvSettable | XvGettable, 0,0xffffff, (char
*)"XV_COLORKEY" },src/sna/sna_video_sprite.c +2
-0@@ -364,6 +366,10 @@ sna_video_sprite_show(struct sna *sna,case FOURCC_UYVY : f.pixel_format =DRM_FORMAT_UYVY ;break ; +case FOURCC_AYUV : +/* i915 doesn't support alpha, so we use XYUV */
src/sna/sna_video_sprite.c +8
-1+ f.pixel_format =DRM_FORMAT_XYUV8888 ; +break ;case FOURCC_YUY2 :default : f.pixel_format =DRM_FORMAT_YUYV ;@@ -705,7 +711,12 @@ static intsna_video_sprite_query (ddQueryImageAttributes_ARGS) tmp *= (*h >> 1); size += tmp;break ; - +case FOURCC_AYUV : + tmp = *w <<2 ; +if (pitches) + pitches[0 ] = tmp; + size = *h * tmp; +break ;default : *w = (*w +1 ) & ~1 ;src/sna/sna_video_sprite.c +4
-1*h = (*h +1 ) & ~1 ;@@ -805,7 +816,10 @@ void sna_video_sprite_setup(struct sna *sna, ScreenPtr screen) adaptor->nAttributes = ARRAY_SIZE(attribs); adaptor->pAttributes = (XvAttributeRec *)attribs; -if (sna_has_sprite_format (sna,DRM_FORMAT_NV12 )) { +if (sna_has_sprite_format (sna,DRM_FORMAT_XYUV8888 )) { + adaptor->pImages = (XvImageRec *)images_ayuv; + adaptor->nImages =ARRAY_SIZE (images_ayuv); + }else if (sna_has_sprite_format (sna,DRM_FORMAT_NV12 )) { adaptor->pImages = (XvImageRec *)images_nv12; adaptor->nImages =ARRAY_SIZE (images_nv12);src/sna/sna_video_sprite.c +0
-0}else if (sna_has_sprite_format (sna,DRM_FORMAT_RGB565 )) {src/sna/sna_video_textured.c +7
-0@@ -68,6 +68,7 @@ static const XvImageRec gen4_Images[] = {XVIMAGE_I420 ,XVIMAGE_NV12 ,XVIMAGE_UYVY , +XVIMAGE_AYUV , XVMC_YUV, };@@ -337,6 +338,12 @@sna_video_textured_query (ddQueryImageAttributes_ARGS) pitches[0 ] = size; size *= *h;break ; +case FOURCC_AYUV : + size = *w <<2 ; +if (pitches) + pitches[0 ] = size; + size *= *h; +break ;case FOURCC_XVMC : *h = (*h +1 ) & ~1 ;size =
sizeof(uint32_t);
Signature · 7 lines
Best Regards, Lisovskiy Stanislav _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoting Stanislav Lisovskiy (2018-11-02 10:06:03)
Quoted 20 lines
v2: Renamed
DRM_FORMAT_XYUVtoDRM_FORMAT_XYUV8888.
Added comment about AYUV byte ordering in Gstreamer.v3: Removed
sna_composite_opflags related change to the separate patch.v4: Fixed review comments, done code refactoring
v5: Fixed following review comments:
- Fixed comment in shader code for ayuv kernel.
- Fixed naming to VIDEO_AYUV_BT601/BT709 for ayuv kernels.
- Removed duplicategen9_kernelparameter, left from previous patches
- Added colorspace handling for new AYUV kernel
- Fixed naming ofsna_copy_packed_data_ayuvtosna_copy_ayuv_data
- Started using standardbswap_32function for byte swapping insna_copy_ayuv_data
- Removed redundant code insna_copy_ayuv_dataso that it looks more neat
- FixedXVIMAGE_AYUVstructure initialization to contain proper byte sequence for GST
- Fixed bogus comment about subsampling forDRM_FORMAT_XYUV8888
- Fixed AYUV advertisement for all platforms
- Removed unnecessary RGB888 declaration.
Quoted 8 lines
v6:
- Fixed surface format not to use alpha as supposed
- Now doing byte swapping always during copy
- Changed hack, required for GST to work to be at one place
- Fixed invalid sampling values forXVIMAGE_AYUV
- Fixed sprite format checking order andimages_ayuvdefinition.Signed-off-by Stanislav Lisovskiy <[email protected]>
Ville, happy?
src/sna/sna_video.c sna_copy_packed_data(struct sna_video *video, · line 625
Quoted 7 lines
src/sna/sna_video.c +7
-0+if (reverse_bytes) { +/* +* Have to reverse bytes order, because the only +* player which supports AYUV format currently is +* Gstreamer and it supports in bad way, even though +* spec says MSB:AYUV, we get the bytes opposite way. +*/
This worries me. Is there no room for negotiation with Gstreamer so they use the format the kernel and HW expects. Though I presume they chose their layout for good reason (some TV probably expects it in host order.)
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 28 lines · Chris Wilson
Quoting Stanislav Lisovskiy (2018-11-02 10:06:03)
Quoted 27 lines
v2: Renamed
DRM_FORMAT_XYUVtoDRM_FORMAT_XYUV8888.
Added comment about AYUV byte ordering in Gstreamer.v3: Removed
sna_composite_opflags related change to the separate patch.v4: Fixed review comments, done code refactoring
v5: Fixed following review comments:
- Fixed comment in shader code for ayuv kernel.
- Fixed naming to VIDEO_AYUV_BT601/BT709 for ayuv kernels.
- Removed duplicategen9_kernelparameter, left from previous patches
- Added colorspace handling for new AYUV kernel
- Fixed naming ofsna_copy_packed_data_ayuvtosna_copy_ayuv_data
- Started using standardbswap_32function for byte swapping insna_copy_ayuv_data
- Removed redundant code insna_copy_ayuv_dataso that it looks more neat
- FixedXVIMAGE_AYUVstructure initialization to contain proper byte sequence for GST
- Fixed bogus comment about subsampling forDRM_FORMAT_XYUV8888
- Fixed AYUV advertisement for all platforms
- Removed unnecessary RGB888 declaration.v6:
- Fixed surface format not to use alpha as supposed
- Now doing byte swapping always during copy
- Changed hack, required for GST to work to be at one place
- Fixed invalid sampling values forXVIMAGE_AYUV
- Fixed sprite format checking order andimages_ayuvdefinition.
Quoted 3 lines
Quoted 1 line
Signed-off-by Stanislav Lisovskiy <[email protected]>Ville, happy?
Almost.
Quoted 2 lines
Quoted 2 lines
+ if (
reverse_bytes) {
This bool bugs me, replied separately.
Quoted 11 lines
src/sna/sna_video.c sna_copy_packed_data(struct sna_video *video, · line 625
Quoted 6 lines
src/sna/sna_video.c +6
-0+/* +* Have to reverse bytes order, because the only +* player which supports AYUV format currently is +* Gstreamer and it supports in bad way, even though +* spec says MSB:AYUV, we get the bytes opposite way. +*/ This worries me. Is there no room for negotiation with Gstreamer so they use the format the kernel and HW expects. Though I presume they chose their layout for good reason (some TV probably expects it in host order.)
Either that or no one ever actually tested it.
One might hope that the component_order[] in the XvImage can be used to tell the standard AYUV and gst AYUV apart. But probably no one even looks at that thing. Also not sure how that would work w.r.t. the fourcc if both needed to be supported.
Signature · 6 lines
Ville Syrjälä Intel _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 256 lines · Stanislav Lisovskiy
v2: Renamed
DRM_FORMAT_XYUVtoDRM_FORMAT_XYUV8888.
Added comment about AYUV byte ordering in Gstreamer.v3: Removed
sna_composite_opflags related change to the separate patch.v4: Fixed review comments, done code refactoring
v5: Fixed following review comments:
- Fixed comment in shader code for ayuv kernel.
- Fixed naming to VIDEO_AYUV_BT601/BT709 for ayuv kernels.
- Removed duplicategen9_kernelparameter, left from previous patches
- Added colorspace handling for new AYUV kernel
- Fixed naming ofsna_copy_packed_data_ayuvtosna_copy_ayuv_data
- Started using standardbswap_32function for byte swapping insna_copy_ayuv_data
- Removed redundant code insna_copy_ayuv_dataso that it looks more neat
- FixedXVIMAGE_AYUVstructure initialization to contain proper byte sequence for GST
- Fixed bogus comment about subsampling forDRM_FORMAT_XYUV8888
- Fixed AYUV advertisement for all platforms
- Removed unnecessary RGB888 declaration.v6:
- Fixed surface format not to use alpha as supposed
- Now doing byte swapping always during copy
- Changed hack, required for GST to work to be at one place
- Fixed invalid sampling values forXVIMAGE_AYUV
- Fixed sprite format checking order andimages_ayuvdefinition.Signed-off-by Stanislav Lisovskiy <[email protected]>--- src/render_program/Makefile.am | 2 + .../exa_wm_src_sample_argb_ayuv.g8a | 76 ++++++++++++++++ .../exa_wm_src_sample_argb_ayuv.g8b | 8 ++ src/sna/gen9_render.c | 24 ++++- src/sna/sna_render.h | 3 + src/sna/sna_video.c | 89 ++++++++++++++++++- src/sna/sna_video.h | 20 +++++ src/sna/sna_video_sprite.c | 20 ++++- src/sna/sna_video_textured.c | 7 ++ 9 files changed, 244 insertions(+), 5 deletions(-) create mode 100644 src/render_program/exa_wm_src_sample_argb_ayuv.g8a create mode 100644 src/render_program/exa_wm_src_sample_argb_ayuv.g8bsrc/render_program/Makefile.am +2
-0@@ -196,6 +196,7 @@ INTEL_G7B = \ INTEL_G8A = \ exa_wm_src_affine.g8a \ exa_wm_src_sample_argb.g8a \ + exa_wm_src_sample_argb_ayuv.g8a \ exa_wm_src_sample_nv12.g8a \ exa_wm_src_sample_planar.g8a \ exa_wm_write.g8a \@@ -205,6 +206,7 @@ INTEL_G8A = \ INTEL_G8B = \ exa_wm_src_affine.g8b \ + exa_wm_src_sample_argb_ayuv.g8b \ exa_wm_src_sample_argb.g8b \ exa_wm_src_sample_nv12.g8b \ exa_wm_src_sample_planar.g8b \src/render_program/exa_wm_src_sample_argb_ayuv.g8a new file +76
-0@@ -0,0 +1,76 @@ +/* + * Copyright © 2006 Intel Corporation + * + * 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, sublicense, + * 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 NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS 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. + * + * Authors: + * Wang Zhenyu <[email protected]> + * Keith Packard <[email protected]> + */ + +/* Sample the src surface */ + +include(`exa_wm.g4i') + +undefine(`src_msg') +undefine(`src_msg_ind') + +define(`src_msg', `g65') +define(`src_msg_ind', `65') + +/* prepare sampler read back gX register, which would be written back to output */ + +/* use simd16 sampler, param 0 is u, param 1 is v. */ +/* 'payload' loading, assuming tex coord start from g4 */ + +/* load argb */ +mov (1) g0.8<1>UD 0x00000000UD { align1 mask_disable }; +mov (8) src_msg<1>UD g0<8,8,1>UD { align1 }; /* copy to msg start reg*/ + +/* src_msg will be copied with g0, as it contains send desc */ +/* emit sampler 'send' cmd */ +send (16) src_msg_ind /* msg reg index */ + src_sample_base<1>UW /* readback */ + null + sampler (1,0,F) /* sampler message description, (binding_table,sampler_index,datatype) + /* here(src->dst) we should use src_sampler and src_surface */ + mlen 5 rlen 8 { align1 }; /* required message len 5, readback len 8 */ + +/* + * Have to change bytes order, because the only + * player which supports AYUV format currently is + * Gstreamer and it supports in bad way, even though + * spec says MSB:AYUV, we get the bytes opposite way. + * We swap bytes both for sprite and texture modes during copy. + * So here we get argb which then becomes 1bgr. + */ +mov (16) src_sample_a<1>UD src_sample_b<1>UD { align1 }; +mov (16) src_sample_b<1>UD src_sample_g<1>UD { align1 }; +mov (16) src_sample_g<1>UD src_sample_r<1>UD { align1 }; +mov (16) src_sample_r<1>UD src_sample_a<1>UD { align1 }; +mov (16) src_sample_a<1>F 1.0F; + + + + + + + +src/render_program/exa_wm_src_sample_argb_ayuv.g8b new file +8
-0@@ -0,0 +1,8 @@ + { 0x00000001, 0x2008060c, 0x00000000, 0x00000000 }, + { 0x00600001, 0x28200208, 0x008d0000, 0x00000000 }, + { 0x02800031, 0x21c00a48, 0x06000820, 0x0a8c0001 }, + { 0x00800001, 0x22800208, 0x00200240, 0x00000000 }, + { 0x00800001, 0x22400208, 0x00200200, 0x00000000 }, + { 0x00800001, 0x22000208, 0x002001c0, 0x00000000 }, + { 0x00800001, 0x21c00208, 0x00200280, 0x00000000 }, + { 0x00800001, 0x22803ee8, 0x38000000, 0x3f800000 },src/sna/gen9_render.c +23
-1@@ -129,6 +129,20 @@ static const uint32_t ps_kernel_planar_bt709[][4] = {#include "exa_wm_write.g8b" }; +static const uint32_t ps_kernel_ayuv_bt601[][4 ] = { +#include "exa_wm_src_affine.g8b" +#include "exa_wm_src_sample_argb_ayuv.g8b" +#include "exa_wm_yuv_rgb_bt601.g8b" +#include "exa_wm_write.g8b" +}; + +static const uint32_t ps_kernel_ayuv_bt709[][4 ] = { +#include "exa_wm_src_affine.g8b" +#include "exa_wm_src_sample_argb_ayuv.g8b" +#include "exa_wm_yuv_rgb_bt709.g8b" +#include "exa_wm_write.g6b" +}; +static const uint32_t ps_kernel_nv12_bt709[][4 ] = { #include "exa_wm_src_affine.g8b" #include "exa_wm_src_sample_nv12.g8b"@@ -177,6 +191,8 @@ static const struct wm_kernel_info {KERNEL (VIDEO_PLANAR_BT709 , ps_kernel_planar_bt709,7 ),KERNEL (VIDEO_NV12_BT709 , ps_kernel_nv12_bt709,7 ),KERNEL (VIDEO_PACKED_BT709 , ps_kernel_packed_bt709,2 ), +KERNEL (VIDEO_AYUV_BT601 , ps_kernel_ayuv_bt601,2 ), +KERNEL (VIDEO_AYUV_BT709 , ps_kernel_ayuv_bt709,2 ), KERNEL(VIDEO_RGB, ps_kernel_rgb, 2), #endif };@@ -2552,7 +2568,6 @@ gen9_render_composite(struct sna *sna, tmp->mask.bo !=NULL , tmp->has_component_alpha, tmp->is_affine); - tmp->blt = gen9_render_composite_blt; tmp->box = gen9_render_composite_box; tmp->boxes = gen9_render_composite_boxes__blt;@@ -3853,6 +3868,8 @@ static void gen9_emit_video_state(struct sna *sna, src_surf_format[0 ] =SURFACEFORMAT_B8G8R8X8_UNORM ; else if (frame->id == FOURCC_UYVY) src_surf_format[0 ] =SURFACEFORMAT_YCRCB_SWAPY ; + else if (is_ayuv_fourcc(frame->id)) + src_surf_format[0 ] =SURFACEFORMAT_B8G8R8X8_UNORM ; else src_surf_format[0 ] =SURFACEFORMAT_YCRCB_NORMAL ;@@ -3903,6 +3920,11 @@ static unsigned select_video_kernel(const struct sna_video *video,case FOURCC_RGB565 :return GEN9_WM_KERNEL_VIDEO_RGB ; +case FOURCC_AYUV : +return video->colorspace ? +GEN9_WM_KERNEL_VIDEO_AYUV_BT709 : +GEN9_WM_KERNEL_VIDEO_AYUV_BT601 ; +default :return video->colorspace ? GEN9_WM_KERNEL_VIDEO_PACKED_BT709 :src/sna/sna_render.h +3
-0@@ -617,6 +617,9 @@ enum {GEN9_WM_KERNEL_VIDEO_NV12_BT709 ,GEN9_WM_KERNEL_VIDEO_PACKED_BT709 , +GEN9_WM_KERNEL_VIDEO_AYUV_BT601 , +GEN9_WM_KERNEL_VIDEO_AYUV_BT709 , +GEN9_WM_KERNEL_VIDEO_RGB , GEN9_WM_KERNEL_COUNT };src/sna/sna_video.c +2
-0@@ -59,6 +59,7 @@#include "intel_options.h" #include <xf86xv.h> +#include <byteswap.h> #ifdef SNA_XVMC #define _SNA_XVMC_SERVER_@@ -281,6 +282,7 @@ sna_video_frame_set_rotation(struct sna_video *video, }else {switch (frame->id) {case FOURCC_RGB888 : +case FOURCC_AYUV :if (rotation & (RR_Rotate_90 | RR_Rotate_270)) { frame->pitch[0 ] =ALIGN ((height <<2 ), align); frame->size = (int )frame->pitch[0 ] * width;
src/sna/sna_video.c sna_copy_packed_data(struct sna_video *video, · line 594
Quoted 9 lines
src/sna/sna_video.c +6
-0@@ -584,6 +586,89 @@ sna_copy_packed_data(struct sna_video *video, } } +static void +sna_copy_ayuv_data (struct sna_video *video, +const struct sna_video_frame *frame, +const uint8_t *buf, +uint8_t *dst, +bool reverse_bytes)
Why this parameter? It's always true no?
Quoted 30 lines
src/sna/sna_video.c +30
-0+{ +int pitch = frame->width <<2 ; +const uint8_t *src, *s; +const uint32_t *src_dw; +uint32_t *dst_dw = (uint32_t *)dst; +int x, y, w, h; +int i, j; +uint32_t dw; + +if (video->textured) { +/* XXX support copying cropped extents */ + x = y =0 ; + w = frame->width; + h = frame->height; + }else { + x = frame->image.x1; + y = frame->image.y1; + w = frame->image.x2 - frame->image.x1; + h = frame->image.y2 - frame->image.y1; + } + + src = buf + (y * pitch) + (x <<2 ); + src_dw = (uint32_t *)src; + +if (reverse_bytes) { +/* +* Have to reverse bytes order, because the only +* player which supports AYUV format currently is +* Gstreamer and it supports in bad way, even though +* spec says MSB:AYUV, we get the bytes opposite way.
src/sna/sna_video.c sna_copy_packed_data(struct sna_video *video, · line 634
Quoted 10 lines
src/sna/sna_video.c +10
-0+*/ +for (i =0 ; i < h; i++) { +for (j =0 ; j < w; j++) { +uint32_t reverse_dw; + dw = src_dw[i * w + j]; + reverse_dw =bswap_32 (dw); + dst_dw[i * w + j] = reverse_dw; + } + } + }
Two loops through the data isn't quite what I was thinking.
src/sna/sna_video.c sna_copy_packed_data(struct sna_video *video, · line 641
Quoted 7 lines
src/sna/sna_video.c +7
-0+ +switch (frame->rotation) { +case RR_Rotate_0: +for (i =0 ; i < h; i++) { +for (j =0 ; j < w; j++) { + dw = dst_dw[i * w + j]; + dst_dw[i * w + j] = dw;
What I had in mind was just
dst_dw[..] = bswap_32(src_dw[...]);
here.
Quoted 187 lines
src/sna/sna_video.c +33
-1+ } + } +break ; +case RR_Rotate_90: +for (i =0 ; i < h; i++) { +for (j =0 ; j < w; j++) { + dw = dst_dw[i * w + j]; + dst_dw[(w - j -1 ) * h + i] = dw; + } + } +break ; +case RR_Rotate_180: +for (i =0 ; i < h; i++) { +for (j =0 ; j < w; j++) { + dw = dst_dw[i * w + j]; + dst_dw[(h - i -1 ) * w + w - j -1 ] = dw; + } + } +break ; +case RR_Rotate_270: +for (i =0 ; i < h; i++) { +for (j =0 ; j < w; j++) { + dw = dst_dw[i * w + j];; + dst_dw[(w - j -1 ) * h + i] = dw; + } + } +break ; + } +} + bool sna_video_copy_data(struct sna_video *video, struct sna_video_frame *frame,@@ -604,7 +689,7 @@ sna_video_copy_data(struct sna_video *video,assert (frame->size);/* In the common case, we can simply the upload in a single pwrite */ -if (frame->rotation == RR_Rotate_0 && !video->tiled) { +if (frame->rotation == RR_Rotate_0 && !video->tiled && !is_ayuv_fourcc (frame->id)) {DBG (("%s: unrotated, untiled fast paths: is-planar?=%d\n" , __FUNCTION__,is_planar_fourcc (frame->id)));if (is_nv12_fourcc (frame->id)) {@@ -709,6 +794,8 @@ use_gtt: /* copy data, must use GTT so that we keep the overlay uncached */sna_copy_nv12_data (video, frame, buf, dst); else if (is_planar_fourcc(frame->id)) sna_copy_planar_data(video, frame, buf, dst); + else if (is_ayuv_fourcc(frame->id)) + sna_copy_ayuv_data(video, frame, buf, dst, true); elsesna_copy_packed_data (video ,frame ,buf ,dst );src/sna/sna_video.h +20
-0@@ -39,6 +39,7 @@ THE USE OR OTHER DEALINGS IN THE SOFTWARE.#define FOURCC_RGB565 ((16 << 24) + ('B' << 16) + ('G' << 8) + 'R')#define FOURCC_RGB888 ((24 << 24) + ('B' << 16) + ('G' << 8) + 'R')#define FOURCC_NV12 (('2' << 24) + ('1' << 16) + ('V' << 8) + 'N') +#define FOURCC_AYUV (('V' << 24) + ('U' << 16) + ('Y' << 8) + 'A')/* * Below, a dummy picture type that is used in XvPutImage @@ -79,6 +80,15 @@ THE USE OR OTHER DEALINGS IN THE SOFTWARE. XvTopToBottom \ } +#define XVIMAGE_AYUV { \ + FOURCC_AYUV, XvYUV, LSBFirst, \ + {'A', 'Y', 'U', 'V', 0x00, 0x00, 0x00, 0x10, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71}, \ + 32, XvPacked, 1, 0, 0, 0, 0, 8, 8, 8, 1, 1, 1, 1, 1, 1, \ + {'A', '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}, \ + XvTopToBottom \ +} + +struct sna_video {struct sna *sna;@@ -189,6 +199,16 @@ static inline int is_nv12_fourcc(int id) } } +static inline int is_ayuv_fourcc (int id) +{ +switch (id) { +case FOURCC_AYUV : +return 1 ; +default : +return 0 ; + } +} + bool sna_video_clip_helper(struct sna_video *video, struct sna_video_frame *frame,src/sna/sna_video_sprite.c +17
-3@@ -47,7 +47,7 @@#define DRM_FORMAT_YUYV fourcc_code('Y', 'U', 'Y', 'V')/* [31:0] Cr0:Y1:Cb0:Y0 8:8:8:8 little endian */ #define DRM_FORMAT_UYVY fourcc_code('U', 'Y', 'V', 'Y')/* [31:0] Y1:Cr0:Y0:Cb0 8:8:8:8 little endian */ #define DRM_FORMAT_NV12 fourcc_code('N', 'V', '1', '2')/* 2x2 subsampled Cr:Cb plane */ - +#define DRM_FORMAT_XYUV8888 fourcc_code('X', 'Y', 'U', 'V')/* [31:0] x:Y:U:V 8:8:8:8 little endian */ #define has_hw_scaling (sna, video) ((sna)->kgem.gen < 071 || \ (sna)->kgem.gen >= 0110)@@ -79,6 +79,8 @@ static const XvImageRec images_rgb565[] = { XVIMAGE_YUY2, XVIMAGE_UYVY, XVMC_RGB888, XVMC_RGB565 };static const XvImageRec images_nv12[] = {XVIMAGE_YUY2 ,XVIMAGE_UYVY ,XVIMAGE_NV12 ,XVMC_RGB888 ,XVMC_RGB565 }; +static const XvImageRec images_ayuv[] = {XVIMAGE_AYUV ,XVIMAGE_YUY2 ,XVIMAGE_UYVY , +XVIMAGE_NV12 ,XVMC_RGB888 ,XVMC_RGB565 };static const XvAttributeRec attribs[] = { { XvSettable | XvGettable,0 ,1 , (char *)"XV_COLORSPACE" },/* BT.601, BT.709 */ { XvSettable | XvGettable,0 ,0xffffff , (char *)"XV_COLORKEY" },@@ -364,6 +366,10 @@ sna_video_sprite_show(struct sna *sna,case FOURCC_UYVY : f.pixel_format =DRM_FORMAT_UYVY ;break ; +case FOURCC_AYUV : +/* i915 doesn't support alpha, so we use XYUV */ + f.pixel_format =DRM_FORMAT_XYUV8888 ; +break ;case FOURCC_YUY2 :default : f.pixel_format =DRM_FORMAT_YUYV ;@@ -705,7 +711,12 @@ static int sna_video_sprite_query(ddQueryImageAttributes_ARGS) tmp *= (*h >>1 ); size += tmp;break ; - +case FOURCC_AYUV : + tmp = *w <<2 ; +if (pitches) + pitches[0 ] = tmp; + size = *h * tmp; +break ;default : *w = (*w +1 ) & ~1 ; *h = (*h +1 ) & ~1 ;@@ -805,7 +816,10 @@ void sna_video_sprite_setup(struct sna *sna, ScreenPtr screen) adaptor->nAttributes =ARRAY_SIZE (attribs); adaptor->pAttributes = (XvAttributeRec *)attribs; -if (sna_has_sprite_format (sna,DRM_FORMAT_NV12 )) { +if (sna_has_sprite_format (sna,DRM_FORMAT_XYUV8888 )) { + adaptor->pImages = (XvImageRec *)images_ayuv; + adaptor->nImages =ARRAY_SIZE (images_ayuv); + }else if (sna_has_sprite_format (sna,DRM_FORMAT_NV12 )) { adaptor->pImages = (XvImageRec *)images_nv12; adaptor->nImages =ARRAY_SIZE (images_nv12); }else if (sna_has_sprite_format (sna,DRM_FORMAT_RGB565 )) {src/sna/sna_video_textured.c +7
-0@@ -68,6 +68,7 @@ static const XvImageRec gen4_Images[] = {XVIMAGE_I420 ,XVIMAGE_NV12 ,XVIMAGE_UYVY , +XVIMAGE_AYUV , XVMC_YUV, };@@ -337,6 +338,12 @@ sna_video_textured_query(ddQueryImageAttributes_ARGS) pitches[0 ] = size; size *= *h;break ; +case FOURCC_AYUV : + size = *w <<2 ; +if (pitches) + pitches[0 ] = size; + size *= *h; +break ;case FOURCC_XVMC : *h = (*h +1 ) & ~1 ; size =sizeof (uint32_t );Signature · 6 lines
2.17.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 6 lines
Ville Syrjälä Intel _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 307 lines · Ville Syrjälä
Quoted 306 lines · Stanislav Lisovskiy
v2: Renamed
DRM_FORMAT_XYUVtoDRM_FORMAT_XYUV8888.
Added comment about AYUV byte ordering in Gstreamer.v3: Removed
sna_composite_opflags related change to the separate patch.v4: Fixed review comments, done code refactoring
v5: Fixed following review comments:
- Fixed comment in shader code for ayuv kernel.
- Fixed naming to VIDEO_AYUV_BT601/BT709 for ayuv kernels.
- Removed duplicategen9_kernelparameter, left from previous
patches
- Added colorspace handling for new AYUV kernel
- Fixed naming ofsna_copy_packed_data_ayuvtosna_copy_ayuv_data
- Started using standardbswap_32function for byte swapping insna_copy_ayuv_data
- Removed redundant code insna_copy_ayuv_dataso that it looks
more neat
- FixedXVIMAGE_AYUVstructure initialization to contain proper
byte sequence for GST
- Fixed bogus comment about subsampling forDRM_FORMAT_XYUV8888
- Fixed AYUV advertisement for all platforms
- Removed unnecessary RGB888 declaration.v6:
- Fixed surface format not to use alpha as supposed
- Now doing byte swapping always during copy
- Changed hack, required for GST to work to be at one place
- Fixed invalid sampling values forXVIMAGE_AYUV
- Fixed sprite format checking order andimages_ayuv
definition.Signed-off-by Stanislav Lisovskiy <[email protected]>--- src/render_program/Makefile.am | 2 + .../exa_wm_src_sample_argb_ayuv.g8a | 76 ++++++++++++++++ .../exa_wm_src_sample_argb_ayuv.g8b | 8 ++ src/sna/gen9_render.c | 24 ++++- src/sna/sna_render.h | 3 + src/sna/sna_video.c | 89 ++++++++++++++++++- src/sna/sna_video.h | 20 +++++ src/sna/sna_video_sprite.c | 20 ++++- src/sna/sna_video_textured.c | 7 ++ 9 files changed, 244 insertions(+), 5 deletions(-) create mode 100644 src/render_program/exa_wm_src_sample_argb_ayuv.g8a create mode 100644src/render_program/exa_wm_src_sample_argb_ayuv.g8b
src/render_program/Makefile.am +2
-0@@ -196,6 +196,7 @@ INTEL_G7B = \ INTEL_G8A = \ exa_wm_src_affine.g8a \ exa_wm_src_sample_argb.g8a \ + exa_wm_src_sample_argb_ayuv.g8a \ exa_wm_src_sample_nv12.g8a \ exa_wm_src_sample_planar.g8a \ exa_wm_write.g8a \@@ -205,6 +206,7 @@ INTEL_G8A = \ INTEL_G8B = \ exa_wm_src_affine.g8b \ + exa_wm_src_sample_argb_ayuv.g8b \ exa_wm_src_sample_argb.g8b \ exa_wm_src_sample_nv12.g8b \ exa_wm_src_sample_planar.g8b \src/render_program/exa_wm_src_sample_argb_ayuv.g8a new file +4
-0@@ -0,0 +1,76 @@ +/* + * Copyright © 2006 Intel Corporation + * + * Permission is hereby granted, free of charge, to any personobtaining 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, sublicense,
+ * 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 NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS 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.
+ *
+ * Authors:
+ * Wang Zhenyu <[email protected]>
+ * Keith Packard <[email protected]>
+ */src/render_program/exa_wm_src_sample_argb_ayuv.g8a new file +12
-0+ +/* Sample the src surface */ + +include(`exa_wm.g4i') + +undefine(`src_msg') +undefine(`src_msg_ind') + +define(`src_msg', `g65') +define(`src_msg_ind', `65') + +/* prepare sampler read back gX register, which would be writtenback to output */
src/render_program/exa_wm_src_sample_argb_ayuv.g8a new file +7
-0+ +/* use simd16 sampler, param 0 is u, param 1 is v. */ +/* 'payload' loading, assuming tex coord start from g4 */ + +/* load argb */ +mov (1) g0.8<1>UD 0x00000000UD { align1 mask_disable }; +mov (8) src_msg<1>UD g0<8,8,1>UD { align1 }; /* copy to msg startreg*/
src/render_program/exa_wm_src_sample_argb_ayuv.g8a new file +7
-0+ +/* src_msg will be copied with g0, as it contains send desc */ +/* emit sampler 'send' cmd */ +send (16) src_msg_ind /* msg reg index */ + src_sample_base<1>UW /* readback */ + null + sampler (1,0,F) /* sampler message description,(binding_table,sampler_index,datatype)
src/render_program/exa_wm_src_sample_argb_ayuv.g8a new file +1
-0+ /* here(src->dst) we should use
src_samplerandsrc_surface*/src/render_program/exa_wm_src_sample_argb_ayuv.g8a new file +1
-0+ mlen 5 rlen 8 { align1 }; /* required message len 5,readback len 8 */
src/render_program/exa_wm_src_sample_argb_ayuv.g8a new file +22
-0+ +/* + * Have to change bytes order, because the only + * player which supports AYUV format currently is + * Gstreamer and it supports in bad way, even though + * spec says MSB:AYUV, we get the bytes opposite way. + * We swap bytes both for sprite and texture modes during copy. + * So here we get argb which then becomes 1bgr. + */ +mov (16) src_sample_a<1>UD src_sample_b<1>UD { align1 }; +mov (16) src_sample_b<1>UD src_sample_g<1>UD { align1 }; +mov (16) src_sample_g<1>UD src_sample_r<1>UD { align1 }; +mov (16) src_sample_r<1>UD src_sample_a<1>UD { align1 }; +mov (16) src_sample_a<1>F 1.0F; + + + + + + + +src/render_program/exa_wm_src_sample_argb_ayuv.g8b new file +8
-0@@ -0,0 +1,8 @@ + { 0x00000001, 0x2008060c, 0x00000000, 0x00000000 }, + { 0x00600001, 0x28200208, 0x008d0000, 0x00000000 }, + { 0x02800031, 0x21c00a48, 0x06000820, 0x0a8c0001 }, + { 0x00800001, 0x22800208, 0x00200240, 0x00000000 }, + { 0x00800001, 0x22400208, 0x00200200, 0x00000000 }, + { 0x00800001, 0x22000208, 0x002001c0, 0x00000000 }, + { 0x00800001, 0x21c00208, 0x00200280, 0x00000000 }, + { 0x00800001, 0x22803ee8, 0x38000000, 0x3f800000 },src/sna/gen9_render.c +14
-0@@ -129,6 +129,20 @@ static const uint32_t ps_kernel_planar_bt709[][4] = {#include "exa_wm_write.g8b" }; +static const uint32_t ps_kernel_ayuv_bt601[][4 ] = { +#include "exa_wm_src_affine.g8b" +#include "exa_wm_src_sample_argb_ayuv.g8b" +#include "exa_wm_yuv_rgb_bt601.g8b" +#include "exa_wm_write.g8b" +}; + +static const uint32_t ps_kernel_ayuv_bt709[][4 ] = { +#include "exa_wm_src_affine.g8b" +#include "exa_wm_src_sample_argb_ayuv.g8b" +#include "exa_wm_yuv_rgb_bt709.g8b" +#include "exa_wm_write.g6b" +}; +static const uint32_t ps_kernel_nv12_bt709[][4 ] = { #include "exa_wm_src_affine.g8b"#include "exa_wm_src_sample_nv12.g8b"
src/sna/gen9_render.c +2
-1@@ -177,6 +191,8 @@ static const struct wm_kernel_info {KERNEL (VIDEO_PLANAR_BT709 , ps_kernel_planar_bt709,7 ),KERNEL (VIDEO_NV12_BT709 , ps_kernel_nv12_bt709,7 ),KERNEL (VIDEO_PACKED_BT709 , ps_kernel_packed_bt709,2 ), +KERNEL (VIDEO_AYUV_BT601 , ps_kernel_ayuv_bt601,2 ), +KERNEL (VIDEO_AYUV_BT709 , ps_kernel_ayuv_bt709,2 ), KERNEL(VIDEO_RGB, ps_kernel_rgb, 2), #endif };@@ -2552,7 +2568,6 @@ gen9_render_composite(struct sna *sna, tmp- >mask.bo != NULL, tmp- >has_component_alpha, tmp- >is_affine); -src/sna/gen9_render.c +2
-0tmp->blt = gen9_render_composite_blt; tmp->box = gen9_render_composite_box; tmp->boxes = gen9_render_composite_boxes__blt;@@ -3853,6 +3868,8 @@ static void gen9_emit_video_state(struct sna *sna, src_surf_format[0 ] =SURFACEFORMAT_B8G8R8X8_UNORM ; else if (frame->id == FOURCC_UYVY) src_surf_format[0 ] =SURFACEFORMAT_YCRCB_SWAPY ; + else if (is_ayuv_fourcc(frame->id)) + src_surf_format[0] =
SURFACEFORMAT_B8G8R8X8_UNORM;src/sna/gen9_render.c +0
-0else src_surf_format[0] =
SURFACEFORMAT_YCRCB_NORMAL;src/sna/gen9_render.c +5
-0@@ -3903,6 +3920,11 @@ static unsigned select_video_kernel(conststruct sna_video *video, case FOURCC_RGB565: return GEN9_WM_KERNEL_VIDEO_RGB; +case FOURCC_AYUV : +return video->colorspace ? +GEN9_WM_KERNEL_VIDEO_AYUV_BT709 : +GEN9_WM_KERNEL_VIDEO_AYUV_BT601 ; +default : return video->colorspace ?src/sna/gen9_render.c +0
-0GEN9_WM_KERNEL_VIDEO_PACKED_BT709 :src/sna/sna_render.h +3
-0@@ -617,6 +617,9 @@ enum {GEN9_WM_KERNEL_VIDEO_NV12_BT709 ,GEN9_WM_KERNEL_VIDEO_PACKED_BT709 , +GEN9_WM_KERNEL_VIDEO_AYUV_BT601 , +GEN9_WM_KERNEL_VIDEO_AYUV_BT709 , +GEN9_WM_KERNEL_VIDEO_RGB , GEN9_WM_KERNEL_COUNT };src/sna/sna_video.c +2
-0@@ -59,6 +59,7 @@#include "intel_options.h" #include <xf86xv.h> +#include <byteswap.h> #ifdef SNA_XVMC #define _SNA_XVMC_SERVER_@@ -281,6 +282,7 @@ sna_video_frame_set_rotation(struct sna_video *video, }else {switch (frame->id) {case FOURCC_RGB888 : +case FOURCC_AYUV :if (rotation & (RR_Rotate_90 | RR_Rotate_270)) {frame->pitch[0] = ALIGN((height <<
2), align);
frame->size= (int)frame->pitch[0]
* width;src/sna/sna_video.c +0
-0@@ -584,6 +586,89 @@ sna_copy_packed_data(struct sna_video *video, } }
Quoted 8 lines
src/sna/sna_video.c sna_copy_packed_data(struct sna_video *video, · line 594
Quoted 6 lines
src/sna/sna_video.c +6
-0+static void +sna_copy_ayuv_data (struct sna_video *video, +const struct sna_video_frame *frame, +const uint8_t *buf, +uint8_t *dst, +bool reverse_bytes)Why this parameter? It's always true no?
Yes, it is currently always true. I just thought we might want to have a way to manipulate this byte order thing if some other player except Gstreamer is used and it has a correct order.
Quoted 56 lines
Quoted 33 lines
src/sna/sna_video.c +29
-0+{ +int pitch = frame->width <<2 ; +const uint8_t *src, *s; +const uint32_t *src_dw; +uint32_t *dst_dw = (uint32_t *)dst; +int x, y, w, h; +int i, j; +uint32_t dw; + +if (video->textured) { +/* XXX support copying cropped extents */ + x = y =0 ; + w = frame->width; + h = frame->height; + }else { + x = frame->image.x1; + y = frame->image.y1; + w = frame->image.x2 - frame->image.x1; + h = frame->image.y2 - frame->image.y1; + } + + src = buf + (y * pitch) + (x <<2 ); + src_dw = (uint32_t *)src; + +if (reverse_bytes) { +/* +* Have to reverse bytes order, because the only +* player which supports AYUV format currently is +* Gstreamer and it supports in bad way, even though
src/sna/sna_video.c +1
-0+* spec says MSB:AYUV, we get the bytes opposite way.
src/sna/sna_video.c sna_copy_packed_data(struct sna_video *video, · line 634
Quoted 10 lines
src/sna/sna_video.c +10
-0+*/ +for (i =0 ; i < h; i++) { +for (j =0 ; j < w; j++) { +uint32_t reverse_dw; + dw = src_dw[i * w + j]; + reverse_dw =bswap_32 (dw); + dst_dw[i * w + j] = reverse_dw; + } + } + }Two loops through the data isn't quite what I was thinking.
src/sna/sna_video.c sna_copy_packed_data(struct sna_video *video, · line 641
Quoted 7 lines
src/sna/sna_video.c +7
-0+ +switch (frame->rotation) { +case RR_Rotate_0: +for (i =0 ; i < h; i++) { +for (j =0 ; j < w; j++) { + dw = dst_dw[i * w + j]; + dst_dw[i * w + j] = dw;What I had in mind was just
Quoted 3 lines
dst_dw[..] =
bswap_32(src_dw[...]);here.
I think this is how it was initially in previous revisions, in each of those case labels I was doing bswap in same loop.
I thought your idea was to put it somewhat separately :)
Should I then put it back so that this loop looks like this?
for (i = 0; i < h; i++) {
for (j = 0; j < w; j++) {
if (reverse_bytes)
dst_dw[i * w + j] = bswap_32(src_dw[i * w +j]);
else
dst_dw[i * w + j = src_dw[i * w + j];
}
}However if I remove reverse_bytes parameter from here - we will anyway need to do something once some other player will appear to have a correct AYUV byte order or we'll have only Gst properly playing video with this format.
Quoted 218 lines
Quoted 216 lines
src/sna/sna_video.c +16
-0+ } + } +break ; +case RR_Rotate_90: +for (i =0 ; i < h; i++) { +for (j =0 ; j < w; j++) { + dw = dst_dw[i * w + j]; + dst_dw[(w - j -1 ) * h + i] = dw; + } + } +break ; +case RR_Rotate_180: +for (i =0 ; i < h; i++) { +for (j =0 ; j < w; j++) { + dw = dst_dw[i * w + j]; + dst_dw[(h - i - 1) * w + w - j -1] = dw;
src/sna/sna_video.c +14
-0+ } + } +break ; +case RR_Rotate_270: +for (i =0 ; i < h; i++) { +for (j =0 ; j < w; j++) { + dw = dst_dw[i * w + j];; + dst_dw[(w - j -1 ) * h + i] = dw; + } + } +break ; + } +} + bool sna_video_copy_data(struct sna_video *video, struct sna_video_frame *frame,@@ -604,7 +689,7 @@ sna_video_copy_data(struct sna_video *video,assert (frame->size);/* In the common case, we can simply the upload in a single pwrite */
src/sna/sna_video.c +1
-1-if (frame->rotation == RR_Rotate_0 && !video->tiled) { + if (frame->rotation == RR_Rotate_0 && !video->tiled &&!is_ayuv_fourcc(frame->id)) {
DBG(("%s: unrotated, untiled fast paths: is-
planar?=%d\n",src/sna/sna_video.c +0
-0__FUNCTION__, is_planar_fourcc(frame->id)));if (is_nv12_fourcc (frame->id)) {@@ -709,6 +794,8 @@ use_gtt: /* copy data, must use GTT so that wekeep the overlay uncached */
src/sna/sna_video.c +2
-0sna_copy_nv12_data (video, frame, buf, dst); else if (is_planar_fourcc(frame->id)) sna_copy_planar_data(video, frame, buf, dst); + else if (is_ayuv_fourcc(frame->id)) + sna_copy_ayuv_data(video, frame, buf, dst, true); elsesna_copy_packed_data (video ,frame ,buf ,dst );src/sna/sna_video.h +1
-0@@ -39,6 +39,7 @@ THE USE OR OTHER DEALINGS IN THE SOFTWARE.#define FOURCC_RGB565 ((16 << 24) + ('B' << 16) + ('G' << 8) + 'R')#define FOURCC_RGB888 ((24 << 24) + ('B' << 16) + ('G' << 8) + 'R')#define FOURCC_NV12 (('2' << 24) + ('1' << 16) + ('V' << 8) + 'N') +#define FOURCC_AYUV (('V' << 24) + ('U' << 16) + ('Y' << 8) + 'A')/*
* Below, a dummy picture type that is used in XvPutImagesrc/sna/sna_video.h +9
-0@@ -79,6 +80,15 @@ THE USE OR OTHER DEALINGS IN THE SOFTWARE. XvTopToBottom \ } +#define XVIMAGE_AYUV { \ + FOURCC_AYUV, XvYUV, LSBFirst, \ + {'A', 'Y', 'U', 'V', 0x00, 0x00, 0x00, 0x10, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71}, \ +32 , XvPacked,1 ,0 ,0 ,0 ,0 ,8 ,8 ,8 ,1 ,1 ,1 ,1 ,1 ,1 , \ + {'A', '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}, \ + XvTopToBottom \ +} + + struct sna_video {src/sna/sna_video.h +10
-0struct sna *sna;@@ -189,6 +199,16 @@ static inline int is_nv12_fourcc(int id) } } +static inline int is_ayuv_fourcc (int id) +{ +switch (id) { +case FOURCC_AYUV : +return 1 ; +default : +return 0 ; + } +} + bool sna_video_clip_helper(struct sna_video *video, struct sna_video_frame *frame,src/sna/sna_video_sprite.c +0
-0@@ -47,7 +47,7 @@#define DRM_FORMAT_YUYV fourcc_code('Y', 'U', 'Y', 'V')/* [31:0] Cr0:Y1:Cb0:Y0 8:8:8:8 little endian */
#defineDRM_FORMAT_UYVYfourcc_code('U', 'Y', 'V', 'Y')/*
[31:0] Y1:Cr0:Y0:Cb0 8:8:8:8 little endian */
#defineDRM_FORMAT_NV12fourcc_code('N', 'V', '1', '2')/*
2x2 subsampled Cr:Cb plane */src/sna/sna_video_sprite.c +1
-1- +#define DRM_FORMAT_XYUV8888 fourcc_code('X', 'Y', 'U', 'V')/* [31:0] x:Y:U:V 8:8:8:8 little endian */
#definehas_hw_scaling(sna, video)((sna)->kgem.gen < 071 || \src/sna/sna_video_sprite.c +0
-0(sna)->kgem.gen >= 0110)@@ -79,6 +79,8 @@ static const XvImageRec images_rgb565[] = {XVIMAGE_YUY2 ,XVIMAGE_UYVY ,XVMC_RGB888 , XVMC_RGB565 };static const XvImageRec images_nv12[] = {XVIMAGE_YUY2 ,XVIMAGE_UYVY , XVIMAGE_NV12,
XVMC_RGB888,XVMC_RGB565};
+static const XvImageRec images_ayuv[] = {XVIMAGE_AYUV,XVIMAGE_YUY2,XVIMAGE_UYVY,src/sna/sna_video_sprite.c +1
-0+ XVIMAGE_NV12,
XVMC_RGB888,XVMC_RGB565};
static const XvAttributeRec attribs[] = {
{ XvSettable | XvGettable, 0, 1, (char *)"XV_COLORSPACE"
}, /* BT.601, BT.709 */
{ XvSettable | XvGettable, 0,0xffffff, (char
*)"XV_COLORKEY" },src/sna/sna_video_sprite.c +2
-0@@ -364,6 +366,10 @@ sna_video_sprite_show(struct sna *sna,case FOURCC_UYVY : f.pixel_format =DRM_FORMAT_UYVY ;break ; +case FOURCC_AYUV : +/* i915 doesn't support alpha, so we use XYUV */
src/sna/sna_video_sprite.c +8
-1+ f.pixel_format =DRM_FORMAT_XYUV8888 ; +break ;case FOURCC_YUY2 :default : f.pixel_format =DRM_FORMAT_YUYV ;@@ -705,7 +711,12 @@ static intsna_video_sprite_query (ddQueryImageAttributes_ARGS) tmp *= (*h >> 1); size += tmp;break ; - +case FOURCC_AYUV : + tmp = *w <<2 ; +if (pitches) + pitches[0 ] = tmp; + size = *h * tmp; +break ;default : *w = (*w +1 ) & ~1 ;src/sna/sna_video_sprite.c +4
-1*h = (*h +1 ) & ~1 ;@@ -805,7 +816,10 @@ void sna_video_sprite_setup(struct sna *sna, ScreenPtr screen) adaptor->nAttributes = ARRAY_SIZE(attribs); adaptor->pAttributes = (XvAttributeRec *)attribs; -if (sna_has_sprite_format (sna,DRM_FORMAT_NV12 )) { +if (sna_has_sprite_format (sna,DRM_FORMAT_XYUV8888 )) { + adaptor->pImages = (XvImageRec *)images_ayuv; + adaptor->nImages =ARRAY_SIZE (images_ayuv); + }else if (sna_has_sprite_format (sna,DRM_FORMAT_NV12 )) { adaptor->pImages = (XvImageRec *)images_nv12; adaptor->nImages =ARRAY_SIZE (images_nv12);} else if (
sna_has_sprite_format(sna, DRM_FORMAT_RGB565))
{src/sna/sna_video_textured.c +7
-0@@ -68,6 +68,7 @@ static const XvImageRec gen4_Images[] = {XVIMAGE_I420 ,XVIMAGE_NV12 ,XVIMAGE_UYVY , +XVIMAGE_AYUV , XVMC_YUV, };@@ -337,6 +338,12 @@sna_video_textured_query (ddQueryImageAttributes_ARGS) pitches[0 ] = size; size *= *h;break ; +case FOURCC_AYUV : + size = *w <<2 ; +if (pitches) + pitches[0 ] = size; + size *= *h; +break ;case FOURCC_XVMC : *h = (*h +1 ) & ~1 ;size =
sizeof(uint32_t);Signature · 6 lines
2.17.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 7 lines
Best Regards, Lisovskiy Stanislav _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 317 lines · Stanislav
Quoted 307 lines · Ville Syrjälä
Quoted 306 lines · Stanislav Lisovskiy
v2: Renamed
DRM_FORMAT_XYUVtoDRM_FORMAT_XYUV8888.
Added comment about AYUV byte ordering in Gstreamer.v3: Removed
sna_composite_opflags related change to the separate patch.v4: Fixed review comments, done code refactoring
v5: Fixed following review comments:
- Fixed comment in shader code for ayuv kernel.
- Fixed naming to VIDEO_AYUV_BT601/BT709 for ayuv kernels.
- Removed duplicategen9_kernelparameter, left from previous
patches
- Added colorspace handling for new AYUV kernel
- Fixed naming ofsna_copy_packed_data_ayuvtosna_copy_ayuv_data
- Started using standardbswap_32function for byte swapping insna_copy_ayuv_data
- Removed redundant code insna_copy_ayuv_dataso that it looks
more neat
- FixedXVIMAGE_AYUVstructure initialization to contain proper
byte sequence for GST
- Fixed bogus comment about subsampling forDRM_FORMAT_XYUV8888
- Fixed AYUV advertisement for all platforms
- Removed unnecessary RGB888 declaration.v6:
- Fixed surface format not to use alpha as supposed
- Now doing byte swapping always during copy
- Changed hack, required for GST to work to be at one place
- Fixed invalid sampling values forXVIMAGE_AYUV
- Fixed sprite format checking order andimages_ayuv
definition.Signed-off-by Stanislav Lisovskiy <[email protected]>--- src/render_program/Makefile.am | 2 + .../exa_wm_src_sample_argb_ayuv.g8a | 76 ++++++++++++++++ .../exa_wm_src_sample_argb_ayuv.g8b | 8 ++ src/sna/gen9_render.c | 24 ++++- src/sna/sna_render.h | 3 + src/sna/sna_video.c | 89 ++++++++++++++++++- src/sna/sna_video.h | 20 +++++ src/sna/sna_video_sprite.c | 20 ++++- src/sna/sna_video_textured.c | 7 ++ 9 files changed, 244 insertions(+), 5 deletions(-) create mode 100644 src/render_program/exa_wm_src_sample_argb_ayuv.g8a create mode 100644src/render_program/exa_wm_src_sample_argb_ayuv.g8b
src/render_program/Makefile.am +2
-0@@ -196,6 +196,7 @@ INTEL_G7B = \ INTEL_G8A = \ exa_wm_src_affine.g8a \ exa_wm_src_sample_argb.g8a \ + exa_wm_src_sample_argb_ayuv.g8a \ exa_wm_src_sample_nv12.g8a \ exa_wm_src_sample_planar.g8a \ exa_wm_write.g8a \@@ -205,6 +206,7 @@ INTEL_G8A = \ INTEL_G8B = \ exa_wm_src_affine.g8b \ + exa_wm_src_sample_argb_ayuv.g8b \ exa_wm_src_sample_argb.g8b \ exa_wm_src_sample_nv12.g8b \ exa_wm_src_sample_planar.g8b \src/render_program/exa_wm_src_sample_argb_ayuv.g8a new file +4
-0@@ -0,0 +1,76 @@ +/* + * Copyright © 2006 Intel Corporation + * + * Permission is hereby granted, free of charge, to any personobtaining 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, sublicense,
+ * 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 NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS 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.
+ *
+ * Authors:
+ * Wang Zhenyu <[email protected]>
+ * Keith Packard <[email protected]>
+ */src/render_program/exa_wm_src_sample_argb_ayuv.g8a new file +12
-0+ +/* Sample the src surface */ + +include(`exa_wm.g4i') + +undefine(`src_msg') +undefine(`src_msg_ind') + +define(`src_msg', `g65') +define(`src_msg_ind', `65') + +/* prepare sampler read back gX register, which would be writtenback to output */
src/render_program/exa_wm_src_sample_argb_ayuv.g8a new file +7
-0+ +/* use simd16 sampler, param 0 is u, param 1 is v. */ +/* 'payload' loading, assuming tex coord start from g4 */ + +/* load argb */ +mov (1) g0.8<1>UD 0x00000000UD { align1 mask_disable }; +mov (8) src_msg<1>UD g0<8,8,1>UD { align1 }; /* copy to msg startreg*/
src/render_program/exa_wm_src_sample_argb_ayuv.g8a new file +7
-0+ +/* src_msg will be copied with g0, as it contains send desc */ +/* emit sampler 'send' cmd */ +send (16) src_msg_ind /* msg reg index */ + src_sample_base<1>UW /* readback */ + null + sampler (1,0,F) /* sampler message description,(binding_table,sampler_index,datatype)
src/render_program/exa_wm_src_sample_argb_ayuv.g8a new file +1
-0+ /* here(src->dst) we should use
src_samplerandsrc_surface*/src/render_program/exa_wm_src_sample_argb_ayuv.g8a new file +1
-0+ mlen 5 rlen 8 { align1 }; /* required message len 5,readback len 8 */
src/render_program/exa_wm_src_sample_argb_ayuv.g8a new file +22
-0+ +/* + * Have to change bytes order, because the only + * player which supports AYUV format currently is + * Gstreamer and it supports in bad way, even though + * spec says MSB:AYUV, we get the bytes opposite way. + * We swap bytes both for sprite and texture modes during copy. + * So here we get argb which then becomes 1bgr. + */ +mov (16) src_sample_a<1>UD src_sample_b<1>UD { align1 }; +mov (16) src_sample_b<1>UD src_sample_g<1>UD { align1 }; +mov (16) src_sample_g<1>UD src_sample_r<1>UD { align1 }; +mov (16) src_sample_r<1>UD src_sample_a<1>UD { align1 }; +mov (16) src_sample_a<1>F 1.0F; + + + + + + + +src/render_program/exa_wm_src_sample_argb_ayuv.g8b new file +8
-0@@ -0,0 +1,8 @@ + { 0x00000001, 0x2008060c, 0x00000000, 0x00000000 }, + { 0x00600001, 0x28200208, 0x008d0000, 0x00000000 }, + { 0x02800031, 0x21c00a48, 0x06000820, 0x0a8c0001 }, + { 0x00800001, 0x22800208, 0x00200240, 0x00000000 }, + { 0x00800001, 0x22400208, 0x00200200, 0x00000000 }, + { 0x00800001, 0x22000208, 0x002001c0, 0x00000000 }, + { 0x00800001, 0x21c00208, 0x00200280, 0x00000000 }, + { 0x00800001, 0x22803ee8, 0x38000000, 0x3f800000 },src/sna/gen9_render.c +14
-0@@ -129,6 +129,20 @@ static const uint32_t ps_kernel_planar_bt709[][4] = {#include "exa_wm_write.g8b" }; +static const uint32_t ps_kernel_ayuv_bt601[][4 ] = { +#include "exa_wm_src_affine.g8b" +#include "exa_wm_src_sample_argb_ayuv.g8b" +#include "exa_wm_yuv_rgb_bt601.g8b" +#include "exa_wm_write.g8b" +}; + +static const uint32_t ps_kernel_ayuv_bt709[][4 ] = { +#include "exa_wm_src_affine.g8b" +#include "exa_wm_src_sample_argb_ayuv.g8b" +#include "exa_wm_yuv_rgb_bt709.g8b" +#include "exa_wm_write.g6b" +}; +static const uint32_t ps_kernel_nv12_bt709[][4 ] = { #include "exa_wm_src_affine.g8b"#include "exa_wm_src_sample_nv12.g8b"
src/sna/gen9_render.c +2
-1@@ -177,6 +191,8 @@ static const struct wm_kernel_info {KERNEL (VIDEO_PLANAR_BT709 , ps_kernel_planar_bt709,7 ),KERNEL (VIDEO_NV12_BT709 , ps_kernel_nv12_bt709,7 ),KERNEL (VIDEO_PACKED_BT709 , ps_kernel_packed_bt709,2 ), +KERNEL (VIDEO_AYUV_BT601 , ps_kernel_ayuv_bt601,2 ), +KERNEL (VIDEO_AYUV_BT709 , ps_kernel_ayuv_bt709,2 ), KERNEL(VIDEO_RGB, ps_kernel_rgb, 2), #endif };@@ -2552,7 +2568,6 @@ gen9_render_composite(struct sna *sna, tmp- >mask.bo != NULL, tmp- >has_component_alpha, tmp- >is_affine); -src/sna/gen9_render.c +2
-0tmp->blt = gen9_render_composite_blt; tmp->box = gen9_render_composite_box; tmp->boxes = gen9_render_composite_boxes__blt;@@ -3853,6 +3868,8 @@ static void gen9_emit_video_state(struct sna *sna, src_surf_format[0 ] =SURFACEFORMAT_B8G8R8X8_UNORM ; else if (frame->id == FOURCC_UYVY) src_surf_format[0 ] =SURFACEFORMAT_YCRCB_SWAPY ; + else if (is_ayuv_fourcc(frame->id)) + src_surf_format[0] =
SURFACEFORMAT_B8G8R8X8_UNORM;src/sna/gen9_render.c +0
-0else src_surf_format[0] =
SURFACEFORMAT_YCRCB_NORMAL;src/sna/gen9_render.c +5
-0@@ -3903,6 +3920,11 @@ static unsigned select_video_kernel(conststruct sna_video *video, case FOURCC_RGB565: return GEN9_WM_KERNEL_VIDEO_RGB; +case FOURCC_AYUV : +return video->colorspace ? +GEN9_WM_KERNEL_VIDEO_AYUV_BT709 : +GEN9_WM_KERNEL_VIDEO_AYUV_BT601 ; +default : return video->colorspace ?src/sna/gen9_render.c +0
-0GEN9_WM_KERNEL_VIDEO_PACKED_BT709 :src/sna/sna_render.h +3
-0@@ -617,6 +617,9 @@ enum {GEN9_WM_KERNEL_VIDEO_NV12_BT709 ,GEN9_WM_KERNEL_VIDEO_PACKED_BT709 , +GEN9_WM_KERNEL_VIDEO_AYUV_BT601 , +GEN9_WM_KERNEL_VIDEO_AYUV_BT709 , +GEN9_WM_KERNEL_VIDEO_RGB , GEN9_WM_KERNEL_COUNT };src/sna/sna_video.c +2
-0@@ -59,6 +59,7 @@#include "intel_options.h" #include <xf86xv.h> +#include <byteswap.h> #ifdef SNA_XVMC #define _SNA_XVMC_SERVER_@@ -281,6 +282,7 @@ sna_video_frame_set_rotation(struct sna_video *video, }else {switch (frame->id) {case FOURCC_RGB888 : +case FOURCC_AYUV :if (rotation & (RR_Rotate_90 | RR_Rotate_270)) {frame->pitch[0] = ALIGN((height <<
2), align);
frame->size= (int)frame->pitch[0]
* width;src/sna/sna_video.c +0
-0@@ -584,6 +586,89 @@ sna_copy_packed_data(struct sna_video *video, } }Quoted 8 lines
src/sna/sna_video.c sna_copy_packed_data(struct sna_video *video, · line 594
Quoted 6 lines
src/sna/sna_video.c +6
-0+static void +sna_copy_ayuv_data (struct sna_video *video, +const struct sna_video_frame *frame, +const uint8_t *buf, +uint8_t *dst, +bool reverse_bytes)Why this parameter? It's always true no?
Quoted 3 lines
Yes, it is currently always true. I just thought we might want to have a way to manipulate this byte order thing if some other player except Gstreamer is used and it has a correct order.
If that happens it's easy enough to provide a second copy routine.
Quoted 65 lines
Quoted 57 lines
Quoted 34 lines
src/sna/sna_video.c +29
-0+{ +int pitch = frame->width <<2 ; +const uint8_t *src, *s; +const uint32_t *src_dw; +uint32_t *dst_dw = (uint32_t *)dst; +int x, y, w, h; +int i, j; +uint32_t dw; + +if (video->textured) { +/* XXX support copying cropped extents */ + x = y =0 ; + w = frame->width; + h = frame->height; + }else { + x = frame->image.x1; + y = frame->image.y1; + w = frame->image.x2 - frame->image.x1; + h = frame->image.y2 - frame->image.y1; + } + + src = buf + (y * pitch) + (x <<2 ); + src_dw = (uint32_t *)src; + +if (reverse_bytes) { +/* +* Have to reverse bytes order, because the only +* player which supports AYUV format currently is +* Gstreamer and it supports in bad way, even though
src/sna/sna_video.c +1
-0+* spec says MSB:AYUV, we get the bytes opposite way.
src/sna/sna_video.c sna_copy_packed_data(struct sna_video *video, · line 634
Quoted 10 lines
src/sna/sna_video.c +10
-0+*/ +for (i =0 ; i < h; i++) { +for (j =0 ; j < w; j++) { +uint32_t reverse_dw; + dw = src_dw[i * w + j]; + reverse_dw =bswap_32 (dw); + dst_dw[i * w + j] = reverse_dw; + } + } + }Two loops through the data isn't quite what I was thinking.
src/sna/sna_video.c sna_copy_packed_data(struct sna_video *video, · line 641
Quoted 7 lines
src/sna/sna_video.c +7
-0+ +switch (frame->rotation) { +case RR_Rotate_0: +for (i =0 ; i < h; i++) { +for (j =0 ; j < w; j++) { + dw = dst_dw[i * w + j]; + dst_dw[i * w + j] = dw;What I had in mind was just
Quoted 3 lines
dst_dw[..] =
bswap_32(src_dw[...]);here.
I think this is how it was initially in previous revisions, in each of those case labels I was doing bswap in same loop.
I thought your idea was to put it somewhat separately :)
Quoted 8 lines
Should I then put it back so that this loop looks like this?
for (i = 0; i < h; i++) { for (j = 0; j < w; j++) { if (reverse_bytes) dst_dw[i * w + j] = bswap_32(src_dw[i * w +j]); else dst_dw[i * w + j = src_dw[i * w + j];
No. I don't think we want the extra branch here. Just swap unconditionally.
Quoted 230 lines
} }However if I remove
reverse_bytesparameter from here - we will anyway need to do something once some other player will appear to have a correct AYUV byte order or we'll have only Gst properly playing video with this format.Quoted 218 lines
Quoted 216 lines
src/sna/sna_video.c +16
-0+ } + } +break ; +case RR_Rotate_90: +for (i =0 ; i < h; i++) { +for (j =0 ; j < w; j++) { + dw = dst_dw[i * w + j]; + dst_dw[(w - j -1 ) * h + i] = dw; + } + } +break ; +case RR_Rotate_180: +for (i =0 ; i < h; i++) { +for (j =0 ; j < w; j++) { + dw = dst_dw[i * w + j]; + dst_dw[(h - i - 1) * w + w - j -1] = dw;
src/sna/sna_video.c +14
-0+ } + } +break ; +case RR_Rotate_270: +for (i =0 ; i < h; i++) { +for (j =0 ; j < w; j++) { + dw = dst_dw[i * w + j];; + dst_dw[(w - j -1 ) * h + i] = dw; + } + } +break ; + } +} + bool sna_video_copy_data(struct sna_video *video, struct sna_video_frame *frame,@@ -604,7 +689,7 @@ sna_video_copy_data(struct sna_video *video,assert (frame->size);/* In the common case, we can simply the upload in a single pwrite */
src/sna/sna_video.c +1
-1-if (frame->rotation == RR_Rotate_0 && !video->tiled) { + if (frame->rotation == RR_Rotate_0 && !video->tiled &&!is_ayuv_fourcc(frame->id)) {
DBG(("%s: unrotated, untiled fast paths: is-
planar?=%d\n",src/sna/sna_video.c +0
-0__FUNCTION__, is_planar_fourcc(frame->id)));if (is_nv12_fourcc (frame->id)) {@@ -709,6 +794,8 @@ use_gtt: /* copy data, must use GTT so that wekeep the overlay uncached */
src/sna/sna_video.c +2
-0sna_copy_nv12_data (video, frame, buf, dst); else if (is_planar_fourcc(frame->id)) sna_copy_planar_data(video, frame, buf, dst); + else if (is_ayuv_fourcc(frame->id)) + sna_copy_ayuv_data(video, frame, buf, dst, true); elsesna_copy_packed_data (video ,frame ,buf ,dst );src/sna/sna_video.h +1
-0@@ -39,6 +39,7 @@ THE USE OR OTHER DEALINGS IN THE SOFTWARE.#define FOURCC_RGB565 ((16 << 24) + ('B' << 16) + ('G' << 8) + 'R')#define FOURCC_RGB888 ((24 << 24) + ('B' << 16) + ('G' << 8) + 'R')#define FOURCC_NV12 (('2' << 24) + ('1' << 16) + ('V' << 8) + 'N') +#define FOURCC_AYUV (('V' << 24) + ('U' << 16) + ('Y' << 8) + 'A')/*
* Below, a dummy picture type that is used in XvPutImagesrc/sna/sna_video.h +9
-0@@ -79,6 +80,15 @@ THE USE OR OTHER DEALINGS IN THE SOFTWARE. XvTopToBottom \ } +#define XVIMAGE_AYUV { \ + FOURCC_AYUV, XvYUV, LSBFirst, \ + {'A', 'Y', 'U', 'V', 0x00, 0x00, 0x00, 0x10, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71}, \ +32 , XvPacked,1 ,0 ,0 ,0 ,0 ,8 ,8 ,8 ,1 ,1 ,1 ,1 ,1 ,1 , \ + {'A', '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}, \ + XvTopToBottom \ +} + + struct sna_video {src/sna/sna_video.h +10
-0struct sna *sna;@@ -189,6 +199,16 @@ static inline int is_nv12_fourcc(int id) } } +static inline int is_ayuv_fourcc (int id) +{ +switch (id) { +case FOURCC_AYUV : +return 1 ; +default : +return 0 ; + } +} + bool sna_video_clip_helper(struct sna_video *video, struct sna_video_frame *frame,src/sna/sna_video_sprite.c +0
-0@@ -47,7 +47,7 @@#define DRM_FORMAT_YUYV fourcc_code('Y', 'U', 'Y', 'V')/* [31:0] Cr0:Y1:Cb0:Y0 8:8:8:8 little endian */
#defineDRM_FORMAT_UYVYfourcc_code('U', 'Y', 'V', 'Y')/*
[31:0] Y1:Cr0:Y0:Cb0 8:8:8:8 little endian */
#defineDRM_FORMAT_NV12fourcc_code('N', 'V', '1', '2')/*
2x2 subsampled Cr:Cb plane */src/sna/sna_video_sprite.c +1
-1- +#define DRM_FORMAT_XYUV8888 fourcc_code('X', 'Y', 'U', 'V')/* [31:0] x:Y:U:V 8:8:8:8 little endian */
#definehas_hw_scaling(sna, video)((sna)->kgem.gen < 071 || \src/sna/sna_video_sprite.c +0
-0(sna)->kgem.gen >= 0110)@@ -79,6 +79,8 @@ static const XvImageRec images_rgb565[] = {XVIMAGE_YUY2 ,XVIMAGE_UYVY ,XVMC_RGB888 , XVMC_RGB565 };static const XvImageRec images_nv12[] = {XVIMAGE_YUY2 ,XVIMAGE_UYVY , XVIMAGE_NV12,
XVMC_RGB888,XVMC_RGB565};
+static const XvImageRec images_ayuv[] = {XVIMAGE_AYUV,XVIMAGE_YUY2,XVIMAGE_UYVY,src/sna/sna_video_sprite.c +1
-0+ XVIMAGE_NV12,
XVMC_RGB888,XVMC_RGB565};
static const XvAttributeRec attribs[] = {
{ XvSettable | XvGettable, 0, 1, (char *)"XV_COLORSPACE"
}, /* BT.601, BT.709 */
{ XvSettable | XvGettable, 0,0xffffff, (char
*)"XV_COLORKEY" },src/sna/sna_video_sprite.c +2
-0@@ -364,6 +366,10 @@ sna_video_sprite_show(struct sna *sna,case FOURCC_UYVY : f.pixel_format =DRM_FORMAT_UYVY ;break ; +case FOURCC_AYUV : +/* i915 doesn't support alpha, so we use XYUV */
src/sna/sna_video_sprite.c +8
-1+ f.pixel_format =DRM_FORMAT_XYUV8888 ; +break ;case FOURCC_YUY2 :default : f.pixel_format =DRM_FORMAT_YUYV ;@@ -705,7 +711,12 @@ static intsna_video_sprite_query (ddQueryImageAttributes_ARGS) tmp *= (*h >> 1); size += tmp;break ; - +case FOURCC_AYUV : + tmp = *w <<2 ; +if (pitches) + pitches[0 ] = tmp; + size = *h * tmp; +break ;default : *w = (*w +1 ) & ~1 ;src/sna/sna_video_sprite.c +4
-1*h = (*h +1 ) & ~1 ;@@ -805,7 +816,10 @@ void sna_video_sprite_setup(struct sna *sna, ScreenPtr screen) adaptor->nAttributes = ARRAY_SIZE(attribs); adaptor->pAttributes = (XvAttributeRec *)attribs; -if (sna_has_sprite_format (sna,DRM_FORMAT_NV12 )) { +if (sna_has_sprite_format (sna,DRM_FORMAT_XYUV8888 )) { + adaptor->pImages = (XvImageRec *)images_ayuv; + adaptor->nImages =ARRAY_SIZE (images_ayuv); + }else if (sna_has_sprite_format (sna,DRM_FORMAT_NV12 )) { adaptor->pImages = (XvImageRec *)images_nv12; adaptor->nImages =ARRAY_SIZE (images_nv12);} else if (
sna_has_sprite_format(sna, DRM_FORMAT_RGB565))
{src/sna/sna_video_textured.c +7
-0@@ -68,6 +68,7 @@ static const XvImageRec gen4_Images[] = {XVIMAGE_I420 ,XVIMAGE_NV12 ,XVIMAGE_UYVY , +XVIMAGE_AYUV , XVMC_YUV, };@@ -337,6 +338,12 @@sna_video_textured_query (ddQueryImageAttributes_ARGS) pitches[0 ] = size; size *= *h;break ; +case FOURCC_AYUV : + size = *w <<2 ; +if (pitches) + pitches[0 ] = size; + size *= *h; +break ;case FOURCC_XVMC : *h = (*h +1 ) & ~1 ;size =
sizeof(uint32_t);Signature · 6 lines
2.17.1 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfxSignature · 3 lines
Best Regards, Lisovskiy Stanislav
Signature · 17 lines
Ville Syrjälä Intel --------------------------------------------------------------------- Intel Finland Oy Registered Address: PL 281, 00181 Helsinki Business Identity Code: 0357606 - 4 Domiciled in Helsinki This e-mail and any attachments may contain confidential material for the sole use of the intended recipient(s). Any review or distribution by others is strictly prohibited. If you are not the intended recipient, please contact the sender and delete all copies. _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx