Changeset 736 for soft/giet_vm/applications/mjpeg/demux.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/demux.c (modified) (14 diffs)

soft/giet_vm/applications/mjpeg/demux.c

@@ -86 +86 @@
     // giet_tty_alloc( 0 );
 
-    PRINTF("\n[MJPEG] thread DEMUX[%d] starts on P[%d,%d,%d]\n", index, x, y, p )
+    PRINTF("\n[MJPEG] thread DEMUX[%d] starts on P[%d,%d,%d] / trdid = %x\n", 
+           index , x , y , p, (uint32_t)trdid_demux[index] )
 
     // initialise BUFIO for MWMR channel <in>
@@ -95 +96 @@
 
 #if (DEBUG_DEMUX > 1)
-PRINTF("\nDEMUX[%d] <in> : &mwmr = %x / &bufio = %x\n", 
-       index , mwmr_in , &bufio_in )
+if ( (index == DEBUG_CLUSTER_INDEX) || (DEBUG_CLUSTER_INDEX == 0XFFFFFFFF) )
+{ PRINTF("\nDEMUX[%d] <in> : &mwmr = %x / &bufio = %x\n", 
+         index , mwmr_in , &bufio_in ) }
 #endif
 
@@ -106 +108 @@
 
 #if (DEBUG_DEMUX > 1)
-PRINTF("\nDEMUX[%d] : <out_quanti> : mwmr = %x / &bufio = %x\n",
-       index , mwmr_out_quanti , &bufio_out_quanti )
+if ( (index == DEBUG_CLUSTER_INDEX) || (DEBUG_CLUSTER_INDEX == 0XFFFFFFFF) )
+{ PRINTF("\nDEMUX[%d] : <out_quanti> : mwmr = %x / &bufio = %x\n",
+         index , mwmr_out_quanti , &bufio_out_quanti ) }
 #endif
 
@@ -117 +120 @@
 
 #if (DEBUG_DEMUX > 1)
-PRINTF("\nDEMUX[%d] : <out_huff> : mwmr = %x / &bufio = %x\n",
-       index , mwmr_out_huff , &bufio_out_huff )
+if ( (index == DEBUG_CLUSTER_INDEX) || (DEBUG_CLUSTER_INDEX == 0XFFFFFFFF) )
+{ PRINTF("\nDEMUX[%d] : <out_huff> : mwmr = %x / &bufio = %x\n",
+         index , mwmr_out_huff , &bufio_out_huff ) }
 #endif
 
@@ -128 +132 @@
 
 #if (DEBUG_DEMUX > 1)
-PRINTF("\nDEMUX[%d] : <out_data> : mwmr = %x / &bufio = %x\n",
-       index , mwmr_out_data , &bufio_out_data )
+if ( (index == DEBUG_CLUSTER_INDEX) || (DEBUG_CLUSTER_INDEX == 0XFFFFFFFF) )
+{ PRINTF("\nDEMUX[%d] : <out_data> : mwmr = %x / &bufio = %x\n",
+         index , mwmr_out_data , &bufio_out_data ) }
 #endif
 
@@ -150 +155 @@
             marker = get_next_marker( &bufio_in );
 
-#if (DEBUG_DEMUX > 1)
-if ( marker == SOI_MK ) PRINTF("\nDEMUX[%x] found Start of Image marker\n", index )
-#endif
         } 
         while ( marker != SOI_MK );
+
+#if (DEBUG_DEMUX > 1)
+if ( (index == DEBUG_CLUSTER_INDEX) || (DEBUG_CLUSTER_INDEX == 0XFFFFFFFF) )
+{ PRINTF("\nDEMUX[%x] found Start of Image marker\n", index ) }
+#endif
 
         found_marker = 0;
@@ -173 +180 @@
 
 #if (DEBUG_DEMUX > 1)
-PRINTF("\nDEMUX[%x] found Start of Frame marker\n", index )
+if ( (index == DEBUG_CLUSTER_INDEX) || (DEBUG_CLUSTER_INDEX == 0XFFFFFFFF) )
+{ PRINTF("\nDEMUX[%x] found Start of Frame marker\n", index ) }
 #endif
                 // Only one component per image is supported
@@ -208 +216 @@
 
 #if (DEBUG_DEMUX > 1)
-PRINTF("\nDEMUX[%x] found Quantization Table marker\n", index )
+if ( (index == DEBUG_CLUSTER_INDEX) || (DEBUG_CLUSTER_INDEX == 0XFFFFFFFF) )
+{ PRINTF("\nDEMUX[%x] found Quantization Table marker\n", index ) }
 #endif
                 // The  quantisation table segment being fixed length, 
@@ -235 +244 @@
 
 #if (DEBUG_DEMUX > 1)
-PRINTF("\nDEMUX[%x] found Huffman Table marker\n", index )
+if ( (index == DEBUG_CLUSTER_INDEX) || (DEBUG_CLUSTER_INDEX == 0XFFFFFFFF) )
+{ PRINTF("\nDEMUX[%x] found Huffman Table marker\n", index ) }
 #endif
                 // The Huffman Table segment being variable length, 
@@ -279 +289 @@
 
 #if (DEBUG_DEMUX > 1)
-PRINTF("\nDEMUX[%x] found Start of Scan marker\n", index )
+if ( (index == DEBUG_CLUSTER_INDEX) || (DEBUG_CLUSTER_INDEX == 0XFFFFFFFF) )
+{ PRINTF("\nDEMUX[%x] found Start of Scan marker\n", index ) }
 #endif
                 // The scan segment has a variable length: 
@@ -330 +341 @@
 
 #if (DEBUG_DEMUX > 1)
-PRINTF("\nDEMUX[%x] found End of Image marker\n", index )
+if ( (index == DEBUG_CLUSTER_INDEX) || (DEBUG_CLUSTER_INDEX == 0XFFFFFFFF) )
+{ PRINTF("\nDEMUX[%x] found End of Image marker\n", index ) }
 #endif
                 mwmr_bufio_flush( &bufio_out_data );
@@ -341 +353 @@
 
 #if (DEBUG_DEMUX > 1)
-PRINTF("\nDEMUX[%x] found Comment or Application marker\n", index )
+if ( (index == DEBUG_CLUSTER_INDEX) || (DEBUG_CLUSTER_INDEX == 0XFFFFFFFF) )
+{ PRINTF("\nDEMUX[%x] found Comment or Application marker\n", index ) }
 #endif
                 // read segment length from bufio_in
@@ -367 +380 @@
 
 #if DEBUG_DEMUX
-PRINTF("\nDEMUX[%d] completes image %d at cycle %d\n", index , image , giet_proctime() )
+if ( (index == DEBUG_CLUSTER_INDEX) || (DEBUG_CLUSTER_INDEX == 0XFFFFFFFF) )
+{ PRINTF("\nDEMUX[%d] completes image %d at cycle %d\n", index , image , giet_proctime() ) }
 #endif
         image = image + x_size * y_size;
@@ -373 +387 @@
     }  // end while on images
 
-    giet_pthread_exit( "demux completed" );
+    giet_pthread_exit( "DEMUX completed" );
 
 }  // end demux()