| OLD | NEW |
|---|
| 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/video_frame.h" | 10 #include "media/base/video_frame.h" |
| (...skipping 11 matching lines...) Expand all Loading... |
| 22 case H264PROFILE_HIGH10PROFILE: | 22 case H264PROFILE_HIGH10PROFILE: |
| 23 case H264PROFILE_HIGH422PROFILE: | 23 case H264PROFILE_HIGH422PROFILE: |
| 24 case H264PROFILE_HIGH444PREDICTIVEPROFILE: | 24 case H264PROFILE_HIGH444PREDICTIVEPROFILE: |
| 25 case H264PROFILE_SCALABLEBASELINE: | 25 case H264PROFILE_SCALABLEBASELINE: |
| 26 case H264PROFILE_SCALABLEHIGH: | 26 case H264PROFILE_SCALABLEHIGH: |
| 27 case H264PROFILE_STEREOHIGH: | 27 case H264PROFILE_STEREOHIGH: |
| 28 case H264PROFILE_MULTIVIEWHIGH: | 28 case H264PROFILE_MULTIVIEWHIGH: |
| 29 return kCodecH264; | 29 return kCodecH264; |
| 30 case VP8PROFILE_ANY: | 30 case VP8PROFILE_ANY: |
| 31 return kCodecVP8; | 31 return kCodecVP8; |
| 32 case VP9PROFILE_ANY: | 32 case VP9PROFILE_PROFILE0: |
| 33 case VP9PROFILE_PROFILE1: |
| 34 case VP9PROFILE_PROFILE2: |
| 35 case VP9PROFILE_PROFILE3: |
| 33 return kCodecVP9; | 36 return kCodecVP9; |
| 34 } | 37 } |
| 35 NOTREACHED(); | 38 NOTREACHED(); |
| 36 return kUnknownVideoCodec; | 39 return kUnknownVideoCodec; |
| 37 } | 40 } |
| 38 | 41 |
| 39 VideoDecoderConfig::VideoDecoderConfig() | 42 VideoDecoderConfig::VideoDecoderConfig() |
| 40 : codec_(kUnknownVideoCodec), | 43 : codec_(kUnknownVideoCodec), |
| 41 profile_(VIDEO_CODEC_PROFILE_UNKNOWN), | 44 profile_(VIDEO_CODEC_PROFILE_UNKNOWN), |
| 42 format_(PIXEL_FORMAT_UNKNOWN) {} | 45 format_(PIXEL_FORMAT_UNKNOWN) {} |
| (...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 106 << " visible rect: [" << visible_rect().x() << "," << visible_rect().y() | 109 << " visible rect: [" << visible_rect().x() << "," << visible_rect().y() |
| 107 << "," << visible_rect().width() << "," << visible_rect().height() << "]" | 110 << "," << visible_rect().width() << "," << visible_rect().height() << "]" |
| 108 << " natural size: [" << natural_size().width() << "," | 111 << " natural size: [" << natural_size().width() << "," |
| 109 << natural_size().height() << "]" | 112 << natural_size().height() << "]" |
| 110 << " has extra data? " << (extra_data().empty() ? "false" : "true") | 113 << " has extra data? " << (extra_data().empty() ? "false" : "true") |
| 111 << " encrypted? " << (is_encrypted() ? "true" : "false"); | 114 << " encrypted? " << (is_encrypted() ? "true" : "false"); |
| 112 return s.str(); | 115 return s.str(); |
| 113 } | 116 } |
| 114 | 117 |
| 115 } // namespace media | 118 } // namespace media |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 1769593002:
Add 4 VP9 profiles to the media::VideoCodecProfile enum. (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@hevc-codec-7