FaSTTUBe/GST-Tensordecoder-ov_ep
37
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

videbox: Use MIN instead of CLAMP for uint

Browse Source 
an unsigned int is always positive.

CID #206207
CID #206208
CID #206209
CID #206210
CID #206211

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/-/merge_requests/583>
This commit is contained in:
Edward Hervey 2020-05-06 06:48:24 +02:00 committed by GStreamer Merge Bot
parent 619457ae26
commit 756f390f56
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gst/videobox/gstvideobox.c
View File

@ -147,7 +147,7 @@ fill_ayuv (GstVideoBoxFill fill_type, guint b_alpha,
width = GST_VIDEO_FRAME_WIDTH (frame); width = GST_VIDEO_FRAME_WIDTH (frame);
height = GST_VIDEO_FRAME_HEIGHT (frame); height = GST_VIDEO_FRAME_HEIGHT (frame);
b_alpha = CLAMP (b_alpha, 0, 255); b_alpha = MIN (b_alpha, 255);
if (sdtv) if (sdtv)
empty_pixel = GUINT32_FROM_BE ((b_alpha << 24) | empty_pixel = GUINT32_FROM_BE ((b_alpha << 24) |
@ -1695,7 +1695,7 @@ copy_i420_ayuv (guint i_alpha, GstVideoFrame * dest_frame,
srcU = srcU + (src_y / 2) * src_strideU + src_x / 2; srcU = srcU + (src_y / 2) * src_strideU + src_x / 2;
srcV = srcV + (src_y / 2) * src_strideV + src_x / 2; srcV = srcV + (src_y / 2) * src_strideV + src_x / 2;
i_alpha = CLAMP (i_alpha, 0, 255); i_alpha = MIN (i_alpha, 255);
if (src_sdtv != dest_sdtv) { if (src_sdtv != dest_sdtv) {
gint i, j, uv_idx; gint i, j, uv_idx;
@ -1779,7 +1779,7 @@ fill_rgb32 (GstVideoBoxFill fill_type, guint b_alpha,
p[2] = GST_VIDEO_FRAME_COMP_OFFSET (frame, 1); p[2] = GST_VIDEO_FRAME_COMP_OFFSET (frame, 1);
p[3] = GST_VIDEO_FRAME_COMP_OFFSET (frame, 2); p[3] = GST_VIDEO_FRAME_COMP_OFFSET (frame, 2);
b_alpha = CLAMP (b_alpha, 0, 255); b_alpha = MIN (b_alpha, 255);
if (GST_VIDEO_FRAME_N_COMPONENTS (frame) == 4) { if (GST_VIDEO_FRAME_N_COMPONENTS (frame) == 4) {
empty_pixel = GUINT32_FROM_LE ((b_alpha << (p[0] * 8)) | empty_pixel = GUINT32_FROM_LE ((b_alpha << (p[0] * 8)) |
@ -1886,7 +1886,7 @@ copy_rgb32 (guint i_alpha, GstVideoFrame * dest_frame,
} }
} else if (out_alpha && !packed_in) { } else if (out_alpha && !packed_in) {
w *= 4; w *= 4;
i_alpha = CLAMP (i_alpha, 0, 255); i_alpha = MIN (i_alpha, 255);
for (i = 0; i < h; i++) { for (i = 0; i < h; i++) {
for (j = 0; j < w; j += 4) { for (j = 0; j < w; j += 4) {
@ -1899,7 +1899,7 @@ copy_rgb32 (guint i_alpha, GstVideoFrame * dest_frame,
src += src_stride; src += src_stride;
} }
} else if (out_alpha && packed_in) { } else if (out_alpha && packed_in) {
i_alpha = CLAMP (i_alpha, 0, 255); i_alpha = MIN (i_alpha, 255);
for (i = 0; i < h; i++) { for (i = 0; i < h; i++) {
for (j = 0; j < w; j++) { for (j = 0; j < w; j++) {
@ -1995,7 +1995,7 @@ copy_rgb32_ayuv (guint i_alpha, GstVideoFrame * dest_frame,
} }
} else if (!packed_in) { } else if (!packed_in) {
w *= 4; w *= 4;
i_alpha = CLAMP (i_alpha, 0, 255); i_alpha = MIN (i_alpha, 255);
for (i = 0; i < h; i++) { for (i = 0; i < h; i++) {
for (j = 0; j < w; j += 4) { for (j = 0; j < w; j += 4) {
@ -2017,7 +2017,7 @@ copy_rgb32_ayuv (guint i_alpha, GstVideoFrame * dest_frame,
src += src_stride; src += src_stride;
} }
} else { } else {
i_alpha = CLAMP (i_alpha, 0, 255); i_alpha = MIN (i_alpha, 255);
for (i = 0; i < h; i++) { for (i = 0; i < h; i++) {
for (j = 0; j < w; j++) { for (j = 0; j < w; j++) {