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

Unified Diff: media/mojo/common/media_type_converters.cc

Issue 2388383002: media: Use IPC_STRUCT_TRAITS to convert SubsampleEntry for mojo (Closed)
Patch Set: 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
Index: media/mojo/common/media_type_converters.cc
diff --git a/media/mojo/common/media_type_converters.cc b/media/mojo/common/media_type_converters.cc
index 84f914e7036f717480096b0d2adb0cd4a09ef62c..695019115c452efed393d32ecee292a10b5fd065 100644
--- a/media/mojo/common/media_type_converters.cc
+++ b/media/mojo/common/media_type_converters.cc
@@ -25,6 +25,7 @@
#include "media/base/video_frame.h"
#include "media/mojo/common/mojo_shared_buffer_video_frame.h"
#include "media/mojo/interfaces/demuxer_stream.mojom.h"
+#include "media/mojo/interfaces/subsample_entry.mojom.h"
#include "mojo/public/cpp/system/buffer.h"
namespace mojo {
@@ -394,24 +395,6 @@ TypeConverter<media::EncryptionScheme, media::mojom::EncryptionSchemePtr>::
}
// static
-media::mojom::SubsampleEntryPtr
-TypeConverter<media::mojom::SubsampleEntryPtr, media::SubsampleEntry>::Convert(
- const media::SubsampleEntry& input) {
- media::mojom::SubsampleEntryPtr mojo_subsample_entry(
- media::mojom::SubsampleEntry::New());
- mojo_subsample_entry->clear_bytes = input.clear_bytes;
- mojo_subsample_entry->cypher_bytes = input.cypher_bytes;
- return mojo_subsample_entry;
-}
-
-// static
-media::SubsampleEntry
-TypeConverter<media::SubsampleEntry, media::mojom::SubsampleEntryPtr>::Convert(
- const media::mojom::SubsampleEntryPtr& input) {
- return media::SubsampleEntry(input->clear_bytes, input->cypher_bytes);
-}
-
-// static
media::mojom::DecryptConfigPtr
TypeConverter<media::mojom::DecryptConfigPtr, media::DecryptConfig>::Convert(
const media::DecryptConfig& input) {
@@ -420,7 +403,8 @@ TypeConverter<media::mojom::DecryptConfigPtr, media::DecryptConfig>::Convert(
mojo_decrypt_config->key_id = input.key_id();
mojo_decrypt_config->iv = input.iv();
mojo_decrypt_config->subsamples =
- Array<media::mojom::SubsampleEntryPtr>::From(input.subsamples());
+ Array<media::SubsampleEntry>::From(input.subsamples());
+
return mojo_decrypt_config;
}

Powered by Google App Engine
This is Rietveld 408576698