OLD | NEW |
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 "chromecast/media/cma/ipc_streamer/video_decoder_config_marshaller.h" | 5 #include "chromecast/media/cma/ipc_streamer/video_decoder_config_marshaller.h" |
6 | 6 |
7 #include <vector> | 7 #include <vector> |
8 | 8 |
9 #include "base/basictypes.h" | 9 #include "base/basictypes.h" |
10 #include "base/logging.h" | 10 #include "base/logging.h" |
11 #include "chromecast/media/cma/ipc/media_message.h" | 11 #include "chromecast/media/cma/ipc/media_message.h" |
| 12 #include "chromecast/media/cma/ipc_streamer/encryption_scheme_marshaller.h" |
12 #include "media/base/video_decoder_config.h" | 13 #include "media/base/video_decoder_config.h" |
13 #include "ui/gfx/geometry/rect.h" | 14 #include "ui/gfx/geometry/rect.h" |
14 #include "ui/gfx/geometry/size.h" | 15 #include "ui/gfx/geometry/size.h" |
15 | 16 |
16 namespace chromecast { | 17 namespace chromecast { |
17 namespace media { | 18 namespace media { |
18 | 19 |
19 namespace { | 20 namespace { |
20 const size_t kMaxExtraDataSize = 16 * 1024; | 21 const size_t kMaxExtraDataSize = 16 * 1024; |
21 | 22 |
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
58 // static | 59 // static |
59 void VideoDecoderConfigMarshaller::Write( | 60 void VideoDecoderConfigMarshaller::Write( |
60 const ::media::VideoDecoderConfig& config, MediaMessage* msg) { | 61 const ::media::VideoDecoderConfig& config, MediaMessage* msg) { |
61 CHECK(msg->WritePod(config.codec())); | 62 CHECK(msg->WritePod(config.codec())); |
62 CHECK(msg->WritePod(config.profile())); | 63 CHECK(msg->WritePod(config.profile())); |
63 CHECK(msg->WritePod(config.format())); | 64 CHECK(msg->WritePod(config.format())); |
64 CHECK(msg->WritePod(config.color_space())); | 65 CHECK(msg->WritePod(config.color_space())); |
65 SizeMarshaller::Write(config.coded_size(), msg); | 66 SizeMarshaller::Write(config.coded_size(), msg); |
66 RectMarshaller::Write(config.visible_rect(), msg); | 67 RectMarshaller::Write(config.visible_rect(), msg); |
67 SizeMarshaller::Write(config.natural_size(), msg); | 68 SizeMarshaller::Write(config.natural_size(), msg); |
68 CHECK(msg->WritePod(config.is_encrypted())); | 69 EncryptionSchemeMarshaller::Write(config.encryption_scheme(), msg); |
69 CHECK(msg->WritePod(config.extra_data().size())); | 70 CHECK(msg->WritePod(config.extra_data().size())); |
70 if (!config.extra_data().empty()) | 71 if (!config.extra_data().empty()) |
71 CHECK(msg->WriteBuffer(&config.extra_data()[0], | 72 CHECK(msg->WriteBuffer(&config.extra_data()[0], |
72 config.extra_data().size())); | 73 config.extra_data().size())); |
73 } | 74 } |
74 | 75 |
75 // static | 76 // static |
76 ::media::VideoDecoderConfig VideoDecoderConfigMarshaller::Read( | 77 ::media::VideoDecoderConfig VideoDecoderConfigMarshaller::Read( |
77 MediaMessage* msg) { | 78 MediaMessage* msg) { |
78 ::media::VideoCodec codec; | 79 ::media::VideoCodec codec; |
79 ::media::VideoCodecProfile profile; | 80 ::media::VideoCodecProfile profile; |
80 ::media::VideoPixelFormat format; | 81 ::media::VideoPixelFormat format; |
81 ::media::ColorSpace color_space; | 82 ::media::ColorSpace color_space; |
82 gfx::Size coded_size; | 83 gfx::Size coded_size; |
83 gfx::Rect visible_rect; | 84 gfx::Rect visible_rect; |
84 gfx::Size natural_size; | 85 gfx::Size natural_size; |
85 bool is_encrypted; | |
86 size_t extra_data_size; | 86 size_t extra_data_size; |
| 87 ::media::EncryptionScheme encryption_scheme; |
87 std::vector<uint8_t> extra_data; | 88 std::vector<uint8_t> extra_data; |
88 | 89 |
89 CHECK(msg->ReadPod(&codec)); | 90 CHECK(msg->ReadPod(&codec)); |
90 CHECK(msg->ReadPod(&profile)); | 91 CHECK(msg->ReadPod(&profile)); |
91 CHECK(msg->ReadPod(&format)); | 92 CHECK(msg->ReadPod(&format)); |
92 CHECK(msg->ReadPod(&color_space)); | 93 CHECK(msg->ReadPod(&color_space)); |
93 coded_size = SizeMarshaller::Read(msg); | 94 coded_size = SizeMarshaller::Read(msg); |
94 visible_rect = RectMarshaller::Read(msg); | 95 visible_rect = RectMarshaller::Read(msg); |
95 natural_size = SizeMarshaller::Read(msg); | 96 natural_size = SizeMarshaller::Read(msg); |
96 CHECK(msg->ReadPod(&is_encrypted)); | 97 encryption_scheme = EncryptionSchemeMarshaller::Read(msg); |
97 CHECK(msg->ReadPod(&extra_data_size)); | 98 CHECK(msg->ReadPod(&extra_data_size)); |
98 | 99 |
99 CHECK_GE(codec, ::media::kUnknownVideoCodec); | 100 CHECK_GE(codec, ::media::kUnknownVideoCodec); |
100 CHECK_LE(codec, ::media::kVideoCodecMax); | 101 CHECK_LE(codec, ::media::kVideoCodecMax); |
101 CHECK_GE(profile, ::media::VIDEO_CODEC_PROFILE_UNKNOWN); | 102 CHECK_GE(profile, ::media::VIDEO_CODEC_PROFILE_UNKNOWN); |
102 CHECK_LE(profile, ::media::VIDEO_CODEC_PROFILE_MAX); | 103 CHECK_LE(profile, ::media::VIDEO_CODEC_PROFILE_MAX); |
103 CHECK_GE(format, ::media::PIXEL_FORMAT_UNKNOWN); | 104 CHECK_GE(format, ::media::PIXEL_FORMAT_UNKNOWN); |
104 CHECK_LE(format, ::media::PIXEL_FORMAT_MAX); | 105 CHECK_LE(format, ::media::PIXEL_FORMAT_MAX); |
105 CHECK_GE(color_space, ::media::COLOR_SPACE_UNSPECIFIED); | 106 CHECK_GE(color_space, ::media::COLOR_SPACE_UNSPECIFIED); |
106 CHECK_LE(color_space, ::media::COLOR_SPACE_MAX); | 107 CHECK_LE(color_space, ::media::COLOR_SPACE_MAX); |
107 CHECK_LT(extra_data_size, kMaxExtraDataSize); | 108 CHECK_LT(extra_data_size, kMaxExtraDataSize); |
108 if (extra_data_size > 0) { | 109 if (extra_data_size > 0) { |
109 extra_data.resize(extra_data_size); | 110 extra_data.resize(extra_data_size); |
110 CHECK(msg->ReadBuffer(&extra_data[0], extra_data.size())); | 111 CHECK(msg->ReadBuffer(&extra_data[0], extra_data.size())); |
111 } | 112 } |
112 | 113 |
113 return ::media::VideoDecoderConfig( | 114 return ::media::VideoDecoderConfig( |
114 codec, profile, format, color_space, | 115 codec, profile, format, color_space, |
115 coded_size, visible_rect, natural_size, | 116 coded_size, visible_rect, natural_size, |
116 extra_data, is_encrypted); | 117 extra_data, encryption_scheme); |
117 } | 118 } |
118 | 119 |
119 } // namespace media | 120 } // namespace media |
120 } // namespace chromecast | 121 } // namespace chromecast |
OLD | NEW |