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

Side by Side Diff: media/test/pipeline_integration_test.cc

Issue 2760893003: Update new VP9 codec string parsing (Closed)
Patch Set: So many tests... Created 3 years, 9 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 unified diff | Download patch
« no previous file with comments | « media/filters/chunk_demuxer_unittest.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include <stddef.h> 5 #include <stddef.h>
6 #include <stdint.h> 6 #include <stdint.h>
7 7
8 #include <memory> 8 #include <memory>
9 #include <utility> 9 #include <utility>
10 10
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 98
99 const char kWebM[] = "video/webm; codecs=\"vp8,vorbis\""; 99 const char kWebM[] = "video/webm; codecs=\"vp8,vorbis\"";
100 const char kWebMVP9[] = "video/webm; codecs=\"vp9\""; 100 const char kWebMVP9[] = "video/webm; codecs=\"vp9\"";
101 const char kAudioOnlyWebM[] = "video/webm; codecs=\"vorbis\""; 101 const char kAudioOnlyWebM[] = "video/webm; codecs=\"vorbis\"";
102 const char kOpusAudioOnlyWebM[] = "video/webm; codecs=\"opus\""; 102 const char kOpusAudioOnlyWebM[] = "video/webm; codecs=\"opus\"";
103 const char kVideoOnlyWebM[] = "video/webm; codecs=\"vp8\""; 103 const char kVideoOnlyWebM[] = "video/webm; codecs=\"vp8\"";
104 #if BUILDFLAG(USE_PROPRIETARY_CODECS) 104 #if BUILDFLAG(USE_PROPRIETARY_CODECS)
105 const char kADTS[] = "audio/aac"; 105 const char kADTS[] = "audio/aac";
106 const char kMP4[] = "video/mp4; codecs=\"avc1.4D4041,mp4a.40.2\""; 106 const char kMP4[] = "video/mp4; codecs=\"avc1.4D4041,mp4a.40.2\"";
107 const char kMP4VideoAVC3[] = "video/mp4; codecs=\"avc3.64001f\""; 107 const char kMP4VideoAVC3[] = "video/mp4; codecs=\"avc3.64001f\"";
108 const char kMP4VideoVP9[] = "video/mp4; codecs=\"vp09.00.00.08.01.01.00.00\""; 108 const char kMP4VideoVP9[] = "video/mp4; codecs=\"vp09.00.10.08.01.05.01\"";
109 const char kMP4VideoHEVC1[] = "video/mp4; codecs=\"hvc1.1.6.L93.B0\""; 109 const char kMP4VideoHEVC1[] = "video/mp4; codecs=\"hvc1.1.6.L93.B0\"";
110 const char kMP4VideoHEVC2[] = "video/mp4; codecs=\"hev1.1.6.L93.B0\""; 110 const char kMP4VideoHEVC2[] = "video/mp4; codecs=\"hev1.1.6.L93.B0\"";
111 const char kMP4Video[] = "video/mp4; codecs=\"avc1.4D4041\""; 111 const char kMP4Video[] = "video/mp4; codecs=\"avc1.4D4041\"";
112 const char kMP4Audio[] = "audio/mp4; codecs=\"mp4a.40.2\""; 112 const char kMP4Audio[] = "audio/mp4; codecs=\"mp4a.40.2\"";
113 const char kMP3[] = "audio/mpeg"; 113 const char kMP3[] = "audio/mpeg";
114 const char kMP2AudioSBR[] = "video/mp2t; codecs=\"avc1.4D4041,mp4a.40.5\""; 114 const char kMP2AudioSBR[] = "video/mp2t; codecs=\"avc1.4D4041,mp4a.40.5\"";
115 #endif // BUILDFLAG(USE_PROPRIETARY_CODECS) 115 #endif // BUILDFLAG(USE_PROPRIETARY_CODECS)
116 116
117 const size_t kAppendWholeFile = std::numeric_limits<size_t>::max(); 117 const size_t kAppendWholeFile = std::numeric_limits<size_t>::max();
118 118
(...skipping 2497 matching lines...) Expand 10 before | Expand all | Expand 10 after
2616 2616
2617 TEST_F(PipelineIntegrationTest, BasicPlaybackPositiveStartTime) { 2617 TEST_F(PipelineIntegrationTest, BasicPlaybackPositiveStartTime) {
2618 ASSERT_EQ(PIPELINE_OK, Start("nonzero-start-time.webm")); 2618 ASSERT_EQ(PIPELINE_OK, Start("nonzero-start-time.webm"));
2619 Play(); 2619 Play();
2620 ASSERT_TRUE(WaitUntilOnEnded()); 2620 ASSERT_TRUE(WaitUntilOnEnded());
2621 ASSERT_EQ(base::TimeDelta::FromMicroseconds(396000), 2621 ASSERT_EQ(base::TimeDelta::FromMicroseconds(396000),
2622 demuxer_->GetStartTime()); 2622 demuxer_->GetStartTime());
2623 } 2623 }
2624 2624
2625 } // namespace media 2625 } // namespace media
OLDNEW
« no previous file with comments | « media/filters/chunk_demuxer_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698