Fix writing frame end with multiline captions

Author: pszemus

src/lib_ccx/ccx_encoders_transcript.c

@@ -134,6 +134,7 @@ int write_cc_subtitle_as_transcript(struct cc_subtitle *sub, struct encoder_ctx
 
 		str = sub->data;
 
+		int wrote_something = 0;
 		str = strtok_r(str, "\r\n", &save_str);
 		do
 		{
@@ -143,6 +144,15 @@ int write_cc_subtitle_as_transcript(struct cc_subtitle *sub, struct encoder_ctx
 				continue;
 			}
 
+			if (wrote_something)
+			{
+				ret = write(context->out->fh, context->encoded_crlf, context->encoded_crlf_length);
+				if (ret < context->encoded_crlf_length)
+				{
+					mprint("Warning:Loss of data\n");
+				}
+			}
+
 			if (context->transcript_settings->showStartTime)
 			{
 				char buf[80];
@@ -200,14 +210,16 @@ int write_cc_subtitle_as_transcript(struct cc_subtitle *sub, struct encoder_ctx
 				mprint("Warning:Loss of data\n");
 			}
 
-			ret = write(context->out->fh, context->encoded_end_frame, context->encoded_end_frame_length);
-			if (ret < context->encoded_end_frame_length)
-			{
-				mprint("Warning:Loss of data\n");
-			}
+			wrote_something = 1;
 
 		} while ((str = strtok_r(NULL, "\r\n", &save_str)));
 
+		ret = write(context->out->fh, context->encoded_end_frame, context->encoded_end_frame_length);
+		if (ret < context->encoded_end_frame_length)
+		{
+			mprint("Warning:Loss of data\n");
+		}
+
 		freep(&sub->data);
 		lsub = sub;
 		sub = sub->next;
@@ -321,29 +333,43 @@ void write_cc_line_as_transcript2(struct eia608_screen *data, struct encoder_ctx
 		{
 			mprint("Warning:Loss of data\n");
 		}
-
-		ret = write(context->out->fh, context->encoded_end_frame, context->encoded_end_frame_length);
-		if (ret < context->encoded_end_frame_length)
-		{
-			mprint("Warning:Loss of data\n");
-		}
 	}
 	// fprintf (wb->fh,encoded_crlf);
 }
 
 int write_cc_buffer_as_transcript2(struct eia608_screen *data, struct encoder_ctx *context)
 {
+	int ret;
 	int wrote_something = 0;
 	dbg_print(CCX_DMT_DECODER_608, "\n- - - TRANSCRIPT caption - - -\n");
 
 	for (int i = 0; i < 15; i++)
 	{
 		if (data->row_used[i])
 		{
+			if (wrote_something)
+			{
+				ret = write(context->out->fh, context->encoded_crlf, context->encoded_crlf_length);
+				if (ret < context->encoded_crlf_length)
+				{
+					mprint("Warning:Loss of data\n");
+				}
+			}
+			
 			write_cc_line_as_transcript2(data, context, i);
+			wrote_something = 1;
+		}
+	}
+
+	if (wrote_something)
+	{
+		ret = write(context->out->fh, context->encoded_end_frame, context->encoded_end_frame_length);
+		if (ret < context->encoded_end_frame_length)
+		{
+			mprint("Warning:Loss of data\n");
 		}
-		wrote_something = 1;
 	}
+
 	dbg_print(CCX_DMT_DECODER_608, "- - - - - - - - - - - -\r\n");
 	return wrote_something;
 }

src/rust/src/decoder/tv_screen.rs

@@ -330,8 +330,13 @@ impl dtvcc_tv_screen {
         let time_show = get_time_str(self.time_ms_show);
         let time_hide = get_time_str(self.time_ms_hide);
 
+        let mut wrote_something = false;
         for row_index in 0..CCX_DTVCC_SCREENGRID_ROWS as usize {
             if !self.is_row_empty(row_index) {
+                if wrote_something {
+                    writer.write_to_file(b"\r\n")?;
+                }
+
                 let mut buf = String::new();
 
                 if is_true(writer.transcript_settings.showStartTime) {
@@ -350,10 +355,11 @@ impl dtvcc_tv_screen {
                 }
                 writer.write_to_file(buf.as_bytes())?;
                 self.write_row(writer, row_index, false)?;
-                let end_frame = writer.end_frame.clone();
-                writer.write_to_file(&end_frame)?;
+                wrote_something = true;
             }
         }
+        let end_frame = writer.end_frame.clone();
+        writer.write_to_file(&end_frame)?;
         Ok(())
     }