disable lagged encoding in one-pass
This currently has no effect and can create an artificial lag in e.g., realtime. Change-Id: Ia1c7c6dbe7c6fe82a944f087f1b0d1dbbc0aa1b6
This commit is contained in:
		
							
								
								
									
										61
									
								
								test/config_test.cc
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										61
									
								
								test/config_test.cc
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,61 @@
 | 
				
			|||||||
 | 
					/*
 | 
				
			||||||
 | 
					 *  Copyright (c) 2012 The WebM 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 "third_party/googletest/src/include/gtest/gtest.h"
 | 
				
			||||||
 | 
					#include "test/encode_test_driver.h"
 | 
				
			||||||
 | 
					#include "test/video_source.h"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					namespace {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					class ConfigTest : public ::libvpx_test::EncoderTest,
 | 
				
			||||||
 | 
					    public ::testing::TestWithParam<enum libvpx_test::TestMode> {
 | 
				
			||||||
 | 
					 public:
 | 
				
			||||||
 | 
					  ConfigTest() : frame_count_in_(0), frame_count_out_(0), frame_count_max_(0) {}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					 protected:
 | 
				
			||||||
 | 
					  virtual void SetUp() {
 | 
				
			||||||
 | 
					    InitializeConfig();
 | 
				
			||||||
 | 
					    SetMode(GetParam());
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  virtual void BeginPassHook(unsigned int /*pass*/) {
 | 
				
			||||||
 | 
					    frame_count_in_ = 0;
 | 
				
			||||||
 | 
					    frame_count_out_ = 0;
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  virtual void PreEncodeFrameHook(libvpx_test::VideoSource* /*video*/) {
 | 
				
			||||||
 | 
					    ++frame_count_in_;
 | 
				
			||||||
 | 
					    abort_ |= (frame_count_in_ >= frame_count_max_);
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  virtual void FramePktHook(const vpx_codec_cx_pkt_t* /*pkt*/) {
 | 
				
			||||||
 | 
					    ++frame_count_out_;
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  virtual bool Continue() {
 | 
				
			||||||
 | 
					    return !HasFatalFailure() && !abort_;
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  unsigned int frame_count_in_;
 | 
				
			||||||
 | 
					  unsigned int frame_count_out_;
 | 
				
			||||||
 | 
					  unsigned int frame_count_max_;
 | 
				
			||||||
 | 
					};
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					TEST_P(ConfigTest, LagIsDisabled) {
 | 
				
			||||||
 | 
					  frame_count_max_ = 2;
 | 
				
			||||||
 | 
					  cfg_.g_lag_in_frames = 15;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  libvpx_test::DummyVideoSource video;
 | 
				
			||||||
 | 
					  ASSERT_NO_FATAL_FAILURE(RunLoop(&video));
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  EXPECT_EQ(frame_count_in_, frame_count_out_);
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					INSTANTIATE_TEST_CASE_P(OnePassModes, ConfigTest, ONE_PASS_TEST_MODES);
 | 
				
			||||||
 | 
					}  // namespace
 | 
				
			||||||
@@ -1,5 +1,6 @@
 | 
				
			|||||||
LIBVPX_TEST_SRCS-yes += test.mk
 | 
					LIBVPX_TEST_SRCS-yes += test.mk
 | 
				
			||||||
LIBVPX_TEST_SRCS-yes += boolcoder_test.cc
 | 
					LIBVPX_TEST_SRCS-yes += boolcoder_test.cc
 | 
				
			||||||
 | 
					LIBVPX_TEST_SRCS-yes += config_test.cc
 | 
				
			||||||
LIBVPX_TEST_SRCS-yes += encode_test_driver.cc
 | 
					LIBVPX_TEST_SRCS-yes += encode_test_driver.cc
 | 
				
			||||||
LIBVPX_TEST_SRCS-yes += encode_test_driver.h
 | 
					LIBVPX_TEST_SRCS-yes += encode_test_driver.h
 | 
				
			||||||
LIBVPX_TEST_SRCS-yes += idctllm_test.cc
 | 
					LIBVPX_TEST_SRCS-yes += idctllm_test.cc
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -299,7 +299,7 @@ static vpx_codec_err_t set_vp8e_config(VP8_CONFIG *oxcf,
 | 
				
			|||||||
        break;
 | 
					        break;
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    if (cfg.g_pass == VPX_RC_FIRST_PASS)
 | 
					    if (cfg.g_pass == VPX_RC_FIRST_PASS || cfg.g_pass == VPX_RC_ONE_PASS)
 | 
				
			||||||
    {
 | 
					    {
 | 
				
			||||||
        oxcf->allow_lag     = 0;
 | 
					        oxcf->allow_lag     = 0;
 | 
				
			||||||
        oxcf->lag_in_frames = 0;
 | 
					        oxcf->lag_in_frames = 0;
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user