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

Unified Diff: chromecast/media/cma/base/decoder_config_adapter.cc

Issue 2156193003: [Chromecast] Add a custom CastMediaClient for Chromecast (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@codecs
Patch Set: rebase Created 4 years, 5 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 side-by-side diff with in-line comments
Download patch
Index: chromecast/media/cma/base/decoder_config_adapter.cc
diff --git a/chromecast/media/cma/base/decoder_config_adapter.cc b/chromecast/media/cma/base/decoder_config_adapter.cc
index fa29bde77ba37584588cc2972059d211f28580d1..691ee4768650621b1a71c03c474322afea1bc090 100644
--- a/chromecast/media/cma/base/decoder_config_adapter.cc
+++ b/chromecast/media/cma/base/decoder_config_adapter.cc
@@ -5,6 +5,7 @@
#include "chromecast/media/cma/base/decoder_config_adapter.h"
#include "base/logging.h"
+#include "chromecast/media/base/media_codec_support.h"
#include "media/base/channel_layout.h"
namespace chromecast {
@@ -65,65 +66,6 @@ SampleFormat ToSampleFormat(const ::media::SampleFormat sample_format) {
return kUnknownSampleFormat;
}
-// Converts ::media::VideoCodec to chromecast::media::VideoCodec. Any unknown or
-// unsupported codec will be converted to chromecast::media::kCodecUnknown.
-VideoCodec ToVideoCodec(const ::media::VideoCodec video_codec) {
- switch (video_codec) {
- case ::media::kCodecH264:
- return kCodecH264;
- case ::media::kCodecVP8:
- return kCodecVP8;
- case ::media::kCodecVP9:
- return kCodecVP9;
- case ::media::kCodecHEVC:
- return kCodecHEVC;
- default:
- LOG(ERROR) << "Unsupported video codec " << video_codec;
- }
- return kVideoCodecUnknown;
-}
-
-// Converts ::media::VideoCodecProfile to chromecast::media::VideoProfile.
-VideoProfile ToVideoProfile(const ::media::VideoCodecProfile codec_profile) {
- switch (codec_profile) {
- case ::media::H264PROFILE_BASELINE:
- return kH264Baseline;
- case ::media::H264PROFILE_MAIN:
- return kH264Main;
- case ::media::H264PROFILE_EXTENDED:
- return kH264Extended;
- case ::media::H264PROFILE_HIGH:
- return kH264High;
- case ::media::H264PROFILE_HIGH10PROFILE:
- return kH264High10;
- case ::media::H264PROFILE_HIGH422PROFILE:
- return kH264High422;
- case ::media::H264PROFILE_HIGH444PREDICTIVEPROFILE:
- return kH264High444Predictive;
- case ::media::H264PROFILE_SCALABLEBASELINE:
- return kH264ScalableBaseline;
- case ::media::H264PROFILE_SCALABLEHIGH:
- return kH264ScalableHigh;
- case ::media::H264PROFILE_STEREOHIGH:
- return kH264Stereohigh;
- case ::media::H264PROFILE_MULTIVIEWHIGH:
- return kH264MultiviewHigh;
- case ::media::VP8PROFILE_ANY:
- return kVP8ProfileAny;
- case ::media::VP9PROFILE_PROFILE0:
- return kVP9Profile0;
- case ::media::VP9PROFILE_PROFILE1:
- return kVP9Profile1;
- case ::media::VP9PROFILE_PROFILE2:
- return kVP9Profile2;
- case ::media::VP9PROFILE_PROFILE3:
- return kVP9Profile3;
- default:
- LOG(INFO) << "Unsupported video codec profile " << codec_profile;
- }
- return kVideoProfileUnknown;
-}
-
::media::ChannelLayout ToMediaChannelLayout(int channel_number) {
switch (channel_number) {
case 1:
@@ -289,8 +231,8 @@ VideoConfig DecoderConfigAdapter::ToCastVideoConfig(
}
video_config.id = id;
- video_config.codec = ToVideoCodec(config.codec());
- video_config.profile = ToVideoProfile(config.profile());
+ video_config.codec = ToCastVideoCodec(config.codec());
+ video_config.profile = ToCastVideoProfile(config.profile());
video_config.extra_data = config.extra_data();
video_config.encryption_scheme = ToEncryptionScheme(
config.encryption_scheme());

Powered by Google App Engine
This is Rietveld 408576698