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

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

Issue 2847533002: Update mp4 vp9 test files to follow v1.0 spec (Closed)
Patch Set: Address build breaks on some configs Created 3 years, 7 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/test/data/bear-320x240-v_frag-vp9-cenc.mp4 ('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 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
95 95
96 const char kWebM[] = "video/webm; codecs=\"vp8,vorbis\""; 96 const char kWebM[] = "video/webm; codecs=\"vp8,vorbis\"";
97 const char kWebMVP9[] = "video/webm; codecs=\"vp9\""; 97 const char kWebMVP9[] = "video/webm; codecs=\"vp9\"";
98 const char kAudioOnlyWebM[] = "video/webm; codecs=\"vorbis\""; 98 const char kAudioOnlyWebM[] = "video/webm; codecs=\"vorbis\"";
99 const char kOpusAudioOnlyWebM[] = "video/webm; codecs=\"opus\""; 99 const char kOpusAudioOnlyWebM[] = "video/webm; codecs=\"opus\"";
100 const char kVideoOnlyWebM[] = "video/webm; codecs=\"vp8\""; 100 const char kVideoOnlyWebM[] = "video/webm; codecs=\"vp8\"";
101 #if BUILDFLAG(USE_PROPRIETARY_CODECS) 101 #if BUILDFLAG(USE_PROPRIETARY_CODECS)
102 const char kADTS[] = "audio/aac"; 102 const char kADTS[] = "audio/aac";
103 const char kMP4[] = "video/mp4; codecs=\"avc1.4D4041,mp4a.40.2\""; 103 const char kMP4[] = "video/mp4; codecs=\"avc1.4D4041,mp4a.40.2\"";
104 const char kMP4VideoAVC3[] = "video/mp4; codecs=\"avc3.64001f\""; 104 const char kMP4VideoAVC3[] = "video/mp4; codecs=\"avc3.64001f\"";
105 const char kMP4VideoVP9[] = "video/mp4; codecs=\"vp09.00.10.08.01.05.01\""; 105 const char kMP4VideoVP9[] =
106 "video/mp4; codecs=\"vp09.00.10.08.01.02.02.02.00\"";
106 const char kMP4VideoHEVC1[] = "video/mp4; codecs=\"hvc1.1.6.L93.B0\""; 107 const char kMP4VideoHEVC1[] = "video/mp4; codecs=\"hvc1.1.6.L93.B0\"";
107 const char kMP4VideoHEVC2[] = "video/mp4; codecs=\"hev1.1.6.L93.B0\""; 108 const char kMP4VideoHEVC2[] = "video/mp4; codecs=\"hev1.1.6.L93.B0\"";
108 const char kMP4Video[] = "video/mp4; codecs=\"avc1.4D4041\""; 109 const char kMP4Video[] = "video/mp4; codecs=\"avc1.4D4041\"";
109 const char kMP4Audio[] = "audio/mp4; codecs=\"mp4a.40.2\""; 110 const char kMP4Audio[] = "audio/mp4; codecs=\"mp4a.40.2\"";
110 const char kMP3[] = "audio/mpeg"; 111 const char kMP3[] = "audio/mpeg";
111 const char kMP2AudioSBR[] = "video/mp2t; codecs=\"avc1.4D4041,mp4a.40.5\""; 112 const char kMP2AudioSBR[] = "video/mp2t; codecs=\"avc1.4D4041,mp4a.40.5\"";
112 #endif // BUILDFLAG(USE_PROPRIETARY_CODECS) 113 #endif // BUILDFLAG(USE_PROPRIETARY_CODECS)
113 114
114 // Constants for the Media Source config change tests. 115 // Constants for the Media Source config change tests.
115 const int kAppendTimeSec = 1; 116 const int kAppendTimeSec = 1;
(...skipping 2242 matching lines...) Expand 10 before | Expand all | Expand 10 after
2358 2359
2359 TEST_F(PipelineIntegrationTest, BasicPlaybackPositiveStartTime) { 2360 TEST_F(PipelineIntegrationTest, BasicPlaybackPositiveStartTime) {
2360 ASSERT_EQ(PIPELINE_OK, Start("nonzero-start-time.webm")); 2361 ASSERT_EQ(PIPELINE_OK, Start("nonzero-start-time.webm"));
2361 Play(); 2362 Play();
2362 ASSERT_TRUE(WaitUntilOnEnded()); 2363 ASSERT_TRUE(WaitUntilOnEnded());
2363 ASSERT_EQ(base::TimeDelta::FromMicroseconds(396000), 2364 ASSERT_EQ(base::TimeDelta::FromMicroseconds(396000),
2364 demuxer_->GetStartTime()); 2365 demuxer_->GetStartTime());
2365 } 2366 }
2366 2367
2367 } // namespace media 2368 } // namespace media
OLDNEW
« no previous file with comments | « media/test/data/bear-320x240-v_frag-vp9-cenc.mp4 ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698