media: Clean up MediaCodecBridge and remove subclasses

media/gpu/avda_picture_buffer_manager.h

 // Copyright 2015 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.
 
 #ifndef MEDIA_GPU_AVDA_PICTURE_BUFFER_MANAGER_H_
 #define MEDIA_GPU_AVDA_PICTURE_BUFFER_MANAGER_H_
 
 #include <stdint.h>
 #include <vector>
 
 #include "base/macros.h"
 #include "media/gpu/avda_state_provider.h"
 #include "media/gpu/media_gpu_export.h"
 
 namespace gpu {
 namespace gles2 {
 class GLStreamTextureImage;
 }
 }
 
 namespace gl {
 class ScopedJavaSurface;
 class SurfaceTexture;
 }
 
 namespace media {
 class AVDACodecImage;
 class AVDASharedState;
-class VideoCodecBridge;
+class MediaCodecBridge;
 
 // AVDAPictureBufferManager is used by AVDA to associate its PictureBuffers with
 // MediaCodec output buffers. It attaches AVDACodecImages to the PictureBuffer
 // textures so that when they're used to draw the AVDACodecImage can release the
 // MediaCodec buffer to the backing Surface. If the Surface is a SurfaceTexture,
 // the front buffer can then be used to draw without needing to copy the pixels.
 // If the Surface is a SurfaceView, the release causes the frame to be displayed
 // immediately.
 class MEDIA_GPU_EXPORT AVDAPictureBufferManager {
  public:
@@ skipping 27 matching lines @@
 
   // Release MediaCodec buffers.
   void ReleaseCodecBuffers(const PictureBufferMap& buffers);
 
   // Attempts to free up codec output buffers by rendering early.
   void MaybeRenderEarly();
 
   // Called when the MediaCodec instance changes. If |codec| is nullptr the
   // MediaCodec is being destroyed. Previously provided codecs should no longer
   // be referenced.
-  void CodecChanged(VideoCodecBridge* codec);
+  void CodecChanged(MediaCodecBridge* codec);
 
   // Whether the pictures buffers are overlayable.
   bool ArePicturesOverlayable();
 
   // Are there any unrendered picture buffers oustanding?
   bool HasUnrenderedPictures() const;
 
   scoped_refptr<gl::SurfaceTexture> surface_texture() {
     return surface_texture_;
   }
@@ skipping 17 matching lines @@
   AVDACodecImage* GetImageForPicture(int picture_buffer_id) const;
 
   scoped_refptr<AVDASharedState> shared_state_;
 
   AVDAStateProvider* const state_provider_;
 
   // The SurfaceTexture to render to. Non-null after Initialize() if
   // we're not rendering to a SurfaceView.
   scoped_refptr<gl::SurfaceTexture> surface_texture_;
 
-  VideoCodecBridge* media_codec_;
+  MediaCodecBridge* media_codec_;
 
   // Picture buffer IDs that are out for display. Stored in order of frames as
   // they are returned from the decoder.
   std::vector<int32_t> pictures_out_for_display_;
 
   // Maps a picture buffer id to a AVDACodecImage.
   std::map<int, scoped_refptr<AVDACodecImage>> codec_images_;
 
   DISALLOW_COPY_AND_ASSIGN(AVDAPictureBufferManager);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_GPU_AVDA_PICTURE_BUFFER_MANAGER_H_