media/cast/sender/h264_vt_encoder_unittest.cc - Issue 2580093002: Revert of Convert USE_PROPRIETARY_CODECS to a buildflag header.

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: media/cast/sender/h264_vt_encoder_unittest.cc

Issue 2580093002: Revert of Convert USE_PROPRIETARY_CODECS to a buildflag header. (Closed)

Patch Set: Created 4 years 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: media/cast/sender/h264_vt_encoder_unittest.cc

diff --git a/media/cast/sender/h264_vt_encoder_unittest.cc b/media/cast/sender/h264_vt_encoder_unittest.cc

index 72ff6735224fac8df9486dc7ce4782c28cb611bf..a91feed46a790d62630bc551cfd5745f15d711d4 100644

--- a/media/cast/sender/h264_vt_encoder_unittest.cc

+++ b/media/cast/sender/h264_vt_encoder_unittest.cc

@@ -30,7 +30,6 @@

#include "media/ffmpeg/ffmpeg_common.h"

#include "media/filters/ffmpeg_glue.h"

#include "media/filters/ffmpeg_video_decoder.h"

-#include "media/media_features.h"

#include "testing/gtest/include/gtest/gtest.h"

namespace {

@@ -300,7 +299,7 @@

EXPECT_EQ(10, metadata_recorder->count_frames_delivered());

}

-#if BUILDFLAG(USE_PROPRIETARY_CODECS)

+#if defined(USE_PROPRIETARY_CODECS)

// Failed on mac_chromium_rel_ng trybot. http://crbug.com/627260

TEST_F(H264VideoToolboxEncoderTest, DISABLED_CheckFramesAreDecodable) {

VideoDecoderConfig config(kCodecH264, H264PROFILE_MAIN, frame_->format(),

« no previous file with comments | « media/blink/webcontentdecryptionmodulesession_impl.cc ('k') | media/cdm/aes_decryptor.cc » ('j') | no next file with comments »