Ticket #2077: mythtransode-ac3.diff

external/FFmpeg/libavcodec/

@@ -93 +93 @@
             avctx->channels = s->channels;
             avctx->channel_layout = s->channel_layout;
         }
+         avctx->frame_size = s->samples;
         s1->duration = s->samples;
         avctx->audio_service_type = s->service_type;
     }

programs/mythtranscode/mpeg2fix.cpp

@@ -470 +470 @@
 
 int MPEG2replex::WaitBuffers()
 {
-    pthread_mutex_lock( &mutex );
+    pthread_mutex_lock(&mutex);
     while (1)
     {
         int i, ok = 1;
@@ -1938 +1947 @@
 
     initPTS = vFrame.first()->pkt.pts;
 
-    LOG(VB_GENERAL, LOG_INFO, QString("#%1 PTS:%2 Delta: 0.0ms queue: %3")
+    LOG(VB_GENERAL, LOG_INFO, QString("VID #%1 PTS:%2 Delta: 0.0ms queue: %3")
             .arg(vid_id).arg(PtsTime(vFrame.first()->pkt.pts))
             .arg(vFrame.count()));
 
@@ -1947 +1956 @@
         FrameList *af = (*it);
         deltaPTS = diff2x33(vFrame.first()->pkt.pts, af->first()->pkt.pts);
         LOG(VB_GENERAL, LOG_INFO,
-            QString("#%1 PTS:%2 Delta: %3ms queue: %4")
+            QString("AUD #%1 PTS:%2 Delta: %3ms queue: %4")
                 .arg(it.key()) .arg(PtsTime(af->first()->pkt.pts))
                 .arg(1000.0*deltaPTS / 90000.0).arg(af->count()));
 
@@ -2001 +2010 @@
             displayFrame = 0;
 
             // since we might reorder the frames when coming out of a cutpoint
-            // me need to save the first frame here, as it is guaranteed to
+            // we need to save the first frame here, as it is guaranteed to
             // have a sequence header.
             MPEG2frame *seqFrame = vFrame.first();
 
@@ -2358 +2367 @@
             AVCodecContext *CC = getCodecContext(it.key());
             bool backwardsPTS = false;
 
+            // What to do if the CC is corrupt?
+            // Just wait and hope it repairs itself
+            // But if it won't repair itself it ends up in a 'Deadlock detected' error
+            if (CC->sample_rate == 0 || CC->frame_size == 0)
+            {
+                LOG(VB_FRAME, LOG_ERR, QString("CC corrupt in AUD-Frame #%1. sample_rate %2, frame_size %3, channels %4")
+                                .arg(it.key())
+                                .arg(CC->sample_rate)
+                                .arg(CC->frame_size)
+                                .arg(CC->channels));
+                continue;
+            }
+
             while (af->count())
             {
-                // What to do if the CC is corrupt?
-                // Just wait and hope it repairs itself
-                if (CC->sample_rate == 0 || CC->frame_size == 0)
-                    break;
 
                 // The order of processing frames is critical to making
                 // everything work.  Backwards PTS discrepancies complicate
@@ -2542 +2572 @@
     const struct option long_options[] =
         {
             {"infile", required_argument, NULL, 'i'},
-
             {"outfile", required_argument, NULL, 'o'},
             {"format", required_argument, NULL, 'r'},
             {"dbg_lvl", required_argument, NULL, 'd'},