mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 05:16:13 +00:00
Code Issues 1 Projects Releases Wiki Activity

jpegdec: fix branch hints

Browse source 
Remove inappropriate branching hints and add some new ones.
This commit is contained in:
Tim-Philipp Müller 2009-10-16 13:41:45 +01:00
parent 4fb3f2519c
commit c83ea23a03
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
ext/jpeg/gstjpegdec.c
View file

@ -702,20 +702,20 @@ gst_jpeg_dec_decode_indirect (GstJpegDec * dec, guchar * base[3],
for (i = 0; i < height; i += r_v * DCTSIZE) { for (i = 0; i < height; i += r_v * DCTSIZE) {
lines = jpeg_read_raw_data (&dec->cinfo, scanarray, r_v * DCTSIZE); lines = jpeg_read_raw_data (&dec->cinfo, scanarray, r_v * DCTSIZE);
if (G_LIKELY (lines)) { if (G_LIKELY (lines > 0)) {
for (j = 0, k = 0; j < (r_v * DCTSIZE); j += r_v, k++) { for (j = 0, k = 0; j < (r_v * DCTSIZE); j += r_v, k++) {
memcpy (base[0], y_rows[j], I420_Y_ROWSTRIDE (width)); memcpy (base[0], y_rows[j], I420_Y_ROWSTRIDE (width));
if (base[0] < last[0]) if (G_LIKELY (base[0] < last[0]))
base[0] += I420_Y_ROWSTRIDE (width); base[0] += I420_Y_ROWSTRIDE (width);
if (G_LIKELY (r_v == 2)) { if (r_v == 2) {
memcpy (base[0], y_rows[j + 1], I420_Y_ROWSTRIDE (width)); memcpy (base[0], y_rows[j + 1], I420_Y_ROWSTRIDE (width));
if (base[0] < last[0]) if (G_LIKELY (base[0] < last[0]))
base[0] += I420_Y_ROWSTRIDE (width); base[0] += I420_Y_ROWSTRIDE (width);
} }
if (G_LIKELY (r_h == 2)) { if (r_h == 2) {
memcpy (base[1], u_rows[k], I420_U_ROWSTRIDE (width)); memcpy (base[1], u_rows[k], I420_U_ROWSTRIDE (width));
memcpy (base[2], v_rows[k], I420_V_ROWSTRIDE (width)); memcpy (base[2], v_rows[k], I420_V_ROWSTRIDE (width));
} else if (G_UNLIKELY (r_h == 1)) { } else if (r_h == 1) {
hresamplecpy1 (base[1], u_rows[k], I420_U_ROWSTRIDE (width)); hresamplecpy1 (base[1], u_rows[k], I420_U_ROWSTRIDE (width));
hresamplecpy1 (base[2], v_rows[k], I420_V_ROWSTRIDE (width)); hresamplecpy1 (base[2], v_rows[k], I420_V_ROWSTRIDE (width));
} else { } else {
@ -723,7 +723,7 @@ gst_jpeg_dec_decode_indirect (GstJpegDec * dec, guchar * base[3],
} }
if (r_v == 2 || (k & 1) != 0) { if (r_v == 2 || (k & 1) != 0) {
if (base[1] < last[1] && base[2] < last[2]) { if (G_LIKELY (base[1] < last[1] && base[2] < last[2])) {
base[1] += I420_U_ROWSTRIDE (width); base[1] += I420_U_ROWSTRIDE (width);
base[2] += I420_V_ROWSTRIDE (width); base[2] += I420_V_ROWSTRIDE (width);
} }