[vlc-commits] codec: vt_utils don't use picture_t p_sys

[Thomas Guillem]

vlc | branch: master | Thomas Guillem <thomas at gllm.fr> | Wed Nov 22 16:45:33 2017 +0100| [44fdc78bc52fd784175fb5f1bb9e865382439abc] | committer: Thomas Guillem

codec: vt_utils don't use picture_t p_sys

Use picture context instead. p_sys is generally reserved by the vout.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=44fdc78bc52fd784175fb5f1bb9e865382439abc
---

 modules/codec/vt_utils.c | 50 ++++++++++++++++++++++++++----------------------
 1 file changed, 27 insertions(+), 23 deletions(-)

diff --git a/modules/codec/vt_utils.c b/modules/codec/vt_utils.c
index 943f39945c..d670d44860 100644
--- a/modules/codec/vt_utils.c
+++ b/modules/codec/vt_utils.c
@@ -67,17 +67,17 @@ cvpxpic_copy_cb(struct picture_context_t *opaque)
     return &dst_ctx->s;
 }
 
-int
-cvpxpic_attach(picture_t *p_pic, CVPixelBufferRef cvpx)
+static int
+cvpxpic_attach_common(picture_t *p_pic, CVPixelBufferRef cvpx,
+                      void (*pf_destroy)(picture_context_t *))
 {
-    /* will be freed by the vout */
     struct cvpxpic_ctx *ctx = malloc(sizeof(struct cvpxpic_ctx));
     if (ctx == NULL)
     {
         picture_Release(p_pic);
         return VLC_ENOMEM;
     }
-    ctx->s.destroy = cvpxpic_destroy_cb;
+    ctx->s.destroy = pf_destroy;
     ctx->s.copy = cvpxpic_copy_cb;
     ctx->cvpx = CVPixelBufferRetain(cvpx);
     p_pic->context = &ctx->s;
@@ -85,6 +85,12 @@ cvpxpic_attach(picture_t *p_pic, CVPixelBufferRef cvpx)
     return VLC_SUCCESS;
 }
 
+int
+cvpxpic_attach(picture_t *p_pic, CVPixelBufferRef cvpx)
+{
+    return cvpxpic_attach_common(p_pic, cvpx, cvpxpic_destroy_cb);
+}
+
 CVPixelBufferRef
 cvpxpic_get_ref(picture_t *pic)
 {
@@ -93,21 +99,21 @@ cvpxpic_get_ref(picture_t *pic)
 }
 
 static void
-cvpxpic_destroy_mapped_ro_cb(picture_t *pic)
+cvpxpic_destroy_mapped_ro_cb(picture_context_t *opaque)
 {
-    CVPixelBufferRef cvpx = (void *) pic->p_sys;
-    CVPixelBufferUnlockBaseAddress(cvpx, kCVPixelBufferLock_ReadOnly);
-    CFRelease(cvpx);
-    free(pic);
+    struct cvpxpic_ctx *ctx = (struct cvpxpic_ctx *)opaque;
+
+    CVPixelBufferUnlockBaseAddress(ctx->cvpx, kCVPixelBufferLock_ReadOnly);
+    cvpxpic_destroy_cb(opaque);
 }
 
 static void
-cvpxpic_destroy_mapped_rw_cb(picture_t *pic)
+cvpxpic_destroy_mapped_rw_cb(picture_context_t *opaque)
 {
-    CVPixelBufferRef cvpx = (void *) pic->p_sys;
-    CVPixelBufferUnlockBaseAddress(cvpx, 0);
-    CFRelease(cvpx);
-    free(pic);
+    struct cvpxpic_ctx *ctx = (struct cvpxpic_ctx *)opaque;
+
+    CVPixelBufferUnlockBaseAddress(ctx->cvpx, 0);
+    cvpxpic_destroy_cb(opaque);
 }
 
 picture_t *
@@ -126,11 +132,7 @@ cvpxpic_create_mapped(const video_format_t *fmt, CVPixelBufferRef cvpx,
 
     CVPixelBufferLockFlags lock = readonly ? kCVPixelBufferLock_ReadOnly : 0;
     CVPixelBufferLockBaseAddress(cvpx, lock);
-    picture_resource_t rsc = {
-        .p_sys = (void *)cvpx,
-        .pf_destroy = readonly ? cvpxpic_destroy_mapped_ro_cb
-                               : cvpxpic_destroy_mapped_rw_cb,
-    };
+    picture_resource_t rsc = { };
 
 #ifndef NDEBUG
     assert(CVPixelBufferGetPlaneCount(cvpx) == planes_count);
@@ -152,13 +154,15 @@ cvpxpic_create_mapped(const video_format_t *fmt, CVPixelBufferRef cvpx,
         }
     }
 
+    void (*pf_destroy)(picture_context_t *) = readonly ?
+        cvpxpic_destroy_mapped_ro_cb : cvpxpic_destroy_mapped_rw_cb;
+
     picture_t *pic = picture_NewFromResource(fmt, &rsc);
-    if (pic == NULL)
+    if (pic == NULL || cvpxpic_attach_common(pic, cvpx, pf_destroy) != VLC_SUCCESS)
     {
         CVPixelBufferUnlockBaseAddress(cvpx, lock);
         return NULL;
     }
-    CVPixelBufferRetain(cvpx);
     return pic;
 }
 
@@ -177,7 +181,7 @@ cvpxpic_unmap(picture_t *mapped_pic)
             picture_Release(mapped_pic);
             return NULL;
     }
-    assert(mapped_pic->p_sys != NULL);
+    assert(mapped_pic->context != NULL);
 
     picture_t *hw_pic = picture_NewFromFormat(&fmt);
     if (hw_pic == NULL)
@@ -186,7 +190,7 @@ cvpxpic_unmap(picture_t *mapped_pic)
         return NULL;
     }
 
-    cvpxpic_attach(hw_pic, (void *)mapped_pic->p_sys);
+    cvpxpic_attach(hw_pic, cvpxpic_get_ref(mapped_pic));
     picture_CopyProperties(hw_pic, mapped_pic);
     picture_Release(mapped_pic);
     return hw_pic;