
Reason for revert: Had to revert since FYI bots stopped compiling. Example failure: [94/9470] CXX obj\third_party\webrtc\modules\video_processing\main\source\video_processing_sse2.content_analysis_sse2.obj FAILED: ninja -t msvc -e environment.x86 -- E:\b\build\goma/gomacc "E:\b\depot_tools\win_toolchain\vs2013_files\VC\bin\amd64_x86\cl.exe" /nologo /showIncludes /FC @obj\third_party\webrtc\modules\video_coding\codecs\h264\webrtc_h264.h264.obj.rsp /c ..\..\third_party\webrtc\modules\video_coding\codecs\h264\h264.cc /Foobj\third_party\webrtc\modules\video_coding\codecs\h264\webrtc_h264.h264.obj /Fdobj\third_party\webrtc\modules\webrtc_h264.cc.pdb e:\b\build\slave\win\build\src\base\macros.h(28) : error C2220: warning treated as error - no 'object' file generated e:\b\build\slave\win\build\src\base\macros.h(28) : warning C4005: 'DISALLOW_COPY_AND_ASSIGN' : macro redefinition e:\b\build\slave\win\build\src\third_party\webrtc\base\constructormagic.h(27) : see previous definition of 'DISALLOW_COPY_AND_ASSIGN' FAILED: ninja -t msvc -e environment.x86 -- E:\b\build\goma/gomacc "E:\b\depot_tools\win_toolchain\vs2013_files\VC\bin\amd64_x86\cl.exe" /nologo /showIncludes /FC @obj\third_party\webrtc\base\rtc_base_approved.bitbuffer.obj.rsp /c ..\..\third_party\webrtc\base\bitbuffer.cc /Foobj\third_party\webrtc\base\rtc_base_approved.bitbuffer.obj /Fdobj\third_party\webrtc\base\rtc_base_approved.cc.pdb e:\b\build\slave\win\build\src\base\macros.h(28) : error C2220: warning treated as error - no 'object' file generated e:\b\build\slave\win\build\src\base\macros.h(28) : warning C4005: 'DISALLOW_COPY_AND_ASSIGN' : macro redefinition e:\b\build\slave\win\build\src\third_party\webrtc\base\constructormagic.h(27) : see previous definition of 'DISALLOW_COPY_AND_ASSIGN' FAILED: ninja -t msvc -e environment.x86 -- E:\b\build\goma/gomacc "E:\b\depot_tools\win_toolchain\vs2013_files\VC\bin\amd64_x86\cl.exe" /nologo /showIncludes /FC @obj\third_party\webrtc\modules\audio_processing\logging\audio_processing.aec_logging_file_handling.obj.rsp /c ..\..\third_party\webrtc\modules\audio_processing\logging\aec_logging_file_handling.cc /Foobj\third_party\webrtc\modules\audio_processing\logging\audio_processing.aec_logging_file_handling.obj /Fdobj\third_party\webrtc\modules\audio_processing.cc.pdb e:\b\build\slave\win\build\src\base\macros.h(28) : error C2220: warning treated as error - no 'object' file generated e:\b\build\slave\win\build\src\base\macros.h(28) : warning C4005: 'DISALLOW_COPY_AND_ASSIGN' : macro redefinition e:\b\build\slave\win\build\src\third_party\webrtc\base\constructormagic.h(27) : see previous definition of 'DISALLOW_COPY_AND_ASSIGN' FAILED: ninja -t msvc -e environment.x86 -- E:\b\build\goma/gomacc "E:\b\depot_tools\win_toolchain\vs2013_files\VC\bin\amd64_x86\cl.exe" /nologo /showIncludes /FC @obj\third_party\webrtc\modules\audio_processing\beamformer\audio_processing.nonlinear_beamformer.obj.rsp /c ..\..\third_party\webrtc\modules\audio_processing\beamformer\nonlinear_beamformer.cc /Foobj\third_party\webrtc\modules\audio_processing\beamformer\audio_processing.nonlinear_beamformer.obj /Fdobj\third_party\webrtc\modules\audio_processing.cc.pdb e:\b\build\slave\win\build\src\base\macros.h(28) : error C2220: warning treated as error - no 'object' file generated e:\b\build\slave\win\build\src\base\macros.h(28) : warning C4005: 'DISALLOW_COPY_AND_ASSIGN' : macro redefinition e:\b\build\slave\win\build\src\third_party\webrtc\base\constructormagic.h(27) : see previous definition of 'DISALLOW_COPY_AND_ASSIGN' Original issue's description: > Consolidate constructormagic macros with Chromium version and remove Chromium override. > > Part of work removing dependency on Chromium's base. > > Only adds "= delete". From https://codereview.chromium.org/1151443003 : > "This will guarantee the error to be at compile time, and not rely on the call visibility (private)." > > In consequence of that change, fixed an illegal copy and removed a bunch of unused variables. > > BUG=chromium:468375 (in particular comment #37) > NOTRY=true > > Committed: https://crrev.com/0de8ff488d92e0bc6b7b65662898ff5e955cda93 > Cr-Commit-Position: refs/heads/master@{#9913} TBR=andrew@webrtc.org,henrikg@webrtc.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=chromium:468375 (in particular comment #37) Review URL: https://codereview.webrtc.org/1330283002 Cr-Commit-Position: refs/heads/master@{#9914}
88 lines
2.1 KiB
C++
88 lines
2.1 KiB
C++
/*
|
|
* Copyright (c) 2012 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_MODULES_VIDEO_CODING_TEST_TEST_UTIL_H_
|
|
#define WEBRTC_MODULES_VIDEO_CODING_TEST_TEST_UTIL_H_
|
|
|
|
/*
|
|
* General declarations used through out VCM offline tests.
|
|
*/
|
|
|
|
#include <string>
|
|
|
|
#include "webrtc/base/constructormagic.h"
|
|
#include "webrtc/modules/interface/module_common_types.h"
|
|
#include "webrtc/modules/video_coding/main/interface/video_coding.h"
|
|
#include "webrtc/system_wrappers/interface/event_wrapper.h"
|
|
|
|
enum { kMaxNackListSize = 250 };
|
|
enum { kMaxPacketAgeToNack = 450 };
|
|
|
|
class NullEvent : public webrtc::EventWrapper {
|
|
public:
|
|
virtual ~NullEvent() {}
|
|
|
|
virtual bool Set() { return true; }
|
|
|
|
virtual bool Reset() { return true; }
|
|
|
|
virtual webrtc::EventTypeWrapper Wait(unsigned long max_time) {
|
|
return webrtc::kEventTimeout;
|
|
}
|
|
|
|
virtual bool StartTimer(bool periodic, unsigned long time) { return true; }
|
|
|
|
virtual bool StopTimer() { return true; }
|
|
};
|
|
|
|
class NullEventFactory : public webrtc::EventFactory {
|
|
public:
|
|
virtual ~NullEventFactory() {}
|
|
|
|
virtual webrtc::EventWrapper* CreateEvent() {
|
|
return new NullEvent;
|
|
}
|
|
};
|
|
|
|
class FileOutputFrameReceiver : public webrtc::VCMReceiveCallback {
|
|
public:
|
|
FileOutputFrameReceiver(const std::string& base_out_filename, uint32_t ssrc);
|
|
virtual ~FileOutputFrameReceiver();
|
|
|
|
// VCMReceiveCallback
|
|
virtual int32_t FrameToRender(webrtc::VideoFrame& video_frame);
|
|
|
|
private:
|
|
std::string out_filename_;
|
|
uint32_t ssrc_;
|
|
FILE* out_file_;
|
|
FILE* timing_file_;
|
|
int width_;
|
|
int height_;
|
|
int count_;
|
|
|
|
DISALLOW_IMPLICIT_CONSTRUCTORS(FileOutputFrameReceiver);
|
|
};
|
|
|
|
class CmdArgs {
|
|
public:
|
|
CmdArgs();
|
|
|
|
std::string codecName;
|
|
webrtc::VideoCodecType codecType;
|
|
int width;
|
|
int height;
|
|
int rtt;
|
|
std::string inputFile;
|
|
std::string outputFile;
|
|
};
|
|
|
|
#endif
|