Changes in [909:c7abe5d46b50:910:f4f8118b46ff] in mediastreamer2

Files:

• configure.ac (modified) (2 diffs)
• src/gsm.c (modified) (6 diffs)

configure.ac

@@ -456 +456 @@
         *) AC_MSG_ERROR(bad value ${enableval} for --disable-gsm) ;;
       esac],[gsm=true])
-
+      
 if test x$gsm = xtrue; then
 
@@ -559 +559 @@
 AM_CONDITIONAL(BUILD_V4L, test x$found_v4l = xyes )
 
+AC_ARG_ENABLE(libv4l,
+      [  --disable-libv4l    Disable usage of libv4l, really discouraged],
+      [case "${enableval}" in
+        yes) libv4l=true ;;
+        no)  libv4l=false ;;
+        *) AC_MSG_ERROR(bad value ${enableval} for --disable-libv4l) ;;
+      esac],[libv4l=true])b
+
 PKG_CHECK_MODULES(LIBV4L2, libv4l2,
-        [AC_DEFINE(HAVE_LIBV4L2,1,[Defined if we have libv4l2])]
+        [AC_DEFINE(HAVE_LIBV4L2,1,[Defined if we have libv4l2])
+        have_libv4l2=yes]
         ,[echo "No libv4l2 found."]
 )
 PKG_CHECK_MODULES(LIBV4L1, libv4l1,
-        [AC_DEFINE(HAVE_LIBV4L1,1,[Defined if we have libv4l1])]
+        [AC_DEFINE(HAVE_LIBV4L1,1,[Defined if we have libv4l1])
+        have_libv4l1=yes]
         ,[echo "No libv4l1 found."]
 )
+
+if test "$found_v4l" = "yes" && test "$have_libv4l2" != "yes" ; then
+        if test "$libv4l" = "no" ; then
+                AC_MSG_ERROR(
+[
+Missing libv4l2. It is highly recommended to build with
+libv4l2 headers and library. Many camera will won't work or will crash
+your application if libv4l2 is not installed.
+If you know what you are doing, you can use --disable-libv4l to disable
+this check.
+])
+        fi
+fi
 
 dnl ##################################################

src/gsm.c

@@ -25 +25 @@
         gsm state;
         uint32_t ts;
+        int ptime;
         MSBufferizer *bufferizer;
 } EncState;
+
+static int enc_add_fmtp(MSFilter *f, void *arg){
+        const char *fmtp=(const char *)arg;
+        EncState *s=(EncState*)f->data;
+        char tmp[30];
+        if (fmtp_get_value(fmtp,"ptime",tmp,sizeof(tmp))){
+                int ptime = atoi(tmp);
+                switch (ptime) {
+                case 20:
+                case 40:
+                case 60:
+                case 80:
+                case 100:
+                        s->ptime = atoi(tmp);
+                        break;
+                default:
+                        ms_warning("MSGsmEnc: unsupported ptime [%i] using default",ptime);
+                }
+                ms_message("MSGsmEnc: got ptime=%i using [%i]",ptime,s->ptime);
+        }
+        return 0;
+}
 
 static void enc_init(MSFilter *f){
@@ -32 +55 @@
         s->state=gsm_create();
         s->ts=0;
+        s->ptime=20;
         s->bufferizer=ms_bufferizer_new();
         f->data=s;
@@ -48 +72 @@
         EncState *s=(EncState*)f->data;
         mblk_t *im;
-        int16_t buf[320];
+        unsigned int unitary_buff_size = sizeof(int16_t)*160;
+        unsigned int buff_size = unitary_buff_size*s->ptime/20;
+        int16_t* buff;
+        int offset;
         
         while((im=ms_queue_get(f->inputs[0]))!=NULL){
                 ms_bufferizer_put(s->bufferizer,im);
         }
-        while(ms_bufferizer_read(s->bufferizer,(uint8_t*)buf,sizeof(buf))==sizeof(buf)) {
-                mblk_t *om=allocb(66,0);
-                gsm_encode(s->state,(gsm_signal*)buf,(gsm_byte*)om->b_wptr);
-                om->b_wptr+=33;
-                gsm_encode(s->state,(gsm_signal*)(buf+160),(gsm_byte*)om->b_wptr);
-                om->b_wptr+=33;
+        while(ms_bufferizer_get_avail(s->bufferizer) >= buff_size) {
+                buff = alloca(buff_size);
+                ms_bufferizer_read(s->bufferizer,(uint8_t*)buff,buff_size);
+                mblk_t *om=allocb(33*s->ptime/20,0);
+
+                for (offset=0;offset<buff_size;offset+=unitary_buff_size) {
+                        gsm_encode(s->state,(gsm_signal*)&buff[offset/sizeof(int16_t)],(gsm_byte*)om->b_wptr);
+                        om->b_wptr+=33;
+                }
                 mblk_set_timestamp_info(om,s->ts);
                 ms_queue_put(f->outputs[0],om);
-                s->ts+=sizeof(buf)/2;
-        }
-}
+                s->ts+=buff_size/sizeof(int16_t)/*sizeof(buf)/2*/;
+        }
+}
+static MSFilterMethod enc_methods[]={
+        {       MS_FILTER_ADD_FMTP              ,       enc_add_fmtp},
+        {       0                               ,       NULL            }
+};
 
 #ifdef _MSC_VER
@@ -80 +114 @@
         NULL,
         enc_uninit,
-        NULL
+        enc_methods
 };
 
@@ -96 +130 @@
         .process=enc_process,
         .uninit=enc_uninit,
+        .methods = enc_methods
 };
 
@@ -117 +152 @@
 
         while((im=ms_queue_get(f->inputs[0]))!=NULL){
-                om=allocb(frsz,0);
-                if (gsm_decode(s,(gsm_byte*)im->b_rptr,(gsm_signal*)om->b_wptr)<0){
-                        ms_warning("gsm_decode error!");
-                        freemsg(om);
-                }else{
-                        om->b_wptr+=frsz;
-                        ms_queue_put(f->outputs[0],om);
+                for (;(im->b_wptr-im->b_rptr)>=33;im->b_rptr+=33) {
+                        om=allocb(frsz,0);
+                        if (gsm_decode(s,(gsm_byte*)im->b_rptr,(gsm_signal*)om->b_wptr)<0){
+                                ms_warning("gsm_decode error!");
+                                freemsg(om);
+                        }else{
+                                om->b_wptr+=frsz;
+                                ms_queue_put(f->outputs[0],om);
+                        }
                 }
                 freemsg(im);