Switch to Lollipop APIs for MediaCodec

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 84 matching lines @@
   // and ready to be StartAudio/Video()ed again. HOWEVER, due to the buggy
   // vendor's implementation , b/8125974, Stop() -> StartAudio/Video() may not
   // work on some devices. For reliability, Stop() -> delete and recreate new
   // instance -> StartAudio/Video() is recommended.
   void Stop();
 
   // Used for getting output format. This is valid after DequeueInputBuffer()
   // returns a format change by returning INFO_OUTPUT_FORMAT_CHANGED
   void GetOutputFormat(int* width, int* height);
 
-  // Returns the number of input buffers used by the codec.
-  int GetInputBuffersCount();
-
   // Submits a byte array to the given input buffer. Call this after getting an
   // available buffer from DequeueInputBuffer().  If |data| is NULL, assume the
   // input buffer has already been populated (but still obey |size|).
   // |data_size| must be less than kint32max (because Java).
   MediaCodecStatus QueueInputBuffer(int index,
                                     const uint8* data,
                                     size_t data_size,
                                     const base::TimeDelta& presentation_time);
 
   // Similar to the above call, but submits a buffer that is encrypted.  Note:
@@ skipping 39 matching lines @@
                                        size_t* size,
                                        base::TimeDelta* presentation_time,
                                        bool* end_of_stream,
                                        bool* key_frame);
 
   // Returns the buffer to the codec. If you previously specified a surface when
   // configuring this video decoder you can optionally render the buffer.
   void ReleaseOutputBuffer(int index, bool render);
 
   // Returns the number of output buffers used by the codec.
+  // TODO(qinmin): this call is deprecated in Lollicap.

[mcasas, 2014/10/23 07:19:28]

s/Lollicap/Lollipop/

[qinmin, 2014/10/23 22:42:52]

Done.

   int GetOutputBuffersCount();
 
   // Returns the capacity of each output buffer used by the codec.
+  // TODO(qinmin): this call is deprecated in Lollicap.

[mcasas, 2014/10/23 07:19:28]

Idem.

[qinmin, 2014/10/23 22:42:52]

Done.

   size_t GetOutputBuffersCapacity();
 
-  // Gets output buffers from media codec and keeps them inside the java class.
-  // To access them, use DequeueOutputBuffer(). Returns whether output buffers
-  // were successfully obtained.
-  bool GetOutputBuffers() WARN_UNUSED_RESULT;
-
   // Returns an input buffer's base pointer and capacity.
   void GetInputBuffer(int input_buffer_index, uint8** data, size_t* capacity);
 
   // Copy |dst_size| bytes from output buffer |index|'s |offset| onwards into
   // |*dst|.
   bool CopyFromOutputBuffer(int index, size_t offset, void* dst, int dst_size);
 
   static bool RegisterMediaCodecBridge(JNIEnv* env);
 
  protected:
@@ skipping 101 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_