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

Side by Side Diff: chromecast/common/media/cma_param_traits.cc

Issue 1154283003: Change most uses of Pickle to base::Pickle (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 6 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
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 "chromecast/common/media/cma_param_traits.h" 5 #include "chromecast/common/media/cma_param_traits.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "chromecast/common/media/cma_param_traits_macros.h" 9 #include "chromecast/common/media/cma_param_traits_macros.h"
10 #include "content/public/common/common_param_traits.h" 10 #include "content/public/common/common_param_traits.h"
(...skipping 27 matching lines...) Expand all
38 std::vector<uint8> extra_data; 38 std::vector<uint8> extra_data;
39 if (p.extra_data_size() > 0) { 39 if (p.extra_data_size() > 0) {
40 extra_data = 40 extra_data =
41 std::vector<uint8>(p.extra_data(), 41 std::vector<uint8>(p.extra_data(),
42 p.extra_data() + p.extra_data_size()); 42 p.extra_data() + p.extra_data_size());
43 } 43 }
44 ParamTraits<std::vector<uint8> >::Write(m, extra_data); 44 ParamTraits<std::vector<uint8> >::Write(m, extra_data);
45 } 45 }
46 46
47 bool ParamTraits<media::AudioDecoderConfig>::Read( 47 bool ParamTraits<media::AudioDecoderConfig>::Read(
48 const Message* m, PickleIterator* iter, 48 const Message* m,
49 base::PickleIterator* iter,
49 media::AudioDecoderConfig* r) { 50 media::AudioDecoderConfig* r) {
50 media::AudioCodec codec; 51 media::AudioCodec codec;
51 media::SampleFormat sample_format; 52 media::SampleFormat sample_format;
52 media::ChannelLayout channel_layout; 53 media::ChannelLayout channel_layout;
53 int samples_per_second; 54 int samples_per_second;
54 bool is_encrypted; 55 bool is_encrypted;
55 if (!ParamTraits<media::AudioCodec>::Read(m, iter, &codec) || 56 if (!ParamTraits<media::AudioCodec>::Read(m, iter, &codec) ||
56 !ParamTraits<media::SampleFormat>::Read(m, iter, &sample_format) || 57 !ParamTraits<media::SampleFormat>::Read(m, iter, &sample_format) ||
57 !ParamTraits<media::ChannelLayout>::Read(m, iter, &channel_layout) || 58 !ParamTraits<media::ChannelLayout>::Read(m, iter, &channel_layout) ||
58 !ParamTraits<int>::Read(m, iter, &samples_per_second) || 59 !ParamTraits<int>::Read(m, iter, &samples_per_second) ||
(...skipping 30 matching lines...) Expand all
89 std::vector<uint8> extra_data; 90 std::vector<uint8> extra_data;
90 if (p.extra_data_size() > 0) { 91 if (p.extra_data_size() > 0) {
91 extra_data = 92 extra_data =
92 std::vector<uint8>(p.extra_data(), 93 std::vector<uint8>(p.extra_data(),
93 p.extra_data() + p.extra_data_size()); 94 p.extra_data() + p.extra_data_size());
94 } 95 }
95 ParamTraits<std::vector<uint8> >::Write(m, extra_data); 96 ParamTraits<std::vector<uint8> >::Write(m, extra_data);
96 } 97 }
97 98
98 bool ParamTraits<media::VideoDecoderConfig>::Read( 99 bool ParamTraits<media::VideoDecoderConfig>::Read(
99 const Message* m, PickleIterator* iter, 100 const Message* m,
101 base::PickleIterator* iter,
100 media::VideoDecoderConfig* r) { 102 media::VideoDecoderConfig* r) {
101 media::VideoCodec codec; 103 media::VideoCodec codec;
102 media::VideoCodecProfile profile; 104 media::VideoCodecProfile profile;
103 media::VideoFrame::Format format; 105 media::VideoFrame::Format format;
104 gfx::Size coded_size; 106 gfx::Size coded_size;
105 gfx::Rect visible_rect; 107 gfx::Rect visible_rect;
106 gfx::Size natural_size; 108 gfx::Size natural_size;
107 bool is_encrypted; 109 bool is_encrypted;
108 if (!ParamTraits<media::VideoCodec>::Read(m, iter, &codec) || 110 if (!ParamTraits<media::VideoCodec>::Read(m, iter, &codec) ||
109 !ParamTraits<media::VideoCodecProfile>::Read(m, iter, &profile) || 111 !ParamTraits<media::VideoCodecProfile>::Read(m, iter, &profile) ||
(...skipping 16 matching lines...) Expand all
126 is_encrypted); 128 is_encrypted);
127 return true; 129 return true;
128 } 130 }
129 131
130 void ParamTraits<media::VideoDecoderConfig>::Log( 132 void ParamTraits<media::VideoDecoderConfig>::Log(
131 const media::VideoDecoderConfig& p, std::string* l) { 133 const media::VideoDecoderConfig& p, std::string* l) {
132 l->append(base::StringPrintf("<VideoDecoderConfig>")); 134 l->append(base::StringPrintf("<VideoDecoderConfig>"));
133 } 135 }
134 136
135 } // namespace IPC 137 } // namespace IPC
OLDNEW
« no previous file with comments | « chrome/common/safe_browsing/ipc_protobuf_message_unittest.cc ('k') | cloud_print/service/win/setup_listener.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698