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

Unified Diff: media/base/ipc/media_param_traits_macros.h

Issue 2643743002: Mojify demuxers and allow running {Chunk/FFmpeg}Demuxer in a Utility Process (Closed)
Patch Set: Rebase and make sure to unbind mojom::DemuxerPtr on the bound thread during termination Created 3 years, 10 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/demuxer_factory.cc ('k') | media/base/media_resource.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_macros.h
diff --git a/media/base/ipc/media_param_traits_macros.h b/media/base/ipc/media_param_traits_macros.h
index 98910e7055e695e619d829d998f83087cfb198c3..b28b46b15f916a0f084fae251142266f37d9d6f0 100644
--- a/media/base/ipc/media_param_traits_macros.h
+++ b/media/base/ipc/media_param_traits_macros.h
@@ -5,6 +5,7 @@
#ifndef MEDIA_BASE_IPC_MEDIA_PARAM_TRAITS_MACROS_H_
#define MEDIA_BASE_IPC_MEDIA_PARAM_TRAITS_MACROS_H_
+#include "base/memory/memory_pressure_listener.h"
#include "ipc/ipc_message_macros.h"
#include "media/base/audio_codecs.h"
#include "media/base/audio_parameters.h"
@@ -15,17 +16,25 @@
#include "media/base/content_decryption_module.h"
#include "media/base/decode_status.h"
#include "media/base/decryptor.h"
+#include "media/base/demuxer.h"
#include "media/base/demuxer_stream.h"
#include "media/base/eme_constants.h"
#include "media/base/encryption_scheme.h"
#include "media/base/output_device_info.h"
+#include "media/base/pipeline_status.h"
#include "media/base/sample_format.h"
+#include "media/base/source_buffer.h"
#include "media/base/subsample_entry.h"
#include "media/base/video_codecs.h"
#include "media/base/video_types.h"
// Enum traits.
+IPC_ENUM_TRAITS_VALIDATE(
+ base::MemoryPressureListener::MemoryPressureLevel,
+ (value == base::MemoryPressureListener::MEMORY_PRESSURE_LEVEL_MODERATE ||
+ value == base::MemoryPressureListener::MEMORY_PRESSURE_LEVEL_CRITICAL))
+
IPC_ENUM_TRAITS_MAX_VALUE(media::AudioCodec, media::AudioCodec::kAudioCodecMax)
IPC_ENUM_TRAITS_MAX_VALUE(media::AudioLatency::LatencyType,
@@ -53,6 +62,8 @@ IPC_ENUM_TRAITS_MAX_VALUE(media::Decryptor::Status,
IPC_ENUM_TRAITS_MAX_VALUE(media::Decryptor::StreamType,
media::Decryptor::StreamType::kStreamTypeMax)
+IPC_ENUM_TRAITS_MAX_VALUE(media::Demuxer::LoadType, media::Demuxer::LoadTypeMax)
+
IPC_ENUM_TRAITS_MAX_VALUE(media::DemuxerStream::Status,
media::DemuxerStream::kStatusMax)
@@ -73,11 +84,16 @@ IPC_ENUM_TRAITS_MAX_VALUE(media::ContentDecryptionModule::MessageType,
IPC_ENUM_TRAITS_MAX_VALUE(media::CdmSessionType,
media::CdmSessionType::SESSION_TYPE_MAX)
+IPC_ENUM_TRAITS_MAX_VALUE(media::PipelineStatus,
+ media::PipelineStatus::PIPELINE_STATUS_MAX)
IPC_ENUM_TRAITS_MAX_VALUE(media::OutputDeviceStatus,
media::OutputDeviceStatus::OUTPUT_DEVICE_STATUS_MAX)
IPC_ENUM_TRAITS_MAX_VALUE(media::SampleFormat, media::kSampleFormatMax)
+IPC_ENUM_TRAITS_MAX_VALUE(media::SourceBuffer::Status,
+ media::SourceBuffer::kStatusMax)
+
IPC_ENUM_TRAITS_MAX_VALUE(media::VideoCodec, media::kVideoCodecMax)
IPC_ENUM_TRAITS_MIN_MAX_VALUE(media::VideoCodecProfile,
« no previous file with comments | « media/base/demuxer_factory.cc ('k') | media/base/media_resource.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698