Rename browser side MediaCodec-based decoders

media/base/android/media_codec_player.cc

 // 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.
 
 #include "media/base/android/media_codec_player.h"
 
 #include <utility>
 
 #include "base/barrier_closure.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/threading/thread.h"
-#include "media/base/android/media_codec_audio_decoder.h"
-#include "media/base/android/media_codec_video_decoder.h"
+#include "media/base/android/audio_media_codec_decoder.h"
 #include "media/base/android/media_drm_bridge.h"
 #include "media/base/android/media_player_manager.h"
 #include "media/base/android/media_task_runner.h"
+#include "media/base/android/video_media_codec_decoder.h"
 #include "media/base/bind_to_current_loop.h"
 #include "media/base/timestamp_constants.h"
 
 #define RUN_ON_MEDIA_THREAD(METHOD, ...)                                     \
   do {                                                                       \
     if (!GetMediaTaskRunner()->BelongsToCurrentThread()) {                   \
       DCHECK(ui_task_runner_->BelongsToCurrentThread());                     \
       GetMediaTaskRunner()->PostTask(                                        \
           FROM_HERE, base::Bind(&MediaCodecPlayer::METHOD, media_weak_this_, \
                                 ##__VA_ARGS__));                             \
@@ skipping 1313 matching lines @@
 }
 
 void MediaCodecPlayer::CreateDecoders() {
   DCHECK(GetMediaTaskRunner()->BelongsToCurrentThread());
   DVLOG(1) << __FUNCTION__;
 
   internal_error_cb_ = base::Bind(&MediaCodecPlayer::OnError, media_weak_this_);
 
   media_stat_.reset(new MediaStatistics());
 
-  audio_decoder_.reset(new MediaCodecAudioDecoder(
+  audio_decoder_.reset(new AudioMediaCodecDecoder(
       GetMediaTaskRunner(), &media_stat_->audio_frame_stats(),
       base::Bind(&MediaCodecPlayer::RequestDemuxerData, media_weak_this_,
                  DemuxerStream::AUDIO),
       base::Bind(&MediaCodecPlayer::OnStarvation, media_weak_this_,
                  DemuxerStream::AUDIO),
       base::Bind(&MediaCodecPlayer::OnDecoderDrained, media_weak_this_,
                  DemuxerStream::AUDIO),
       base::Bind(&MediaCodecPlayer::OnStopDone, media_weak_this_,
                  DemuxerStream::AUDIO),
       base::Bind(&MediaCodecPlayer::OnMissingKeyReported, media_weak_this_,
                  DemuxerStream::AUDIO),
-      internal_error_cb_,
-      base::Bind(&MediaCodecPlayer::OnTimeIntervalUpdate, media_weak_this_,
-                 DemuxerStream::AUDIO)));
+      internal_error_cb_, base::Bind(&MediaCodecPlayer::OnTimeIntervalUpdate,
+                                     media_weak_this_, DemuxerStream::AUDIO)));
 
-  video_decoder_.reset(new MediaCodecVideoDecoder(
+  video_decoder_.reset(new VideoMediaCodecDecoder(
       GetMediaTaskRunner(), &media_stat_->video_frame_stats(),
       base::Bind(&MediaCodecPlayer::RequestDemuxerData, media_weak_this_,
                  DemuxerStream::VIDEO),
       base::Bind(&MediaCodecPlayer::OnStarvation, media_weak_this_,
                  DemuxerStream::VIDEO),
       base::Bind(&MediaCodecPlayer::OnDecoderDrained, media_weak_this_,
                  DemuxerStream::VIDEO),
       base::Bind(&MediaCodecPlayer::OnStopDone, media_weak_this_,
                  DemuxerStream::VIDEO),
       base::Bind(&MediaCodecPlayer::OnMissingKeyReported, media_weak_this_,
                  DemuxerStream::VIDEO),
-      internal_error_cb_,
-      base::Bind(&MediaCodecPlayer::OnTimeIntervalUpdate, media_weak_this_,
-                 DemuxerStream::VIDEO),
+      internal_error_cb_, base::Bind(&MediaCodecPlayer::OnTimeIntervalUpdate,
+                                     media_weak_this_, DemuxerStream::VIDEO),
       base::Bind(&MediaCodecPlayer::OnVideoResolutionChanged,
                  media_weak_this_)));
 }
 
 bool MediaCodecPlayer::AudioFinished() const {
   return audio_decoder_->IsCompleted() || !audio_decoder_->HasStream();
 }
 
 bool MediaCodecPlayer::VideoFinished() const {
   return video_decoder_->IsCompleted() || !video_decoder_->HasStream();
@@ skipping 24 matching lines @@
     RETURN_STRING(kStateWaitingForMediaCrypto);
     RETURN_STRING(kStateWaitingForSeek);
     RETURN_STRING(kStateError);
   }
   return nullptr;  // crash early
 }
 
 #undef RETURN_STRING
 
 }  // namespace media