Removes redundant media:: prefixes within media namespace in media/gpu/vaapi directory.

Bug: no bug
Cq-Include-Trybots: luci.chromium.try:android_optional_gpu_tests_rel;luci.chromium.try:linux_optional_gpu_tests_rel;luci.chromium.try:mac_optional_gpu_tests_rel;luci.chromium.try:win_optional_gpu_tests_rel
Change-Id: If0f518894dd1264931e224f5103f2d6f75e343cd
Reviewed-on: https://chromium-review.googlesource.com/1236674Reviewed-by: Miguel Casas <mcasas@chromium.org>
Reviewed-by: Andres Calderon Jaramillo <andrescj@chromium.org>
Commit-Queue: Madeleine Barowsky <mbarowsky@chromium.org>
Cr-Commit-Position: refs/heads/master@{#592925}

media/gpu/vaapi/h264_encoder.h

@@ -81,8 +81,8 @@ class H264Encoder : public AcceleratedVideoEncoder {
     virtual bool SubmitFrameParameters(
         EncodeJob* job,
         const H264Encoder::EncodeParams& encode_params,
-        const media::H264SPS& sps,
-        const media::H264PPS& pps,
+        const H264SPS& sps,
+        const H264PPS& pps,
         scoped_refptr<H264Picture> pic,
         const std::list<scoped_refptr<H264Picture>>& ref_pic_list0,
         const std::list<scoped_refptr<H264Picture>>& ref_pic_list1) = 0;
@@ -119,16 +119,16 @@ class H264Encoder : public AcceleratedVideoEncoder {
   // Current SPS, PPS and their packed versions. Packed versions are NALUs
   // in AnnexB format *without* emulation prevention three-byte sequences
   // (those are expected to be added by the client as needed).
-  media::H264SPS current_sps_;
-  scoped_refptr<media::H264BitstreamBuffer> packed_sps_;
-  media::H264PPS current_pps_;
-  scoped_refptr<media::H264BitstreamBuffer> packed_pps_;
+  H264SPS current_sps_;
+  scoped_refptr<H264BitstreamBuffer> packed_sps_;
+  H264PPS current_pps_;
+  scoped_refptr<H264BitstreamBuffer> packed_pps_;
 
   // Current encoding parameters being used.
   EncodeParams curr_params_;
 
   // H264 profile currently used.
-  media::VideoCodecProfile profile_ = VIDEO_CODEC_PROFILE_UNKNOWN;
+  VideoCodecProfile profile_ = VIDEO_CODEC_PROFILE_UNKNOWN;
 
   // H264 level currently used.
   uint8_t level_ = 0;

media/gpu/vaapi/vaapi_jpeg_encode_accelerator.cc

@@ -49,7 +49,7 @@ static void ReportToUMA(VAJEAEncoderResult result) {
 
 VaapiJpegEncodeAccelerator::EncodeRequest::EncodeRequest(
     int32_t buffer_id,
-    scoped_refptr<media::VideoFrame> video_frame,
+    scoped_refptr<VideoFrame> video_frame,
     std::unique_ptr<UnalignedSharedMemory> exif_shm,
     std::unique_ptr<UnalignedSharedMemory> output_shm,
     int quality)
@@ -266,11 +266,10 @@ size_t VaapiJpegEncodeAccelerator::GetMaxCodedBufferSize(
   return VaapiJpegEncoder::GetMaxCodedBufferSize(picture_size);
 }
 
-void VaapiJpegEncodeAccelerator::Encode(
-    scoped_refptr<media::VideoFrame> video_frame,
-    int quality,
-    const BitstreamBuffer* exif_buffer,
-    const BitstreamBuffer& output_buffer) {
+void VaapiJpegEncodeAccelerator::Encode(scoped_refptr<VideoFrame> video_frame,
+                                        int quality,
+                                        const BitstreamBuffer* exif_buffer,
+                                        const BitstreamBuffer& output_buffer) {
   DVLOGF(4);
   DCHECK(io_task_runner_->BelongsToCurrentThread());
 

media/gpu/vaapi/vaapi_jpeg_encode_accelerator.h

@@ -39,7 +39,7 @@ class MEDIA_GPU_EXPORT VaapiJpegEncodeAccelerator
   size_t GetMaxCodedBufferSize(const gfx::Size& picture_size) override;
 
   // Currently only I420 format is supported for |video_frame|.
-  void Encode(scoped_refptr<media::VideoFrame> video_frame,
+  void Encode(scoped_refptr<VideoFrame> video_frame,
               int quality,
               const BitstreamBuffer* exif_buffer,
               const BitstreamBuffer& output_buffer) override;
@@ -49,14 +49,14 @@ class MEDIA_GPU_EXPORT VaapiJpegEncodeAccelerator
   // consumption, provided by the client.
   struct EncodeRequest {
     EncodeRequest(int32_t buffer_id,
-                  scoped_refptr<media::VideoFrame> video_frame,
+                  scoped_refptr<VideoFrame> video_frame,
                   std::unique_ptr<UnalignedSharedMemory> exif_shm,
                   std::unique_ptr<UnalignedSharedMemory> output_shm,
                   int quality);
     ~EncodeRequest();
 
     int32_t buffer_id;
-    scoped_refptr<media::VideoFrame> video_frame;
+    scoped_refptr<VideoFrame> video_frame;
     std::unique_ptr<UnalignedSharedMemory> exif_shm;
     std::unique_ptr<UnalignedSharedMemory> output_shm;
     int quality;

media/gpu/vaapi/vaapi_video_encode_accelerator.cc

@@ -155,8 +155,8 @@ class VaapiVideoEncodeAccelerator::H264Accelerator
   bool SubmitFrameParameters(
       AcceleratedVideoEncoder::EncodeJob* job,
       const H264Encoder::EncodeParams& encode_params,
-      const media::H264SPS& sps,
-      const media::H264PPS& pps,
+      const H264SPS& sps,
+      const H264PPS& pps,
       scoped_refptr<H264Picture> pic,
       const std::list<scoped_refptr<H264Picture>>& ref_pic_list0,
       const std::list<scoped_refptr<H264Picture>>& ref_pic_list1) override;
@@ -178,7 +178,7 @@ class VaapiVideoEncodeAccelerator::VP8Accelerator
 
   bool SubmitFrameParameters(
       AcceleratedVideoEncoder::EncodeJob* job,
-      const media::VP8Encoder::EncodeParams& encode_params,
+      const VP8Encoder::EncodeParams& encode_params,
       scoped_refptr<VP8Picture> pic,
       const Vp8ReferenceFrameVector& ref_frames) override;
 
@@ -721,9 +721,9 @@ static scoped_refptr<base::RefCountedBytes> MakeRefCountedBytes(void* ptr,
 
 bool VaapiVideoEncodeAccelerator::H264Accelerator::SubmitFrameParameters(
     AcceleratedVideoEncoder::EncodeJob* job,
-    const media::H264Encoder::EncodeParams& encode_params,
-    const media::H264SPS& sps,
-    const media::H264PPS& pps,
+    const H264Encoder::EncodeParams& encode_params,
+    const H264SPS& sps,
+    const H264PPS& pps,
     scoped_refptr<H264Picture> pic,
     const std::list<scoped_refptr<H264Picture>>& ref_pic_list0,
     const std::list<scoped_refptr<H264Picture>>& ref_pic_list1) {
@@ -942,7 +942,7 @@ VaapiVideoEncodeAccelerator::VP8Accelerator::GetPicture(
 
 bool VaapiVideoEncodeAccelerator::VP8Accelerator::SubmitFrameParameters(
     AcceleratedVideoEncoder::EncodeJob* job,
-    const media::VP8Encoder::EncodeParams& encode_params,
+    const VP8Encoder::EncodeParams& encode_params,
     scoped_refptr<VP8Picture> pic,
     const Vp8ReferenceFrameVector& ref_frames) {
   VAEncSequenceParameterBufferVP8 seq_param = {};

media/gpu/vaapi/vp8_encoder.h

@@ -60,7 +60,7 @@ class VP8Encoder : public AcceleratedVideoEncoder {
     // it. Returns true on success.
     virtual bool SubmitFrameParameters(
         EncodeJob* job,
-        const media::VP8Encoder::EncodeParams& encode_params,
+        const VP8Encoder::EncodeParams& encode_params,
         scoped_refptr<VP8Picture> pic,
         const Vp8ReferenceFrameVector& ref_frames) = 0;