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

Unified Diff: media/base/ipc/media_param_traits.cc

Issue 2415703002: Move files video_capture*.* from media/base to media/capture (Closed)
Patch Set: rebase Created 4 years, 2 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
« no previous file with comments | « media/base/ipc/media_param_traits.h ('k') | media/base/ipc/media_param_traits_macros.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/ipc/media_param_traits.cc
diff --git a/media/base/ipc/media_param_traits.cc b/media/base/ipc/media_param_traits.cc
index 3e23a53e7c409089eac7c667fd0c6ddbd25aca9a..6de97b325dd0d4a22b8d1e640435cff97daa6c57 100644
--- a/media/base/ipc/media_param_traits.cc
+++ b/media/base/ipc/media_param_traits.cc
@@ -9,7 +9,6 @@
#include "media/base/audio_parameters.h"
#include "media/base/audio_point.h"
#include "media/base/limits.h"
-#include "media/base/video_capture_types.h"
#include "ui/gfx/ipc/geometry/gfx_param_traits.h"
#include "ui/gfx/ipc/gfx_param_traits.h"
#include "ui/gfx/ipc/skia/gfx_skia_param_traits.h"
@@ -17,7 +16,6 @@
using media::AudioParameters;
using media::AudioLatency;
using media::ChannelLayout;
-using media::VideoCaptureFormat;
namespace IPC {
@@ -82,40 +80,6 @@ void ParamTraits<AudioParameters>::Log(const AudioParameters& p,
l->append(base::StringPrintf("<AudioParameters>"));
}
-void ParamTraits<VideoCaptureFormat>::GetSize(base::PickleSizer* s,
- const VideoCaptureFormat& p) {
- GetParamSize(s, p.frame_size);
- GetParamSize(s, p.frame_rate);
- GetParamSize(s, p.pixel_format);
- GetParamSize(s, p.pixel_storage);
-}
-
-void ParamTraits<VideoCaptureFormat>::Write(base::Pickle* m,
- const VideoCaptureFormat& p) {
- WriteParam(m, p.frame_size);
- WriteParam(m, p.frame_rate);
- WriteParam(m, p.pixel_format);
- WriteParam(m, p.pixel_storage);
-}
-
-bool ParamTraits<VideoCaptureFormat>::Read(const base::Pickle* m,
- base::PickleIterator* iter,
- VideoCaptureFormat* r) {
- if (!ReadParam(m, iter, &r->frame_size) ||
- !ReadParam(m, iter, &r->frame_rate) ||
- !ReadParam(m, iter, &r->pixel_format) ||
- !ReadParam(m, iter, &r->pixel_storage)) {
- return false;
- }
- return r->IsValid();
-}
-
-void ParamTraits<VideoCaptureFormat>::Log(const VideoCaptureFormat& p,
- std::string* l) {
- l->append(base::StringPrintf("<VideoCaptureFormat> %s",
- media::VideoCaptureFormat::ToString(p).c_str()));
-}
-
} // namespace IPC
// Generate param traits size methods.
« no previous file with comments | « media/base/ipc/media_param_traits.h ('k') | media/base/ipc/media_param_traits_macros.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698