Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1134)

Unified Diff: media/filters/chunk_demuxer_unittest.cc

Issue 1539983004: Convert enable_mpeg2ts into a new-style buildflag (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 11 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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/base/mime_util_unittest.cc ('k') | media/filters/stream_parser_factory.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/chunk_demuxer_unittest.cc
diff --git a/media/filters/chunk_demuxer_unittest.cc b/media/filters/chunk_demuxer_unittest.cc
index 2e4983d10d910535f5a956e6d1d1bd4675855e9e..94698d4d6cc6d39faab7d3ea3bec2251ed5a24c4 100644
--- a/media/filters/chunk_demuxer_unittest.cc
+++ b/media/filters/chunk_demuxer_unittest.cc
@@ -25,6 +25,7 @@
#include "media/base/timestamp_constants.h"
#include "media/formats/webm/cluster_builder.h"
#include "media/formats/webm/webm_constants.h"
+#include "media/media_features.h"
#include "testing/gtest/include/gtest/gtest.h"
using ::testing::AnyNumber;
@@ -362,6 +363,7 @@ class ChunkDemuxerTest : public ::testing::Test {
return demuxer_->AddId(source_id, type, codecs);
}
+#if BUILDFLAG(ENABLE_MSE_MPEG2TS_STREAM_PARSER)
ChunkDemuxer::Status AddIdForMp2tSource(const std::string& source_id) {
std::vector<std::string> codecs;
std::string type = "video/mp2t";
@@ -369,6 +371,7 @@ class ChunkDemuxerTest : public ::testing::Test {
codecs.push_back("avc1.640028");
return demuxer_->AddId(source_id, type, codecs);
}
+#endif
void AppendData(const uint8_t* data, size_t length) {
AppendData(kSourceId, data, length);
@@ -3047,7 +3050,7 @@ TEST_F(ChunkDemuxerTest, IsParsingMediaSegmentMidMediaSegment) {
}
#if defined(USE_PROPRIETARY_CODECS)
-#if defined(ENABLE_MPEG2TS_STREAM_PARSER)
+#if BUILDFLAG(ENABLE_MSE_MPEG2TS_STREAM_PARSER)
TEST_F(ChunkDemuxerTest, EmitBuffersDuringAbort) {
EXPECT_CALL(*this, DemuxerOpened());
demuxer_->Initialize(
« no previous file with comments | « media/base/mime_util_unittest.cc ('k') | media/filters/stream_parser_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698