Attachment 117936 Details for Bug 89969 – [PATCH 6/8] nvc0: implement pipe_video_codec::begin_frame/end_frame

[patch] [PATCH 6/8] nvc0: implement pipe_video_codec::begin_frame/end_frame

0006-nvc0-implement-pipe_video_codec-begin_frame-end_fram.patch (text/plain), 3.36 KB, created by Julien Isorce on 2015-08-26 17:51:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Julien Isorce

Created: 2015-08-26 17:51:00 UTC

Size: 3.36 KB

patch

obsolete

>From 23251730408e20c3c404691f3a19a3c2b47a3a91 Mon Sep 17 00:00:00 2001
>From: Julien Isorce <j.isorce@samsung.com>
>Date: Wed, 26 Aug 2015 18:08:46 +0100
>Subject: [PATCH 6/8] nvc0: implement pipe_video_codec::begin_frame/end_frame
>
>In order to add support for chunck decoding.
>Required to support st/va.
>
>https://bugs.freedesktop.org/show_bug.cgi?id=89969
>Signed-off-by: Julien Isorce <j.isorce@samsung.com>
>---
> src/gallium/drivers/nouveau/nvc0/nvc0_video.c | 48 +++++++++++++++++++++------
> 1 file changed, 37 insertions(+), 11 deletions(-)
>
>diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_video.c b/src/gallium/drivers/nouveau/nvc0/nvc0_video.c
>index cb62569..684276d 100644
>--- a/src/gallium/drivers/nouveau/nvc0/nvc0_video.c
>+++ b/src/gallium/drivers/nouveau/nvc0/nvc0_video.c
>@@ -26,6 +26,24 @@
> #include "util/u_format.h"
> 
> static void
>+nvc0_decoder_begin_frame(struct pipe_video_codec *decoder,
>+                         struct pipe_video_buffer *target,
>+                         struct pipe_picture_desc *picture)
>+{
>+    struct nouveau_vp3_decoder *dec = (struct nouveau_vp3_decoder *)decoder;
>+    uint32_t comm_seq = ++dec->fence_seq;
>+    unsigned ret = 0;
>+
>+    assert(dec);
>+    assert(target);
>+    assert(target->base.buffer_format == PIPE_FORMAT_NV12);
>+
>+    ret = nvc0_decoder_bsp_begin(dec, comm_seq);
>+
>+    assert(ret == 2);
>+}
>+
>+static void
> nvc0_decoder_decode_bitstream(struct pipe_video_codec *decoder,
>                               struct pipe_video_buffer *video_target,
>                               struct pipe_picture_desc *picture,
>@@ -34,8 +52,24 @@ nvc0_decoder_decode_bitstream(struct pipe_video_codec *decoder,
>                               const unsigned *num_bytes)
> {
>    struct nouveau_vp3_decoder *dec = (struct nouveau_vp3_decoder *)decoder;
>+   uint32_t comm_seq = dec->fence_seq;
>+   unsigned ret = 0;
>+
>+   assert(decoder);
>+
>+   ret = nvc0_decoder_bsp_next(dec, comm_seq, num_buffers, data, num_bytes);
>+
>+   assert(ret == 2);
>+}
>+
>+static void
>+nvc0_decoder_end_frame(struct pipe_video_codec *decoder,
>+                       struct pipe_video_buffer *video_target,
>+                       struct pipe_picture_desc *picture)
>+{
>+   struct nouveau_vp3_decoder *dec = (struct nouveau_vp3_decoder *)decoder;
>    struct nouveau_vp3_video_buffer *target = (struct nouveau_vp3_video_buffer *)video_target;
>-   uint32_t comm_seq = ++dec->fence_seq;
>+   uint32_t comm_seq = dec->fence_seq;
>    union pipe_desc desc;
> 
>    unsigned vp_caps, is_ref, ret;
>@@ -43,16 +77,6 @@ nvc0_decoder_decode_bitstream(struct pipe_video_codec *decoder,
> 
>    desc.base = picture;
> 
>-   assert(target->base.buffer_format == PIPE_FORMAT_NV12);
>-
>-   ret = nvc0_decoder_bsp_begin(dec, comm_seq);
>-
>-   assert(ret == 2);
>-
>-   ret = nvc0_decoder_bsp_next(dec, comm_seq, num_buffers, data, num_bytes);
>-
>-   assert(ret == 2);
>-
>    ret = nvc0_decoder_bsp_end(dec, desc, target, comm_seq, &vp_caps, &is_ref, refs);
> 
>    /* did we decode bitstream correctly? */
>@@ -170,7 +194,9 @@ nvc0_create_decoder(struct pipe_context *context,
>    PUSH_DATA (push[2], dec->ppp->handle);
> 
>    dec->base.context = context;
>+   dec->base.begin_frame = nvc0_decoder_begin_frame;
>    dec->base.decode_bitstream = nvc0_decoder_decode_bitstream;
>+   dec->base.end_frame = nvc0_decoder_end_frame;
> 
>    for (i = 0; i < NOUVEAU_VP3_VIDEO_QDEPTH && !ret; ++i)
>       ret = nouveau_bo_new(screen->device, NOUVEAU_BO_VRAM,
>-- 
>1.9.1
>

Actions: View | Splinter Review

Attachments on bug 89969: 114987 | 117214 | 117215 | 117358 | 117399 | 117910 | 117928 | 117929 | 117930 | 117931 | 117932 | 117934 | 117936 | 117937 | 117938 | 117939

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.