diff --git a/webrtc/modules/video_coding/BUILD.gn b/webrtc/modules/video_coding/BUILD.gn
index 5750d10178..fc4d3aff50 100644
--- a/webrtc/modules/video_coding/BUILD.gn
+++ b/webrtc/modules/video_coding/BUILD.gn
@@ -281,6 +281,32 @@ rtc_static_library("webrtc_vp9") {
 }
 
 if (rtc_include_tests) {
+  rtc_executable("video_quality_measurement") {
+    testonly = true
+
+    sources = [
+      "codecs/tools/video_quality_measurement.cc",
+    ]
+
+    if (!build_with_chromium && is_clang) {
+      # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
+      suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
+    }
+
+    deps = [
+      ":video_codecs_test_framework",
+      ":video_coding",
+      ":webrtc_vp8",
+      "../..:webrtc_common",
+      "../../base:rtc_base_approved",
+      "../../system_wrappers:field_trial_default",
+      "../../system_wrappers:metrics_default",
+      "../../system_wrappers:system_wrappers",
+      "../../test:test_support",
+      "//third_party/gflags",
+    ]
+  }  # video_quality_measurement
+
   rtc_source_set("video_codecs_test_framework") {
     testonly = true
     sources = [
diff --git a/webrtc/modules/video_coding/codecs/tools/video_quality_measurement.cc b/webrtc/modules/video_coding/codecs/tools/video_quality_measurement.cc
index 1eb47db8c2..f1b580719c 100644
--- a/webrtc/modules/video_coding/codecs/tools/video_quality_measurement.cc
+++ b/webrtc/modules/video_coding/codecs/tools/video_quality_measurement.cc
@@ -491,7 +491,8 @@ int main(int argc, char* argv[]) {
   webrtc::VP8Decoder* decoder = webrtc::VP8Decoder::Create();
   webrtc::test::Stats stats;
   webrtc::test::FrameReaderImpl frame_reader(config.input_filename,
-                                             config.frame_length_in_bytes);
+                                             config.codec_settings->width,
+                                             config.codec_settings->height);
   webrtc::test::FrameWriterImpl frame_writer(config.output_filename,
                                              config.frame_length_in_bytes);
   frame_reader.Init();