--- multiplexer/iso13818ts.1	2001/07/19 09:52:34	1.8
+++ multiplexer/iso13818ts.1	2001/08/01 08:23:18	1.9
@@ -131,7 +131,7 @@ regardless of whether the same file is y
 \fB\-\-si\fR \fIfile\fR [\fIlower_bound\fR \fIupper_bound\fR]
 In a TS \fIfile\fR, all TS pakets with PID in the range
 from \fIlower_bound\fR to \fIupper_bound\fR
-(possible range 0x0000..0x1FFE, recommended range 0x10..0x1F)
+(possible range 0x0001..0x1FFE, recommended range 0x10..0x1F)
 inclusive are handled as SI pakets (according to ETSI EN 300 468).
 These pakets are bypassed and promoted to the output without further handling.
 If no further data from the \fIfile\fR is in use,
@@ -142,6 +142,30 @@ the special handling of SI pakets is tur
 The \fIfile\fR may be specified as \fB=\fR to denote
 the last previously mentioned file.
 .TP
+\fB\-\-sipid\fR \fItarget_program\fR [\fIpid\fR [\fIstream_type\fR]]
+Manually add or delete entries to the target PMT for the given
+\fItarget_program\fR.
+To add an entry, all three parameters must be provided.
+If an entry for the given \fIpid\fR (range 0x0001..0x1FFE) does exist,
+the new \fIstream_type\fR (range 0x00..0xFF) is set
+and all descriptors are cleared.
+If no \fIstream_type\fR is given, a corresponding entry
+in the PMT is deleted,
+if it was added thru \fB\-\-sipid\fR earlier.
+If no \fIpid\fR and no \fIstream_type\fR is given, all
+entries for the \fItarget_program\fR in the PMT are deleted,
+which have been added thru \fB\-\-sipid\fR earlier.
+Note, that regular entries, i.e. those which are generated
+automatically instead of using \fB\-\-sipid\fR,
+cannot be changed.
+Note, that entries added through \fB\-\-sipid\fR are
+solely entries in the PMT, but there is not any corresponding
+data stream created.
+\fB\-\-sipid\fR is meant to be used in conjunction
+with the \fB\-\-si\fR command, which in turn causes
+data to arise in the target stream without listing it
+in the PMT.
+.TP
 \fB\-I\fR, \fB\-\-ident\fR \fItransport_stream_id\fR
 Set the output \fItransport_stream_id\fR (range 0x0000..0xFFFF).
 .TP
@@ -211,16 +235,19 @@ PCR PID for the program.
 .TP
 \fIstreams\fR
 Number of streams in the program.
+A number in parantheses may be added that denotes how many of these
+streams are not PES data streams, but have been added by use of the
+\fB\-\-sipid\fR option to the PMT.
 .TP
 \fIstream\fR
 Stream PID.
 .TP
-\fIsid\fR
-PES stream ID.
-.TP
 \fItype\fR
 Stream type (according to ISO 13818-1 table 2-29).
 .TP
+\fIsid\fR
+PES stream ID.
+.TP
 \fIfile\fR
 Source file contents type (PES=0, PS=1, TS=2).
 .TP
@@ -274,7 +301,7 @@ i.e. if the processing is not performed
 enough (e.g. because of low processor performance),
 errors in the resulting data may occur, namely
 concerning the timing.
-The mutliplexer may be invoked interactively with
+The multiplexer may be invoked interactively with
 the streams to process given as command line options
 or with the commands to be processed typed into
 \fIstdin\fR during operation.
@@ -320,6 +347,35 @@ is one input stream that contains PCR, i
 use the stream for which data packets are found first.
 Note, that for a simple mono TV program this is not
 necessarily the video stream.
+.P
+When using the command \fB\-\-si\fR,
+PID collisions may occur with source stream PIDs
+as well as with target stream PIDs.
+.br
+For source collisions, data streams win,
+i.e. if a packet is encountered,
+that matches the PAT and PMT description of the input file
+as well as the range given by \fB\-\-si\fR,
+the latter match is ignored and the packet is
+processed as PES data packet
+(or PMT packet, if appropriate).
+.br
+For target collisions, the \fB\-\-si\fR range wins,
+i.e. the attempt is made not to assign PIDs to
+target data streams (or PMT streams),
+that are covered by a range given by \fB\-\-si\fR.
+If this attempt fails, e.g. because the full range
+was given with \fI\-\-si 0x0010 0x1FFE\fR,
+the potential collision is accepted, because there
+is no easy algorithm to get around it.
+Instead, the user should avoid covering the full range
+with \fB\-\-si\fR and preferredly only state those
+PIDs, which actually will contain SI packets.
+.P
+Note, that no collision check is done for PIDs,
+that are given with the \fB\-\-sipid\fR command.
+This is because these PIDs are assumed to be
+covered by a corresponding \fB\-\-si\fR.
 .SH EXAMPLES
 To convert a program stream file x.PS to a transport stream file x.TS,
 with program number 42, transport stream id 23
@@ -425,6 +481,10 @@ multiplexer, because that way timing inf
 .SH BUGS
 Non-ISO_13818-1 descriptors (private descriptors) in
 ISO_13818-1 PSI sections are not promoted.
+.P
+End of action sometimes is not detected correctly, which
+causes the multiplexer to hang.
+Nevertheless, it then can be stopped by the \fBquit\fR command.
 .SH "SEE ALSO"
 .BR repeatts (1),
 .BR iso13818ps (1),