source/libvpx/test/encode_test_driver.h - Issue 1302353004: libvpx: Pull from upstream

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: source/libvpx/test/encode_test_driver.h

Issue 1302353004: libvpx: Pull from upstream (Closed) Base URL: https://chromium.googlesource.com/chromium/deps/libvpx.git@master

Patch Set: Created 5 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: source/libvpx/test/encode_test_driver.h

diff --git a/source/libvpx/test/encode_test_driver.h b/source/libvpx/test/encode_test_driver.h

index f7c962186f7ec4ec09b192008c6297b32972bd01..9ecc4989efab80c318c69ff014651c2cc61032df 100644

--- a/source/libvpx/test/encode_test_driver.h

+++ b/source/libvpx/test/encode_test_driver.h

@@ -16,7 +16,7 @@

#include "third_party/googletest/src/include/gtest/gtest.h"

#include "./vpx_config.h"

-#if CONFIG_VP8_ENCODER || CONFIG_VP9_ENCODER

+#if CONFIG_VP8_ENCODER || CONFIG_VP9_ENCODER || CONFIG_VP10_ENCODER

#include "vpx/vp8cx.h"

#endif

#include "vpx/vpx_encoder.h"

@@ -138,7 +138,7 @@ class Encoder {

const vpx_codec_err_t res = vpx_codec_control_(&encoder_, ctrl_id, arg);

ASSERT_EQ(VPX_CODEC_OK, res) << EncoderError();

}

-#if CONFIG_VP8_ENCODER || CONFIG_VP9_ENCODER

+#if CONFIG_VP8_ENCODER || CONFIG_VP9_ENCODER || CONFIG_VP10_ENCODER

void Control(int ctrl_id, vpx_active_map_t *arg) {

const vpx_codec_err_t res = vpx_codec_control_(&encoder_, ctrl_id, arg);

ASSERT_EQ(VPX_CODEC_OK, res) << EncoderError();

« no previous file with comments | « source/libvpx/test/decode_api_test.cc ('k') | source/libvpx/test/encode_test_driver.cc » ('j') | no next file with comments »