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

Side by Side Diff: media/base/video_decoder_config.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 | « media/base/video_codecs_unittest.cc ('k') | media/filters/ffmpeg_video_decoder.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 (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 <vector> 7 #include <vector>
8 8
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "media/base/media_util.h" 10 #include "media/base/media_util.h"
(...skipping 22 matching lines...) Expand all
33 case HEVCPROFILE_MAIN10: 33 case HEVCPROFILE_MAIN10:
34 case HEVCPROFILE_MAIN_STILL_PICTURE: 34 case HEVCPROFILE_MAIN_STILL_PICTURE:
35 return kCodecHEVC; 35 return kCodecHEVC;
36 case VP8PROFILE_ANY: 36 case VP8PROFILE_ANY:
37 return kCodecVP8; 37 return kCodecVP8;
38 case VP9PROFILE_PROFILE0: 38 case VP9PROFILE_PROFILE0:
39 case VP9PROFILE_PROFILE1: 39 case VP9PROFILE_PROFILE1:
40 case VP9PROFILE_PROFILE2: 40 case VP9PROFILE_PROFILE2:
41 case VP9PROFILE_PROFILE3: 41 case VP9PROFILE_PROFILE3:
42 return kCodecVP9; 42 return kCodecVP9;
43 case DOLBYVISION_PROFILE0:
44 case DOLBYVISION_PROFILE4:
45 case DOLBYVISION_PROFILE5:
46 case DOLBYVISION_PROFILE7:
47 return kCodecDolbyVision;
43 } 48 }
44 NOTREACHED(); 49 NOTREACHED();
45 return kUnknownVideoCodec; 50 return kUnknownVideoCodec;
46 } 51 }
47 52
48 VideoDecoderConfig::VideoDecoderConfig() 53 VideoDecoderConfig::VideoDecoderConfig()
49 : codec_(kUnknownVideoCodec), 54 : codec_(kUnknownVideoCodec),
50 profile_(VIDEO_CODEC_PROFILE_UNKNOWN), 55 profile_(VIDEO_CODEC_PROFILE_UNKNOWN),
51 format_(PIXEL_FORMAT_UNKNOWN) {} 56 format_(PIXEL_FORMAT_UNKNOWN) {}
52 57
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
168 << "Config is already encrypted."; 173 << "Config is already encrypted.";
169 // TODO(xhwang): This is only used to guide decoder selection, so set 174 // TODO(xhwang): This is only used to guide decoder selection, so set
170 // a common encryption scheme that should be supported by all decrypting 175 // a common encryption scheme that should be supported by all decrypting
171 // decoders. We should be able to remove this when we support switching 176 // decoders. We should be able to remove this when we support switching
172 // decoders at run time. See http://crbug.com/695595 177 // decoders at run time. See http://crbug.com/695595
173 encryption_scheme_ = AesCtrEncryptionScheme(); 178 encryption_scheme_ = AesCtrEncryptionScheme();
174 } 179 }
175 } 180 }
176 181
177 } // namespace media 182 } // namespace media
OLDNEW
« no previous file with comments | « media/base/video_codecs_unittest.cc ('k') | media/filters/ffmpeg_video_decoder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698