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

Side by Side Diff: content/common/media/media_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 (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 "content/common/media/media_param_traits.h" 5 #include "content/common/media/media_param_traits.h"
6 6
7 #include "base/strings/stringprintf.h" 7 #include "base/strings/stringprintf.h"
8 #include "media/audio/audio_parameters.h" 8 #include "media/audio/audio_parameters.h"
9 #include "media/base/limits.h" 9 #include "media/base/limits.h"
10 #include "media/base/video_capture_types.h" 10 #include "media/base/video_capture_types.h"
(...skipping 10 matching lines...) Expand all
21 m->WriteInt(static_cast<int>(p.format())); 21 m->WriteInt(static_cast<int>(p.format()));
22 m->WriteInt(static_cast<int>(p.channel_layout())); 22 m->WriteInt(static_cast<int>(p.channel_layout()));
23 m->WriteInt(p.sample_rate()); 23 m->WriteInt(p.sample_rate());
24 m->WriteInt(p.bits_per_sample()); 24 m->WriteInt(p.bits_per_sample());
25 m->WriteInt(p.frames_per_buffer()); 25 m->WriteInt(p.frames_per_buffer());
26 m->WriteInt(p.channels()); 26 m->WriteInt(p.channels());
27 m->WriteInt(p.effects()); 27 m->WriteInt(p.effects());
28 } 28 }
29 29
30 bool ParamTraits<AudioParameters>::Read(const Message* m, 30 bool ParamTraits<AudioParameters>::Read(const Message* m,
31 PickleIterator* iter, 31 base::PickleIterator* iter,
32 AudioParameters* r) { 32 AudioParameters* r) {
33 int format, channel_layout, sample_rate, bits_per_sample, 33 int format, channel_layout, sample_rate, bits_per_sample,
34 frames_per_buffer, channels, effects; 34 frames_per_buffer, channels, effects;
35 35
36 if (!iter->ReadInt(&format) || 36 if (!iter->ReadInt(&format) ||
37 !iter->ReadInt(&channel_layout) || 37 !iter->ReadInt(&channel_layout) ||
38 !iter->ReadInt(&sample_rate) || 38 !iter->ReadInt(&sample_rate) ||
39 !iter->ReadInt(&bits_per_sample) || 39 !iter->ReadInt(&bits_per_sample) ||
40 !iter->ReadInt(&frames_per_buffer) || 40 !iter->ReadInt(&frames_per_buffer) ||
41 !iter->ReadInt(&channels) || 41 !iter->ReadInt(&channels) ||
(...skipping 17 matching lines...) Expand all
59 void ParamTraits<VideoCaptureFormat>::Write(Message* m, 59 void ParamTraits<VideoCaptureFormat>::Write(Message* m,
60 const VideoCaptureFormat& p) { 60 const VideoCaptureFormat& p) {
61 // Crash during Send rather than have a failure at the message handler. 61 // Crash during Send rather than have a failure at the message handler.
62 m->WriteInt(p.frame_size.width()); 62 m->WriteInt(p.frame_size.width());
63 m->WriteInt(p.frame_size.height()); 63 m->WriteInt(p.frame_size.height());
64 m->WriteFloat(p.frame_rate); 64 m->WriteFloat(p.frame_rate);
65 m->WriteInt(static_cast<int>(p.pixel_format)); 65 m->WriteInt(static_cast<int>(p.pixel_format));
66 } 66 }
67 67
68 bool ParamTraits<VideoCaptureFormat>::Read(const Message* m, 68 bool ParamTraits<VideoCaptureFormat>::Read(const Message* m,
69 PickleIterator* iter, 69 base::PickleIterator* iter,
70 VideoCaptureFormat* r) { 70 VideoCaptureFormat* r) {
71 int frame_size_width, frame_size_height, pixel_format; 71 int frame_size_width, frame_size_height, pixel_format;
72 if (!iter->ReadInt(&frame_size_width) || 72 if (!iter->ReadInt(&frame_size_width) ||
73 !iter->ReadInt(&frame_size_height) || 73 !iter->ReadInt(&frame_size_height) ||
74 !iter->ReadFloat(&r->frame_rate) || 74 !iter->ReadFloat(&r->frame_rate) ||
75 !iter->ReadInt(&pixel_format)) 75 !iter->ReadInt(&pixel_format))
76 return false; 76 return false;
77 77
78 r->frame_size.SetSize(frame_size_width, frame_size_height); 78 r->frame_size.SetSize(frame_size_width, frame_size_height);
79 r->pixel_format = static_cast<VideoPixelFormat>(pixel_format); 79 r->pixel_format = static_cast<VideoPixelFormat>(pixel_format);
80 if (!r->IsValid()) 80 if (!r->IsValid())
81 return false; 81 return false;
82 return true; 82 return true;
83 } 83 }
84 84
85 void ParamTraits<VideoCaptureFormat>::Log(const VideoCaptureFormat& p, 85 void ParamTraits<VideoCaptureFormat>::Log(const VideoCaptureFormat& p,
86 std::string* l) { 86 std::string* l) {
87 l->append(base::StringPrintf("<VideoCaptureFormat>")); 87 l->append(base::StringPrintf("<VideoCaptureFormat>"));
88 } 88 }
89 89
90 } 90 }
OLDNEW
« no previous file with comments | « content/common/mac/attributed_string_coder.mm ('k') | content/common/page_state_serialization.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698