media: Clean up MediaCodecBridge and remove subclasses

media/base/android/media_codec_loop.cc

 // Copyright 2016 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_loop.h"
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/logging.h"
 #include "media/base/bind_to_current_loop.h"
@@ skipping 132 matching lines @@
     InputBuffer result(pending_input_buf_index_, true);
     pending_input_buf_index_ = kInvalidBufferIndex;
     return result;
   }
 
   int input_buf_index = kInvalidBufferIndex;
 
   media::MediaCodecStatus status =
       media_codec_->DequeueInputBuffer(kNoWaitTimeout, &input_buf_index);
   switch (status) {
-    case media::MEDIA_CODEC_DEQUEUE_INPUT_AGAIN_LATER:
+    case media::MEDIA_CODEC_TRY_AGAIN_LATER:
       break;
 
     case media::MEDIA_CODEC_ERROR:
       DLOG(ERROR) << __func__ << ": MEDIA_CODEC_ERROR from DequeInputBuffer";
       SetState(STATE_ERROR);
       break;
 
     case media::MEDIA_CODEC_OK:
       break;
 
@@ skipping 116 matching lines @@
 
         client_->OnDecodedEos(out);
       } else {
         if (!client_->OnDecodedFrame(out))
           SetState(STATE_ERROR);
       }
 
       did_work = true;
       break;
 
-    case MEDIA_CODEC_DEQUEUE_OUTPUT_AGAIN_LATER:
+    case MEDIA_CODEC_TRY_AGAIN_LATER:
       // Nothing to do.
       break;
 
     case MEDIA_CODEC_ERROR:
       DLOG(ERROR) << __func__ << ": MEDIA_CODEC_ERROR from DequeueOutputBuffer";
       SetState(STATE_ERROR);
       break;
 
     default:
       NOTREACHED() << "Unknown DequeueOutputBuffer status " << status;
@@ skipping 59 matching lines @@
     RETURN_STRING(STATE_DRAINED);
     RETURN_STRING(STATE_ERROR);
   }
 #undef RETURN_STRING
 
   NOTREACHED() << "Unknown state " << state;
   return nullptr;
 }
 
 }  // namespace media