| Index: media/base/android/demuxer_stream_player_params.cc | 
| diff --git a/media/base/android/demuxer_stream_player_params.cc b/media/base/android/demuxer_stream_player_params.cc | 
| deleted file mode 100644 | 
| index 739105eb59fc3481cbe6ac3d25c4558b713399bd..0000000000000000000000000000000000000000 | 
| --- a/media/base/android/demuxer_stream_player_params.cc | 
| +++ /dev/null | 
| @@ -1,117 +0,0 @@ | 
| -// Copyright (c) 2013 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/base/android/demuxer_stream_player_params.h" | 
| -#include <iomanip> | 
| - | 
| -namespace media { | 
| - | 
| -DemuxerConfigs::DemuxerConfigs() | 
| -    : audio_codec(kUnknownAudioCodec), | 
| -      audio_channels(0), | 
| -      audio_sampling_rate(0), | 
| -      is_audio_encrypted(false), | 
| -      audio_codec_delay_ns(-1), | 
| -      audio_seek_preroll_ns(-1), | 
| -      video_codec(kUnknownVideoCodec), | 
| -      is_video_encrypted(false) {} | 
| - | 
| -DemuxerConfigs::DemuxerConfigs(const DemuxerConfigs& other) = default; | 
| - | 
| -DemuxerConfigs::~DemuxerConfigs() {} | 
| - | 
| -AccessUnit::AccessUnit() : is_end_of_stream(false), is_key_frame(false) {} | 
| - | 
| -AccessUnit::AccessUnit(const AccessUnit& other) = default; | 
| - | 
| -AccessUnit::~AccessUnit() {} | 
| - | 
| -DemuxerData::DemuxerData() : type(DemuxerStream::UNKNOWN) {} | 
| - | 
| -DemuxerData::DemuxerData(const DemuxerData& other) = default; | 
| - | 
| -DemuxerData::~DemuxerData() {} | 
| - | 
| -namespace { | 
| - | 
| -const char* AsString(DemuxerStream::Type stream_type) { | 
| -  switch (stream_type) { | 
| -    case DemuxerStream::UNKNOWN: | 
| -      return "UNKNOWN"; | 
| -    case DemuxerStream::AUDIO: | 
| -      return "AUDIO"; | 
| -    case DemuxerStream::VIDEO: | 
| -      return "VIDEO"; | 
| -    case DemuxerStream::TEXT: | 
| -      return "TEXT"; | 
| -    case DemuxerStream::NUM_TYPES: | 
| -      return "NUM_TYPES"; | 
| -  } | 
| -  NOTREACHED(); | 
| -  return nullptr;  // crash early | 
| -} | 
| - | 
| -const char* AsString(DemuxerStream::Status status) { | 
| -  switch (status) { | 
| -    case DemuxerStream::kOk: | 
| -      return "kOk"; | 
| -    case DemuxerStream::kAborted: | 
| -      return "kAborted"; | 
| -    case DemuxerStream::kConfigChanged: | 
| -      return "kConfigChanged"; | 
| -  } | 
| -  NOTREACHED(); | 
| -  return nullptr;  // crash early | 
| -} | 
| - | 
| -}  // namespace (anonymous) | 
| - | 
| -}  // namespace media | 
| - | 
| -std::ostream& operator<<(std::ostream& os, media::DemuxerStream::Type type) { | 
| -  os << media::AsString(type); | 
| -  return os; | 
| -} | 
| - | 
| -std::ostream& operator<<(std::ostream& os, const media::AccessUnit& au) { | 
| -  os << "status:" << media::AsString(au.status) | 
| -     << (au.is_end_of_stream ? " EOS" : "") | 
| -     << (au.is_key_frame ? " KEY_FRAME" : "") << " pts:" << au.timestamp | 
| -     << " size:" << au.data.size(); | 
| -  return os; | 
| -} | 
| - | 
| -std::ostream& operator<<(std::ostream& os, const media::DemuxerConfigs& conf) { | 
| -  os << "duration:" << conf.duration; | 
| - | 
| -  if (conf.audio_codec == media::kUnknownAudioCodec && | 
| -      conf.video_codec == media::kUnknownVideoCodec) { | 
| -    os << " no audio, no video"; | 
| -    return os; | 
| -  } | 
| - | 
| -  if (conf.audio_codec != media::kUnknownAudioCodec) { | 
| -    os << " audio:" << media::GetCodecName(conf.audio_codec) | 
| -       << " channels:" << conf.audio_channels | 
| -       << " rate:" << conf.audio_sampling_rate | 
| -       << (conf.is_audio_encrypted ? " encrypted" : "") | 
| -       << " delay (ns):" << conf.audio_codec_delay_ns | 
| -       << " preroll (ns):" << conf.audio_seek_preroll_ns; | 
| - | 
| -    if (!conf.audio_extra_data.empty()) { | 
| -      os << " extra:{" << std::hex; | 
| -      for (uint8_t byte : conf.audio_extra_data) | 
| -        os << " " << std::setfill('0') << std::setw(2) << (int)byte; | 
| -      os << "}" << std::dec; | 
| -    } | 
| -  } | 
| - | 
| -  if (conf.video_codec != media::kUnknownVideoCodec) { | 
| -    os << " video:" << media::GetCodecName(conf.video_codec) << " " | 
| -       << conf.video_size.width() << "x" << conf.video_size.height() | 
| -       << (conf.is_video_encrypted ? " encrypted" : ""); | 
| -  } | 
| - | 
| -  return os; | 
| -} | 
|  |