Changeset 736 for soft/giet_vm/applications/mjpeg/iqzz.c

Timestamp:

Dec 3, 2015, 4:40:49 PM (9 years ago)

Author:

alain

Message:

Modify the mjpeg application to support an optional
DCT hardware coprocessor.

File:

• soft/giet_vm/applications/mjpeg/iqzz.c (modified) (5 diffs)

soft/giet_vm/applications/mjpeg/iqzz.c

@@ -39 +39 @@
     uint32_t    block;
     uint32_t    i;
-    uint8_t     QTable[64];    // Quantisation Table / 1 byte per pixel
-    int16_t     bufin[64];     // Input data buffer  / 2 bytes per pixel
-    int32_t     bufout[64];    // Output data buffer / 4 bytes per pixel 
+    uint8_t     QT[64];      // Quantisation Table / 1 byte per pixel
+    int16_t     bin[64];     // Input data buffer  / 2 bytes per pixel
+    int32_t     bout[64];    // Output data buffer / 4 bytes per pixel 
 
     uint32_t    nblocks = nblocks_w * nblocks_h;
@@ -55 +55 @@
     giet_proc_xyp( &x , &y , &p );
 
-    PRINTF("\n[MJPEG] thread IQZZ[%d] starts on P[%d,%d,%d]\n", index, x, y, p )
+    PRINTF("\n[MJPEG] thread IQZZ[%d] starts on P[%d,%d,%d] / trdid = %x\n",
+           index , x , y , p, (uint32_t)trdid_iqzz[index] )
+
 
     uint32_t image = index;
@@ -62 +64 @@
     {
         // read the quantization coefs from mwmr_in_quanti (one byte per coef) 
-        mwmr_read( mwmr_in_quanti , (uint32_t*)QTable , 16 );
+        mwmr_read( mwmr_in_quanti , (uint32_t*)QT , 16 );
 
 #if (DEBUG_IQZZ > 1)
-PRINTF("\nIQZZ[%d] get quantisation coefs for image %d\n", index , image )
+if ( (index == DEBUG_CLUSTER_INDEX) || (DEBUG_CLUSTER_INDEX == 0XFFFFFFFF) )
+{ PRINTF("\nIQZZ[%d] get quantisation coefs for image %d\n"
+         "%d  %d  %d  %d  %d  %d  %d  %d\n"
+         "%d  %d  %d  %d  %d  %d  %d  %d\n"
+         "%d  %d  %d  %d  %d  %d  %d  %d\n"
+         "%d  %d  %d  %d  %d  %d  %d  %d\n"
+         "%d  %d  %d  %d  %d  %d  %d  %d\n"
+         "%d  %d  %d  %d  %d  %d  %d  %d\n"
+         "%d  %d  %d  %d  %d  %d  %d  %d\n"
+         "%d  %d  %d  %d  %d  %d  %d  %d\n",
+         index , image ,
+         QT[ 0],QT[ 1],QT[ 2],QT[ 3],QT[ 4],QT[ 5],QT[ 6],QT[ 7],
+         QT[ 8],QT[ 9],QT[10],QT[11],QT[12],QT[13],QT[14],QT[15],
+         QT[16],QT[17],QT[18],QT[19],QT[20],QT[21],QT[22],QT[23],
+         QT[24],QT[25],QT[26],QT[27],QT[28],QT[29],QT[30],QT[31],
+         QT[32],QT[33],QT[34],QT[35],QT[36],QT[37],QT[38],QT[39],
+         QT[40],QT[41],QT[42],QT[43],QT[44],QT[45],QT[46],QT[47],
+         QT[48],QT[49],QT[50],QT[51],QT[52],QT[53],QT[54],QT[55],
+         QT[56],QT[57],QT[58],QT[59],QT[60],QT[61],QT[62],QT[63] ) }
 #endif
 
@@ -71 +91 @@
         {
             // read one block from mwmr_in_data (2 bytes per pixel)
-            mwmr_read( mwmr_in_data , (uint32_t*)bufin , 32 );
+            mwmr_read( mwmr_in_data , (uint32_t*)bin , 32 );
 
             // unquantify & UnZZ each pixel
             for ( i = 0 ; i < 64 ; ++i ) 
             {
-                bufout[G_ZZ[i]] = bufin[i] * QTable[i];
+                bout[G_ZZ[i]] = bin[i] * QT[i];
             }
-    
+
             // write one block to IDCT / 4 bytes per pixel
-            mwmr_write( mwmr_out_data , (uint32_t*)bufout , 64 );
+            mwmr_write( mwmr_out_data , (uint32_t*)bout , 64 );
 
 #if (DEBUG_IQZZ > 1) 
-PRINTF("\nIQZZ[%d] completes block %d/%d in image %d\n", 
-       index , block , nblocks , image )
-PRINTF("  %d  %d  %d  %d  %d  %d  %d  %d\n"
-       "  %d  %d  %d  %d  %d  %d  %d  %d\n"
-       "  %d  %d  %d  %d  %d  %d  %d  %d\n"
-       "  %d  %d  %d  %d  %d  %d  %d  %d\n"
-       "  %d  %d  %d  %d  %d  %d  %d  %d\n"
-       "  %d  %d  %d  %d  %d  %d  %d  %d\n"
-       "  %d  %d  %d  %d  %d  %d  %d  %d\n"
-       "  %d  %d  %d  %d  %d  %d  %d  %d\n",
-       bufout[0] , bufout[1] , bufout[2] , bufout[3] , bufout[4] , bufout[5] , bufout[6] , bufout[7] ,
-       bufout[8] , bufout[9] , bufout[10], bufout[11], bufout[12], bufout[13], bufout[14], bufout[15],
-       bufout[16], bufout[17], bufout[18], bufout[19], bufout[20], bufout[21], bufout[22], bufout[23],
-       bufout[24], bufout[25], bufout[26], bufout[27], bufout[28], bufout[29], bufout[30], bufout[31],
-       bufout[32], bufout[33], bufout[34], bufout[35], bufout[36], bufout[37], bufout[38], bufout[39],
-       bufout[40], bufout[41], bufout[42], bufout[43], bufout[44], bufout[45], bufout[46], bufout[47],
-       bufout[48], bufout[49], bufout[50], bufout[51], bufout[52], bufout[53], bufout[54], bufout[55],
-       bufout[56], bufout[57], bufout[58], bufout[59], bufout[60], bufout[61], bufout[62], bufout[63])
+if ( (index == DEBUG_CLUSTER_INDEX) || (DEBUG_CLUSTER_INDEX == 0XFFFFFFFF) )
+{ PRINTF("\nIQZZ[%d] completes block %d/%d in image %d\n" 
+         "  %d  %d  %d  %d  %d  %d  %d  %d\n"
+         "  %d  %d  %d  %d  %d  %d  %d  %d\n"
+         "  %d  %d  %d  %d  %d  %d  %d  %d\n"
+         "  %d  %d  %d  %d  %d  %d  %d  %d\n"
+         "  %d  %d  %d  %d  %d  %d  %d  %d\n"
+         "  %d  %d  %d  %d  %d  %d  %d  %d\n"
+         "  %d  %d  %d  %d  %d  %d  %d  %d\n"
+         "  %d  %d  %d  %d  %d  %d  %d  %d\n",
+         index , block , nblocks , image ,
+         bout[0] , bout[1] , bout[2] , bout[3] , bout[4] , bout[5] , bout[6] , bout[7] ,
+         bout[8] , bout[9] , bout[10], bout[11], bout[12], bout[13], bout[14], bout[15],
+         bout[16], bout[17], bout[18], bout[19], bout[20], bout[21], bout[22], bout[23],
+         bout[24], bout[25], bout[26], bout[27], bout[28], bout[29], bout[30], bout[31],
+         bout[32], bout[33], bout[34], bout[35], bout[36], bout[37], bout[38], bout[39],
+         bout[40], bout[41], bout[42], bout[43], bout[44], bout[45], bout[46], bout[47],
+         bout[48], bout[49], bout[50], bout[51], bout[52], bout[53], bout[54], bout[55],
+         bout[56], bout[57], bout[58], bout[59], bout[60], bout[61], bout[62], bout[63]) }
 #endif
         }  // end for blocks
 
 #if DEBUG_IQZZ
-PRINTF("\nIQZZ[%d] completes image %d at cycle %d\n", index , image , giet_proctime() )
+if ( (index == DEBUG_CLUSTER_INDEX) || (DEBUG_CLUSTER_INDEX == 0XFFFFFFFF) )
+{ PRINTF("\nIQZZ[%d] completes image %d at cycle %d\n", index , image , giet_proctime() ) }
 #endif
 
@@ -112 +134 @@
     } // end while(1) on images
 
-    giet_pthread_exit( "iqzz completed" );
+    giet_pthread_exit( "IQZZ completed" );
 
 } // end iqzz()