summaryrefslogtreecommitdiff
path: root/src/xine-engine
diff options
context:
space:
mode:
Diffstat (limited to 'src/xine-engine')
-rw-r--r--src/xine-engine/osd.c26
-rw-r--r--src/xine-engine/osd.h11
-rw-r--r--src/xine-engine/video_out.c14
-rw-r--r--src/xine-engine/video_out.h7
-rw-r--r--src/xine-engine/xine_interface.c4
5 files changed, 62 insertions, 0 deletions
diff --git a/src/xine-engine/osd.c b/src/xine-engine/osd.c
index 7f4e6aefb..73470be1f 100644
--- a/src/xine-engine/osd.c
+++ b/src/xine-engine/osd.c
@@ -143,6 +143,10 @@ static osd_object_t *XINE_MALLOC osd_new_object (osd_renderer_t *this, int width
osd->next = this->osds;
this->osds = osd;
+ osd->video_window_x = 0;
+ osd->video_window_y = 0;
+ osd->video_window_width = 0;
+ osd->video_window_height = 0;
osd->extent_width = 0;
osd->extent_height = 0;
osd->width = width;
@@ -186,6 +190,19 @@ static void osd_set_extent (osd_object_t *osd, int extent_width, int extent_heig
osd->extent_height = extent_height;
}
+/*
+ * osd video window defines an area withing osd extent where the
+ * video shall be scaled to while an osd is displayed on screen.
+ * both width and height must be > 0 to take effect.
+ */
+static void osd_set_video_window (osd_object_t *osd, int window_x, int window_y, int window_width, int window_height) {
+
+ osd->video_window_x = window_x;
+ osd->video_window_y = window_y;
+ osd->video_window_width = window_width;
+ osd->video_window_height = window_height;
+}
+
/*
@@ -254,6 +271,11 @@ static int _osd_show (osd_object_t *osd, int64_t vpts, int unscaled ) {
this->event.object.overlay->width = osd->x2 - osd->x1;
this->event.object.overlay->height = osd->y2 - osd->y1;
+ this->event.object.overlay->video_window_x = osd->video_window_x;
+ this->event.object.overlay->video_window_y = osd->video_window_y;
+ this->event.object.overlay->video_window_width = osd->video_window_width;
+ this->event.object.overlay->video_window_height = osd->video_window_height;
+
this->event.object.overlay->extent_width = osd->extent_width;
this->event.object.overlay->extent_height = osd->extent_height;
@@ -1627,6 +1649,9 @@ static uint32_t osd_get_capabilities (osd_object_t *osd) {
if (vo_capabilities & VO_CAP_ARGB_LAYER_OVERLAY)
capabilities |= XINE_OSD_CAP_ARGB_LAYER;
+ if (vo_capabilities & VO_CAP_VIDEO_WINDOW_OVERLAY)
+ capabilities |= XINE_OSD_CAP_VIDEO_WINDOW;
+
return capabilities;
}
@@ -1691,6 +1716,7 @@ osd_renderer_t *_x_osd_renderer_init( xine_stream_t *stream ) {
this->show_unscaled = osd_show_unscaled;
this->get_capabilities = osd_get_capabilities;
this->set_extent = osd_set_extent;
+ this->set_video_window = osd_set_video_window;
return this;
}
diff --git a/src/xine-engine/osd.h b/src/xine-engine/osd.h
index 36e6fc0ae..be5e2218c 100644
--- a/src/xine-engine/osd.h
+++ b/src/xine-engine/osd.h
@@ -50,6 +50,10 @@ struct osd_object_s {
int area_touched; /* work area was used for painting */
int display_x,display_y; /* where to display it in screen */
+ /* video output area within osd extent */
+ int video_window_x, video_window_y;
+ int video_window_width, video_window_height;
+
/* extent of reference coordinate system */
int extent_width, extent_height;
@@ -243,6 +247,13 @@ struct osd_renderer_s {
void (*set_argb_buffer) (osd_object_t *osd, uint32_t *argb_buffer,
int dirty_x, int dirty_y, int dirty_width, int dirty_height);
+ /*
+ * osd video window defines an area withing osd extent where the
+ * video shall be scaled to while an osd is displayed on screen.
+ * both width and height must be > 0 to take effect.
+ */
+ void (*set_video_window) (osd_object_t *osd,
+ int window_x, int window_y, int window_width, int window_height);
/* private stuff */
diff --git a/src/xine-engine/video_out.c b/src/xine-engine/video_out.c
index 171190bc5..152f0878a 100644
--- a/src/xine-engine/video_out.c
+++ b/src/xine-engine/video_out.c
@@ -437,6 +437,20 @@ static int vo_frame_draw (vo_frame_t *img, xine_stream_t *stream) {
int frames_to_skip;
int duration;
+ /*if (1) {
+ static int64_t pts = 0;
+ fprintf(stderr, "img->pts: %lld, pts: %lld, img->duration: %d", img->pts, pts, img->duration);
+ if (img->pts) {
+ if (pts != img->pts)
+ fprintf(stderr, " ERROR: %12ld", img->pts - pts);
+ pts = img->pts + img->duration;
+ }
+ else {
+ pts += img->duration;
+ }
+ fprintf(stderr, "\n");
+ }*/
+
/* handle anonymous streams like NULL for easy checking */
if (stream == XINE_ANON_STREAM) stream = NULL;
diff --git a/src/xine-engine/video_out.h b/src/xine-engine/video_out.h
index bbf0dcc35..480c1c8f2 100644
--- a/src/xine-engine/video_out.h
+++ b/src/xine-engine/video_out.h
@@ -299,6 +299,7 @@ struct xine_video_port_s {
#define VO_CAP_VDPAU_VC1 0x00000200 /* driver can use VDPAU for mpeg1/2 */
#define VO_CAP_CUSTOM_EXTENT_OVERLAY 0x01000000 /* driver can blend custom extent overlay to output extent */
#define VO_CAP_ARGB_LAYER_OVERLAY 0x02000000 /* driver supports true color overlay */
+#define VO_CAP_VIDEO_WINDOW_OVERLAY 0x04000000 /* driver can scale video to an area within overlay */
/*
@@ -429,6 +430,12 @@ struct vo_overlay_s {
int width; /* width of subpicture area */
int height; /* height of subpicture area */
+ /* area within osd extent to scale video to */
+ int video_window_x;
+ int video_window_y;
+ int video_window_width;
+ int video_window_height;
+
/* extent of reference coordinate system */
int extent_width;
int extent_height;
diff --git a/src/xine-engine/xine_interface.c b/src/xine-engine/xine_interface.c
index 20101b436..8301414cd 100644
--- a/src/xine-engine/xine_interface.c
+++ b/src/xine-engine/xine_interface.c
@@ -868,6 +868,10 @@ void xine_osd_set_extent(xine_osd_t *this, int extent_width, int extent_height)
this->osd.renderer->set_extent(&this->osd, extent_width, extent_height);
}
+void xine_osd_set_video_window(xine_osd_t *this, int window_x, int window_y, int window_width, int window_height) {
+ this->osd.renderer->set_video_window(&this->osd, window_x, window_y, window_width, window_height);
+}
+
const char *const *xine_post_list_inputs(xine_post_t *this_gen) {
post_plugin_t *this = (post_plugin_t *)this_gen;
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-26 08:21:08 +0000