Ticket #12602: mythtranscode.patch

mythtv/programs/mythtranscode/mpeg2fix.cpp

@@ -495 +495 @@
     if (done)
     {
         finish_mpg(mplex);
-        pthread_exit(NULL);
+        static int errorcount = 0; // thread exit must return static, not stack
+        errorcount = mplex->error;
+        if (mplex->error) {
+          LOG(VB_GENERAL, LOG_ERR,
+              QString("twitham: thread finished with %1 write errors")
+              .arg(mplex->error));
+        }
+        pthread_exit(&errorcount);
     }
 
     return 0;
@@ -554 +561 @@
     while (1)
     {
         check_times( &mx, &video_ok, ext_ok, &start);
-        write_out_packs( &mx, video_ok, ext_ok);
+        if (write_out_packs( &mx, video_ok, ext_ok)) {
+          // exiting here blocks the reading thread indefinitely;
+          // maybe there is a way to fail it also?
+          // LOG(VB_GENERAL, LOG_ERR, // or comment all this to fail until close
+          //     QString("twitham: exiting thread after %1 write errors")
+          //     .arg(mplex->error));
+          // pthread_exit(&mplex->error);
+        }
     }
 }
 
@@ -2555 +2569 @@
     pthread_mutex_lock( &rx.mutex );
     pthread_cond_signal(&rx.cond);
     pthread_mutex_unlock( &rx.mutex );
-    pthread_join(thread, NULL);
+    int ex = REENCODE_OK;
+    void *errors;       // return error if any write or close failures
+    pthread_join(thread, &errors);
+    if (*(int *)errors > 0) {
+      LOG(VB_GENERAL, LOG_ERR,
+          QString("twitham: joined thread failed with %1 write errors")
+          .arg(*(int *)errors));
+      ex = REENCODE_ERROR;
+    }
 
     avformat_close_input(&inputFC);
     inputFC = NULL;
-    return REENCODE_OK;
+    return ex;
 }
 
 #ifdef NO_MYTH

mythtv/programs/mythtranscode/replex/multiplex.c

@@ -295 +295 @@
         //estimate next pts based on bitrate of this stream and data written
         viu->dts = uptsdiff(viu->dts + ((nlength*viu->ptsrate)>>8), 0);
 
-        write(mx->fd_out, outbuf, written);
+        if (write(mx->fd_out, outbuf, written) != written) {
+          if (mx->error++ < 10) /* log only first few failures */
+            LOG(VB_GENERAL, LOG_ERR, "twitham: %d write failed: %s",
+                mx->error, strerror(errno));
+        }
 
 #ifdef OUT_DEBUG
         LOG(VB_GENERAL, LOG_DEBUG, "VPTS");
@@ -571 +575 @@
         }
 #endif
 }
-void write_out_packs( multiplex_t *mx, int video_ok, int *ext_ok)
+int write_out_packs( multiplex_t *mx, int video_ok, int *ext_ok)
 {
         int i;
 
@@ -589 +593 @@
                         writeout_padding(mx);
                 }
         }
-        
+        return mx->error || 0;
 }
 
-void finish_mpg(multiplex_t *mx)
+int finish_mpg(multiplex_t *mx)
 {
         int start=0;
         int video_ok = 0;
@@ -637 +641 @@
         if (mx->otype == REPLEX_MPEG2)
                 write(mx->fd_out, mpeg_end,4);
 
+        if (close(mx->fd_out) < 0) {
+          mx->error++;
+          LOG(VB_GENERAL, LOG_ERR, "twitham: %d close failed: %s",
+              mx->error, strerror(errno));
+        }
+
         dummy_destroy(&mx->vdbuf);
         for (i=0; i<mx->extcnt;i++)
                 dummy_destroy(&mx->ext[i].dbuf);
+        return mx->error || 0;
 }
 
 static int get_ts_video_overhead(int pktsize, sequence_t *seq)
@@ -684 +695 @@
         int i;
         uint32_t data_rate;
 
+        mx->error = 0;
         mx->fill_buffers = fill_buffers;
         mx->video_delay = video_delay;
         mx->audio_delay = audio_delay;

mythtv/programs/mythtranscode/replex/multiplex.h

@@ -81 +81 @@
 
         int (*fill_buffers)(void *p, int f);
         void *priv;
+        int error;
 } multiplex_t;
 
 void check_times( multiplex_t *mx, int *video_ok, int *ext_ok, int *start);
-void write_out_packs( multiplex_t *mx, int video_ok, int *ext_ok);
-void finish_mpg(multiplex_t *mx);
+int write_out_packs( multiplex_t *mx, int video_ok, int *ext_ok);
+int finish_mpg(multiplex_t *mx);
 void init_multiplex( multiplex_t *mx, sequence_t *seq_head,
                      audio_frame_t *extframe, int *exttype, int *exttypcnt,
                      uint64_t video_delay, uint64_t audio_delay, int fd,