Catch CodecException in MediaCodecBridge and return MEDIA_CODEC_ERROR

media/base/android/sdk_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_SDK_MEDIA_CODEC_BRIDGE_H_
 #define MEDIA_BASE_ANDROID_SDK_MEDIA_CODEC_BRIDGE_H_
 
 #include <jni.h>
 #include <stddef.h>
 #include <stdint.h>
@@ skipping 14 matching lines @@
 
 // This class implements MediaCodecBridge using android MediaCodec SDK APIs.
 class MEDIA_EXPORT SdkMediaCodecBridge : public MediaCodecBridge {
  public:
   ~SdkMediaCodecBridge() override;
 
   // MediaCodecBridge implementations.
   MediaCodecStatus Reset() override;
   bool Start() override;
   void Stop() override;
-  void GetOutputFormat(int* width, int* height) override;
-  int GetOutputSamplingRate() override;
+  MediaCodecStatus GetOutputSize(gfx::Size* size) override;
+  MediaCodecStatus GetOutputSamplingRate(int* sampling_rate) override;
   MediaCodecStatus QueueInputBuffer(
       int index,
       const uint8_t* data,
       size_t data_size,
       const base::TimeDelta& presentation_time) override;
   using MediaCodecBridge::QueueSecureInputBuffer;
   MediaCodecStatus QueueSecureInputBuffer(
       int index,
       const uint8_t* data,
       size_t data_size,
       const std::vector<char>& key_id,
       const std::vector<char>& iv,
       const SubsampleEntry* subsamples,
       int subsamples_size,
       const base::TimeDelta& presentation_time) override;
   void QueueEOS(int input_buffer_index) override;
   MediaCodecStatus DequeueInputBuffer(const base::TimeDelta& timeout,
                                       int* index) override;
   MediaCodecStatus DequeueOutputBuffer(const base::TimeDelta& timeout,
                                        int* index,
                                        size_t* offset,
                                        size_t* size,
                                        base::TimeDelta* presentation_time,
                                        bool* end_of_stream,
                                        bool* key_frame) override;
   void ReleaseOutputBuffer(int index, bool render) override;
-  void GetInputBuffer(int input_buffer_index,
-                      uint8_t** data,
-                      size_t* capacity) override;
-  void CopyFromOutputBuffer(int index,
-                            size_t offset,
-                            void* dst,
-                            size_t num) override;
+  MediaCodecStatus GetInputBuffer(int input_buffer_index,
+                                  uint8_t** data,
+                                  size_t* capacity) override;
+  MediaCodecStatus CopyFromOutputBuffer(int index,
+                                        size_t offset,
+                                        void* dst,
+                                        size_t num) override;
 
   static bool RegisterSdkMediaCodecBridge(JNIEnv* env);
 
  protected:
   SdkMediaCodecBridge(const std::string& mime,
                       bool is_secure,
                       MediaCodecDirection direction);
 
   // Called to get the buffer address given the output buffer index and offset.
-  // This function returns the size of available data to read and |addr| is the
-  // pointer to the address to read.
-  size_t GetOutputBufferAddress(int index, size_t offset, void** addr);
+  // The size of available data to read is written to |*capacity| and the
+  // address to read from is written to |*addr|.
+  // Returns MEDIA_CODEC_ERROR if a error occurs, or MEDIA_CODEC_OK otherwise.
+  MediaCodecStatus GetOutputBufferAddress(int index,
+                                          size_t offset,
+                                          void** addr,
+                                          size_t* capacity);
 
   jobject media_codec() { return j_media_codec_.obj(); }
   MediaCodecDirection direction_;
 
  private:
   // Java MediaCodec instance.
   base::android::ScopedJavaGlobalRef<jobject> j_media_codec_;
 
   DISALLOW_COPY_AND_ASSIGN(SdkMediaCodecBridge);
 };
@@ skipping 26 matching lines @@
                          const uint8_t* extra_data,
                          size_t extra_data_size,
                          int64_t codec_delay_ns,
                          int64_t seek_preroll_ns,
                          bool play_audio,
                          jobject media_crypto) WARN_UNUSED_RESULT;
 
   // Plays the output buffer right away or save for later playback if |postpone|
   // is set to true. This call must be called after DequeueOutputBuffer() and
   // before ReleaseOutputBuffer. The data is extracted from the output buffers
-  // using |index|, |size| and |offset|. Returns the playback head position
-  // expressed in frames.
+  // using |index|, |size| and |offset|. The playback head position in frames is
+  // output in |*playback_pos|.
   // When |postpone| is set to true, the next PlayOutputBuffer() should have
   // postpone == false, and it will play two buffers: the postponed one and
   // the one identified by |index|.
-  int64_t PlayOutputBuffer(int index,
-                           size_t size,
-                           size_t offset,
-                           bool postpone = false);
+  // Returns MEDIA_CODEC_ERROR if an error occurs, or MEDIA_CODEC_OK otherwise.
+  MediaCodecStatus PlayOutputBuffer(int index,
+                                    size_t size,
+                                    size_t offset,
+                                    bool postpone,
+                                    int64_t* playback_pos);
 
   // 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,
@@ skipping 52 matching lines @@
   VideoCodecBridge(const std::string& mime,
                    bool is_secure,
                    MediaCodecDirection direction);
 
   int adaptive_playback_supported_for_testing_;
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_ANDROID_SDK_MEDIA_CODEC_BRIDGE_H_