diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2011-12-30 14:20:29 +0400 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2011-12-30 14:20:29 +0400 |
commit | c21cfb4fcdea919e9dac50cd7784cd4902695f1d (patch) | |
tree | 0091e7fa14c72af959cf07fbb6013261824cf242 /source/blender/blenkernel/intern/tracking.c | |
parent | 90760b9f877beba7eeb159d369406feb91feff03 (diff) | |
parent | e98e8acf1a00ec4fb1adf0c4e30bc687cfc8efad (diff) |
Camera tracking: improvements of track preview widget
- Enable bicybic filtering fir image displayed in track preview
- Option to show grayscale content of track preview
- When some channels are disabled, display exactly the same
content of preview image which is sending to tracker library.
Merged from tomato branch using command:
svn merge -r42382:42383 -r42384:42385 -r42394:42395 \
-r42397:42398 -r42398:42399 -r42406:42407 \
-r42410:42411 -r42417:42418 -r42471:42472 \
^/branches/soc-2011-tomato
Diffstat (limited to 'source/blender/blenkernel/intern/tracking.c')
-rw-r--r-- | source/blender/blenkernel/intern/tracking.c | 61 |
1 files changed, 42 insertions, 19 deletions
diff --git a/source/blender/blenkernel/intern/tracking.c b/source/blender/blenkernel/intern/tracking.c index b29e121beec..3fa7355767a 100644 --- a/source/blender/blenkernel/intern/tracking.c +++ b/source/blender/blenkernel/intern/tracking.c @@ -883,29 +883,53 @@ void BKE_tracking_context_free(MovieTrackingContext *context) MEM_freeN(context); } -static void disable_imbuf_channels(ImBuf *ibuf, MovieTrackingTrack *track) +/* zap channels from the imbuf that are disabled by the user. this can lead to + * better tracks sometimes. however, instead of simply zeroing the channels + * out, do a partial grayscale conversion so the display is better. */ +static void disable_imbuf_channels(ImBuf *ibuf, MovieTrackingTrack *track, int grayscale) { int x, y; + float scale; - if((track->flag&(TRACK_DISABLE_RED|TRACK_DISABLE_GREEN|TRACK_DISABLE_BLUE))==0) + if((track->flag&(TRACK_DISABLE_RED|TRACK_DISABLE_GREEN|TRACK_DISABLE_BLUE))==0 && !grayscale) return; + /* If only some components are selected, it's important to rescale the result + * appropriately so that e.g. if only blue is selected, it's not zeroed out. */ + scale = ((track->flag&TRACK_DISABLE_RED ) ? 0.0f : 0.2126f) + + ((track->flag&TRACK_DISABLE_GREEN) ? 0.0f : 0.7152f) + + ((track->flag&TRACK_DISABLE_BLUE) ? 0.0f : 0.0722f); + for(y= 0; y<ibuf->y; y++) { for (x= 0; x<ibuf->x; x++) { int pixel= ibuf->x*y + x; if(ibuf->rect_float) { float *rrgbf= ibuf->rect_float + pixel*4; - - if(track->flag&TRACK_DISABLE_RED) rrgbf[0]= 0; - if(track->flag&TRACK_DISABLE_GREEN) rrgbf[1]= 0; - if(track->flag&TRACK_DISABLE_BLUE) rrgbf[2]= 0; + float r = (track->flag&TRACK_DISABLE_RED) ? 0.0f : rrgbf[0]; + float g = (track->flag&TRACK_DISABLE_GREEN) ? 0.0f : rrgbf[1]; + float b = (track->flag&TRACK_DISABLE_BLUE) ? 0.0f : rrgbf[2]; + if (grayscale) { + float gray = (0.2126f*r + 0.7152f*g + 0.0722f*b) / scale; + rrgbf[0] = rrgbf[1] = rrgbf[2] = gray; + } else { + rrgbf[0] = r; + rrgbf[1] = g; + rrgbf[2] = b; + } } else { char *rrgb= (char*)ibuf->rect + pixel*4; - - if(track->flag&TRACK_DISABLE_RED) rrgb[0]= 0; - if(track->flag&TRACK_DISABLE_GREEN) rrgb[1]= 0; - if(track->flag&TRACK_DISABLE_BLUE) rrgb[2]= 0; + char r = (track->flag&TRACK_DISABLE_RED) ? 0 : rrgb[0]; + char g = (track->flag&TRACK_DISABLE_GREEN) ? 0 : rrgb[1]; + char b = (track->flag&TRACK_DISABLE_BLUE) ? 0 : rrgb[2]; + if (grayscale) { + float gray = (0.2126f*r + 0.7152f*g + 0.0722f*b) / scale; + rrgb[0] = rrgb[1] = rrgb[2] = gray; + } else { + rrgb[0] = r; + rrgb[1] = g; + rrgb[2] = b; + } } } } @@ -947,7 +971,12 @@ static ImBuf *get_area_imbuf(ImBuf *ibuf, MovieTrackingTrack *track, MovieTracki origin[1]= y1-margin; } - disable_imbuf_channels(tmpibuf, track); + if ((track->flag & TRACK_PREVIEW_GRAYSCALE) || + (track->flag & TRACK_DISABLE_RED) || + (track->flag & TRACK_DISABLE_GREEN) || + (track->flag & TRACK_DISABLE_BLUE) ) { + disable_imbuf_channels(tmpibuf, track, 1 /* grayscale */); + } return tmpibuf; } @@ -976,7 +1005,7 @@ static float *get_search_floatbuf(ImBuf *ibuf, MovieTrackingTrack *track, MovieT height= (track->search_max[1]-track->search_min[1])*ibuf->y; tmpibuf= BKE_tracking_get_search_imbuf(ibuf, track, marker, 0, 0, pos, origin); - disable_imbuf_channels(tmpibuf, track); + disable_imbuf_channels(tmpibuf, track, 0 /* don't grayscale */); *width_r= width; *height_r= height; @@ -988,14 +1017,11 @@ static float *get_search_floatbuf(ImBuf *ibuf, MovieTrackingTrack *track, MovieT if(tmpibuf->rect_float) { float *rrgbf= tmpibuf->rect_float + pixel*4; - *fp= 0.2126*rrgbf[0] + 0.7152*rrgbf[1] + 0.0722*rrgbf[2]; } else { unsigned char *rrgb= (unsigned char*)tmpibuf->rect + pixel*4; - *fp= (0.2126*rrgb[0] + 0.7152*rrgb[1] + 0.0722*rrgb[2])/255.0f; } - fp++; } } @@ -1017,14 +1043,11 @@ static unsigned char *get_ucharbuf(ImBuf *ibuf) if(ibuf->rect_float) { float *rrgbf= ibuf->rect_float + pixel*4; - *cp= FTOCHAR(0.2126f*rrgbf[0] + 0.7152f*rrgbf[1] + 0.0722f*rrgbf[2]); } else { unsigned char *rrgb= (unsigned char*)ibuf->rect + pixel*4; - *cp= 0.2126f*rrgb[0] + 0.7152f*rrgb[1] + 0.0722f*rrgb[2]; } - cp++; } } @@ -1039,7 +1062,7 @@ static unsigned char *get_search_bytebuf(ImBuf *ibuf, MovieTrackingTrack *track, unsigned char *pixels; tmpibuf= BKE_tracking_get_search_imbuf(ibuf, track, marker, 0, 0, pos, origin); - disable_imbuf_channels(tmpibuf, track); + disable_imbuf_channels(tmpibuf, track, 0 /* don't grayscale */); *width_r= tmpibuf->x; *height_r= tmpibuf->y; |