Cleaning up src/media to be consistent with static versus anonymous namespaces.

media/filters/ffmpeg_glue.cc

-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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.
 
+#include "media/filters/ffmpeg_glue.h"
+
 #include "base/string_util.h"
 #include "media/base/filters.h"
 #include "media/ffmpeg/ffmpeg_common.h"
-#include "media/filters/ffmpeg_glue.h"
 
-namespace {
+namespace media {
 
-media::FFmpegURLProtocol* ToProtocol(void* data) {
-  return reinterpret_cast<media::FFmpegURLProtocol*>(data);
+static FFmpegURLProtocol* ToProtocol(void* data) {
+  return reinterpret_cast<FFmpegURLProtocol*>(data);
 }
 
 // FFmpeg protocol interface.
-int OpenContext(URLContext* h, const char* filename, int flags) {
-  media::FFmpegURLProtocol* protocol;
-  media::FFmpegGlue::GetInstance()->GetProtocol(filename, &protocol);
+static int OpenContext(URLContext* h, const char* filename, int flags) {
+  FFmpegURLProtocol* protocol;
+  FFmpegGlue::GetInstance()->GetProtocol(filename, &protocol);
   if (!protocol)
     return AVERROR_IO;
 
   h->priv_data = protocol;
   h->flags = URL_RDONLY;
   h->is_streamed = protocol->IsStreaming();
   return 0;
 }
 
-int ReadContext(URLContext* h, unsigned char* buf, int size) {
-  media::FFmpegURLProtocol* protocol = ToProtocol(h->priv_data);
+static int ReadContext(URLContext* h, unsigned char* buf, int size) {
+  FFmpegURLProtocol* protocol = ToProtocol(h->priv_data);
   int result = protocol->Read(size, buf);
   if (result < 0)
     result = AVERROR_IO;
   return result;
 }
 
 #if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(52, 68, 0)
-int WriteContext(URLContext* h, const unsigned char* buf, int size) {
+static int WriteContext(URLContext* h, const unsigned char* buf, int size) {
 #else
-int WriteContext(URLContext* h, unsigned char* buf, int size) {
+static int WriteContext(URLContext* h, unsigned char* buf, int size) {
 #endif
   // We don't support writing.
   return AVERROR_IO;
 }
 
-int64 SeekContext(URLContext* h, int64 offset, int whence) {
-  media::FFmpegURLProtocol* protocol = ToProtocol(h->priv_data);
+static int64 SeekContext(URLContext* h, int64 offset, int whence) {
+  FFmpegURLProtocol* protocol = ToProtocol(h->priv_data);
   int64 new_offset = AVERROR_IO;
   switch (whence) {
     case SEEK_SET:
       if (protocol->SetPosition(offset))
         protocol->GetPosition(&new_offset);
       break;
 
     case SEEK_CUR:
       int64 pos;
       if (!protocol->GetPosition(&pos))
@@ skipping 15 matching lines @@
       break;
 
     default:
       NOTREACHED();
   }
   if (new_offset < 0)
     new_offset = AVERROR_IO;
   return new_offset;
 }
 
-int CloseContext(URLContext* h) {
+static int CloseContext(URLContext* h) {
   h->priv_data = NULL;
   return 0;
 }
 
-int LockManagerOperation(void** lock, enum AVLockOp op) {
+static int LockManagerOperation(void** lock, enum AVLockOp op) {
   switch (op) {
     case AV_LOCK_CREATE:
       *lock = new base::Lock();
       if (!*lock)
         return 1;
       return 0;
 
     case AV_LOCK_OBTAIN:
       static_cast<base::Lock*>(*lock)->Acquire();
       return 0;
 
     case AV_LOCK_RELEASE:
       static_cast<base::Lock*>(*lock)->Release();
       return 0;
 
     case AV_LOCK_DESTROY:
       delete static_cast<base::Lock*>(*lock);
       *lock = NULL;
       return 0;
   }
   return 1;
 }
 
-}  // namespace
-
-//------------------------------------------------------------------------------
-
-namespace media {
-
 // Use the HTTP protocol to avoid any file path separator issues.
 static const char kProtocol[] = "http";
 
 // Fill out our FFmpeg protocol definition.
 static URLProtocol kFFmpegURLProtocol = {
   kProtocol,
   &OpenContext,
   &ReadContext,
   &WriteContext,
   &SeekContext,
@@ skipping 55 matching lines @@
 }
 
 std::string FFmpegGlue::GetProtocolKey(FFmpegURLProtocol* protocol) {
   // Use the FFmpegURLProtocol's memory address to generate the unique string.
   // This also has the nice property that adding the same FFmpegURLProtocol
   // reference will not generate duplicate entries.
   return StringPrintf("%s://%p", kProtocol, static_cast<void*>(protocol));
 }
 
 }  // namespace media