14665ff7d4
Clang version changed 223108:230914
Details: e144d30..6fdb142/tools/clang/scripts/update.sh
Removes the OVERRIDE macro defined in:
* webrtc/base/common.h
* webrtc/typedefs.h
The majority of the source changes were done by running this in src/:
perl -0pi -e "s/virtual\s([^({;]*(\([^({;]*\)[^({;]*))(OVERRIDE|override)/\1override/sg" `find {talk,webrtc} -name "*.h" -o -name "*.cc*" -o -name "*.mm*"`
which converted all:
virtual Foo() OVERRIDE
functions to:
Foo() override
Then I manually edited:
* talk/media/webrtc/fakewebrtccommon.h
* webrtc/test/fake_common.h
Remaining uses of OVERRIDE was fixed by search+replace.
Manual edits were done to fix virtual destructors that were
overriding inherited ones.
Finally a build error related to the pure virtual definitions of
Read, Write and Rewind in common_types.h required a bit of
refactoring in:
* webrtc/common_types.cc
* webrtc/common_types.h
* webrtc/system_wrappers/interface/file_wrapper.h
* webrtc/system_wrappers/source/file_impl.cc
This roll should make it possible for us to finally re-enable deadlock
detection for TSan on the buildbots.
BUG=4106
R=pbos@webrtc.org, tommi@webrtc.org
Review URL: https://webrtc-codereview.appspot.com/41069004
Cr-Commit-Position: refs/heads/master@{#8596}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8596 4adac7df-926f-26a2-2b94-8c16560cd09d
75 lines
2.4 KiB
C++
75 lines
2.4 KiB
C++
/*
|
|
* 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.
|
|
*/
|
|
|
|
#ifndef WEBRTC_TEST_TESTSUPPORT_FRAME_READER_H_
|
|
#define WEBRTC_TEST_TESTSUPPORT_FRAME_READER_H_
|
|
|
|
#include <stdio.h>
|
|
|
|
#include <string>
|
|
|
|
#include "webrtc/typedefs.h"
|
|
|
|
namespace webrtc {
|
|
namespace test {
|
|
|
|
// Handles reading of frames from video files.
|
|
class FrameReader {
|
|
public:
|
|
virtual ~FrameReader() {}
|
|
|
|
// Initializes the frame reader, i.e. opens the input file.
|
|
// This must be called before reading of frames has started.
|
|
// Returns false if an error has occurred, in addition to printing to stderr.
|
|
virtual bool Init() = 0;
|
|
|
|
// Reads a frame into the supplied buffer, which must contain enough space
|
|
// for the frame size.
|
|
// Returns true if there are more frames to read, false if we've already
|
|
// read the last frame (in the previous call).
|
|
virtual bool ReadFrame(uint8_t* source_buffer) = 0;
|
|
|
|
// Closes the input file if open. Essentially makes this class impossible
|
|
// to use anymore. Will also be invoked by the destructor.
|
|
virtual void Close() = 0;
|
|
|
|
// Frame length in bytes of a single frame image.
|
|
virtual size_t FrameLength() = 0;
|
|
// Total number of frames in the input video source.
|
|
virtual int NumberOfFrames() = 0;
|
|
};
|
|
|
|
class FrameReaderImpl : public FrameReader {
|
|
public:
|
|
// Creates a file handler. The input file is assumed to exist and be readable.
|
|
// Parameters:
|
|
// input_filename The file to read from.
|
|
// frame_length_in_bytes The size of each frame.
|
|
// For YUV this is 3 * width * height / 2
|
|
FrameReaderImpl(std::string input_filename, size_t frame_length_in_bytes);
|
|
~FrameReaderImpl() override;
|
|
bool Init() override;
|
|
bool ReadFrame(uint8_t* source_buffer) override;
|
|
void Close() override;
|
|
size_t FrameLength() override;
|
|
int NumberOfFrames() override;
|
|
|
|
private:
|
|
std::string input_filename_;
|
|
size_t frame_length_in_bytes_;
|
|
int number_of_frames_;
|
|
FILE* input_file_;
|
|
};
|
|
|
|
} // namespace test
|
|
} // namespace webrtc
|
|
|
|
#endif // WEBRTC_TEST_TESTSUPPORT_FRAME_READER_H_
|