summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/xine/osd.h2
-rw-r--r--include/xine/video_out.h2
-rw-r--r--src/xine-engine/osd.c93
-rw-r--r--src/xine-engine/video_overlay.c6
4 files changed, 82 insertions, 21 deletions
diff --git a/include/xine/osd.h b/include/xine/osd.h
index 00df97ad2..44471534b 100644
--- a/include/xine/osd.h
+++ b/include/xine/osd.h
@@ -69,7 +69,7 @@ struct osd_object_s {
/* this holds an optional ARGB overlay, which
* is only be used by supported video_out modules.
* right now this is only vdpau */
- argb_layer_t argb_layer;
+ argb_layer_t *argb_layer;
int32_t handle;
};
diff --git a/include/xine/video_out.h b/include/xine/video_out.h
index 9d5380884..799e8f726 100644
--- a/include/xine/video_out.h
+++ b/include/xine/video_out.h
@@ -449,6 +449,7 @@ typedef struct argb_layer_s {
/* dirty area */
int x1, y1;
int x2, y2;
+ int ref_count;
} argb_layer_t;
struct vo_overlay_s {
@@ -489,6 +490,7 @@ struct vo_overlay_s {
argb_layer_t *argb_layer;
};
+void set_argb_layer_ptr(argb_layer_t **dst, argb_layer_t *src);
/* API to video_overlay manager
*
diff --git a/src/xine-engine/osd.c b/src/xine-engine/osd.c
index a2d2806ec..8e48da99d 100644
--- a/src/xine-engine/osd.c
+++ b/src/xine-engine/osd.c
@@ -262,12 +262,10 @@ static osd_object_t *XINE_MALLOC osd_new_object (osd_renderer_t *this, int width
osd->area = calloc(width, height);
osd->area_touched = 0;
- osd->x1 = osd->argb_layer.x1 = width;
- osd->y1 = osd->argb_layer.y1 = height;
- osd->x2 = osd->argb_layer.x2 = 0;
- osd->y2 = osd->argb_layer.y2 = 0;
-
- pthread_mutex_init(&osd->argb_layer.mutex, NULL);
+ osd->x1 = width;
+ osd->y1 = height;
+ osd->x2 = 0;
+ osd->y2 = 0;
memcpy(osd->color, textpalettes_color[0], sizeof(textpalettes_color[0]));
memcpy(osd->trans, textpalettes_trans[0], sizeof(textpalettes_trans[0]));
@@ -311,6 +309,41 @@ static void osd_set_video_window (osd_object_t *osd, int window_x, int window_y,
osd->video_window_height = window_height;
}
+static argb_layer_t *argb_layer_create() {
+
+ argb_layer_t *argb_layer = (argb_layer_t *)calloc(1, sizeof (argb_layer_t));
+
+ pthread_mutex_init(&argb_layer->mutex, NULL);
+ return argb_layer;
+}
+
+static void argb_layer_destroy(argb_layer_t *argb_layer) {
+
+ pthread_mutex_destroy(&argb_layer->mutex);
+ free(argb_layer);
+}
+
+void set_argb_layer_ptr(argb_layer_t **dst, argb_layer_t *src) {
+
+ if (src) {
+ pthread_mutex_lock(&src->mutex);
+ ++src->ref_count;
+ pthread_mutex_unlock(&src->mutex);
+ }
+
+ if (*dst) {
+ int free_argb_layer;
+
+ pthread_mutex_lock(&(*dst)->mutex);
+ free_argb_layer = (0 == --(*dst)->ref_count);
+ pthread_mutex_unlock(&(*dst)->mutex);
+
+ if (free_argb_layer)
+ argb_layer_destroy(*dst);
+ }
+
+ *dst = src;
+}
/*
@@ -371,7 +404,7 @@ static int _osd_show (osd_object_t *osd, int64_t vpts, int unscaled ) {
memset( this->event.object.overlay, 0, sizeof(*this->event.object.overlay) );
- this->event.object.overlay->argb_layer = &osd->argb_layer;
+ set_argb_layer_ptr(&this->event.object.overlay->argb_layer, osd->argb_layer);
this->event.object.overlay->unscaled = unscaled;
this->event.object.overlay->x = osd->display_x + osd->x1;
@@ -451,6 +484,8 @@ static int _osd_show (osd_object_t *osd, int64_t vpts, int unscaled ) {
this->event.event_type = OVERLAY_EVENT_SHOW;
this->event.vpts = vpts;
ovl_manager->add_event(ovl_manager, (void *)&this->event);
+
+ set_argb_layer_ptr(&this->event.object.overlay->argb_layer, NULL);
} else {
/* osd empty - hide it */
_osd_hide(osd, vpts);
@@ -534,10 +569,20 @@ static void osd_clear (osd_object_t *osd) {
osd->area_touched = 0;
memset(osd->area, 0, osd->width * osd->height);
}
- osd->x1 = osd->argb_layer.x1 = osd->width;
- osd->y1 = osd->argb_layer.y1 = osd->height;
- osd->x2 = osd->argb_layer.x2 = 0;
- osd->y2 = osd->argb_layer.y2 = 0;
+
+ osd->x1 = osd->width;
+ osd->y1 = osd->height;
+ osd->x2 = 0;
+ osd->y2 = 0;
+
+ if (osd->argb_layer) {
+ pthread_mutex_lock(&osd->argb_layer->mutex);
+ osd->argb_layer->x1 = osd->x1;
+ osd->argb_layer->y1 = osd->y1;
+ osd->argb_layer->x2 = osd->x2;
+ osd->argb_layer->y2 = osd->y2;
+ pthread_mutex_unlock(&osd->argb_layer->mutex);
+ }
}
/*
@@ -1657,6 +1702,12 @@ static void osd_free_object (osd_object_t *osd_to_close) {
osd_to_close->handle = -1; /* handle will be freed */
}
+ if (osd_to_close->argb_layer) {
+ /* clear argb buffer pointer so that buffer may be freed safely after returning */
+ this->set_argb_buffer(osd_to_close, NULL, 0, 0, 0, 0);
+ set_argb_layer_ptr(&osd_to_close->argb_layer, NULL);
+ }
+
pthread_mutex_lock (&this->osd_mutex);
last = NULL;
@@ -1673,7 +1724,6 @@ static void osd_free_object (osd_object_t *osd_to_close) {
else
this->osds = osd->next;
- pthread_mutex_destroy(&osd->argb_layer.mutex);
free( osd );
break;
}
@@ -1741,7 +1791,10 @@ static void osd_draw_bitmap(osd_object_t *osd, uint8_t *bitmap,
static void osd_set_argb_buffer(osd_object_t *osd, uint32_t *argb_buffer,
int dirty_x, int dirty_y, int dirty_width, int dirty_height)
{
- if (osd->argb_layer.buffer != argb_buffer) {
+ if (!osd->argb_layer)
+ set_argb_layer_ptr(&osd->argb_layer, argb_layer_create());
+
+ if (osd->argb_layer->buffer != argb_buffer) {
dirty_x = 0;
dirty_y = 0;
dirty_width = osd->width;
@@ -1754,17 +1807,17 @@ static void osd_set_argb_buffer(osd_object_t *osd, uint32_t *argb_buffer,
osd->y1 = MIN( osd->y1, dirty_y );
osd->y2 = MAX( osd->y2, dirty_y + dirty_height );
- pthread_mutex_lock(&osd->argb_layer.mutex);
+ pthread_mutex_lock(&osd->argb_layer->mutex);
/* argb layer update area accumulation */
- osd->argb_layer.x1 = MIN( osd->argb_layer.x1, dirty_x );
- osd->argb_layer.x2 = MAX( osd->argb_layer.x2, dirty_x + dirty_width );
- osd->argb_layer.y1 = MIN( osd->argb_layer.y1, dirty_y );
- osd->argb_layer.y2 = MAX( osd->argb_layer.y2, dirty_y + dirty_height );
+ osd->argb_layer->x1 = MIN( osd->argb_layer->x1, dirty_x );
+ osd->argb_layer->x2 = MAX( osd->argb_layer->x2, dirty_x + dirty_width );
+ osd->argb_layer->y1 = MIN( osd->argb_layer->y1, dirty_y );
+ osd->argb_layer->y2 = MAX( osd->argb_layer->y2, dirty_y + dirty_height );
- osd->argb_layer.buffer = argb_buffer;
+ osd->argb_layer->buffer = argb_buffer;
- pthread_mutex_unlock(&osd->argb_layer.mutex);
+ pthread_mutex_unlock(&osd->argb_layer->mutex);
}
static uint32_t osd_get_capabilities (osd_object_t *osd) {
diff --git a/src/xine-engine/video_overlay.c b/src/xine-engine/video_overlay.c
index 172a93c3e..0052375bb 100644
--- a/src/xine-engine/video_overlay.c
+++ b/src/xine-engine/video_overlay.c
@@ -174,6 +174,8 @@ static void internal_video_overlay_free_handle(video_overlay_t *this, int32_t ha
pthread_mutex_lock( &this->objects_mutex );
if( this->objects[handle].overlay ) {
+ set_argb_layer_ptr(&this->objects[handle].overlay->argb_layer, NULL);
+
if( this->objects[handle].overlay->rle )
free( this->objects[handle].overlay->rle );
free( this->objects[handle].overlay );
@@ -396,6 +398,8 @@ static int video_overlay_event( video_overlay_t *this, int64_t vpts ) {
#endif
/* free any overlay associated with this event */
if (this->events[this_event].event->object.overlay != NULL) {
+ set_argb_layer_ptr(&this->events[this_event].event->object.overlay->argb_layer, NULL);
+
if( this->events[this_event].event->object.overlay->rle != NULL )
free( this->events[this_event].event->object.overlay->rle );
free(this->events[this_event].event->object.overlay);
@@ -410,6 +414,8 @@ static int video_overlay_event( video_overlay_t *this, int64_t vpts ) {
#endif
/* free any overlay associated with this event */
if( this->events[this_event].event->object.overlay != NULL) {
+ set_argb_layer_ptr(&this->events[this_event].event->object.overlay->argb_layer, NULL);
+
if( this->events[this_event].event->object.overlay->rle != NULL )
free( this->events[this_event].event->object.overlay->rle );
free(this->events[this_event].event->object.overlay);
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-22 05:18:33 +0000