Attachment #10449 for bug #20956

View | Details | Raw Unified | Return to bug 20956
Collapse All | Expand All

Lines 59-64 Link Here

(-)main.c (+11 lines)
59	*************************************************************************/	59	*************************************************************************/
60		60
61	#include "main.h"	61	#include "main.h"
		62	#include <unistd.h>
62		63
63	/*************************************************************************	64	/*************************************************************************
64	Main	65	Main
Lines 75-80 Link Here
75	struct timeval tp_global_end;	76	struct timeval tp_global_end;
76	#endif	77	#endif
77		78
		79	int Interactive=0;
		80
78	int main (argc, argv)	81	int main (argc, argv)
79		82
80	int argc;	83	int argc;
Lines 93-98 Link Here
93	unsigned int which_streams=0;	96	unsigned int which_streams=0;
94	double startup_delay=0;	97	double startup_delay=0;
95		98
		99	int tmp;
		100
		101	if( getopt( argc, argv, "i" ) == 'i' )
		102	Interactive=1;
		103
		104	optind -= 1;
		105	argc -= optind;
		106	argv += optind;
96		107
97	intro (argc);	108	intro (argc);
98	check_files (argc, argv, &audio_file, &video_file, &multi_file,	109	check_files (argc, argv, &audio_file, &video_file, &multi_file,

Lines 1-4 Link Here

(-)inptstrm.c (+3 lines)
1	#include "main.h"	1	#include "main.h"
		2	extern int Interactive;
2	/*************************************************************************	3	/*************************************************************************
3	MPEG Streams Kontrolle	4	MPEG Streams Kontrolle
4		5
Lines 310-315 Link Here
310	fclose (info_file);	311	fclose (info_file);
311	output_info_video (video_info);	312	output_info_video (video_info);
312		313
		314	if( Interactive )
313	ask_continue ();	315	ask_continue ();
314	}	316	}
315		317
Lines 565-570 Link Here
565	close_bit_stream_r (&audio_bs);	567	close_bit_stream_r (&audio_bs);
566	fclose (info_file);	568	fclose (info_file);
567	output_info_audio (audio_info);	569	output_info_audio (audio_info);
		570	if( Interactive )
568	ask_continue ();	571	ask_continue ();
569		572
570	}	573	}

Lines 1-4 Link Here

(-)multplex.c (+18 lines)
1	#include "main.h"	1	#include "main.h"
		2	extern int Interactive;
2	#ifdef TIMER	3	#ifdef TIMER
3	extern long total_sec;	4	extern long total_sec;
4	extern long total_usec;	5	extern long total_usec;
Lines 129-134 Link Here
129	picture_start = TRUE;	130	picture_start = TRUE;
130	}	131	}
131		132
		133	if( Interactive ) {
132	printf("\nMerging elementary streams to MPEG/SYSTEMS multiplexed stream.\n");	134	printf("\nMerging elementary streams to MPEG/SYSTEMS multiplexed stream.\n");
133	printf("\n+------------------ MPEG/SYSTEMS INFORMATION -----------------+\n");	135	printf("\n+------------------ MPEG/SYSTEMS INFORMATION -----------------+\n");
134		136
Lines 144-149 Link Here
144	scanf ("%ld", &video_buffer_size);	146	scanf ("%ld", &video_buffer_size);
145	printf ("STD audio buffer in kB (CSPS: max 4 kB) : ");	147	printf ("STD audio buffer in kB (CSPS: max 4 kB) : ");
146	scanf ("%ld", &audio_buffer_size);	148	scanf ("%ld", &audio_buffer_size);
		149	} else {
		150	sector_size=2324;
		151	packets_per_pack=1;
		152	video_buffer_size=46;
		153	audio_buffer_size=4;
		154	}
147		155
148	write_pack = packets_per_pack;	156	write_pack = packets_per_pack;
149	video_buffer_size *= 1024;	157	video_buffer_size *= 1024;
Lines 197-202 Link Here
197	(double)(packets_per_pack-1.))) / (double)(packets_per_pack) );	205	(double)(packets_per_pack-1.))) / (double)(packets_per_pack) );
198	data_rate = ceil(dmux_rate/50.)*50;	206	data_rate = ceil(dmux_rate/50.)*50;
199		207
		208	if( Interactive ) {
200	printf ("\ncomputed multiplexed stream data rate : %7.3f\n",dmux_rate);	209	printf ("\ncomputed multiplexed stream data rate : %7.3f\n",dmux_rate);
201	printf ("target data rate (e.g. %6u) : ",data_rate);	210	printf ("target data rate (e.g. %6u) : ",data_rate);
202	scanf ("%lf", &dmux_rate);	211	scanf ("%lf", &dmux_rate);
Lines 206-217 Link Here
206	scanf ("%u", &video_delay_ms);	215	scanf ("%u", &video_delay_ms);
207	printf ("audio stream startup offset (ms) : ");	216	printf ("audio stream startup offset (ms) : ");
208	scanf ("%u", &audio_delay_ms);	217	scanf ("%u", &audio_delay_ms);
		218	} else {
		219	dmux_rate=data_rate;
		220	sectors_delay=8;
		221	video_delay_ms=0;
		222	audio_delay_ms=0;
		223	}
209		224
210	video_delay = (double)video_delay_ms*(double)(CLOCKS/1000);	225	video_delay = (double)video_delay_ms*(double)(CLOCKS/1000);
211	audio_delay = (double)audio_delay_ms*(double)(CLOCKS/1000);	226	audio_delay = (double)audio_delay_ms*(double)(CLOCKS/1000);
212		227
		228	if( Interactive ) {
213	verbose=ask_verbose();	229	verbose=ask_verbose();
214	printf ("\n");	230	printf ("\n");
		231	} else
		232	verbose=1;
215		233
216	#ifdef TIMER	234	#ifdef TIMER
217	gettimeofday (&tp_global_start,NULL);	235	gettimeofday (&tp_global_start,NULL);

Return to bug 20956