Ticket #2252: replex.diff

element.h

@@ -115 +115 @@
         uint32_t mode_extension;
         uint32_t emphasis;
         uint32_t framesize;
+    uint32_t frametime;
         uint32_t off;
 } audio_frame_t;
 

replex.c

@@ -117 +117 @@
         while (c < len){
                 if ( (pos = find_audio_sync(rbuf, buf, c+off, type, len-c) ) 
                      >= 0 ){
-                        if (!aframe->set){
+            if (!aframe->set){
                                 switch( type ){
                                 case AC3:
                                         re = get_ac3_info(rbuf, aframe, 
@@ -183 +183 @@
                                 }
                         }
 
+                        if (aframe->set && rx->fix_sync && first){
+                                int frame_time = aframe->frametime;
+                                int64_t diff;
+                                diff = ptsdiff(trans_pts_dts(p->pts), add_pts_audio(0, aframe,*acount + 1) + *fpts);
+                                if (abs ((int)diff) >= frame_time){
+                                        fprintf(stderr,"fixing audio PTS inconsistency - diff: ");
+                                        printpts(abs(diff));
+                                        fprintf(stderr,"\n");
 
+                                        if (diff < 0){
+                                                diff = abs(diff);
+                                                int framesdiff = diff / frame_time;
+                                                fprintf(stderr, "need to remove %d frame(s)\n", framesdiff);
+                                                //FIXME need to remove audio frame(s) here
+                                                iu->pts = add_pts_audio(0, aframe, -framesdiff);
+                                        } else {
+                                                int framesdiff = diff / frame_time;
+                                                fprintf(stderr, "need to add %d frame(s)\n", framesdiff);
+
+                                                // get a copy of the current audio frame
+                                                uint8_t *framebuf;
+                                                if ( !(framebuf = (uint8_t *) malloc(sizeof(uint8_t *) * aframe->framesize))) {
+                                                        fprintf(stderr,"Not enough memory for audio frame\n");
+                                                        exit(1);
+                                                }
+
+                                                int res;
+                                                res = ring_peek(rbuf, framebuf, aframe->framesize, 0);
+                                                if (res != aframe->framesize) {
+                                                        fprintf(stderr,"ring buffer failed to peek frame res: %d\n", res);
+                                                        exit(1);
+                                                }
+
+                                                // add each extra frame required direct to the output file
+                                                int x;
+                                                for (x = 0; x < framesdiff; x++){
+                                                        //FIXME need to fix for ac3 streams
+                                                        write(rx->dmx_out[num+1], framebuf, aframe->framesize);
+                                                        *acount += 1;
+                                                }
+                                        }
+                                }
+                        }
+
                         if (aframe->set){
                                 if(iu->active){
                                         iu->length = ring_posdiff(rbuf, 
                                                                   iu->start, 
                                                                   p->ini_pos + 
                                                                   pos+c);
-                                        if (iu->length < aframe->framesize ||
+
+                                if (iu->length < aframe->framesize ||
                                             iu->length > aframe->framesize+1){
                                                 fprintf(stderr,"Wrong audio frame size: %d\n", iu->length);
                                                 iu->err= FRAME_ERR;
@@ -2351 +2395 @@
                         }
                         fprintf(stderr,"AC3%d output File is: %s\n",i,fname);
                 }
-                do_demux(&rx);
+        // FIXME
+        rx.fix_sync = 1;
+        do_demux(&rx);
         } else if (analyze){
                 rx.demux=1;
                 do_analyze(&rx);

replex.h

@@ -45 +45 @@
         int otype;
         int ignore_pts; 
         int keep_pts;
+        int fix_sync;
         uint64_t inflength;
         uint64_t finread;
         int lastper;

element.c

@@ -517 +517 @@
         af->off = c;
         af->set = 1;
 
+        af->frametime = ((samples [3-af->layer] * 27000000ULL) / af->frequency);
         af->framesize = af->bit_rate *slots [3-af->layer]/ af->frequency;
         fprintf(stderr," frame size: %d (", af->framesize);
-        printpts( ((samples [3-af->layer] * 27000000ULL) 
-                   / af->frequency));
+        printpts(af->frametime);
         fprintf(stderr,") ");
 
         return c;
@@ -572 +572 @@
 
         af->off = c;
         af->set = 1;
-        return c;
+
+        //FIXME calculate frametime
+        af->frametime = 0;
+
+    return c;
 }