media: Use native DemuxerStream enum types in media mojo interfaces

media/mojo/common/media_type_converters.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/mojo/common/media_type_converters.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include "base/memory/ptr_util.h"
 #include "base/numerics/safe_conversions.h"
 #include "media/base/audio_buffer.h"
 #include "media/base/audio_decoder_config.h"
 #include "media/base/cdm_config.h"
 #include "media/base/cdm_key_information.h"
 #include "media/base/decoder_buffer.h"
 #include "media/base/decrypt_config.h"
-#include "media/base/demuxer_stream.h"
 #include "media/base/encryption_scheme.h"
 #include "media/base/media_keys.h"
 #include "media/base/subsample_entry.h"
 #include "media/base/video_decoder_config.h"
 #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 "mojo/public/cpp/system/buffer.h"
 
 namespace mojo {
 
 #define ASSERT_ENUM_EQ(media_enum, media_prefix, mojo_prefix, value)        \
   static_assert(media::media_prefix##value ==                               \
                     static_cast<media::media_enum>(                         \
                         media::mojom::media_enum::mojo_prefix##value),      \
                 "Mismatched enum: " #media_prefix #value " != " #media_enum \
                 "::" #mojo_prefix #value)
 
 #define ASSERT_ENUM_EQ_RAW(media_enum, media_enum_value, mojo_enum_value)      \
   static_assert(media::media_enum_value == static_cast<media::media_enum>(     \
                                                media::mojom::mojo_enum_value), \
                 "Mismatched enum: " #media_enum_value " != " #mojo_enum_value)
 
-// DemuxerStream Type.  Note: Mojo DemuxerStream's don't have the TEXT type.
-ASSERT_ENUM_EQ_RAW(DemuxerStream::Type,
-                   DemuxerStream::UNKNOWN,
-                   DemuxerStream::Type::UNKNOWN);
-ASSERT_ENUM_EQ_RAW(DemuxerStream::Type,
-                   DemuxerStream::AUDIO,
-                   DemuxerStream::Type::AUDIO);
-ASSERT_ENUM_EQ_RAW(DemuxerStream::Type,
-                   DemuxerStream::VIDEO,
-                   DemuxerStream::Type::VIDEO);
-static_assert(
-    media::DemuxerStream::NUM_TYPES ==
-        static_cast<media::DemuxerStream::Type>(
-            static_cast<int>(media::mojom::DemuxerStream::Type::LAST_TYPE) + 2),
-    "Mismatched enum: media::DemuxerStream::NUM_TYPES != "
-    "media::mojom::DemuxerStream::Type::LAST_TYPE + 2");
-
-// DemuxerStream Status.
-ASSERT_ENUM_EQ_RAW(DemuxerStream::Status,
-                   DemuxerStream::kOk,
-                   DemuxerStream::Status::OK);
-ASSERT_ENUM_EQ_RAW(DemuxerStream::Status,
-                   DemuxerStream::kAborted,
-                   DemuxerStream::Status::ABORTED);
-ASSERT_ENUM_EQ_RAW(DemuxerStream::Status,
-                   DemuxerStream::kConfigChanged,
-                   DemuxerStream::Status::CONFIG_CHANGED);
-
 // CipherMode
 ASSERT_ENUM_EQ_RAW(EncryptionScheme::CipherMode,
                    EncryptionScheme::CipherMode::CIPHER_MODE_UNENCRYPTED,
                    CipherMode::UNENCRYPTED);
 ASSERT_ENUM_EQ_RAW(EncryptionScheme::CipherMode,
                    EncryptionScheme::CipherMode::CIPHER_MODE_AES_CTR,
                    CipherMode::AES_CTR);
 ASSERT_ENUM_EQ_RAW(EncryptionScheme::CipherMode,
                    EncryptionScheme::CipherMode::CIPHER_MODE_AES_CBC,
                    CipherMode::AES_CBC);
@@ skipping 408 matching lines @@
       input->format, input->coded_size, input->visible_rect,
       input->natural_size, std::move(input->frame_data),
       base::saturated_cast<size_t>(input->frame_data_size),
       base::saturated_cast<size_t>(input->y_offset),
       base::saturated_cast<size_t>(input->u_offset),
       base::saturated_cast<size_t>(input->v_offset), input->y_stride,
       input->u_stride, input->v_stride, input->timestamp);
 }
 
 }  // namespace mojo