Revision eb5ce4e7

View differences:

QoE.pl
40 40
  #$qoe{ 'chunkloss' } = peer_chunkloss($peer,@losts);
41 41

  
42 42
  my $q;
43
  if ($chunksize=='gop') {
44
#    $q=`$PSNR_TOOLS/psnr.sh calc 0 lost.txt 2>/dev/null`;
45
    $q=`$PSNR_TOOLS/psnr.sh calc 0 lost.txt`;
46
  } else {
47
#    $q=`$PSNR_TOOLS/psnr.sh calc $chunksize lost.txt 2>/dev/null`;
48
    $q=`$PSNR_TOOLS/psnr.sh calc $chunksize lost.txt`;
49
  }
43
  $q=`$PSNR_TOOLS/psnr.sh calc $chunksize lost.txt`;
50 44

  
51 45
  $q =~ m/psnr: ([\d\.]+)/;
52 46
  $qoe{ 'psnr' } = $1;
......
152 146
  my ($inputfolder,$every)=@_;
153 147
  $gl_inputfolder=$inputfolder;
154 148

  
155
  my $srcqoe = peer_qoe('src','gop');
149
  my $srcqoe = peer_qoe('src',0);
156 150
  print "psnr(uncompressed->compressed): ".$srcqoe->{'psnr'}."\n";
157 151
  print "ssim(uncompressed->compressed): ".$srcqoe->{'ssim'}."\n";
158 152

  
159 153
  my $chunksize = ceil($srcqoe->{'bytes'}/$srcqoe->{'chunks'}); 
160 154

  
161 155
  print "\nQuality with GOP size chunks (avg chunk size = $srcqoe->{'bytes'}/$srcqoe->{'chunks'} bytes )\n";
162
  my $avgqoe_gop = qoe('gop',$every);
156
  my $avgqoe_gop = qoe(0,$every);
163 157
  print "\nQuality with $chunksize bytes chunks\n";
164 158
  my $avgqoe_nogop = qoe($chunksize,$every);
165 159
  print "PSNRresults $srcqoe->{'psnr'} $avgqoe_gop->{'psnr'} $avgqoe_nogop->{'psnr'}".

Also available in: Unified diff