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

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

Issue 1565343003: Move mojo/application/public -> mojo/shell/public (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@fetcher
Patch Set: . 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 unified diff | Download patch
« no previous file with comments | « media/test/DEPS ('k') | mojo/BUILD.gn » ('j') | 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 #include <utility> 7 #include <utility>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 17 matching lines...) Expand all
28 #include "media/filters/chunk_demuxer.h" 28 #include "media/filters/chunk_demuxer.h"
29 #include "media/renderers/renderer_impl.h" 29 #include "media/renderers/renderer_impl.h"
30 #include "media/test/pipeline_integration_test_base.h" 30 #include "media/test/pipeline_integration_test_base.h"
31 #include "testing/gmock/include/gmock/gmock.h" 31 #include "testing/gmock/include/gmock/gmock.h"
32 #include "url/gurl.h" 32 #include "url/gurl.h"
33 33
34 #if defined(MOJO_RENDERER) 34 #if defined(MOJO_RENDERER)
35 #include "media/mojo/interfaces/renderer.mojom.h" 35 #include "media/mojo/interfaces/renderer.mojom.h"
36 #include "media/mojo/interfaces/service_factory.mojom.h" 36 #include "media/mojo/interfaces/service_factory.mojom.h"
37 #include "media/mojo/services/mojo_renderer_impl.h" 37 #include "media/mojo/services/mojo_renderer_impl.h"
38 #include "mojo/application/public/cpp/application_impl.h" 38 #include "mojo/shell/public/cpp/application_impl.h"
39 #include "mojo/application/public/cpp/application_test_base.h" 39 #include "mojo/shell/public/cpp/application_test_base.h"
40 #include "mojo/application/public/cpp/connect.h" 40 #include "mojo/shell/public/cpp/connect.h"
41 41
42 // TODO(dalecurtis): The mojo renderer is in another process, so we have no way 42 // TODO(dalecurtis): The mojo renderer is in another process, so we have no way
43 // currently to get hashes for video and audio samples. This also means that 43 // currently to get hashes for video and audio samples. This also means that
44 // real audio plays out for each test. 44 // real audio plays out for each test.
45 #define EXPECT_HASH_EQ(a, b) 45 #define EXPECT_HASH_EQ(a, b)
46 #define EXPECT_VIDEO_FORMAT_EQ(a, b) 46 #define EXPECT_VIDEO_FORMAT_EQ(a, b)
47 #define EXPECT_COLOR_SPACE_EQ(a, b) 47 #define EXPECT_COLOR_SPACE_EQ(a, b)
48 48
49 // TODO(xhwang): EME support is not complete for the mojo renderer, so all 49 // TODO(xhwang): EME support is not complete for the mojo renderer, so all
50 // encrypted tests are currently disabled. 50 // encrypted tests are currently disabled.
(...skipping 1886 matching lines...) Expand 10 before | Expand all | Expand 10 after
1937 1937
1938 TEST_F(PipelineIntegrationTest, BasicPlaybackPositiveStartTime) { 1938 TEST_F(PipelineIntegrationTest, BasicPlaybackPositiveStartTime) {
1939 ASSERT_EQ(PIPELINE_OK, Start("nonzero-start-time.webm")); 1939 ASSERT_EQ(PIPELINE_OK, Start("nonzero-start-time.webm"));
1940 Play(); 1940 Play();
1941 ASSERT_TRUE(WaitUntilOnEnded()); 1941 ASSERT_TRUE(WaitUntilOnEnded());
1942 ASSERT_EQ(base::TimeDelta::FromMicroseconds(396000), 1942 ASSERT_EQ(base::TimeDelta::FromMicroseconds(396000),
1943 demuxer_->GetStartTime()); 1943 demuxer_->GetStartTime());
1944 } 1944 }
1945 1945
1946 } // namespace media 1946 } // namespace media
OLDNEW
« no previous file with comments | « media/test/DEPS ('k') | mojo/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698