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

Side by Side Diff: media/base/renderer_factory_selector.cc

Issue 2826883002: Rename AdaptiveRendererFactory (Closed)
Patch Set: Minor fixes 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
OLDNEW
1 // Copyright 2017 The Chromium Authors. All rights reserved. 1 // Copyright 2017 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 "media/base/renderer_factory_selector.h" 5 #include "media/base/renderer_factory_selector.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 8
9 namespace media { 9 namespace media {
10 10
11 RendererFactorySelector::RendererFactorySelector() {} 11 RendererFactorySelector::RendererFactorySelector() {}
12 12
13 RendererFactorySelector::~RendererFactorySelector() {} 13 RendererFactorySelector::~RendererFactorySelector() {}
14 14
15 void RendererFactorySelector::AddFactory( 15 void RendererFactorySelector::AddFactory(
16 FactoryType type, 16 FactoryType type,
17 std::unique_ptr<RendererFactory> factory) { 17 std::unique_ptr<RendererFactory> factory) {
18 DCHECK(!factories_[type]); 18 DCHECK(!factories_[type]);
19 19
20 factories_[type] = std::move(factory); 20 factories_[type] = std::move(factory);
21 } 21 }
22 22
23 void RendererFactorySelector::SetBaseFactoryType(FactoryType type) { 23 void RendererFactorySelector::SetBaseFactoryType(FactoryType type) {
24 DCHECK(factories_[type]); 24 DCHECK(factories_[type]);
25 base_factory_type_ = type; 25 base_factory_type_ = type;
26 current_factory_needs_update_ = true; 26 current_factory_needs_update_ = true;
27 } 27 }
28 28
29 // For the moment, this method should only be called once or twice.
30 // This method will be regularly called whenever the logic in choosing a
31 // renderer type is moved out of the AdaptiveRendererFactory, into this method.
32 void RendererFactorySelector::UpdateCurrentFactory() { 29 void RendererFactorySelector::UpdateCurrentFactory() {
30 // We cannot use the MEDIA_PLAYER and the COURIER factory at the same time.
31 DCHECK(!use_media_player_ || !use_courier_cb_);
32
33 DCHECK(base_factory_type_); 33 DCHECK(base_factory_type_);
34 FactoryType next_factory_type = base_factory_type_.value(); 34 FactoryType next_factory_type = base_factory_type_.value();
35 35
36 if (use_media_player_) 36 if (use_media_player_)
37 next_factory_type = FactoryType::MEDIA_PLAYER; 37 next_factory_type = FactoryType::MEDIA_PLAYER;
38 38
39 if (use_courier_cb_ && use_courier_cb_.Run())
40 next_factory_type = FactoryType::COURIER;
41
39 DVLOG(1) << __func__ << " Selecting factory type: " << next_factory_type; 42 DVLOG(1) << __func__ << " Selecting factory type: " << next_factory_type;
40 43
41 current_factory_ = factories_[next_factory_type].get(); 44 current_factory_ = factories_[next_factory_type].get();
42 current_factory_needs_update_ = false; 45
46 // Update |current_factory_| every time if we are using the COURIER factory.
47 current_factory_needs_update_ = !!use_courier_cb_;
43 } 48 }
44 49
45 RendererFactory* RendererFactorySelector::GetCurrentFactory() { 50 RendererFactory* RendererFactorySelector::GetCurrentFactory() {
46 if (current_factory_needs_update_) 51 if (current_factory_needs_update_)
47 UpdateCurrentFactory(); 52 UpdateCurrentFactory();
48 53
49 DCHECK(current_factory_); 54 DCHECK(current_factory_);
50 return current_factory_; 55 return current_factory_;
51 } 56 }
52 57
53 #if defined(OS_ANDROID) 58 #if defined(OS_ANDROID)
54 void RendererFactorySelector::SetUseMediaPlayer(bool use_media_player) { 59 void RendererFactorySelector::SetUseMediaPlayer(bool use_media_player) {
55 use_media_player_ = use_media_player; 60 use_media_player_ = use_media_player;
56 current_factory_needs_update_ = true; 61 current_factory_needs_update_ = true;
57 } 62 }
58 #endif 63 #endif
59 64
65 void RendererFactorySelector::SetUseCourierCB(UseCourierCB use_courier_cb) {
66 DCHECK(!use_courier_cb_);
67 use_courier_cb_ = use_courier_cb;
68 current_factory_needs_update_ = true;
69 }
70
60 } // namespace media 71 } // namespace media
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698