Update of
/cvsroot/dirac/compress/util/instrumentation/libdirac_instru
ment
In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv1619
Modified Files:
draw_overlay.cpp motion_arrows.cpp motion_colour.cpp
motion_colour_arrows.cpp overlay.cpp pred_mode.cpp sad.cpp
split_mode.cpp
Log Message:
Treat all input and intermediate data as bipolar. It is
converted to unsigned
byte when written to the output file.
Index: sad.cpp
============================================================
=======
RCS file:
/cvsroot/dirac/compress/util/instrumentation/libdirac_instru
ment/sad.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** sad.cpp 6 Jun 2006 16:11:28 -0000 1.5
--- sad.cpp 31 Aug 2007 13:10:47 -0000 1.6
***************
*** 60,64 ****
int value = int(m_cost[j][i].SAD / (double(m_scale) /
250));
GetPowerUV(value, U, V);
! DrawMvBlockUV(j, i, U+125, V+125);
// if intra, draw white box round block
--- 60,64 ----
int value = int(m_cost[j][i].SAD / (double(m_scale) /
250));
GetPowerUV(value, U, V);
! DrawMvBlockUV(j, i, U, V);
// if intra, draw white box round block
Index: motion_arrows.cpp
============================================================
=======
RCS file:
/cvsroot/dirac/compress/util/instrumentation/libdirac_instru
ment/motion_arrows.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** motion_arrows.cpp 6 Jun 2006 16:11:28 -0000 1.5
--- motion_arrows.cpp 31 Aug 2007 13:10:47 -0000 1.6
***************
*** 66,71 ****
if (x >= m_frame.Udata().LengthX() || x
>= m_frame.Vdata().LengthX())
break;
! m_frame.Udata()[y][x] = 128;
! m_frame.Vdata()[y][x] = 128;
}
}
--- 66,71 ----
if (x >= m_frame.Udata().LengthX() || x
>= m_frame.Vdata().LengthX())
break;
! m_frame.Udata()[y][x] = 0;
! m_frame.Vdata()[y][x] = 0;
}
}
Index: draw_overlay.cpp
============================================================
=======
RCS file:
/cvsroot/dirac/compress/util/instrumentation/libdirac_instru
ment/draw_overlay.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** draw_overlay.cpp 19 Mar 2007 16:19:00 -0000 1.7
--- draw_overlay.cpp 31 Aug 2007 13:10:47 -0000 1.8
***************
*** 115,119 ****
for (int xpx=0; xpx<5; ++xpx)
! m_frame.Ydata()[ypx][xpx]=128; // grey
background
}
--- 115,119 ----
for (int xpx=0; xpx<5; ++xpx)
! m_frame.Ydata()[ypx][xpx]=0; // grey
background
}
***************
*** 131,136 ****
for (int xpx=0;
xpx<=4/m_draw_params.ChromaFactorX(); ++xpx)
{
! m_frame.Udata()[ypx][xpx]=U+128;
! m_frame.Vdata()[ypx][xpx]=V+128;
}
}
--- 131,136 ----
for (int xpx=0;
xpx<=4/m_draw_params.ChromaFactorX(); ++xpx)
{
! m_frame.Udata()[ypx][xpx]=U;
! m_frame.Vdata()[ypx][xpx]=V;
}
}
***************
*** 150,154 ****
for (int x=x_offset, x_ch=0; x<x_offset+8; ++x,
++x_ch)
{
! m_frame.Ydata()[y][x]=ch[y_ch][x_ch]*256;
}// x
}// y
--- 150,154 ----
for (int x=x_offset, x_ch=0; x<x_offset+8; ++x,
++x_ch)
{
! m_frame.Ydata()[y][x]=ch[y_ch][x_ch]*255-128;
}// x
}// y
***************
*** 159,164 ****
for (int
xpx=x_offset/m_draw_params.ChromaFactorX();
xpx<(x_offset+8)/m_draw_params.ChromaFactorX(); ++xpx)
{
! m_frame.Udata()[ypx][xpx]=128;
! m_frame.Vdata()[ypx][xpx]=128;
}// xpx
}// ypx
--- 159,164 ----
for (int
xpx=x_offset/m_draw_params.ChromaFactorX();
xpx<(x_offset+8)/m_draw_params.ChromaFactorX(); ++xpx)
{
! m_frame.Udata()[ypx][xpx]=0;
! m_frame.Vdata()[ypx][xpx]=0;
}// xpx
}// ypx
Index: motion_colour_arrows.cpp
============================================================
=======
RCS file:
/cvsroot/dirac/compress/util/instrumentation/libdirac_instru
ment/motion_colour_arrows.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** motion_colour_arrows.cpp 5 Jun 2006 14:57:03 -0000 1.4
--- motion_colour_arrows.cpp 31 Aug 2007 13:10:47 -0000 1.5
***************
*** 112,116 ****
for (int x=i; x<i+m_blocks_per_arrow_x;
++x)
{
! DrawMvBlockUV(y, x, U+128, V+128);
}
}
--- 112,116 ----
for (int x=i; x<i+m_blocks_per_arrow_x;
++x)
{
! DrawMvBlockUV(y, x, U, V);
}
}
Index: pred_mode.cpp
============================================================
=======
RCS file:
/cvsroot/dirac/compress/util/instrumentation/libdirac_instru
ment/pred_mode.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** pred_mode.cpp 5 Jun 2006 14:57:03 -0000 1.4
--- pred_mode.cpp 31 Aug 2007 13:10:47 -0000 1.5
***************
*** 66,70 ****
GetPowerUV(power, U, V);
! DrawMvBlockUV(j, i, U+125, V+125);
}
--- 66,70 ----
GetPowerUV(power, U, V);
! DrawMvBlockUV(j, i, U, V);
}
***************
*** 76,80 ****
{
for (int xpx=7; xpx>=0; --xpx)
! m_frame.Ydata()[ypx][xpx]=125;
}
--- 76,80 ----
{
for (int xpx=7; xpx>=0; --xpx)
! m_frame.Ydata()[ypx][xpx]=0;
}
***************
*** 82,99 ****
GetPowerUV(100, U, V); // intra
!
DrawBlockUV((m_draw_params.PicY()/m_draw_params.ChromaFactor
Y())-1-(64/m_draw_params.ChromaFactorY())+1, 0, U+125,
V+125);
!
DrawBlockUV((m_draw_params.PicY()/m_draw_params.ChromaFactor
Y())-1-(56/m_draw_params.ChromaFactorY())+1, 0, U+125,
V+125);
GetPowerUV(250, U, V); // ref 1
!
DrawBlockUV((m_draw_params.PicY()/m_draw_params.ChromaFactor
Y())-1-(48/m_draw_params.ChromaFactorY())+1, 0, U+125,
V+125);
!
DrawBlockUV((m_draw_params.PicY()/m_draw_params.ChromaFactor
Y())-1-(40/m_draw_params.ChromaFactorY())+1, 0, U+125,
V+125);
GetPowerUV(50, U, V); // ref 2
!
DrawBlockUV((m_draw_params.PicY()/m_draw_params.ChromaFactor
Y())-1-(32/m_draw_params.ChromaFactorY())+1, 0, U+125,
V+125);
!
DrawBlockUV((m_draw_params.PicY()/m_draw_params.ChromaFactor
Y())-1-(24/m_draw_params.ChromaFactorY())+1, 0, U+125,
V+125);
GetPowerUV(0, U, V); // ref 1 and 2
!
DrawBlockUV((m_draw_params.PicY()/m_draw_params.ChromaFactor
Y())-1-(16/m_draw_params.ChromaFactorY())+1, 0, U+125,
V+125);
!
DrawBlockUV((m_draw_params.PicY()/m_draw_params.ChromaFactor
Y())-1-(8/m_draw_params.ChromaFactorY())+1, 0, U+125,
V+125);
// black horizontal lines
--- 82,99 ----
GetPowerUV(100, U, V); // intra
!
DrawBlockUV((m_draw_params.PicY()/m_draw_params.ChromaFactor
Y())-1-(64/m_draw_params.ChromaFactorY())+1, 0, U, V);
!
DrawBlockUV((m_draw_params.PicY()/m_draw_params.ChromaFactor
Y())-1-(56/m_draw_params.ChromaFactorY())+1, 0, U, V);
GetPowerUV(250, U, V); // ref 1
!
DrawBlockUV((m_draw_params.PicY()/m_draw_params.ChromaFactor
Y())-1-(48/m_draw_params.ChromaFactorY())+1, 0, U, V);
!
DrawBlockUV((m_draw_params.PicY()/m_draw_params.ChromaFactor
Y())-1-(40/m_draw_params.ChromaFactorY())+1, 0, U, V);
GetPowerUV(50, U, V); // ref 2
!
DrawBlockUV((m_draw_params.PicY()/m_draw_params.ChromaFactor
Y())-1-(32/m_draw_params.ChromaFactorY())+1, 0, U, V);
!
DrawBlockUV((m_draw_params.PicY()/m_draw_params.ChromaFactor
Y())-1-(24/m_draw_params.ChromaFactorY())+1, 0, U, V);
GetPowerUV(0, U, V); // ref 1 and 2
!
DrawBlockUV((m_draw_params.PicY()/m_draw_params.ChromaFactor
Y())-1-(16/m_draw_params.ChromaFactorY())+1, 0, U, V);
!
DrawBlockUV((m_draw_params.PicY()/m_draw_params.ChromaFactor
Y())-1-(8/m_draw_params.ChromaFactorY())+1, 0, U, V);
// black horizontal lines
***************
*** 125,130 ****
for (int xpx=(32/m_draw_params.MvYBlockX())-1;
xpx>=(16/m_draw_params.ChromaFactorX()); --xpx)
{
! m_frame.Udata()[ypx][xpx]=125;
! m_frame.Vdata()[ypx][xpx]=125;
}
}
--- 125,130 ----
for (int xpx=(32/m_draw_params.MvYBlockX())-1;
xpx>=(16/m_draw_params.ChromaFactorX()); --xpx)
{
! m_frame.Udata()[ypx][xpx]=0;
! m_frame.Vdata()[ypx][xpx]=0;
}
}
Index: motion_colour.cpp
============================================================
=======
RCS file:
/cvsroot/dirac/compress/util/instrumentation/libdirac_instru
ment/motion_colour.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** motion_colour.cpp 5 Jun 2006 14:57:03 -0000 1.4
--- motion_colour.cpp 31 Aug 2007 13:10:47 -0000 1.5
***************
*** 56,61 ****
void DrawMotionColour: rawBlock
(int j, int i)
{
! DrawMvBlockUV(j, i, (((m_mv[j][i].x) *
(125/m_mv_clip)) / m_mv_scale) + 125,
! (((m_mv[j][i].y) *
(125/m_mv_clip)) / m_mv_scale) + 125);
}
--- 56,61 ----
void DrawMotionColour:rawBlock
(int j, int i)
{
! DrawMvBlockUV(j, i, (((m_mv[j][i].x) *
(125/m_mv_clip)) / m_mv_scale),
! (((m_mv[j][i].y) *
(125/m_mv_clip)) / m_mv_scale));
}
***************
*** 70,78 ****
for (int xpx=1; xpx<40; ++xpx)
{
! m_frame.Ydata()[ypx][xpx]=125;
}
// crosshair vertical line
! m_frame.Ydata()[ypx][21]=88;
}
--- 70,78 ----
for (int xpx=1; xpx<40; ++xpx)
{
! m_frame.Ydata()[ypx][xpx]=0;
}
// crosshair vertical line
! m_frame.Ydata()[ypx][21]=88-128;
}
***************
*** 84,89 ****
for (int xpx=40/m_draw_params.ChromaFactorX(),
x=20; xpx>=0; --xpx, x-=m_draw_params.ChromaFactorX())
{
! m_frame.Udata()[ypx][xpx]=(x*25)+125;
! m_frame.Vdata()[ypx][xpx]=(y*25)+125;
}
}
--- 84,89 ----
for (int xpx=40/m_draw_params.ChromaFactorX(),
x=20; xpx>=0; --xpx, x-=m_draw_params.ChromaFactorX())
{
! m_frame.Udata()[ypx][xpx]=(x*25)-128;
! m_frame.Vdata()[ypx][xpx]=(y*25)-128;
}
}
***************
*** 92,96 ****
for (int xpx=0; xpx<40; ++xpx)
{
! m_frame.Ydata()[y_start+16][xpx]=88;
}
--- 92,96 ----
for (int xpx=0; xpx<40; ++xpx)
{
! m_frame.Ydata()[y_start+16][xpx]=88-128;
}
***************
*** 98,103 ****
for (int ypx=y_start+1; ypx<=y_start+30; ++ypx)
{
! m_frame.Ydata()[ypx][41]=0;
! m_frame.Ydata()[ypx][0]=0;
}
--- 98,103 ----
for (int ypx=y_start+1; ypx<=y_start+30; ++ypx)
{
! m_frame.Ydata()[ypx][41]=-128;
! m_frame.Ydata()[ypx][0]=-128;
}
Index: split_mode.cpp
============================================================
=======
RCS file:
/cvsroot/dirac/compress/util/instrumentation/libdirac_instru
ment/split_mode.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** split_mode.cpp 5 Jun 2006 14:57:04 -0000 1.5
--- split_mode.cpp 31 Aug 2007 13:10:47 -0000 1.6
***************
*** 63,67 ****
GetPowerUV(power, U, V);
! DrawMvBlockUV(j, i, U+125, V+125);
}
--- 63,67 ----
GetPowerUV(power, U, V);
! DrawMvBlockUV(j, i, U, V);
}
***************
*** 74,78 ****
{
for (int xpx=7; xpx>=0; --xpx)
! m_frame.Ydata()[ypx][xpx]=125; // grey
}
--- 74,78 ----
{
for (int xpx=7; xpx>=0; --xpx)
! m_frame.Ydata()[ypx][xpx]=0; // grey
}
***************
*** 80,100 ****
GetPowerUV(200, U, V); // mode 2
!
DrawBlockUV((m_draw_params.PicY()/m_draw_params.ChromaFactor
Y())-1-(48/m_draw_params.ChromaFactorY())+1, 0, U+125,
V+125);
!
DrawBlockUV((m_draw_params.PicY()/m_draw_params.ChromaFactor
Y())-1-(40/m_draw_params.ChromaFactorY())+1, 0, U+125,
V+125);
GetPowerUV(100, U, V); // mode 1
!
DrawBlockUV((m_draw_params.PicY()/m_draw_params.ChromaFactor
Y())-1-(32/m_draw_params.ChromaFactorY())+1, 0, U+125,
V+125);
!
DrawBlockUV((m_draw_params.PicY()/m_draw_params.ChromaFactor
Y())-1-(24/m_draw_params.ChromaFactorY())+1, 0, U+125,
V+125);
GetPowerUV(0, U, V); // mode 0
!
DrawBlockUV((m_draw_params.PicY()/m_draw_params.ChromaFactor
Y())-1-(16/m_draw_params.ChromaFactorY())+1, 0, U+125,
V+125);
!
DrawBlockUV((m_draw_params.PicY()/m_draw_params.ChromaFactor
Y())-1-(8/m_draw_params.ChromaFactorY())+1, 0, U+125,
V+125);
// black horizontal lines
for (int xpx=15; xpx>=0; --xpx)
{
! m_frame.Ydata()[m_draw_params.PicY()-49][xpx]=0;
! m_frame.Ydata()[m_draw_params.PicY()-33][xpx]=0;
! m_frame.Ydata()[m_draw_params.PicY()-17][xpx]=0;
}
--- 80,100 ----
GetPowerUV(200, U, V); // mode 2
!
DrawBlockUV((m_draw_params.PicY()/m_draw_params.ChromaFactor
Y())-1-(48/m_draw_params.ChromaFactorY())+1, 0, U, V);
!
DrawBlockUV((m_draw_params.PicY()/m_draw_params.ChromaFactor
Y())-1-(40/m_draw_params.ChromaFactorY())+1, 0, U, V);
GetPowerUV(100, U, V); // mode 1
!
DrawBlockUV((m_draw_params.PicY()/m_draw_params.ChromaFactor
Y())-1-(32/m_draw_params.ChromaFactorY())+1, 0, U, V);
!
DrawBlockUV((m_draw_params.PicY()/m_draw_params.ChromaFactor
Y())-1-(24/m_draw_params.ChromaFactorY())+1, 0, U, V);
GetPowerUV(0, U, V); // mode 0
!
DrawBlockUV((m_draw_params.PicY()/m_draw_params.ChromaFactor
Y())-1-(16/m_draw_params.ChromaFactorY())+1, 0, U, V);
!
DrawBlockUV((m_draw_params.PicY()/m_draw_params.ChromaFactor
Y())-1-(8/m_draw_params.ChromaFactorY())+1, 0, U, V);
// black horizontal lines
for (int xpx=15; xpx>=0; --xpx)
{
!
m_frame.Ydata()[m_draw_params.PicY()-49][xpx]=-128;
!
m_frame.Ydata()[m_draw_params.PicY()-33][xpx]=-128;
!
m_frame.Ydata()[m_draw_params.PicY()-17][xpx]=-128;
}
Index: overlay.cpp
============================================================
=======
RCS file:
/cvsroot/dirac/compress/util/instrumentation/libdirac_instru
ment/overlay.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** overlay.cpp 5 Jun 2006 14:57:03 -0000 1.8
--- overlay.cpp 31 Aug 2007 13:10:47 -0000 1.9
***************
*** 63,67 ****
{
for (int i=0; i<=m_frame.Ydata().LastX();
++i)
! m_frame.Ydata()[j][i]=128;
}
}
--- 63,67 ----
{
for (int i=0; i<=m_frame.Ydata().LastX();
++i)
! m_frame.Ydata()[j][i]=0;
}
}
***************
*** 72,77 ****
for (int i=0; i<m_frame.Udata().LengthX();
++i)
{
! m_frame.Udata()[j][i]=128;
! m_frame.Vdata()[j][i]=128;
}
}
--- 72,77 ----
for (int i=0; i<m_frame.Udata().LengthX();
++i)
{
! m_frame.Udata()[j][i]=0;
! m_frame.Vdata()[j][i]=0;
}
}
***************
*** 105,109 ****
{
for (int i=0; i<=m_frame.Ydata().LastX();
++i)
! m_frame.Ydata()[j][i]=128;
}
}
--- 105,109 ----
{
for (int i=0; i<=m_frame.Ydata().LastX();
++i)
! m_frame.Ydata()[j][i]=0;
}
}
***************
*** 259,264 ****
for (int x=0; x<m_frame.Udata().LengthX();
++x)
{
! m_frame.Udata()[y][x] = 128;
! m_frame.Vdata()[y][x] = 128;
}
}
--- 259,264 ----
for (int x=0; x<m_frame.Udata().LengthX();
++x)
{
! m_frame.Udata()[y][x] = 0;
! m_frame.Vdata()[y][x] = 0;
}
}
------------------------------------------------------------
-------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and
a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Dirac-commits mailing list
Dirac-commits lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/dirac-com
mits
|