Re: [Libva] [PATCH] V3: Add 422H support.

2014-03-23 Thread Zhao Yakui
On Sun, 2014-03-23 at 21:28 -0600, Xiang, Haihao wrote:
> No. Please rebase it against the latest branch.
> 
> s/VA_FOURCC(x, x, x, x)/VA_FOURCC_

Thanks for the info.

OK. I already help to handle it manually before pushing it.

Thanks.
Yakui
> 
> Thanks
> Haihao
> 
> 
> > On Sun, 2014-03-23 at 20:45 -0600, Wu, Zhiwen wrote:
> > > From: Alex wu 
> > > 
> > > Changes between V3 to V2:
> > > 1. Add 422H support into gen8_post_processing.c, according to
> > >yakui's comments.
> > > 
> > > changes between V2 and V1:
> > > 1. Rebase on staging branch.
> > > 2. Add 422H support for pp.
> > > 3. Reword the commit title.
> > 
> > LGTM.
> > 
> > This will be pushed.
> > 
> > Thanks
> > Yakui
> > 
> > > ---
> > >  src/gen8_post_processing.c |2 +-
> > >  src/i965_drv_video.c   |   13 +
> > >  src/i965_post_processing.c |2 +-
> > >  3 files changed, 15 insertions(+), 2 deletions(-)
> > > 
> > > diff --git a/src/gen8_post_processing.c b/src/gen8_post_processing.c
> > > index 6f3afe7..2e5b880 100644
> > > --- a/src/gen8_post_processing.c
> > > +++ b/src/gen8_post_processing.c
> > > @@ -566,7 +566,7 @@ gen8_pp_set_media_rw_message_surface(VADriverContextP 
> > > ctx, struct i965_post_proc
> > >  height[2] = obj_image->image.height / 2;
> > >  pitch[2] = obj_image->image.pitches[V];
> > >  offset[2] = obj_image->image.offsets[V];
> > > -if (fourcc == VA_FOURCC('Y', 'V', '1', '6')) {
> > > +if (fourcc == VA_FOURCC('Y', 'V', '1', '6') || fourcc == 
> > > VA_FOURCC('4', '2', '2', 'H')) {
> > >  width[1] = obj_image->image.width / 2;
> > >  height[1] = obj_image->image.height;
> > >  width[2] = obj_image->image.width / 2;
> > > diff --git a/src/i965_drv_video.c b/src/i965_drv_video.c
> > > index 67f93ef..8792660 100755
> > > --- a/src/i965_drv_video.c
> > > +++ b/src/i965_drv_video.c
> > > @@ -159,6 +159,8 @@ i965_image_formats_map[I965_MAX_IMAGE_FORMATS + 1] = {
> > >{ VA_FOURCC('Y','U','Y','2'), VA_LSB_FIRST, 16, } },
> > >  { I965_SURFACETYPE_YUV,
> > >{ VA_FOURCC('U','Y','V','Y'), VA_LSB_FIRST, 16, } },
> > > +{ I965_SURFACETYPE_YUV,
> > > +  { VA_FOURCC('4','2','2','H'), VA_LSB_FIRST, 16, } },
> > >  { I965_SURFACETYPE_RGBA,
> > >{ VA_FOURCC('R','G','B','X'), VA_LSB_FIRST, 32, 24, 0x00ff, 
> > > 0xff00, 0x00ff } },
> > >  { I965_SURFACETYPE_RGBA,
> > > @@ -2864,6 +2866,16 @@ i965_CreateImage(VADriverContextP ctx,
> > >  image->offsets[2] = size + size2;
> > >  image->data_size  = size + 2 * size2;
> > >  break;
> > > +case VA_FOURCC('4','2','2','H'):
> > > +image->num_planes = 3;
> > > +image->pitches[0] = awidth;
> > > +image->offsets[0] = 0;
> > > +image->pitches[1] = awidth / 2;
> > > +image->offsets[1] = size;
> > > +image->pitches[2] = awidth / 2;
> > > +image->offsets[2] = size + (awidth / 2) * aheight;
> > > +image->data_size  = size + 2 * ((awidth / 2) * aheight);
> > > +break;
> > >  case VA_FOURCC('N','V','1','2'):
> > >  image->num_planes = 2;
> > >  image->pitches[0] = awidth;
> > > @@ -3271,6 +3283,7 @@ VAStatus i965_DeriveImage(VADriverContextP ctx,
> > >  break;
> > >  
> > >  case VA_FOURCC('I', '4', '2', '0'):
> > > +case VA_FOURCC('4', '2', '2', 'H'):
> > >  image->num_planes = 3;
> > >  image->pitches[0] = w_pitch; /* Y */
> > >  image->offsets[0] = 0;
> > > diff --git a/src/i965_post_processing.c b/src/i965_post_processing.c
> > > index 35bc515..5d8dd90 100755
> > > --- a/src/i965_post_processing.c
> > > +++ b/src/i965_post_processing.c
> > > @@ -1954,7 +1954,7 @@ 
> > > gen7_pp_set_media_rw_message_surface(VADriverContextP ctx, struct 
> > > i965_post_proc
> > >  height[2] = obj_image->image.height / 2;
> > >  pitch[2] = obj_image->image.pitches[V];
> > >  offset[2] = obj_image->image.offsets[V];
> > > -if (fourcc == VA_FOURCC('Y', 'V', '1', '6')) {
> > > +if (fourcc == VA_FOURCC('Y', 'V', '1', '6') || fourcc == 
> > > VA_FOURCC('4', '2', '2', 'H')) {
> > >  width[1] = obj_image->image.width / 2;
> > >  height[1] = obj_image->image.height;
> > >  width[2] = obj_image->image.width / 2;
> > 
> > 
> > ___
> > Libva mailing list
> > Libva@lists.freedesktop.org
> > http://lists.freedesktop.org/mailman/listinfo/libva
> 
> 


___
Libva mailing list
Libva@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libva


Re: [Libva] [ANNOUNCE] libva-1.3.0.pre1

2014-03-23 Thread Xiang, Haihao

Bumping the version to 1.3.0 is to reflect the recent change.

Thanks
Haihao

> Hi,
> 
> 2014-03-17 5:40 GMT+01:00 Xiang, Haihao :
> 
> > libva-1.3.0 is planned for release soon.  Please report any critical
> > issue with
> 
> Oh, well, 1.2.2 was fine actually. If I had mentioned 0.35.0 in
> another patch, that was because of the planned interface addition.
> This one could have remained at 0.34.1 as scheduled. :)


___
Libva mailing list
Libva@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libva


Re: [Libva] [PATCH] V3: Add 422H support.

2014-03-23 Thread Xiang, Haihao

No. Please rebase it against the latest branch.

s/VA_FOURCC(x, x, x, x)/VA_FOURCC_

Thanks
Haihao


> On Sun, 2014-03-23 at 20:45 -0600, Wu, Zhiwen wrote:
> > From: Alex wu 
> > 
> > Changes between V3 to V2:
> > 1. Add 422H support into gen8_post_processing.c, according to
> >yakui's comments.
> > 
> > changes between V2 and V1:
> > 1. Rebase on staging branch.
> > 2. Add 422H support for pp.
> > 3. Reword the commit title.
> 
> LGTM.
> 
> This will be pushed.
> 
> Thanks
> Yakui
> 
> > ---
> >  src/gen8_post_processing.c |2 +-
> >  src/i965_drv_video.c   |   13 +
> >  src/i965_post_processing.c |2 +-
> >  3 files changed, 15 insertions(+), 2 deletions(-)
> > 
> > diff --git a/src/gen8_post_processing.c b/src/gen8_post_processing.c
> > index 6f3afe7..2e5b880 100644
> > --- a/src/gen8_post_processing.c
> > +++ b/src/gen8_post_processing.c
> > @@ -566,7 +566,7 @@ gen8_pp_set_media_rw_message_surface(VADriverContextP 
> > ctx, struct i965_post_proc
> >  height[2] = obj_image->image.height / 2;
> >  pitch[2] = obj_image->image.pitches[V];
> >  offset[2] = obj_image->image.offsets[V];
> > -if (fourcc == VA_FOURCC('Y', 'V', '1', '6')) {
> > +if (fourcc == VA_FOURCC('Y', 'V', '1', '6') || fourcc == 
> > VA_FOURCC('4', '2', '2', 'H')) {
> >  width[1] = obj_image->image.width / 2;
> >  height[1] = obj_image->image.height;
> >  width[2] = obj_image->image.width / 2;
> > diff --git a/src/i965_drv_video.c b/src/i965_drv_video.c
> > index 67f93ef..8792660 100755
> > --- a/src/i965_drv_video.c
> > +++ b/src/i965_drv_video.c
> > @@ -159,6 +159,8 @@ i965_image_formats_map[I965_MAX_IMAGE_FORMATS + 1] = {
> >{ VA_FOURCC('Y','U','Y','2'), VA_LSB_FIRST, 16, } },
> >  { I965_SURFACETYPE_YUV,
> >{ VA_FOURCC('U','Y','V','Y'), VA_LSB_FIRST, 16, } },
> > +{ I965_SURFACETYPE_YUV,
> > +  { VA_FOURCC('4','2','2','H'), VA_LSB_FIRST, 16, } },
> >  { I965_SURFACETYPE_RGBA,
> >{ VA_FOURCC('R','G','B','X'), VA_LSB_FIRST, 32, 24, 0x00ff, 
> > 0xff00, 0x00ff } },
> >  { I965_SURFACETYPE_RGBA,
> > @@ -2864,6 +2866,16 @@ i965_CreateImage(VADriverContextP ctx,
> >  image->offsets[2] = size + size2;
> >  image->data_size  = size + 2 * size2;
> >  break;
> > +case VA_FOURCC('4','2','2','H'):
> > +image->num_planes = 3;
> > +image->pitches[0] = awidth;
> > +image->offsets[0] = 0;
> > +image->pitches[1] = awidth / 2;
> > +image->offsets[1] = size;
> > +image->pitches[2] = awidth / 2;
> > +image->offsets[2] = size + (awidth / 2) * aheight;
> > +image->data_size  = size + 2 * ((awidth / 2) * aheight);
> > +break;
> >  case VA_FOURCC('N','V','1','2'):
> >  image->num_planes = 2;
> >  image->pitches[0] = awidth;
> > @@ -3271,6 +3283,7 @@ VAStatus i965_DeriveImage(VADriverContextP ctx,
> >  break;
> >  
> >  case VA_FOURCC('I', '4', '2', '0'):
> > +case VA_FOURCC('4', '2', '2', 'H'):
> >  image->num_planes = 3;
> >  image->pitches[0] = w_pitch; /* Y */
> >  image->offsets[0] = 0;
> > diff --git a/src/i965_post_processing.c b/src/i965_post_processing.c
> > index 35bc515..5d8dd90 100755
> > --- a/src/i965_post_processing.c
> > +++ b/src/i965_post_processing.c
> > @@ -1954,7 +1954,7 @@ gen7_pp_set_media_rw_message_surface(VADriverContextP 
> > ctx, struct i965_post_proc
> >  height[2] = obj_image->image.height / 2;
> >  pitch[2] = obj_image->image.pitches[V];
> >  offset[2] = obj_image->image.offsets[V];
> > -if (fourcc == VA_FOURCC('Y', 'V', '1', '6')) {
> > +if (fourcc == VA_FOURCC('Y', 'V', '1', '6') || fourcc == 
> > VA_FOURCC('4', '2', '2', 'H')) {
> >  width[1] = obj_image->image.width / 2;
> >  height[1] = obj_image->image.height;
> >  width[2] = obj_image->image.width / 2;
> 
> 
> ___
> Libva mailing list
> Libva@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/libva


___
Libva mailing list
Libva@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libva


Re: [Libva] [PATCH] V3: Add 422H support.

2014-03-23 Thread Zhao Yakui
On Sun, 2014-03-23 at 20:45 -0600, Wu, Zhiwen wrote:
> From: Alex wu 
> 
> Changes between V3 to V2:
> 1. Add 422H support into gen8_post_processing.c, according to
>yakui's comments.
> 
> changes between V2 and V1:
> 1. Rebase on staging branch.
> 2. Add 422H support for pp.
> 3. Reword the commit title.

LGTM.

This will be pushed.

Thanks
Yakui

> ---
>  src/gen8_post_processing.c |2 +-
>  src/i965_drv_video.c   |   13 +
>  src/i965_post_processing.c |2 +-
>  3 files changed, 15 insertions(+), 2 deletions(-)
> 
> diff --git a/src/gen8_post_processing.c b/src/gen8_post_processing.c
> index 6f3afe7..2e5b880 100644
> --- a/src/gen8_post_processing.c
> +++ b/src/gen8_post_processing.c
> @@ -566,7 +566,7 @@ gen8_pp_set_media_rw_message_surface(VADriverContextP 
> ctx, struct i965_post_proc
>  height[2] = obj_image->image.height / 2;
>  pitch[2] = obj_image->image.pitches[V];
>  offset[2] = obj_image->image.offsets[V];
> -if (fourcc == VA_FOURCC('Y', 'V', '1', '6')) {
> +if (fourcc == VA_FOURCC('Y', 'V', '1', '6') || fourcc == 
> VA_FOURCC('4', '2', '2', 'H')) {
>  width[1] = obj_image->image.width / 2;
>  height[1] = obj_image->image.height;
>  width[2] = obj_image->image.width / 2;
> diff --git a/src/i965_drv_video.c b/src/i965_drv_video.c
> index 67f93ef..8792660 100755
> --- a/src/i965_drv_video.c
> +++ b/src/i965_drv_video.c
> @@ -159,6 +159,8 @@ i965_image_formats_map[I965_MAX_IMAGE_FORMATS + 1] = {
>{ VA_FOURCC('Y','U','Y','2'), VA_LSB_FIRST, 16, } },
>  { I965_SURFACETYPE_YUV,
>{ VA_FOURCC('U','Y','V','Y'), VA_LSB_FIRST, 16, } },
> +{ I965_SURFACETYPE_YUV,
> +  { VA_FOURCC('4','2','2','H'), VA_LSB_FIRST, 16, } },
>  { I965_SURFACETYPE_RGBA,
>{ VA_FOURCC('R','G','B','X'), VA_LSB_FIRST, 32, 24, 0x00ff, 
> 0xff00, 0x00ff } },
>  { I965_SURFACETYPE_RGBA,
> @@ -2864,6 +2866,16 @@ i965_CreateImage(VADriverContextP ctx,
>  image->offsets[2] = size + size2;
>  image->data_size  = size + 2 * size2;
>  break;
> +case VA_FOURCC('4','2','2','H'):
> +image->num_planes = 3;
> +image->pitches[0] = awidth;
> +image->offsets[0] = 0;
> +image->pitches[1] = awidth / 2;
> +image->offsets[1] = size;
> +image->pitches[2] = awidth / 2;
> +image->offsets[2] = size + (awidth / 2) * aheight;
> +image->data_size  = size + 2 * ((awidth / 2) * aheight);
> +break;
>  case VA_FOURCC('N','V','1','2'):
>  image->num_planes = 2;
>  image->pitches[0] = awidth;
> @@ -3271,6 +3283,7 @@ VAStatus i965_DeriveImage(VADriverContextP ctx,
>  break;
>  
>  case VA_FOURCC('I', '4', '2', '0'):
> +case VA_FOURCC('4', '2', '2', 'H'):
>  image->num_planes = 3;
>  image->pitches[0] = w_pitch; /* Y */
>  image->offsets[0] = 0;
> diff --git a/src/i965_post_processing.c b/src/i965_post_processing.c
> index 35bc515..5d8dd90 100755
> --- a/src/i965_post_processing.c
> +++ b/src/i965_post_processing.c
> @@ -1954,7 +1954,7 @@ gen7_pp_set_media_rw_message_surface(VADriverContextP 
> ctx, struct i965_post_proc
>  height[2] = obj_image->image.height / 2;
>  pitch[2] = obj_image->image.pitches[V];
>  offset[2] = obj_image->image.offsets[V];
> -if (fourcc == VA_FOURCC('Y', 'V', '1', '6')) {
> +if (fourcc == VA_FOURCC('Y', 'V', '1', '6') || fourcc == 
> VA_FOURCC('4', '2', '2', 'H')) {
>  width[1] = obj_image->image.width / 2;
>  height[1] = obj_image->image.height;
>  width[2] = obj_image->image.width / 2;


___
Libva mailing list
Libva@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libva


[Libva] [PATCH] BDW: Fix one error in shader binaray for media encoding

2014-03-23 Thread Zhao Yakui
The commit 7ac4263ff2dae5c877b92356d04df4ccfe10d7c9 updates
the shader binary more than it required. So it is removed.

Signed-off-by: Zhao Yakui 
---
 src/shaders/vme/inter_bframe_gen8.g8b | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/shaders/vme/inter_bframe_gen8.g8b 
b/src/shaders/vme/inter_bframe_gen8.g8b
index f981ca3..77daf5a 100644
--- a/src/shaders/vme/inter_bframe_gen8.g8b
+++ b/src/shaders/vme/inter_bframe_gen8.g8b
@@ -411,7 +411,7 @@
{ 0x0005, 0x2fe41248, 0x16000f70, 0x00030003 },
{ 0x0020, 0x3400, 0x0e001400, 0x00a0 },
{ 0x0001, 0x2f681248, 0x0fa8, 0x },
-   { 0x0510, 0x20001a60, 0x1e000f68, 0x00020002 },
+   { 0x0510, 0x20001240, 0x16000f68, 0x00020002 },
{ 0x00010005, 0x2fe41248, 0x16000f60, 0x00030003 },
{ 0x00010020, 0x3400, 0x0e001400, 0x0060 },
{ 0x0008, 0x2f701248, 0x16000f60, 0x00020002 },
-- 
1.8.2-rc2

___
Libva mailing list
Libva@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libva


[Libva] [PATCH] V3: Add 422H support.

2014-03-23 Thread zhiwen . wu
From: Alex wu 

Changes between V3 to V2:
1. Add 422H support into gen8_post_processing.c, according to
   yakui's comments.

changes between V2 and V1:
1. Rebase on staging branch.
2. Add 422H support for pp.
3. Reword the commit title.
---
 src/gen8_post_processing.c |2 +-
 src/i965_drv_video.c   |   13 +
 src/i965_post_processing.c |2 +-
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/gen8_post_processing.c b/src/gen8_post_processing.c
index 6f3afe7..2e5b880 100644
--- a/src/gen8_post_processing.c
+++ b/src/gen8_post_processing.c
@@ -566,7 +566,7 @@ gen8_pp_set_media_rw_message_surface(VADriverContextP ctx, 
struct i965_post_proc
 height[2] = obj_image->image.height / 2;
 pitch[2] = obj_image->image.pitches[V];
 offset[2] = obj_image->image.offsets[V];
-if (fourcc == VA_FOURCC('Y', 'V', '1', '6')) {
+if (fourcc == VA_FOURCC('Y', 'V', '1', '6') || fourcc == 
VA_FOURCC('4', '2', '2', 'H')) {
 width[1] = obj_image->image.width / 2;
 height[1] = obj_image->image.height;
 width[2] = obj_image->image.width / 2;
diff --git a/src/i965_drv_video.c b/src/i965_drv_video.c
index 67f93ef..8792660 100755
--- a/src/i965_drv_video.c
+++ b/src/i965_drv_video.c
@@ -159,6 +159,8 @@ i965_image_formats_map[I965_MAX_IMAGE_FORMATS + 1] = {
   { VA_FOURCC('Y','U','Y','2'), VA_LSB_FIRST, 16, } },
 { I965_SURFACETYPE_YUV,
   { VA_FOURCC('U','Y','V','Y'), VA_LSB_FIRST, 16, } },
+{ I965_SURFACETYPE_YUV,
+  { VA_FOURCC('4','2','2','H'), VA_LSB_FIRST, 16, } },
 { I965_SURFACETYPE_RGBA,
   { VA_FOURCC('R','G','B','X'), VA_LSB_FIRST, 32, 24, 0x00ff, 
0xff00, 0x00ff } },
 { I965_SURFACETYPE_RGBA,
@@ -2864,6 +2866,16 @@ i965_CreateImage(VADriverContextP ctx,
 image->offsets[2] = size + size2;
 image->data_size  = size + 2 * size2;
 break;
+case VA_FOURCC('4','2','2','H'):
+image->num_planes = 3;
+image->pitches[0] = awidth;
+image->offsets[0] = 0;
+image->pitches[1] = awidth / 2;
+image->offsets[1] = size;
+image->pitches[2] = awidth / 2;
+image->offsets[2] = size + (awidth / 2) * aheight;
+image->data_size  = size + 2 * ((awidth / 2) * aheight);
+break;
 case VA_FOURCC('N','V','1','2'):
 image->num_planes = 2;
 image->pitches[0] = awidth;
@@ -3271,6 +3283,7 @@ VAStatus i965_DeriveImage(VADriverContextP ctx,
 break;
 
 case VA_FOURCC('I', '4', '2', '0'):
+case VA_FOURCC('4', '2', '2', 'H'):
 image->num_planes = 3;
 image->pitches[0] = w_pitch; /* Y */
 image->offsets[0] = 0;
diff --git a/src/i965_post_processing.c b/src/i965_post_processing.c
index 35bc515..5d8dd90 100755
--- a/src/i965_post_processing.c
+++ b/src/i965_post_processing.c
@@ -1954,7 +1954,7 @@ gen7_pp_set_media_rw_message_surface(VADriverContextP 
ctx, struct i965_post_proc
 height[2] = obj_image->image.height / 2;
 pitch[2] = obj_image->image.pitches[V];
 offset[2] = obj_image->image.offsets[V];
-if (fourcc == VA_FOURCC('Y', 'V', '1', '6')) {
+if (fourcc == VA_FOURCC('Y', 'V', '1', '6') || fourcc == 
VA_FOURCC('4', '2', '2', 'H')) {
 width[1] = obj_image->image.width / 2;
 height[1] = obj_image->image.height;
 width[2] = obj_image->image.width / 2;
-- 
1.7.9.5

___
Libva mailing list
Libva@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libva


Re: [Libva] [PATCH] V2: Add 422H support.

2014-03-23 Thread Zhao Yakui
On Sun, 2014-03-23 at 19:54 -0600, Wu, Zhiwen wrote:
> From: Alex wu 
> 
> Changes to V1:
> 1. Rebase on staging branch.
> 2. Add 422H support for pp.
> 3. Reword the commit title.


This patch is OK to me except the missing piece in file of
gen8_post_processing.c.

> if (fourcc == VA_FOURCC('Y', 'V', '1', '6') || fourcc ==
VA_FOURCC('4', '2', '2', 'H')) {
>  width[1] = obj_image->image.width / 2;
>  height[1] = obj_image->image.height;
>  width[2] = obj_image->image.width / 2;

Will you please also add the above check in file of
gen8_post_processing.c?

Thanks.
Yakui
> ---
>  src/i965_drv_video.c   |   13 +
>  src/i965_post_processing.c |2 +-
>  2 files changed, 14 insertions(+), 1 deletion(-)
> 
> diff --git a/src/i965_drv_video.c b/src/i965_drv_video.c
> index 67f93ef..8792660 100755
> --- a/src/i965_drv_video.c
> +++ b/src/i965_drv_video.c
> @@ -159,6 +159,8 @@ i965_image_formats_map[I965_MAX_IMAGE_FORMATS + 1] = {
>{ VA_FOURCC('Y','U','Y','2'), VA_LSB_FIRST, 16, } },
>  { I965_SURFACETYPE_YUV,
>{ VA_FOURCC('U','Y','V','Y'), VA_LSB_FIRST, 16, } },
> +{ I965_SURFACETYPE_YUV,
> +  { VA_FOURCC('4','2','2','H'), VA_LSB_FIRST, 16, } },
>  { I965_SURFACETYPE_RGBA,
>{ VA_FOURCC('R','G','B','X'), VA_LSB_FIRST, 32, 24, 0x00ff, 
> 0xff00, 0x00ff } },
>  { I965_SURFACETYPE_RGBA,
> @@ -2864,6 +2866,16 @@ i965_CreateImage(VADriverContextP ctx,
>  image->offsets[2] = size + size2;
>  image->data_size  = size + 2 * size2;
>  break;
> +case VA_FOURCC('4','2','2','H'):
> +image->num_planes = 3;
> +image->pitches[0] = awidth;
> +image->offsets[0] = 0;
> +image->pitches[1] = awidth / 2;
> +image->offsets[1] = size;
> +image->pitches[2] = awidth / 2;
> +image->offsets[2] = size + (awidth / 2) * aheight;
> +image->data_size  = size + 2 * ((awidth / 2) * aheight);
> +break;
>  case VA_FOURCC('N','V','1','2'):
>  image->num_planes = 2;
>  image->pitches[0] = awidth;
> @@ -3271,6 +3283,7 @@ VAStatus i965_DeriveImage(VADriverContextP ctx,
>  break;
>  
>  case VA_FOURCC('I', '4', '2', '0'):
> +case VA_FOURCC('4', '2', '2', 'H'):
>  image->num_planes = 3;
>  image->pitches[0] = w_pitch; /* Y */
>  image->offsets[0] = 0;
> diff --git a/src/i965_post_processing.c b/src/i965_post_processing.c
> index 35bc515..5d8dd90 100755
> --- a/src/i965_post_processing.c
> +++ b/src/i965_post_processing.c
> @@ -1954,7 +1954,7 @@ gen7_pp_set_media_rw_message_surface(VADriverContextP 
> ctx, struct i965_post_proc
>  height[2] = obj_image->image.height / 2;
>  pitch[2] = obj_image->image.pitches[V];
>  offset[2] = obj_image->image.offsets[V];
> -if (fourcc == VA_FOURCC('Y', 'V', '1', '6')) {
> +if (fourcc == VA_FOURCC('Y', 'V', '1', '6') || fourcc == 
> VA_FOURCC('4', '2', '2', 'H')) {
>  width[1] = obj_image->image.width / 2;
>  height[1] = obj_image->image.height;
>  width[2] = obj_image->image.width / 2;


___
Libva mailing list
Libva@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libva


Re: [Libva] [PATCH Libva-intel-driver 0/4] Use the VA_FOURCC_ABCD constant to replace VA_FOURCC(A, B, C, D)

2014-03-23 Thread Zhao Yakui
On Thu, 2014-03-20 at 00:24 -0600, Zhao, Yakui wrote:
> This is the patch set that try to use the VA_FOURCC_ABCD constant to replace
> the VA_FOURCC(A,B,C,D). There is no function change. But it is helpful
> to avoid the typo error of VA_FOURCC(A,B,C,D).
> 
> Zhao Yakui (4):
>   [Patch 01/4] Use the VA_FOURCC_ to replace the VA_FOURCC(X,X,X,X) in
> i965_drv_video.c
>   [Patch 02/4] VPP: Use the VA_FOURCC_ABCD constant to replace the 
> VA_FOURCC(A,B,C,D)
>   [Patch 03/4] VEBOX: Use the VA_FOURCC_ABCD constant to replace the
> VA_FOURCC(A,B,C,D)
>   [Patch 04/4] Use the VA_FOURCC_ABCD constant to replace the 
> VA_FOURCC(A,B,C,D)
> 

This will be committed into the staging.

Thanks.
Yakui

>  src/Makefile.am |   1 +
>  src/gen6_mfc_common.c   |   2 +-
>  src/gen6_mfd.c  |   6 +-
>  src/gen75_mfc.c |   2 +-
>  src/gen75_mfd.c |  26 +--
>  src/gen75_picture_process.c |   6 +-
>  src/gen75_vpp_gpe.c |   2 +-
>  src/gen75_vpp_vebox.c   |  83 +-
>  src/gen7_mfc.c  |   2 +-
>  src/gen7_mfd.c  |  26 +--
>  src/gen8_mfc.c  |   2 +-
>  src/gen8_mfd.c  |  26 +--
>  src/gen8_post_processing.c  |  42 ++---
>  src/gen8_render.c   |   6 +-
>  src/i965_avc_bsd.c  |   2 +-
>  src/i965_decoder_utils.c|   2 +-
>  src/i965_drv_video.c| 396 
> ++--
>  src/i965_drv_video.h|   1 +
>  src/i965_encoder.c  |   4 +-
>  src/i965_fourcc.h   |  36 
>  src/i965_gpe_utils.c|  10 +-
>  src/i965_media_mpeg2.c  |   2 +-
>  src/i965_output_wayland.c   |  18 +-
>  src/i965_post_processing.c  | 204 +++
>  src/i965_render.c   |   6 +-
>  25 files changed, 475 insertions(+), 438 deletions(-)
>  create mode 100644 src/i965_fourcc.h
> 


___
Libva mailing list
Libva@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libva


[Libva] [PATCH] V2: Add 422H support.

2014-03-23 Thread zhiwen . wu
From: Alex wu 

Changes to V1:
1. Rebase on staging branch.
2. Add 422H support for pp.
3. Reword the commit title.
---
 src/i965_drv_video.c   |   13 +
 src/i965_post_processing.c |2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/i965_drv_video.c b/src/i965_drv_video.c
index 67f93ef..8792660 100755
--- a/src/i965_drv_video.c
+++ b/src/i965_drv_video.c
@@ -159,6 +159,8 @@ i965_image_formats_map[I965_MAX_IMAGE_FORMATS + 1] = {
   { VA_FOURCC('Y','U','Y','2'), VA_LSB_FIRST, 16, } },
 { I965_SURFACETYPE_YUV,
   { VA_FOURCC('U','Y','V','Y'), VA_LSB_FIRST, 16, } },
+{ I965_SURFACETYPE_YUV,
+  { VA_FOURCC('4','2','2','H'), VA_LSB_FIRST, 16, } },
 { I965_SURFACETYPE_RGBA,
   { VA_FOURCC('R','G','B','X'), VA_LSB_FIRST, 32, 24, 0x00ff, 
0xff00, 0x00ff } },
 { I965_SURFACETYPE_RGBA,
@@ -2864,6 +2866,16 @@ i965_CreateImage(VADriverContextP ctx,
 image->offsets[2] = size + size2;
 image->data_size  = size + 2 * size2;
 break;
+case VA_FOURCC('4','2','2','H'):
+image->num_planes = 3;
+image->pitches[0] = awidth;
+image->offsets[0] = 0;
+image->pitches[1] = awidth / 2;
+image->offsets[1] = size;
+image->pitches[2] = awidth / 2;
+image->offsets[2] = size + (awidth / 2) * aheight;
+image->data_size  = size + 2 * ((awidth / 2) * aheight);
+break;
 case VA_FOURCC('N','V','1','2'):
 image->num_planes = 2;
 image->pitches[0] = awidth;
@@ -3271,6 +3283,7 @@ VAStatus i965_DeriveImage(VADriverContextP ctx,
 break;
 
 case VA_FOURCC('I', '4', '2', '0'):
+case VA_FOURCC('4', '2', '2', 'H'):
 image->num_planes = 3;
 image->pitches[0] = w_pitch; /* Y */
 image->offsets[0] = 0;
diff --git a/src/i965_post_processing.c b/src/i965_post_processing.c
index 35bc515..5d8dd90 100755
--- a/src/i965_post_processing.c
+++ b/src/i965_post_processing.c
@@ -1954,7 +1954,7 @@ gen7_pp_set_media_rw_message_surface(VADriverContextP 
ctx, struct i965_post_proc
 height[2] = obj_image->image.height / 2;
 pitch[2] = obj_image->image.pitches[V];
 offset[2] = obj_image->image.offsets[V];
-if (fourcc == VA_FOURCC('Y', 'V', '1', '6')) {
+if (fourcc == VA_FOURCC('Y', 'V', '1', '6') || fourcc == 
VA_FOURCC('4', '2', '2', 'H')) {
 width[1] = obj_image->image.width / 2;
 height[1] = obj_image->image.height;
 width[2] = obj_image->image.width / 2;
-- 
1.7.9.5

___
Libva mailing list
Libva@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libva