summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/video_out/video_out_xcbshm.c90
-rw-r--r--src/video_out/video_out_xshm.c90
2 files changed, 90 insertions, 90 deletions
diff --git a/src/video_out/video_out_xcbshm.c b/src/video_out/video_out_xcbshm.c
index eb211e75d..9ca0beeb3 100644
--- a/src/video_out/video_out_xcbshm.c
+++ b/src/video_out/video_out_xcbshm.c
@@ -233,6 +233,51 @@ static uint32_t xshm_get_capabilities (vo_driver_t *this_gen) {
return capabilities;
}
+static void xshm_compute_ideal_size (xshm_driver_t *this, xshm_frame_t *frame) {
+ _x_vo_scale_compute_ideal_size( &frame->sc );
+}
+
+static void xshm_compute_rgb_size (xshm_driver_t *this, xshm_frame_t *frame) {
+ _x_vo_scale_compute_output_size( &frame->sc );
+
+ /* avoid problems in yuv2rgb */
+ if (frame->sc.output_height < 1)
+ frame->sc.output_height = 1;
+ if (frame->sc.output_width < 8)
+ frame->sc.output_width = 8;
+ if (frame->sc.output_width & 1) /* yuv2rgb_mlib needs an even YUV2 width */
+ frame->sc.output_width++;
+
+ lprintf("frame source (%d) %d x %d => screen output %d x %d%s\n",
+ frame->vo_frame.id,
+ frame->sc.delivered_width, frame->sc.delivered_height,
+ frame->sc.output_width, frame->sc.output_height,
+ ( frame->sc.delivered_width != frame->sc.output_width
+ || frame->sc.delivered_height != frame->sc.output_height
+ ? ", software scaling"
+ : "" )
+ );
+}
+
+static void xshm_frame_field (vo_frame_t *vo_img, int which_field) {
+ xshm_frame_t *frame = (xshm_frame_t *) vo_img ;
+ /* xshm_driver_t *this = (xshm_driver_t *) vo_img->driver; */
+
+ switch (which_field) {
+ case VO_TOP_FIELD:
+ frame->rgb_dst = frame->image;
+ break;
+ case VO_BOTTOM_FIELD:
+ frame->rgb_dst = frame->image + frame->bytes_per_line;
+ break;
+ case VO_BOTH_FIELDS:
+ frame->rgb_dst = frame->image;
+ break;
+ }
+
+ frame->yuv2rgb->next_slice (frame->yuv2rgb, NULL);
+}
+
static void xshm_frame_proc_slice (vo_frame_t *vo_img, uint8_t **src) {
xshm_frame_t *frame = (xshm_frame_t *) vo_img ;
/*xshm_driver_t *this = (xshm_driver_t *) vo_img->driver; */
@@ -260,25 +305,6 @@ static void xshm_frame_proc_slice (vo_frame_t *vo_img, uint8_t **src) {
lprintf ("copy...done\n");
}
-static void xshm_frame_field (vo_frame_t *vo_img, int which_field) {
- xshm_frame_t *frame = (xshm_frame_t *) vo_img ;
- /* xshm_driver_t *this = (xshm_driver_t *) vo_img->driver; */
-
- switch (which_field) {
- case VO_TOP_FIELD:
- frame->rgb_dst = frame->image;
- break;
- case VO_BOTTOM_FIELD:
- frame->rgb_dst = frame->image + frame->bytes_per_line;
- break;
- case VO_BOTH_FIELDS:
- frame->rgb_dst = frame->image;
- break;
- }
-
- frame->yuv2rgb->next_slice (frame->yuv2rgb, NULL);
-}
-
static void xshm_frame_dispose (vo_frame_t *vo_img) {
xshm_frame_t *frame = (xshm_frame_t *) vo_img ;
xshm_driver_t *this = (xshm_driver_t *) vo_img->driver;
@@ -329,32 +355,6 @@ static vo_frame_t *xshm_alloc_frame (vo_driver_t *this_gen) {
return (vo_frame_t *) frame;
}
-static void xshm_compute_ideal_size (xshm_driver_t *this, xshm_frame_t *frame) {
- _x_vo_scale_compute_ideal_size( &frame->sc );
-}
-
-static void xshm_compute_rgb_size (xshm_driver_t *this, xshm_frame_t *frame) {
- _x_vo_scale_compute_output_size( &frame->sc );
-
- /* avoid problems in yuv2rgb */
- if (frame->sc.output_height < 1)
- frame->sc.output_height = 1;
- if (frame->sc.output_width < 8)
- frame->sc.output_width = 8;
- if (frame->sc.output_width & 1) /* yuv2rgb_mlib needs an even YUV2 width */
- frame->sc.output_width++;
-
- lprintf("frame source (%d) %d x %d => screen output %d x %d%s\n",
- frame->vo_frame.id,
- frame->sc.delivered_width, frame->sc.delivered_height,
- frame->sc.output_width, frame->sc.output_height,
- ( frame->sc.delivered_width != frame->sc.output_width
- || frame->sc.delivered_height != frame->sc.output_height
- ? ", software scaling"
- : "" )
- );
-}
-
static void xshm_update_frame_format (vo_driver_t *this_gen,
vo_frame_t *frame_gen,
uint32_t width, uint32_t height,
diff --git a/src/video_out/video_out_xshm.c b/src/video_out/video_out_xshm.c
index 5dfc2c34e..2b6f696b6 100644
--- a/src/video_out/video_out_xshm.c
+++ b/src/video_out/video_out_xshm.c
@@ -325,6 +325,51 @@ static uint32_t xshm_get_capabilities (vo_driver_t *this_gen) {
return capabilities;
}
+static void xshm_compute_ideal_size (xshm_driver_t *this, xshm_frame_t *frame) {
+ _x_vo_scale_compute_ideal_size( &frame->sc );
+}
+
+static void xshm_compute_rgb_size (xshm_driver_t *this, xshm_frame_t *frame) {
+ _x_vo_scale_compute_output_size( &frame->sc );
+
+ /* avoid problems in yuv2rgb */
+ if (frame->sc.output_height < 1)
+ frame->sc.output_height = 1;
+ if (frame->sc.output_width < 8)
+ frame->sc.output_width = 8;
+ if (frame->sc.output_width & 1) /* yuv2rgb_mlib needs an even YUV2 width */
+ frame->sc.output_width++;
+
+ lprintf("frame source (%d) %d x %d => screen output %d x %d%s\n",
+ frame->vo_frame.id,
+ frame->sc.delivered_width, frame->sc.delivered_height,
+ frame->sc.output_width, frame->sc.output_height,
+ ( frame->sc.delivered_width != frame->sc.output_width
+ || frame->sc.delivered_height != frame->sc.output_height
+ ? ", software scaling"
+ : "" )
+ );
+}
+
+static void xshm_frame_field (vo_frame_t *vo_img, int which_field) {
+ xshm_frame_t *frame = (xshm_frame_t *) vo_img ;
+ /* xshm_driver_t *this = (xshm_driver_t *) vo_img->driver; */
+
+ switch (which_field) {
+ case VO_TOP_FIELD:
+ frame->rgb_dst = (uint8_t *)frame->image->data;
+ break;
+ case VO_BOTTOM_FIELD:
+ frame->rgb_dst = (uint8_t *)frame->image->data + frame->image->bytes_per_line ;
+ break;
+ case VO_BOTH_FIELDS:
+ frame->rgb_dst = (uint8_t *)frame->image->data;
+ break;
+ }
+
+ frame->yuv2rgb->next_slice (frame->yuv2rgb, NULL);
+}
+
static void xshm_frame_proc_slice (vo_frame_t *vo_img, uint8_t **src) {
xshm_frame_t *frame = (xshm_frame_t *) vo_img ;
/*xshm_driver_t *this = (xshm_driver_t *) vo_img->driver; */
@@ -352,25 +397,6 @@ static void xshm_frame_proc_slice (vo_frame_t *vo_img, uint8_t **src) {
lprintf ("copy...done\n");
}
-static void xshm_frame_field (vo_frame_t *vo_img, int which_field) {
- xshm_frame_t *frame = (xshm_frame_t *) vo_img ;
- /* xshm_driver_t *this = (xshm_driver_t *) vo_img->driver; */
-
- switch (which_field) {
- case VO_TOP_FIELD:
- frame->rgb_dst = (uint8_t *)frame->image->data;
- break;
- case VO_BOTTOM_FIELD:
- frame->rgb_dst = (uint8_t *)frame->image->data + frame->image->bytes_per_line ;
- break;
- case VO_BOTH_FIELDS:
- frame->rgb_dst = (uint8_t *)frame->image->data;
- break;
- }
-
- frame->yuv2rgb->next_slice (frame->yuv2rgb, NULL);
-}
-
static void xshm_frame_dispose (vo_frame_t *vo_img) {
xshm_frame_t *frame = (xshm_frame_t *) vo_img ;
xshm_driver_t *this = (xshm_driver_t *) vo_img->driver;
@@ -421,32 +447,6 @@ static vo_frame_t *xshm_alloc_frame (vo_driver_t *this_gen) {
return (vo_frame_t *) frame;
}
-static void xshm_compute_ideal_size (xshm_driver_t *this, xshm_frame_t *frame) {
- _x_vo_scale_compute_ideal_size( &frame->sc );
-}
-
-static void xshm_compute_rgb_size (xshm_driver_t *this, xshm_frame_t *frame) {
- _x_vo_scale_compute_output_size( &frame->sc );
-
- /* avoid problems in yuv2rgb */
- if (frame->sc.output_height < 1)
- frame->sc.output_height = 1;
- if (frame->sc.output_width < 8)
- frame->sc.output_width = 8;
- if (frame->sc.output_width & 1) /* yuv2rgb_mlib needs an even YUV2 width */
- frame->sc.output_width++;
-
- lprintf("frame source (%d) %d x %d => screen output %d x %d%s\n",
- frame->vo_frame.id,
- frame->sc.delivered_width, frame->sc.delivered_height,
- frame->sc.output_width, frame->sc.output_height,
- ( frame->sc.delivered_width != frame->sc.output_width
- || frame->sc.delivered_height != frame->sc.output_height
- ? ", software scaling"
- : "" )
- );
-}
-
static void xshm_update_frame_format (vo_driver_t *this_gen,
vo_frame_t *frame_gen,
uint32_t width, uint32_t height,
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-22 13:31:24 +0000