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

Side by Side Diff: media/mojo/services/media_type_converters.cc

Issue 816353010: Implemented HEVC video demuxing and parsing (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Moved back h265_parser_unittest.cc in media/BUILD.gn Created 5 years, 3 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/mojo/interfaces/media_types.mojom ('k') | media/test/data/bear.hevc » ('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 "media/mojo/services/media_type_converters.h" 5 #include "media/mojo/services/media_type_converters.h"
6 6
7 #include "media/base/audio_decoder_config.h" 7 #include "media/base/audio_decoder_config.h"
8 #include "media/base/buffering_state.h" 8 #include "media/base/buffering_state.h"
9 #include "media/base/cdm_config.h" 9 #include "media/base/cdm_config.h"
10 #include "media/base/cdm_key_information.h" 10 #include "media/base/cdm_key_information.h"
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after
153 COLOR_SPACE_UNSPECIFIED, 153 COLOR_SPACE_UNSPECIFIED,
154 COLOR_SPACE_UNSPECIFIED); 154 COLOR_SPACE_UNSPECIFIED);
155 ASSERT_ENUM_EQ_RAW(ColorSpace, COLOR_SPACE_JPEG, COLOR_SPACE_JPEG); 155 ASSERT_ENUM_EQ_RAW(ColorSpace, COLOR_SPACE_JPEG, COLOR_SPACE_JPEG);
156 ASSERT_ENUM_EQ_RAW(ColorSpace, COLOR_SPACE_HD_REC709, COLOR_SPACE_HD_REC709); 156 ASSERT_ENUM_EQ_RAW(ColorSpace, COLOR_SPACE_HD_REC709, COLOR_SPACE_HD_REC709);
157 ASSERT_ENUM_EQ_RAW(ColorSpace, COLOR_SPACE_SD_REC601, COLOR_SPACE_SD_REC601); 157 ASSERT_ENUM_EQ_RAW(ColorSpace, COLOR_SPACE_SD_REC601, COLOR_SPACE_SD_REC601);
158 ASSERT_ENUM_EQ_RAW(ColorSpace, COLOR_SPACE_MAX, COLOR_SPACE_MAX); 158 ASSERT_ENUM_EQ_RAW(ColorSpace, COLOR_SPACE_MAX, COLOR_SPACE_MAX);
159 159
160 // VideoCodec 160 // VideoCodec
161 ASSERT_ENUM_EQ_RAW(VideoCodec, kUnknownVideoCodec, VIDEO_CODEC_UNKNOWN); 161 ASSERT_ENUM_EQ_RAW(VideoCodec, kUnknownVideoCodec, VIDEO_CODEC_UNKNOWN);
162 ASSERT_ENUM_EQ(VideoCodec, kCodec, VIDEO_CODEC_, H264); 162 ASSERT_ENUM_EQ(VideoCodec, kCodec, VIDEO_CODEC_, H264);
163 ASSERT_ENUM_EQ(VideoCodec, kCodec, VIDEO_CODEC_, HEVC);
163 ASSERT_ENUM_EQ(VideoCodec, kCodec, VIDEO_CODEC_, VC1); 164 ASSERT_ENUM_EQ(VideoCodec, kCodec, VIDEO_CODEC_, VC1);
164 ASSERT_ENUM_EQ(VideoCodec, kCodec, VIDEO_CODEC_, MPEG2); 165 ASSERT_ENUM_EQ(VideoCodec, kCodec, VIDEO_CODEC_, MPEG2);
165 ASSERT_ENUM_EQ(VideoCodec, kCodec, VIDEO_CODEC_, MPEG4); 166 ASSERT_ENUM_EQ(VideoCodec, kCodec, VIDEO_CODEC_, MPEG4);
166 ASSERT_ENUM_EQ(VideoCodec, kCodec, VIDEO_CODEC_, Theora); 167 ASSERT_ENUM_EQ(VideoCodec, kCodec, VIDEO_CODEC_, Theora);
167 ASSERT_ENUM_EQ(VideoCodec, kCodec, VIDEO_CODEC_, VP8); 168 ASSERT_ENUM_EQ(VideoCodec, kCodec, VIDEO_CODEC_, VP8);
168 ASSERT_ENUM_EQ(VideoCodec, kCodec, VIDEO_CODEC_, VP9); 169 ASSERT_ENUM_EQ(VideoCodec, kCodec, VIDEO_CODEC_, VP9);
169 ASSERT_ENUM_EQ_RAW(VideoCodec, kVideoCodecMax, VIDEO_CODEC_Max); 170 ASSERT_ENUM_EQ_RAW(VideoCodec, kVideoCodecMax, VIDEO_CODEC_Max);
170 171
171 // VideoCodecProfile 172 // VideoCodecProfile
172 ASSERT_ENUM_EQ(VideoCodecProfile, 173 ASSERT_ENUM_EQ(VideoCodecProfile,
(...skipping 359 matching lines...) Expand 10 before | Expand all | Expand 10 after
532 TypeConverter<media::CdmConfig, media::interfaces::CdmConfigPtr>::Convert( 533 TypeConverter<media::CdmConfig, media::interfaces::CdmConfigPtr>::Convert(
533 const media::interfaces::CdmConfigPtr& input) { 534 const media::interfaces::CdmConfigPtr& input) {
534 media::CdmConfig config; 535 media::CdmConfig config;
535 config.allow_distinctive_identifier = input->allow_distinctive_identifier; 536 config.allow_distinctive_identifier = input->allow_distinctive_identifier;
536 config.allow_persistent_state = input->allow_persistent_state; 537 config.allow_persistent_state = input->allow_persistent_state;
537 config.use_hw_secure_codecs = input->use_hw_secure_codecs; 538 config.use_hw_secure_codecs = input->use_hw_secure_codecs;
538 return config; 539 return config;
539 } 540 }
540 541
541 } // namespace mojo 542 } // namespace mojo
OLDNEW
« no previous file with comments | « media/mojo/interfaces/media_types.mojom ('k') | media/test/data/bear.hevc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698