services/media/factory_service/media_timeline_controller_impl.h - Issue 2097953002: Motown: Rename MediaProducer/Consumer to MediaPacketProducer/Consumer

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: services/media/factory_service/media_timeline_controller_impl.h

Issue 2097953002: Motown: Rename MediaProducer/Consumer to MediaPacketProducer/Consumer (Closed) Base URL: https://github.com/domokit/mojo.git@master

Patch Set: Fixed #ifndef guards Created 4 years, 5 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 | « services/media/factory_service/media_source_impl.cc ('k') | services/media/factory_service/network_reader_impl.h » ('j') | no next file with comments »

OLD	NEW
1 // Copyright 2016 The Chromium Authors. All rights reserved.	1 // Copyright 2016 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 MOJO_SERVICES_MEDIA_FACTORY_TIMELINE_CONTROLLER_IMPL_H_	5 #ifndef SERVICES_MEDIA_FACTORY_TIMELINE_CONTROLLER_IMPL_H_

6 #define MOJO_SERVICES_MEDIA_FACTORY_TIMELINE_CONTROLLER_IMPL_H_	6 #define SERVICES_MEDIA_FACTORY_TIMELINE_CONTROLLER_IMPL_H_

7	7

8 #include <memory>	8 #include <memory>

9 #include <vector>	9 #include <vector>

10	10

11 #include "mojo/public/cpp/bindings/binding.h"	11 #include "mojo/public/cpp/bindings/binding.h"

12 #include "mojo/services/media/common/cpp/local_time.h"	12 #include "mojo/services/media/common/cpp/local_time.h"

13 #include "mojo/services/media/common/cpp/timeline.h"	13 #include "mojo/services/media/common/cpp/timeline.h"

14 #include "mojo/services/media/common/cpp/timeline_function.h"	14 #include "mojo/services/media/common/cpp/timeline_function.h"

15 #include "mojo/services/media/core/interfaces/timeline_controller.mojom.h"	15 #include "mojo/services/media/core/interfaces/timeline_controller.mojom.h"

16 #include "services/media/common/mojo_publisher.h"	16 #include "services/media/common/mojo_publisher.h"

(...skipping 130 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
147 MojoPublisher<GetStatusCallback> status_publisher_;	147 MojoPublisher<GetStatusCallback> status_publisher_;

148 std::vector<std::unique_ptr<ControlPointState>> control_point_states_;	148 std::vector<std::unique_ptr<ControlPointState>> control_point_states_;

149 TimelineFunction current_timeline_function_;	149 TimelineFunction current_timeline_function_;

150 bool end_of_stream_ = false;	150 bool end_of_stream_ = false;

151 std::weak_ptr<TimelineTransition> pending_transition_;	151 std::weak_ptr<TimelineTransition> pending_transition_;

152 };	152 };

153	153

154 } // namespace media	154 } // namespace media

155 } // namespace mojo	155 } // namespace mojo

156	156

157 #endif // MOJO_SERVICES_MEDIA_FACTORY_TIMELINE_CONTROLLER_IMPL_H_	157 #endif // SERVICES_MEDIA_FACTORY_TIMELINE_CONTROLLER_IMPL_H_

OLD	NEW