Revert of media: Enable Opus support in Clank <video> and MSE

media/base/android/media_codec_bridge.h

 // Copyright (c) 2013 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_BASE_ANDROID_MEDIA_CODEC_BRIDGE_H_
 #define MEDIA_BASE_ANDROID_MEDIA_CODEC_BRIDGE_H_
 
 #include <jni.h>
 #include <string>
 
@@ skipping 211 matching lines @@
   // Returns an AudioCodecBridge instance if |codec| is supported, or a NULL
   // pointer otherwise.
   static AudioCodecBridge* Create(const AudioCodec& codec);
 
   // See MediaCodecBridge::IsKnownUnaccelerated().
   static bool IsKnownUnaccelerated(const AudioCodec& codec);
 
   // Start the audio codec bridge.
   bool Start(const AudioCodec& codec, int sample_rate, int channel_count,
              const uint8* extra_data, size_t extra_data_size,
-             int64 codec_delay_ns, int64 seek_preroll_ns,
              bool play_audio, jobject media_crypto) WARN_UNUSED_RESULT;
 
   // Play the output buffer. This call must be called after
   // DequeueOutputBuffer() and before ReleaseOutputBuffer. Returns the playback
   // head position expressed in frames.
   int64 PlayOutputBuffer(int index, size_t size);
 
   // Set the volume of the audio output.
   void SetVolume(double volume);
 
  private:
   explicit AudioCodecBridge(const std::string& mime);
 
   // Configure the java MediaFormat object with the extra codec data passed in.
   bool ConfigureMediaFormat(jobject j_format, const AudioCodec& codec,
-                            const uint8* extra_data, size_t extra_data_size,
-                            int64 codec_delay_ns, int64 seek_preroll_ns);
+                            const uint8* extra_data, size_t extra_data_size);
 };
 
 class MEDIA_EXPORT VideoCodecBridge : public MediaCodecBridge {
  public:
   // See MediaCodecBridge::IsKnownUnaccelerated().
   static bool IsKnownUnaccelerated(const VideoCodec& codec,
                                    MediaCodecDirection direction);
 
   // Create, start, and return a VideoCodecBridge decoder or NULL on failure.
   static VideoCodecBridge* CreateDecoder(
@@ skipping 33 matching lines @@
   VideoCodecBridge(const std::string& mime,
                    bool is_secure,
                    MediaCodecDirection direction);
 
   int adaptive_playback_supported_for_testing_;
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_ANDROID_MEDIA_CODEC_BRIDGE_H_