Index: media/omx/omx_configurator.cc |
diff --git a/media/omx/omx_configurator.cc b/media/omx/omx_configurator.cc |
index 6f9c2ad5ad3cdf06d3cb41711dc2c086087c69dc..821cd2d169c789f3b000864b0bcb30588e6d1d4e 100644 |
--- a/media/omx/omx_configurator.cc |
+++ b/media/omx/omx_configurator.cc |
@@ -1,4 +1,4 @@ |
-// Copyright (c) 2010 The Chromium Authors. All rights reserved. Use of this |
+// Copyright (c) 2011 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. |
@@ -6,17 +6,17 @@ |
#include "base/logging.h" |
-namespace { |
+namespace media { |
-std::string GetCodecName(media::OmxConfigurator::Codec codec) { |
+static std::string GetCodecName(OmxConfigurator::Codec codec) { |
switch (codec) { |
- case media::OmxConfigurator::kCodecH264: |
+ case OmxConfigurator::kCodecH264: |
return "avc"; |
- case media::OmxConfigurator::kCodecH263: |
+ case OmxConfigurator::kCodecH263: |
return "h263"; |
- case media::OmxConfigurator::kCodecMpeg4: |
+ case OmxConfigurator::kCodecMpeg4: |
return "mpeg4"; |
- case media::OmxConfigurator::kCodecVc1: |
+ case OmxConfigurator::kCodecVc1: |
return "vc1"; |
default: |
break; |
@@ -25,10 +25,6 @@ std::string GetCodecName(media::OmxConfigurator::Codec codec) { |
return ""; |
} |
-} // namespace |
- |
-namespace media { |
- |
std::string OmxDecoderConfigurator::GetRoleName() const { |
return "video_decoder." + GetCodecName(input_format().codec); |
} |