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

Side by Side Diff: content/renderer/media/render_media_client.cc

Issue 2640113004: Introduce Dolby Vision video codec and Demuxer support (Closed)
Patch Set: fix build break on Android Created 3 years, 9 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 | « chromecast/media/cma/base/decoder_config_adapter.cc ('k') | gpu/config/gpu_info.h » ('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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "content/renderer/media/render_media_client.h" 5 #include "content/renderer/media/render_media_client.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/time/default_tick_clock.h" 8 #include "base/time/default_tick_clock.h"
9 #include "content/public/common/content_client.h" 9 #include "content/public/common/content_client.h"
10 #include "content/public/renderer/content_renderer_client.h" 10 #include "content/public/renderer/content_renderer_client.h"
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
97 case media::kCodecVP8: 97 case media::kCodecVP8:
98 case media::kCodecVP9: 98 case media::kCodecVP9:
99 case media::kCodecTheora: 99 case media::kCodecTheora:
100 return true; 100 return true;
101 101
102 case media::kUnknownVideoCodec: 102 case media::kUnknownVideoCodec:
103 case media::kCodecVC1: 103 case media::kCodecVC1:
104 case media::kCodecMPEG2: 104 case media::kCodecMPEG2:
105 case media::kCodecMPEG4: 105 case media::kCodecMPEG4:
106 case media::kCodecHEVC: 106 case media::kCodecHEVC:
107 case media::kCodecDolbyVision:
107 return false; 108 return false;
108 } 109 }
109 110
110 NOTREACHED(); 111 NOTREACHED();
111 return false; 112 return false;
112 } 113 }
113 114
114 void RenderMediaClient::SetTickClockForTesting( 115 void RenderMediaClient::SetTickClockForTesting(
115 std::unique_ptr<base::TickClock> tick_clock) { 116 std::unique_ptr<base::TickClock> tick_clock) {
116 tick_clock_.swap(tick_clock); 117 tick_clock_.swap(tick_clock);
117 } 118 }
118 119
119 // static 120 // static
120 RenderMediaClient* RenderMediaClient::GetInstance() { 121 RenderMediaClient* RenderMediaClient::GetInstance() {
121 static RenderMediaClient* client = new RenderMediaClient(); 122 static RenderMediaClient* client = new RenderMediaClient();
122 return client; 123 return client;
123 } 124 }
124 125
125 } // namespace content 126 } // namespace content
OLDNEW
« no previous file with comments | « chromecast/media/cma/base/decoder_config_adapter.cc ('k') | gpu/config/gpu_info.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698