# HG changeset patch
# User renatofilho
# Date 1183159548 -3600
# Node ID 1be4b68bfb0eda489e3fa1bce727e10578e80147
# Parent  949291aaba656f3876756a7e60390204ad03fd5a
[svn r768] implemented chuk mode for http

diff -r 949291aaba65 -r 1be4b68bfb0e gmyth-stream/gmemcoder/INSTALL
--- a/gmyth-stream/gmemcoder/INSTALL	Fri Jun 29 14:40:01 2007 +0100
+++ b/gmyth-stream/gmemcoder/INSTALL	Sat Jun 30 00:25:48 2007 +0100
@@ -0,0 +1,236 @@
+Installation Instructions
+*************************
+
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free
+Software Foundation, Inc.
+
+This file is free documentation; the Free Software Foundation gives
+unlimited permission to copy, distribute and modify it.
+
+Basic Installation
+==================
+
+These are generic installation instructions.
+
+   The `configure' shell script attempts to guess correct values for
+various system-dependent variables used during compilation.  It uses
+those values to create a `Makefile' in each directory of the package.
+It may also create one or more `.h' files containing system-dependent
+definitions.  Finally, it creates a shell script `config.status' that
+you can run in the future to recreate the current configuration, and a
+file `config.log' containing compiler output (useful mainly for
+debugging `configure').
+
+   It can also use an optional file (typically called `config.cache'
+and enabled with `--cache-file=config.cache' or simply `-C') that saves
+the results of its tests to speed up reconfiguring.  (Caching is
+disabled by default to prevent problems with accidental use of stale
+cache files.)
+
+   If you need to do unusual things to compile the package, please try
+to figure out how `configure' could check whether to do them, and mail
+diffs or instructions to the address given in the `README' so they can
+be considered for the next release.  If you are using the cache, and at
+some point `config.cache' contains results you don't want to keep, you
+may remove or edit it.
+
+   The file `configure.ac' (or `configure.in') is used to create
+`configure' by a program called `autoconf'.  You only need
+`configure.ac' if you want to change it or regenerate `configure' using
+a newer version of `autoconf'.
+
+The simplest way to compile this package is:
+
+  1. `cd' to the directory containing the package's source code and type
+     `./configure' to configure the package for your system.  If you're
+     using `csh' on an old version of System V, you might need to type
+     `sh ./configure' instead to prevent `csh' from trying to execute
+     `configure' itself.
+
+     Running `configure' takes awhile.  While running, it prints some
+     messages telling which features it is checking for.
+
+  2. Type `make' to compile the package.
+
+  3. Optionally, type `make check' to run any self-tests that come with
+     the package.
+
+  4. Type `make install' to install the programs and any data files and
+     documentation.
+
+  5. You can remove the program binaries and object files from the
+     source code directory by typing `make clean'.  To also remove the
+     files that `configure' created (so you can compile the package for
+     a different kind of computer), type `make distclean'.  There is
+     also a `make maintainer-clean' target, but that is intended mainly
+     for the package's developers.  If you use it, you may have to get
+     all sorts of other programs in order to regenerate files that came
+     with the distribution.
+
+Compilers and Options
+=====================
+
+Some systems require unusual options for compilation or linking that the
+`configure' script does not know about.  Run `./configure --help' for
+details on some of the pertinent environment variables.
+
+   You can give `configure' initial values for configuration parameters
+by setting variables in the command line or in the environment.  Here
+is an example:
+
+     ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
+
+   *Note Defining Variables::, for more details.
+
+Compiling For Multiple Architectures
+====================================
+
+You can compile the package for more than one kind of computer at the
+same time, by placing the object files for each architecture in their
+own directory.  To do this, you must use a version of `make' that
+supports the `VPATH' variable, such as GNU `make'.  `cd' to the
+directory where you want the object files and executables to go and run
+the `configure' script.  `configure' automatically checks for the
+source code in the directory that `configure' is in and in `..'.
+
+   If you have to use a `make' that does not support the `VPATH'
+variable, you have to compile the package for one architecture at a
+time in the source code directory.  After you have installed the
+package for one architecture, use `make distclean' before reconfiguring
+for another architecture.
+
+Installation Names
+==================
+
+By default, `make install' installs the package's commands under
+`/usr/local/bin', include files under `/usr/local/include', etc.  You
+can specify an installation prefix other than `/usr/local' by giving
+`configure' the option `--prefix=PREFIX'.
+
+   You can specify separate installation prefixes for
+architecture-specific files and architecture-independent files.  If you
+pass the option `--exec-prefix=PREFIX' to `configure', the package uses
+PREFIX as the prefix for installing programs and libraries.
+Documentation and other data files still use the regular prefix.
+
+   In addition, if you use an unusual directory layout you can give
+options like `--bindir=DIR' to specify different values for particular
+kinds of files.  Run `configure --help' for a list of the directories
+you can set and what kinds of files go in them.
+
+   If the package supports it, you can cause programs to be installed
+with an extra prefix or suffix on their names by giving `configure' the
+option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
+
+Optional Features
+=================
+
+Some packages pay attention to `--enable-FEATURE' options to
+`configure', where FEATURE indicates an optional part of the package.
+They may also pay attention to `--with-PACKAGE' options, where PACKAGE
+is something like `gnu-as' or `x' (for the X Window System).  The
+`README' should mention any `--enable-' and `--with-' options that the
+package recognizes.
+
+   For packages that use the X Window System, `configure' can usually
+find the X include and library files automatically, but if it doesn't,
+you can use the `configure' options `--x-includes=DIR' and
+`--x-libraries=DIR' to specify their locations.
+
+Specifying the System Type
+==========================
+
+There may be some features `configure' cannot figure out automatically,
+but needs to determine by the type of machine the package will run on.
+Usually, assuming the package is built to be run on the _same_
+architectures, `configure' can figure that out, but if it prints a
+message saying it cannot guess the machine type, give it the
+`--build=TYPE' option.  TYPE can either be a short name for the system
+type, such as `sun4', or a canonical name which has the form:
+
+     CPU-COMPANY-SYSTEM
+
+where SYSTEM can have one of these forms:
+
+     OS KERNEL-OS
+
+   See the file `config.sub' for the possible values of each field.  If
+`config.sub' isn't included in this package, then this package doesn't
+need to know the machine type.
+
+   If you are _building_ compiler tools for cross-compiling, you should
+use the option `--target=TYPE' to select the type of system they will
+produce code for.
+
+   If you want to _use_ a cross compiler, that generates code for a
+platform different from the build platform, you should specify the
+"host" platform (i.e., that on which the generated programs will
+eventually be run) with `--host=TYPE'.
+
+Sharing Defaults
+================
+
+If you want to set default values for `configure' scripts to share, you
+can create a site shell script called `config.site' that gives default
+values for variables like `CC', `cache_file', and `prefix'.
+`configure' looks for `PREFIX/share/config.site' if it exists, then
+`PREFIX/etc/config.site' if it exists.  Or, you can set the
+`CONFIG_SITE' environment variable to the location of the site script.
+A warning: not all `configure' scripts look for a site script.
+
+Defining Variables
+==================
+
+Variables not defined in a site shell script can be set in the
+environment passed to `configure'.  However, some packages may run
+configure again during the build, and the customized values of these
+variables may be lost.  In order to avoid this problem, you should set
+them in the `configure' command line, using `VAR=value'.  For example:
+
+     ./configure CC=/usr/local2/bin/gcc
+
+causes the specified `gcc' to be used as the C compiler (unless it is
+overridden in the site shell script).  Here is a another example:
+
+     /bin/bash ./configure CONFIG_SHELL=/bin/bash
+
+Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent
+configuration-related scripts to be executed by `/bin/bash'.
+
+`configure' Invocation
+======================
+
+`configure' recognizes the following options to control how it operates.
+
+`--help'
+`-h'
+     Print a summary of the options to `configure', and exit.
+
+`--version'
+`-V'
+     Print the version of Autoconf used to generate the `configure'
+     script, and exit.
+
+`--cache-file=FILE'
+     Enable the cache: use and save the results of the tests in FILE,
+     traditionally `config.cache'.  FILE defaults to `/dev/null' to
+     disable caching.
+
+`--config-cache'
+`-C'
+     Alias for `--cache-file=config.cache'.
+
+`--quiet'
+`--silent'
+`-q'
+     Do not print messages saying which checks are being made.  To
+     suppress all normal output, redirect it to `/dev/null' (any error
+     messages will still be shown).
+
+`--srcdir=DIR'
+     Look for the package's source code in directory DIR.  Usually
+     `configure' can determine that directory automatically.
+
+`configure' also accepts some other, not widely useful, options.  Run
+`configure --help' for more details.
+
diff -r 949291aaba65 -r 1be4b68bfb0e gmyth-stream/gmemcoder/Makefile.am
--- a/gmyth-stream/gmemcoder/Makefile.am	Fri Jun 29 14:40:01 2007 +0100
+++ b/gmyth-stream/gmemcoder/Makefile.am	Sat Jun 30 00:25:48 2007 +0100
@@ -1,4 +1,4 @@
-SUBDIRS = src tests
+SUBDIRS = src
 
 EXTRA_DIST = 			\
 	ChangeLog
diff -r 949291aaba65 -r 1be4b68bfb0e gmyth-stream/gmemcoder/configure.ac
--- a/gmyth-stream/gmemcoder/configure.ac	Fri Jun 29 14:40:01 2007 +0100
+++ b/gmyth-stream/gmemcoder/configure.ac	Sat Jun 30 00:25:48 2007 +0100
@@ -73,7 +73,6 @@
 AC_OUTPUT([
 Makefile
 src/Makefile
-tests/Makefile
 ])
 
 if test "x$enable_debug" != "xno"; then
diff -r 949291aaba65 -r 1be4b68bfb0e gmyth-stream/gmemcoder/src/gmencoder.c
--- a/gmyth-stream/gmemcoder/src/gmencoder.c	Fri Jun 29 14:40:01 2007 +0100
+++ b/gmyth-stream/gmemcoder/src/gmencoder.c	Sat Jun 30 00:25:48 2007 +0100
@@ -8,6 +8,8 @@
 #include <glib.h>
 #include <gst/gst.h>
 #include <string.h>
+#include <sys/types.h>
+#include <sys/socket.h>
 
 #include "gmencoder.h"
 
@@ -16,7 +18,7 @@
 
 // #define SUPPORT_MULT_INPUT 0
 #define USE_MANUAL_SINK
-#define BUFFER_SIZE 512
+#define BUFFER_SIZE (1024 * 64)
 
 typedef struct _GMencoderPrivate GMencoderPrivate;
 typedef struct _SetupInfo SetupInfo;
@@ -49,6 +51,9 @@
     gint            sources;
     gint            tick_id;
     gint64          duration;
+#ifdef USE_MANUAL_SINK
+    GByteArray	    *queue;
+#endif
 };
 
 enum {
@@ -99,6 +104,7 @@
                                     gchar ** audio_encode_prop,
                                     guint audio_rate);
 #ifdef USE_MANUAL_SINK
+static void _flush_queue 	    (GMencoder *self);
 static void _buffer_arrive_cb       (GstElement* object,
                                      GstBuffer* buff,
                                      GstPad* pad,
@@ -163,6 +169,9 @@
 {
     GMencoderPrivate *priv = G_MENCODER_GET_PRIVATE(self);
     priv->info = g_new0(SetupInfo, 1);
+#ifdef USE_MANUAL_SINK
+    priv->queue = g_byte_array_new ();
+#endif
 }
 
 static void
@@ -173,8 +182,14 @@
 static void
 g_mencoder_finalize(GObject * object)
 {
+    GMencoderPrivate *priv = G_MENCODER_GET_PRIVATE(object);
+
     // TODO: clear vars
     g_mencoder_close_stream(G_MENCODER(object));
+    g_free (priv->info);
+#ifdef USE_MANUAL_SINK
+    g_byte_array_free (priv->queue, TRUE);
+#endif
 }
 
 GMencoder      *
@@ -657,7 +672,6 @@
     GstElement     *ap = NULL;
     GstElement     *vp = NULL;
 #endif
-    GMencoderPrivate *priv = G_MENCODER_GET_PRIVATE(self);
 
     pipe = gst_pipeline_new("pipe");
 
@@ -666,6 +680,7 @@
     vp = gst_element_factory_make("concatmux", "vp");
     gst_bin_add_many(GST_BIN(pipe), ap, vp, NULL);
 #endif
+    GMencoderPrivate *priv = G_MENCODER_GET_PRIVATE(self);
 
     mux =
         gst_element_factory_make((mux_name ? mux_name : "ffmux_mpeg"),
@@ -678,10 +693,11 @@
 
 #ifdef USE_MANUAL_SINK
     sink = gst_element_factory_make("fakesink", "sink");
+    g_object_set (G_OBJECT (sink), "signal-handoffs", TRUE, NULL);
     g_signal_connect (G_OBJECT (sink),
                       "handoff",
                       G_CALLBACK (_buffer_arrive_cb),
-                      GINT_TO_POINTER (priv->fd));
+                      self);
 #else    
     sink = gst_element_factory_make("fdsink", "sink");
     if (sink == NULL)
@@ -886,6 +902,7 @@
     i = g_strsplit(uri, "://", 0);
     if (strcmp(i[0], "fd") == 0) {
         priv->fd = atoi(i[1]);
+	fcntl (priv->fd, F_SETFL, O_ASYNC);
     } else if (strcmp(i[0], "file") == 0) {
         if (g_file_test (i[1], G_FILE_TEST_EXISTS)) {
             if (unlink (i[1]) != 0) {
@@ -971,6 +988,9 @@
 
     case GST_MESSAGE_EOS:
         priv->ready = FALSE;
+#ifdef USE_MANUAL_SINK
+	_flush_queue (G_MENCODER (user_data));
+#endif
         g_signal_emit(user_data, g_mencoder_signals[EOS], 0);
         break;
 
@@ -1054,23 +1074,80 @@
 
 
 #ifdef USE_MANUAL_SINK
+static gboolean
+_send_buffer (gint fd, gpointer buff, gint size)
+{
+    gboolean ret = TRUE;
+    gchar *msg;
+    GByteArray *b_send;
+
+    b_send = g_byte_array_new ();
+    msg = g_strdup_printf ("%x\r\n", size);
+    b_send = g_byte_array_append (b_send, (const guint8*) msg, strlen (msg) * sizeof (gchar));
+    g_free (msg);
+
+    b_send = g_byte_array_append (b_send, buff, size);
+
+    msg = g_strdup ("\r\n");
+    b_send = g_byte_array_append (b_send, (const guint8*) msg, strlen (msg) * sizeof (gchar));
+    g_free (msg);
+
+    if (send (fd, b_send->data, b_send->len, MSG_MORE) <= 0) 
+        ret = FALSE;
+    g_byte_array_free (b_send, TRUE);
+
+    return ret;
+}
+
+static void
+_flush_queue (GMencoder *self)
+{
+    gchar *end_msg;
+    GMencoderPrivate *priv = G_MENCODER_GET_PRIVATE(self);
+
+    if (BUFFER_SIZE == 0)
+        return;
+
+    if (priv->queue->len > 0) {
+        _send_buffer (priv->fd, priv->queue->data, priv->queue->len);
+        priv->queue = g_byte_array_remove_range (priv->queue, 0, priv->queue->len);
+    }
+
+    end_msg = g_strdup ("0\r\n\r\n");
+    write (priv->fd, (const guint8*) end_msg, strlen(end_msg) * sizeof(gchar));
+    g_free (end_msg);
+    return;
+}
 static void 
 _buffer_arrive_cb (GstElement* object,
                    GstBuffer* buff,
                    GstPad* pad,
                    gpointer user_data)
 {
-    static GByteArray *queue = NULL;
-    static guint offset = 0;
+    GMencoderPrivate *priv = G_MENCODER_GET_PRIVATE(user_data);
 
-    gint fd = GPOINTER_TO_INT (user_data);
+    if (BUFFER_SIZE == 0) {
+	if (_send_buffer (priv->fd, GST_BUFFER_DATA (buff), GST_BUFFER_SIZE (buff)) == FALSE)
+             goto error;
+        return;
+    }
 
-    queue = g_byte_array_append (queue, GST_BUFFER_DATA (buff), GST_BUFFER_SIZE (buff));
+    priv->queue = g_byte_array_append (priv->queue, GST_BUFFER_DATA (buff), GST_BUFFER_SIZE (buff));
+    while (priv->queue->len >= BUFFER_SIZE) {
+    	//g_usleep (0.2 * G_USEC_PER_SEC);	
+	if (_send_buffer (priv->fd, priv->queue->data, BUFFER_SIZE) == FALSE)
+            goto error;
+        priv->queue = g_byte_array_remove_range (priv->queue, 0, BUFFER_SIZE);
+    }
+    return;
 
-    if (queue->len >= BUFFER_SIZE) {
-        write (fd, queue->data, BUFFER_SIZE);
-        queue = g_byte_array_remove_range (queue, 0, BUFFER_SIZE);
+error:
+    if (priv->tick_id != 0) {
+        g_source_remove(priv->tick_id);
+        priv->tick_id = 0;
     }
+    priv->queue = g_byte_array_remove_range (priv->queue, 0, priv->queue->len);
+    g_signal_emit(user_data, g_mencoder_signals[ERROR], 0, "Error on socket");
 }
 #endif