video coding tests: updating quality tests following r466

Review URL: http://webrtc-codereview.appspot.com/131009

git-svn-id: http://webrtc.googlecode.com/svn/trunk@470 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
mikhal@webrtc.org 2011-08-26 21:18:35 +00:00
parent d24a97fae1
commit b7ac56d92b

View File

@ -9,14 +9,16 @@
*/
#include "quality_modes_test.h"
#include "../source/event.h"
#include "test_macros.h"
#include "vplib.h"
#include <iostream>
#include <string>
#include <time.h>
#include "../source/event.h"
#include "test_macros.h"
#include "video_metrics.h"
#include "vplib.h"
using namespace webrtc;
int qualityModeTest()
@ -107,7 +109,7 @@ QualityModesTest::Print()
double avgEncTime = _totalEncodeTime / _frameCnt;
double avgDecTime = _totalDecodeTime / _frameCnt;
double psnr,ssim;
PSNRfromFiles(_inname.c_str(), _outname.c_str(), _nativeWidth, _nativeHeight, &psnr);
PsnrFromFiles(_inname.c_str(), _outname.c_str(), _nativeWidth, _nativeHeight, &psnr);
printf("Actual bitrate: %f kbps\n", actualBitRate);
printf("Target bitrate: %f kbps\n", _bitRate);
( _log) << "Actual bitrate: " << actualBitRate<< " kbps\tTarget: " << _bitRate << " kbps" << std::endl;
@ -121,7 +123,7 @@ QualityModesTest::Print()
if (_flagSSIM == 1)
{
printf("***computing SSIM***\n");
SSIMfromFiles(_inname.c_str(), _outname.c_str(), _nativeWidth, _nativeHeight, &ssim);
SsimFromFiles(_inname.c_str(), _outname.c_str(), _nativeWidth, _nativeHeight, &ssim);
printf("SSIM: %f \n", ssim);
}
(_log) << std::endl;