Merge branch 'hw-huffdctycc' into net-mjpeg

[fpga-leon-mjpeg/leon-mjpeg.git] / snapgear-2.6-p42 / user / jpeg-6b / jdatasrc.c

diff --git a/snapgear-2.6-p42/user/jpeg-6b/jdatasrc.c b/snapgear-2.6-p42/user/jpeg-6b/jdatasrc.c
index 8308882..6e8e57a 100644 (file)
--- a/snapgear-2.6-p42/user/jpeg-6b/jdatasrc.c
+++ b/snapgear-2.6-p42/user/jpeg-6b/jdatasrc.c
@@ -1,4 +1,7 @@
 /*
+ * modified by Kenichi Kurimoto
+ */
+/*
  * jdatasrc.c
  *
  * Copyright (C) 1994-1996, Thomas G. Lane.
@@ -92,8 +95,11 @@ fill_input_buffer (j_decompress_ptr cinfo)
   my_src_ptr src = (my_src_ptr) cinfo->src;
   size_t nbytes;
 
-  nbytes = JFREAD(src->infile, src->buffer, INPUT_BUF_SIZE);
-
+  if(cinfo->is_net == 1){
+    nbytes = read(cinfo->sock, src->buffer, INPUT_BUF_SIZE);
+    }else{
+    nbytes = JFREAD(src->infile, src->buffer, INPUT_BUF_SIZE);
+  }
   if (nbytes <= 0) {
     /* add for LEON mjpeg pj*/
     exit(0);