generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "Port frame_analyzer and rgba_to_i420_converter targets to GN build."

Browse Source 
This reverts commit 6ac53b2b37.

Reason: breaks compile on Win GN:
https://build.chromium.org/p/chromium.webrtc.fyi/builders/Win%20GN/builds/131

TBR=tfarina@chromium.org

Review URL: https://webrtc-codereview.appspot.com/45919004

Cr-Commit-Position: refs/heads/master@{#8915}
This commit is contained in:
Henrik Kjellander
2015-04-01 22:53:56 +02:00
parent 6ac53b2b37
commit fa16dda238
4 changed files with 4 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
webrtc/tools/BUILD.gn
View File

@@ -16,50 +16,12 @@ source_set("tools") {
source_set("command_line_parser") { source_set("command_line_parser") {
sources = [ sources = [
"simple_command_line_parser.cc",
"simple_command_line_parser.h", "simple_command_line_parser.h",
] "simple_command_line_parser.cc",
deps = [
"..:gtest_prod",
] ]
configs += [ "..:common_config" ] configs += [ "..:common_config" ]
public_configs = [ "..:common_inherited_config" ] public_configs = [ "..:common_inherited_config"]
}
source_set("video_quality_analysis") {
sources = [
"frame_analyzer/video_quality_analysis.cc",
"frame_analyzer/video_quality_analysis.h",
]
deps = [
"../common_video",
]
public_deps = [
"../common_video",
]
}
executable("frame_analyzer") {
sources = [
"frame_analyzer/frame_analyzer.cc",
]
deps = [
":command_line_parser",
":video_quality_analysis",
]
}
executable("rgba_to_i420_converter") {
sources = [
"converter/converter.cc",
"converter/converter.h",
"converter/rgba_to_i420_converter.cc",
]
deps = [
":command_line_parser",
"../common_video",
]
} }
# TODO(kjellander): Convert all of tools.gyp into GN here. # TODO(kjellander): Convert all of tools.gyp into GN here.
@@ -73,7 +35,7 @@ if (!build_with_chromium) {
] ]
configs += [ "..:common_config" ] configs += [ "..:common_config" ]
public_configs = [ "..:common_inherited_config" ] public_configs = [ "..:common_inherited_config"]
deps = [ deps = [
":command_line_parser", ":command_line_parser",

3
webrtc/tools/frame_analyzer/video_quality_analysis.cc
View File

@@ -26,9 +26,6 @@ namespace test {
using std::string; using std::string;
ResultsContainer::ResultsContainer() {}
ResultsContainer::~ResultsContainer() {}
int GetI420FrameSize(int width, int height) { int GetI420FrameSize(int width, int height) {
int half_width = (width + 1) >> 1; int half_width = (width + 1) >> 1;
int half_height = (height + 1) >> 1; int half_height = (height + 1) >> 1;

3
webrtc/tools/frame_analyzer/video_quality_analysis.h
View File

@@ -32,9 +32,6 @@ struct AnalysisResult {
}; };
struct ResultsContainer { struct ResultsContainer {
ResultsContainer();
~ResultsContainer();
std::vector<AnalysisResult> frames; std::vector<AnalysisResult> frames;
}; };

5
webrtc/tools/internal_tools.gyp
View File

@@ -20,9 +20,6 @@
'simple_command_line_parser.h', 'simple_command_line_parser.h',
'simple_command_line_parser.cc', 'simple_command_line_parser.cc',
], ],
'deps': [
'<(webrtc_root)/common.gyp:gtest_prod',
],
}, # command_line_parser }, # command_line_parser
], ],
} }