Splitted FileHandler into FrameReader and FrameWriter classes and moved them to testsupport in test.gyp.
Fixed unit tests so they don't use ASSERT_DEATH since that doesn't work with Valgrind. Fixed all Valgrind warnings except the one caused by CriticalSectionWrapper in system_wrappers. Reworked all includes and GYP include paths to use full directory paths. Removed util.h for logging, since it rendered warnings in Valgrind because of gflags. Replaced it with a verbose flag and a new function in video_quality_measurement.cc BUG= TEST=Passed test_support_unittests and video_codecs_test_framework_unittests on Linux, Mac and Windows. Review URL: http://webrtc-codereview.appspot.com/311001 git-svn-id: http://webrtc.googlecode.com/svn/trunk@1126 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
56
test/testsupport/packet_reader.cc
Normal file
56
test/testsupport/packet_reader.cc
Normal file
@@ -0,0 +1,56 @@
|
||||
/*
|
||||
* Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
|
||||
*
|
||||
* Use of this source code is governed by a BSD-style license
|
||||
* that can be found in the LICENSE file in the root of the source
|
||||
* tree. An additional intellectual property rights grant can be found
|
||||
* in the file PATENTS. All contributing project authors may
|
||||
* be found in the AUTHORS file in the root of the source tree.
|
||||
*/
|
||||
|
||||
#include "testsupport/packet_reader.h"
|
||||
|
||||
#include <cassert>
|
||||
#include <cstdio>
|
||||
|
||||
namespace webrtc {
|
||||
namespace test {
|
||||
|
||||
PacketReader::PacketReader()
|
||||
: initialized_(false) {}
|
||||
|
||||
PacketReader::~PacketReader() {}
|
||||
|
||||
void PacketReader::InitializeReading(WebRtc_UWord8* data,
|
||||
int data_length_in_bytes,
|
||||
int packet_size_in_bytes) {
|
||||
assert(data);
|
||||
assert(data_length_in_bytes >= 0);
|
||||
assert(packet_size_in_bytes > 0);
|
||||
data_ = data;
|
||||
data_length_ = data_length_in_bytes;
|
||||
packet_size_ = packet_size_in_bytes;
|
||||
currentIndex_ = 0;
|
||||
initialized_ = true;
|
||||
}
|
||||
|
||||
int PacketReader::NextPacket(WebRtc_UWord8** packet_pointer) {
|
||||
if (!initialized_) {
|
||||
fprintf(stderr, "Attempting to use uninitialized PacketReader!\n");
|
||||
return -1;
|
||||
}
|
||||
*packet_pointer = data_ + currentIndex_;
|
||||
// Check if we're about to read the last packet:
|
||||
if (data_length_ - currentIndex_ <= packet_size_) {
|
||||
int size = data_length_ - currentIndex_;
|
||||
currentIndex_ = data_length_;
|
||||
assert(size >= 0);
|
||||
return size;
|
||||
}
|
||||
currentIndex_ += packet_size_;
|
||||
assert(packet_size_ >= 0);
|
||||
return packet_size_;
|
||||
}
|
||||
|
||||
} // namespace test
|
||||
} // namespace webrtc
|
||||
Reference in New Issue
Block a user