summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/video_out/video_out_xcbshm.c51
-rw-r--r--src/video_out/video_out_xshm.c51
2 files changed, 66 insertions, 36 deletions
diff --git a/src/video_out/video_out_xcbshm.c b/src/video_out/video_out_xcbshm.c
index d1af69529..6438cd18a 100644
--- a/src/video_out/video_out_xcbshm.c
+++ b/src/video_out/video_out_xcbshm.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2000-2012 the xine project
+ * Copyright (C) 2000-2014 the xine project
*
* This file is part of xine, a free video player.
*
@@ -532,7 +532,7 @@ static void xshm_update_frame_format (vo_driver_t *this_gen,
uint32_t width, uint32_t height,
double ratio, int format, int flags) {
xshm_frame_t *frame = (xshm_frame_t *) frame_gen;
- int j, pitch;
+ int j, y_pitch, uv_pitch;
flags &= VO_BOTH_FIELDS;
@@ -551,23 +551,38 @@ static void xshm_update_frame_format (vo_driver_t *this_gen,
/* bottom black pad for certain crop_top > crop_bottom cases */
if (format == XINE_IMGFMT_YV12) {
- pitch = (width + 7) & ~7;
- frame->vo_frame.pitches[0] = pitch;
- frame->vo_frame.base[0] = av_malloc (pitch * (height + 16));
- memset (frame->vo_frame.base[0] + pitch * height, 0, pitch * 16);
- pitch = ((width + 15) & ~15) >> 1;
- frame->vo_frame.pitches[1] = pitch;
- frame->vo_frame.pitches[2] = pitch;
- frame->vo_frame.base[1] = av_malloc (pitch * ((height + 17) / 2));
- memset (frame->vo_frame.base[1] + pitch * height / 2, 128, pitch * 8);
- frame->vo_frame.base[2] = av_malloc (pitch * ((height + 17) / 2));
- memset (frame->vo_frame.base[2] + pitch * height / 2, 128, pitch * 8);
+ y_pitch = (width + 7) & ~7;
+ frame->vo_frame.pitches[0] = y_pitch;
+ frame->vo_frame.base[0] = av_malloc (y_pitch * (height + 16));
+ uv_pitch = ((width + 15) & ~15) >> 1;
+ frame->vo_frame.pitches[1] = uv_pitch;
+ frame->vo_frame.pitches[2] = uv_pitch;
+ frame->vo_frame.base[1] = av_malloc (uv_pitch * ((height + 17) / 2));
+ frame->vo_frame.base[2] = av_malloc (uv_pitch * ((height + 17) / 2));
+ if (!frame->vo_frame.base[0] || !frame->vo_frame.base[1] || !frame->vo_frame.base[2]) {
+ av_freep (&frame->vo_frame.base[0]);
+ av_freep (&frame->vo_frame.base[1]);
+ av_freep (&frame->vo_frame.base[2]);
+ frame->sc.delivered_width = 0;
+ frame->vo_frame.width = 0;
+ } else {
+ memset (frame->vo_frame.base[0], 0, y_pitch * (height + 16));
+ memset (frame->vo_frame.base[1], 128, uv_pitch * (height + 16) / 2);
+ memset (frame->vo_frame.base[2], 128, uv_pitch * (height + 16) / 2);
+ }
} else {
- pitch = ((width + 3) & ~3) << 1;
- frame->vo_frame.pitches[0] = pitch;
- frame->vo_frame.base[0] = av_malloc (pitch * (height + 16));
- for (j = pitch * height; j < pitch * (height + 16); j++)
- (frame->vo_frame.base[0])[j] = (j & 1) << 7;
+ y_pitch = ((width + 3) & ~3) << 1;
+ frame->vo_frame.pitches[0] = y_pitch;
+ frame->vo_frame.base[0] = av_malloc (y_pitch * (height + 16));
+ if (frame->vo_frame.base[0]) {
+ const union {uint8_t bytes[4]; uint32_t word;} black = {{0, 128, 0, 128}};
+ uint32_t *q = (uint32_t *)frame->vo_frame.base[0];
+ for (j = y_pitch * (height + 16) / 4; j > 0; j--)
+ *q++ = black.word;
+ } else {
+ frame->sc.delivered_width = 0;
+ frame->vo_frame.width = 0;
+ }
}
/* defer the rest to xshm_frame_proc_setup () */
diff --git a/src/video_out/video_out_xshm.c b/src/video_out/video_out_xshm.c
index ea4754e8e..878de612b 100644
--- a/src/video_out/video_out_xshm.c
+++ b/src/video_out/video_out_xshm.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2000-2012 the xine project
+ * Copyright (C) 2000-2014 the xine project
*
* This file is part of xine, a free video player.
*
@@ -626,7 +626,7 @@ static void xshm_update_frame_format (vo_driver_t *this_gen,
uint32_t width, uint32_t height,
double ratio, int format, int flags) {
xshm_frame_t *frame = (xshm_frame_t *) frame_gen;
- int j, pitch;
+ int j, y_pitch, uv_pitch;
flags &= VO_BOTH_FIELDS;
@@ -645,23 +645,38 @@ static void xshm_update_frame_format (vo_driver_t *this_gen,
/* bottom black pad for certain crop_top > crop_bottom cases */
if (format == XINE_IMGFMT_YV12) {
- pitch = (width + 7) & ~7;
- frame->vo_frame.pitches[0] = pitch;
- frame->vo_frame.base[0] = av_malloc (pitch * (height + 16));
- memset (frame->vo_frame.base[0] + pitch * height, 0, pitch * 16);
- pitch = ((width + 15) & ~15) >> 1;
- frame->vo_frame.pitches[1] = pitch;
- frame->vo_frame.pitches[2] = pitch;
- frame->vo_frame.base[1] = av_malloc (pitch * ((height + 17) / 2));
- memset (frame->vo_frame.base[1] + pitch * height / 2, 128, pitch * 8);
- frame->vo_frame.base[2] = av_malloc (pitch * ((height + 17) / 2));
- memset (frame->vo_frame.base[2] + pitch * height / 2, 128, pitch * 8);
+ y_pitch = (width + 7) & ~7;
+ frame->vo_frame.pitches[0] = y_pitch;
+ frame->vo_frame.base[0] = av_malloc (y_pitch * (height + 16));
+ uv_pitch = ((width + 15) & ~15) >> 1;
+ frame->vo_frame.pitches[1] = uv_pitch;
+ frame->vo_frame.pitches[2] = uv_pitch;
+ frame->vo_frame.base[1] = av_malloc (uv_pitch * ((height + 17) / 2));
+ frame->vo_frame.base[2] = av_malloc (uv_pitch * ((height + 17) / 2));
+ if (!frame->vo_frame.base[0] || !frame->vo_frame.base[1] || !frame->vo_frame.base[2]) {
+ av_freep (&frame->vo_frame.base[0]);
+ av_freep (&frame->vo_frame.base[1]);
+ av_freep (&frame->vo_frame.base[2]);
+ frame->sc.delivered_width = 0;
+ frame->vo_frame.width = 0;
+ } else {
+ memset (frame->vo_frame.base[0], 0, y_pitch * (height + 16));
+ memset (frame->vo_frame.base[1], 128, uv_pitch * (height + 16) / 2);
+ memset (frame->vo_frame.base[2], 128, uv_pitch * (height + 16) / 2);
+ }
} else {
- pitch = ((width + 3) & ~3) << 1;
- frame->vo_frame.pitches[0] = pitch;
- frame->vo_frame.base[0] = av_malloc (pitch * (height + 16));
- for (j = pitch * height; j < pitch * (height + 16); j++)
- (frame->vo_frame.base[0])[j] = (j & 1) << 7;
+ y_pitch = ((width + 3) & ~3) << 1;
+ frame->vo_frame.pitches[0] = y_pitch;
+ frame->vo_frame.base[0] = av_malloc (y_pitch * (height + 16));
+ if (frame->vo_frame.base[0]) {
+ const union {uint8_t bytes[4]; uint32_t word;} black = {{0, 128, 0, 128}};
+ uint32_t *q = (uint32_t *)frame->vo_frame.base[0];
+ for (j = y_pitch * (height + 16) / 4; j > 0; j--)
+ *q++ = black.word;
+ } else {
+ frame->sc.delivered_width = 0;
+ frame->vo_frame.width = 0;
+ }
}
/* defer the rest to xshm_frame_proc_setup () */
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-22 05:24:52 +0000