Changeset 1014:587430e7483c in mediastreamer2

Timestamp:

Jun 23, 2010 4:32:53 PM (3 years ago)

Author:

Simon Morlat <simon.morlat@…>

Branch:

default

Message:

fix crash in alsa
enhance rfc2190 support

Files:

• NEWS (modified) (1 diff)
• src/alsa.c (modified) (2 diffs)
• src/videodec.c (modified) (4 diffs)

NEWS

@@ -1 @@
-mediastreamer-2.5.1: ???
+mediastreamer-2.6.0: June 23, 2010
+        * fix crash when video window is closed on windows
+        * move H264 decoder from msx264 to mediastreamer2
+        * MSVolume improvements and cleanup, with native AGC support.
+        * Echo canceller reworked: use soundcard stream to synchronise far-end stream.
+        * fix segfault in ALSA support when capturing a stereo stream.
+        * H263 RFC2190 support improvements
 
 mediastreamer-2.5.0: June 3, 2010

src/alsa.c

@@ -873 +873 @@
         while (alsa_can_read(ad->handle)>=samples){
           
-                int size=samples*2;
+                int size=samples*2*ad->nchannels;
                 om=allocb(size,0);
                 if ((err=alsa_read(ad->handle,om->b_wptr,samples))<=0) {
@@ -893 +893 @@
         mblk_t *om=NULL;
         int samples=(160*ad->rate)/8000;
-
+        int size=samples*2*ad->nchannels;
+        
         ms_mutex_lock(&ad->mutex);
-        while (ms_bufferizer_get_avail(ad->bufferizer)>=samples*2){
+        while (ms_bufferizer_get_avail(ad->bufferizer)>=size){
           
-          om=allocb(samples*2,0);
-          ms_bufferizer_read(ad->bufferizer,om->b_wptr,samples*2);        
-          om->b_wptr+=samples*2;
+          om=allocb(size,0);
+          ms_bufferizer_read(ad->bufferizer,om->b_wptr,size);     
+          om->b_wptr+=size;
           /*ms_message("alsa_read_process: Outputing %i bytes",size);*/
           ms_queue_put(obj->outputs[0],om);

src/videodec.c

@@ -142 +142 @@
 
 static mblk_t * skip_rfc2190_header(mblk_t *inm){
-        if (msgdsize(inm) >= 4) {
-                uint8_t *ph = inm->b_rptr;
-                int F = (ph[0]>>7) & 0x1;
-                int P = (ph[0]>>6) & 0x1;
-                if (F == 0) inm->b_rptr += 4;  // mode A
-                else if (P == 0) inm->b_rptr += 8; // mode B
-                else inm->b_rptr += 12;   // mode C
+        uint8_t *ph = inm->b_rptr;
+        uint8_t sbit = (ph[0] >> 3) & 0x07; 
+        //unsigned int ebit = ph[0] & 0x7;
+        bool_t isIFrame=0;
+        unsigned hdrLen;
+        char mode;
+        if (msgdsize(inm) < 5 ) {
+                ms_warning("RFC2190 packet too small (size %d) to scan!", msgdsize(inm));
+                freemsg(inm);
+                return NULL;
+        }
+        if ((ph[0] & 0x80) == 0) {
+                isIFrame = (ph[1] & 0x10) == 0;
+                hdrLen = 4;
+                mode = 'A';
+        } else if ((ph[0] & 0x40) == 0) {
+                isIFrame = (ph[4] & 0x80) == 0;
+                hdrLen = 8;
+                mode = 'B';
         } else {
+                isIFrame = (ph[4] & 0x80) == 0;
+                hdrLen = 12;
+                mode = 'C';
+        }
+        if (msgdsize(inm) > hdrLen) {
+                inm->reserved2 |= (sbit << 11);
+                inm->b_rptr += hdrLen;
+        } else {
+                ms_warning("RFC2190 packet mode:%c%s too small (size %d)", mode, isIFrame ?
+                                " (I-Frame)":"", msgdsize(inm)); 
                 freemsg(inm);
                 inm=NULL;
@@ -598 +620 @@
         return dupmsg(s->yuv_msg);
 }
+/* Bitmasks to select bits of a byte from low side */
+static unsigned char smasks[7] = { 0x7f, 0x3f, 0x1f, 0x0f, 0x07, 0x03, 0x01 };
 
 static void dec_process_frame(MSFilter *f, mblk_t *inm){
@@ -613 +637 @@
                 if (s->input==NULL){
                         s->input=inm;
-                }else{
+                }else{ 
+                        uint8_t sbit = (inm->reserved2 >> 11) & 0x7;
+                        if (sbit!=0) {  
+                                mblk_t *mp = s->input;
+                                while ( mp->b_cont != NULL ) mp = mp->b_cont;
+                                mp->b_wptr--;
+                                mp->b_wptr[0] |= ( inm->b_rptr[0] & smasks[sbit-1] );
+                                mp->b_wptr++;
+                                inm->b_rptr++;
+                        }
                         concatb(s->input,inm);
                 }
@@ -632 +665 @@
                                 pkt.size = remain;
                                 len=avcodec_decode_video2(&s->av_context,&orig,&got_picture,&pkt);
-                                /*len=avcodec_decode_video(&s->av_context,&orig,&got_picture,(uint8_t*)frame->b_rptr,remain );*/
                                 if (len<=0) {
                                         ms_warning("ms_AVdecoder_process: error %i.",len);