[go: nahoru, domu]

media: Drop "media::" in media/gpu

Now media/gpu is moved to media namespace, there's no need to use
media:: anymore.

BUG=586386

Review-Url: https://codereview.chromium.org/2061823003
Cr-Commit-Position: refs/heads/master@{#399790}
diff --git a/media/gpu/vp9_decoder.cc b/media/gpu/vp9_decoder.cc
index 58b42ca..ec10b76 100644
--- a/media/gpu/vp9_decoder.cc
+++ b/media/gpu/vp9_decoder.cc
@@ -19,7 +19,7 @@
 VP9Decoder::VP9Decoder(VP9Accelerator* accelerator)
     : state_(kNeedStreamMetadata), accelerator_(accelerator) {
   DCHECK(accelerator_);
-  ref_frames_.resize(media::kVp9NumRefFrames);
+  ref_frames_.resize(kVp9NumRefFrames);
 }
 
 VP9Decoder::~VP9Decoder() {}
@@ -53,17 +53,17 @@
   while (1) {
     // Read a new frame header if one is not awaiting decoding already.
     if (!curr_frame_hdr_) {
-      std::unique_ptr<media::Vp9FrameHeader> hdr(new media::Vp9FrameHeader());
-      media::Vp9Parser::Result res = parser_.ParseNextFrame(hdr.get());
+      std::unique_ptr<Vp9FrameHeader> hdr(new Vp9FrameHeader());
+      Vp9Parser::Result res = parser_.ParseNextFrame(hdr.get());
       switch (res) {
-        case media::Vp9Parser::kOk:
+        case Vp9Parser::kOk:
           curr_frame_hdr_.reset(hdr.release());
           break;
 
-        case media::Vp9Parser::kEOStream:
+        case Vp9Parser::kEOStream:
           return kRanOutOfStreamData;
 
-        case media::Vp9Parser::kInvalidStream:
+        case Vp9Parser::kInvalidStream:
           DVLOG(1) << "Error parsing stream";
           SetError();
           return kDecodeError;
@@ -141,7 +141,7 @@
 }
 
 void VP9Decoder::RefreshReferenceFrames(const scoped_refptr<VP9Picture>& pic) {
-  for (size_t i = 0; i < media::kVp9NumRefFrames; ++i) {
+  for (size_t i = 0; i < kVp9NumRefFrames; ++i) {
     DCHECK(!pic->frame_hdr->IsKeyframe() || pic->frame_hdr->RefreshFlag(i));
     if (pic->frame_hdr->RefreshFlag(i))
       ref_frames_[i] = pic;
@@ -177,7 +177,7 @@
 size_t VP9Decoder::GetRequiredNumOfPictures() const {
   // kMaxVideoFrames to keep higher level media pipeline populated, +2 for the
   // pictures being parsed and decoded currently.
-  return media::limits::kMaxVideoFrames + media::kVp9NumRefFrames + 2;
+  return limits::kMaxVideoFrames + kVp9NumRefFrames + 2;
 }
 
 }  // namespace media