Attachment 10449 Details for Bug 20956 – file.diff

[patch] file.diff

file.diff (text/plain), 2.90 KB, created by Andre Albsmeier on 2000-08-31 07:20:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andre Albsmeier

Created: 2000-08-31 07:20:00 UTC

Size: 2.90 KB

patch

obsolete

>--- main.c.ORI	Wed Aug 30 20:37:31 2000
>+++ main.c	Wed Aug 30 20:36:38 2000
>@@ -59,6 +59,7 @@
> *************************************************************************/
> 
> #include "main.h"
>+#include <unistd.h>
> 
> /*************************************************************************
>     Main
>@@ -75,6 +76,8 @@
>     struct timeval  tp_global_end;
> #endif
> 
>+int Interactive=0;
>+
> int main (argc, argv)
> 
> int argc;
>@@ -93,6 +96,14 @@
>     unsigned int which_streams=0;
>     double	startup_delay=0;
> 
>+    int tmp;
>+
>+    if( getopt( argc, argv, "i" ) == 'i' )
>+      Interactive=1;
>+
>+    optind -= 1;
>+    argc -= optind;
>+    argv += optind;
> 
>     intro (argc);
>     check_files (argc, argv, &audio_file, &video_file, &multi_file,
>--- inptstrm.c.ORI	Wed May 31 15:04:11 1995
>+++ inptstrm.c	Wed Aug 30 20:39:29 2000
>@@ -1,4 +1,5 @@
> #include "main.h"
>+extern int Interactive;
> /*************************************************************************
>     MPEG Streams Kontrolle
> 
>@@ -310,6 +311,7 @@
>     fclose (info_file);
>     output_info_video (video_info);
> 
>+  if( Interactive )
>     ask_continue ();
> }
> 
>@@ -565,6 +567,7 @@
>     close_bit_stream_r (&audio_bs);
>     fclose (info_file);
>     output_info_audio (audio_info);
>+  if( Interactive )
>     ask_continue ();
> 
> }
>--- multplex.c.ORI	Tue Jun  6 14:16:52 1995
>+++ multplex.c	Wed Aug 30 20:47:35 2000
>@@ -1,4 +1,5 @@
> #include "main.h"
>+extern int Interactive;
> #ifdef TIMER
>     extern long total_sec;
>     extern long total_usec;
>@@ -129,6 +130,7 @@
> 	picture_start = TRUE;
>     }
> 
>+if( Interactive ) {
> printf("\nMerging elementary streams to MPEG/SYSTEMS multiplexed stream.\n");
> printf("\n+------------------ MPEG/SYSTEMS INFORMATION -----------------+\n");
>     
>@@ -144,6 +146,12 @@
>     scanf ("%ld", &video_buffer_size);
>     printf   ("STD audio buffer in kB (CSPS: max  4 kB) : ");
>     scanf ("%ld", &audio_buffer_size);
>+} else {
>+    sector_size=2324;
>+    packets_per_pack=1;
>+    video_buffer_size=46;
>+    audio_buffer_size=4;
>+}
> 
>     write_pack = packets_per_pack;
>     video_buffer_size *= 1024;
>@@ -197,6 +205,7 @@
> 		 (double)(packets_per_pack-1.))) / (double)(packets_per_pack) );
>     data_rate = ceil(dmux_rate/50.)*50;
> 
>+if( Interactive ) {
>     printf ("\ncomputed multiplexed stream data rate    : %7.3f\n",dmux_rate);
>     printf ("target data rate (e.g. %6u)           : ",data_rate);
>     scanf  ("%lf", &dmux_rate);
>@@ -206,12 +215,21 @@
>     scanf  ("%u", &video_delay_ms);
>     printf ("audio stream startup offset (ms)         : ");
>     scanf  ("%u", &audio_delay_ms);
>+} else {
>+    dmux_rate=data_rate;
>+    sectors_delay=8;
>+    video_delay_ms=0;
>+    audio_delay_ms=0;
>+}
> 
>     video_delay = (double)video_delay_ms*(double)(CLOCKS/1000);
>     audio_delay = (double)audio_delay_ms*(double)(CLOCKS/1000);
> 
>+if( Interactive ) {
>     verbose=ask_verbose();
>     printf ("\n");
>+} else
>+    verbose=1;
> 
> #ifdef TIMER
>     gettimeofday (&tp_global_start,NULL);

Actions: View | Diff

Attachments on bug 20956: 10449