1 files changed, 22 insertions, 23 deletions

diff --git a/baseline/source/g723_enc/g723_enc.c b/baseline/source/g723_enc/g723_enc.c
index 209e3ce..bf2df51 100644
--- a/baseline/source/g723_enc/g723_enc.c
+++ b/baseline/source/g723_enc/g723_enc.c
@@ -172,6 +172,9 @@ short g723_enc_fitab[16] = {0, 0, 0, 0x200, 0x200, 0x200, 0x600, 0xE00,
                             0xE00, 0x600, 0x200, 0x200, 0x200, 0, 0, 0
                            };
 
+static unsigned int g723_enc_out_buffer = 0;
+static int    g723_enc_out_bits = 0;
+static int              g723_enc_i = 0;
 
 /*
   Declaration of macros
@@ -753,24 +756,21 @@ g723_enc_pack_output(
   unsigned  char  code,
   int     bits )
 {
-  static unsigned int out_buffer = 0;
-  static int    out_bits = 0;
   unsigned char   out_byte;
-  static int              i = 0;
-
-  out_buffer |= ( code << out_bits );
-  out_bits += bits;
-  if ( out_bits >= 8 ) {
-    out_byte = out_buffer & 0xff;
-    out_bits -= 8;
-    out_buffer >>= 8;
+
+  g723_enc_out_buffer |= ( code << g723_enc_out_bits );
+  g723_enc_out_bits += bits;
+  if ( g723_enc_out_bits >= 8 ) {
+    out_byte = g723_enc_out_buffer & 0xff;
+    g723_enc_out_bits -= 8;
+    g723_enc_out_buffer >>= 8;
     //fwrite(&out_byte, sizeof (char), 1, fp_out);
     //fwrite(&out_byte, 1, 1, fp_out);
-    g723_enc_OUTPUT[i] = out_byte;
-    i =  i + 1;
+    g723_enc_OUTPUT[g723_enc_i] = out_byte;
+    g723_enc_i =  g723_enc_i + 1;
   }
 
-  return ( out_bits > 0 );
+  return ( g723_enc_out_bits > 0 );
 }
 
 /*
@@ -815,6 +815,9 @@ void g723_enc_init()
 {
   int i;
   volatile int x = 0;
+  g723_enc_out_buffer = 0;
+  g723_enc_out_bits = 0;
+  g723_enc_i = 0;
   g723_enc_init_state( &g723_enc_state );
 
    _Pragma( "loopbound min 256 max 256" )
@@ -872,16 +875,12 @@ void _Pragma( "entrypoint" ) g723_enc_main()
 
 int main( int argc, char **argv )
 {
-        //SET_UP
-        int jobsComplete;
-        int maxJobs=9;
-        for (jobsComplete=0; jobsComplete<maxJobs; jobsComplete++){
-        //      START_LOOP
-                g723_enc_init();
-                g723_enc_main();
-        //      STOP_LOOP
-        }
-        //WRITE_TO_FILE
+  SET_UP
+  for_each_job {
+    g723_enc_init();
+    g723_enc_main();
+  }
+  WRITE_TO_FILE
   return ( g723_enc_return() );
 }