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

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

Issue 816353010: Implemented HEVC video demuxing and parsing (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: CR feedback Created 5 years, 6 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 (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 "media/base/video_decoder_config.h" 5 #include "media/base/video_decoder_config.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/metrics/histogram.h" 8 #include "base/metrics/histogram.h"
9 9
10 namespace media { 10 namespace media {
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
133 return s.str(); 133 return s.str();
134 } 134 }
135 135
136 // The names come from src/third_party/ffmpeg/libavcodec/codec_desc.c 136 // The names come from src/third_party/ffmpeg/libavcodec/codec_desc.c
137 std::string VideoDecoderConfig::GetHumanReadableCodecName() const { 137 std::string VideoDecoderConfig::GetHumanReadableCodecName() const {
138 switch (codec()) { 138 switch (codec()) {
139 case kUnknownVideoCodec: 139 case kUnknownVideoCodec:
140 return "unknown"; 140 return "unknown";
141 case kCodecH264: 141 case kCodecH264:
142 return "h264"; 142 return "h264";
143 case kCodecHEVC:
144 return "hevc";
143 case kCodecVC1: 145 case kCodecVC1:
144 return "vc1"; 146 return "vc1";
145 case kCodecMPEG2: 147 case kCodecMPEG2:
146 return "mpeg2video"; 148 return "mpeg2video";
147 case kCodecMPEG4: 149 case kCodecMPEG4:
148 return "mpeg4"; 150 return "mpeg4";
149 case kCodecTheora: 151 case kCodecTheora:
150 return "theora"; 152 return "theora";
151 case kCodecVP8: 153 case kCodecVP8:
152 return "vp8"; 154 return "vp8";
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
189 191
190 size_t VideoDecoderConfig::extra_data_size() const { 192 size_t VideoDecoderConfig::extra_data_size() const {
191 return extra_data_.size(); 193 return extra_data_.size();
192 } 194 }
193 195
194 bool VideoDecoderConfig::is_encrypted() const { 196 bool VideoDecoderConfig::is_encrypted() const {
195 return is_encrypted_; 197 return is_encrypted_;
196 } 198 }
197 199
198 } // namespace media 200 } // namespace media
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698