summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim-Philipp Müller <tim.muller@collabora.co.uk>2009-10-16 13:41:45 +0100
committerTim-Philipp Müller <tim.muller@collabora.co.uk>2009-10-16 13:41:45 +0100
commitc83ea23a03538030c0866c7d02337d05b4ecdc15 (patch)
tree23b58c1569e382a115de5273255764c6a49f2e97
parent4fb3f2519cfaf5add427c52b606b4b4278462633 (diff)
jpegdec: fix branch hints
Remove inappropriate branching hints and add some new ones.
-rw-r--r--ext/jpeg/gstjpegdec.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/ext/jpeg/gstjpegdec.c b/ext/jpeg/gstjpegdec.c
index 2bea646ea..f481e0e65 100644
--- a/ext/jpeg/gstjpegdec.c
+++ b/ext/jpeg/gstjpegdec.c
@@ -702,20 +702,20 @@ gst_jpeg_dec_decode_indirect (GstJpegDec * dec, guchar * base[3],
for (i = 0; i < height; i += 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++) {
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);
- if (G_LIKELY (r_v == 2)) {
+ if (r_v == 2) {
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);
}
- if (G_LIKELY (r_h == 2)) {
+ if (r_h == 2) {
memcpy (base[1], u_rows[k], I420_U_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[2], v_rows[k], I420_V_ROWSTRIDE (width));
} else {
@@ -723,7 +723,7 @@ gst_jpeg_dec_decode_indirect (GstJpegDec * dec, guchar * base[3],
}
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[2] += I420_V_ROWSTRIDE (width);
}