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

Side by Side Diff: examples/media_test/media_test.h

Issue 1986303002: Motown: Use new TimelineTransform and related definitions (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: Fixes per feedback. Created 4 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 | « examples/audio_play_test/play_wav.cc ('k') | examples/media_test/media_test.cc » ('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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 #ifndef EXAMPLES_MEDIA_TEST_MEDIA_TEST_H_ 5 #ifndef EXAMPLES_MEDIA_TEST_MEDIA_TEST_H_
6 #define EXAMPLES_MEDIA_TEST_MEDIA_TEST_H_ 6 #define EXAMPLES_MEDIA_TEST_MEDIA_TEST_H_
7 7
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "mojo/public/cpp/application/application_impl.h" 9 #include "mojo/public/cpp/application/application_impl.h"
10 #include "mojo/services/media/common/cpp/linear_transform.h" 10 #include "mojo/services/media/common/cpp/timeline_function.h"
11 #include "mojo/services/media/common/interfaces/rate_control.mojom.h" 11 #include "mojo/services/media/common/interfaces/rate_control.mojom.h"
12 #include "mojo/services/media/control/interfaces/media_factory.mojom.h" 12 #include "mojo/services/media/control/interfaces/media_factory.mojom.h"
13 #include "mojo/services/media/control/interfaces/media_player.mojom.h" 13 #include "mojo/services/media/control/interfaces/media_player.mojom.h"
14 14
15 namespace mojo { 15 namespace mojo {
16 namespace media { 16 namespace media {
17 namespace examples { 17 namespace examples {
18 18
19 // Model for media test application. 19 // Model for media test application.
20 class MediaTest { 20 class MediaTest {
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 MediaTest(mojo::ApplicationImpl* app, const std::string& input_file_name); 56 MediaTest(mojo::ApplicationImpl* app, const std::string& input_file_name);
57 57
58 // Handles a status update from the player. When called with the default 58 // Handles a status update from the player. When called with the default
59 // argument values, initiates status updates. 59 // argument values, initiates status updates.
60 void HandleStatusUpdates(uint64_t version = MediaPlayer::kInitialStatus, 60 void HandleStatusUpdates(uint64_t version = MediaPlayer::kInitialStatus,
61 MediaPlayerStatusPtr status = nullptr); 61 MediaPlayerStatusPtr status = nullptr);
62 62
63 MediaPlayerPtr media_player_; 63 MediaPlayerPtr media_player_;
64 MediaState previous_state_ = MediaState::UNPREPARED; 64 MediaState previous_state_ = MediaState::UNPREPARED;
65 MediaState state_ = MediaState::UNPREPARED; 65 MediaState state_ = MediaState::UNPREPARED;
66 LinearTransform transform_ = LinearTransform(0, 0, 1, 0); 66 TimelineFunction timeline_function_;
67 MediaMetadataPtr metadata_; 67 MediaMetadataPtr metadata_;
68 UpdateCallback update_callback_; 68 UpdateCallback update_callback_;
69 69
70 DISALLOW_COPY_AND_ASSIGN(MediaTest); 70 DISALLOW_COPY_AND_ASSIGN(MediaTest);
71 }; 71 };
72 72
73 } // namespace examples 73 } // namespace examples
74 } // namespace media 74 } // namespace media
75 } // namespace mojo 75 } // namespace mojo
76 76
77 #endif // EXAMPLES_MEDIA_TEST_MEDIA_TEST_H_ 77 #endif // EXAMPLES_MEDIA_TEST_MEDIA_TEST_H_
OLDNEW
« no previous file with comments | « examples/audio_play_test/play_wav.cc ('k') | examples/media_test/media_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698