Commit c8ab39be authored by Jon Kåre Hellan's avatar Jon Kåre Hellan

Olav's 2010-09-29 version

parent d0aa7efd
...@@ -132,7 +132,7 @@ $SIG{KILL} = sub { $uninterrupted=0; # return if $nkill++ < 1; ...@@ -132,7 +132,7 @@ $SIG{KILL} = sub { $uninterrupted=0; # return if $nkill++ < 1;
$SIG{ALRM} = sub { $SIG{ALRM} = sub {
# die "No packets received" if $n_packets < 1; # die "No packets received" if $n_packets < 1;
# $uninterrupted=0; # $uninterrupted=0;
&display_stats if ! $endstream; &display_stats if ! $endstream;
# die "End after alarm\n"; # die "End after alarm\n";
# return(0); # return(0);
$endstream=1; $endstream=1;
...@@ -315,7 +315,7 @@ sub eat_stream { ...@@ -315,7 +315,7 @@ sub eat_stream {
if ($opt_dump){ if ($opt_dump){
print DUMP $packet; print DUMP $packet;
} }
$endstream = tv_interval($t0, $tc) >= $opt_last if $opt_last; $endstream = tv_interval($t0, $tc) >= $opt_last if $opt_last && !$endstream;
} else { # assume that we got an interrupt } else { # assume that we got an interrupt
# die "Failed to receive packet: $!"; # die "Failed to receive packet: $!";
} }
...@@ -770,7 +770,7 @@ sub pkt_stats { ...@@ -770,7 +770,7 @@ sub pkt_stats {
$interval=int($us/10**6 / $opt_period); $interval=int($us/10**6 / $opt_period);
if ($interval > $pinterval){ if ($interval > $pinterval){
&mpeg_debug() if $opt_debug; &mpeg_debug() if $opt_debug;
&display_stats() ; &display_stats();
$pinterval=$interval; $pinterval=$interval;
$pinterval{$f}=$interval; $pinterval{$f}=$interval;
$endstream = $opt_nperiod && $interval >= $opt_nperiod; $endstream = $opt_nperiod && $interval >= $opt_nperiod;
...@@ -1035,6 +1035,7 @@ sub display_stats{ ...@@ -1035,6 +1035,7 @@ sub display_stats{
&lesbars(sdv($ngap{$f}, $sumgap{$f},$ssgap{$f})/1000), &lesbars(sdv($ngap{$f}, $sumgap{$f},$ssgap{$f})/1000),
&lesbars($mingap{$f}/1000), &lesbars($maxgap{$f}/1000) ); &lesbars($mingap{$f}/1000), &lesbars($maxgap{$f}/1000) );
} }
printf "%8s %8d %4d %4d %4s", printf "%8s %8d %4d %4d %4s",
$time, $npkt{$f}, $dup{$f}+$ntimeerr{$f}, $late{$f}, &lesbar($lost{$f},4); $time, $npkt{$f}, $dup{$f}+$ntimeerr{$f}, $late{$f}, &lesbar($lost{$f},4);
...@@ -1044,7 +1045,7 @@ sub display_stats{ ...@@ -1044,7 +1045,7 @@ sub display_stats{
&lesbar(compare_cc_dists(\%dist1, \%dist2))) if $opt_mpeg; &lesbar(compare_cc_dists(\%dist1, \%dist2))) if $opt_mpeg;
} else { } else {
printf "%4d %4.1f", $sumbyte{$f}/$n, sdv($n, $sumbyte{$f}, $ssbyte{$f}); printf " %4d %4.1f", $sumbyte{$f}/$n, sdv($n, $sumbyte{$f}, $ssbyte{$f});
} }
printf " %5s %5s %5s %5s",@jitterstat; printf " %5s %5s %5s %5s",@jitterstat;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment