Catch CodecException in MediaCodecBridge and return MEDIA_CODEC_ERROR

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 <stddef.h>
 #include <stdint.h>
 
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "base/time/time.h"
 #include "media/base/android/media_codec_util.h"
 #include "media/base/media_export.h"
+#include "ui/gfx/geometry/size.h"
 
 namespace media {
 
 struct SubsampleEntry;
 
 // These must be in sync with MediaCodecBridge.MEDIA_CODEC_XXX constants in
 // MediaCodecBridge.java.
 enum MediaCodecStatus {
   MEDIA_CODEC_OK,
   MEDIA_CODEC_DEQUEUE_INPUT_AGAIN_LATER,
@@ skipping 12 matching lines @@
 // http://developer.android.com/reference/android/media/MediaCodec.html
 // Note: MediaCodec is only available on JB and greater.
 class MEDIA_EXPORT MediaCodecBridge {
  public:
   virtual ~MediaCodecBridge();
 
   // Resets both input and output, all indices previously returned in calls to
   // DequeueInputBuffer() and DequeueOutputBuffer() become invalid.
   // Please note that this clears all the inputs in the media codec. In other
   // words, there will be no outputs until new input is provided.
-  // Returns MEDIA_CODEC_ERROR if an unexpected error happens, or Media_CODEC_OK
+  // Returns MEDIA_CODEC_ERROR if an unexpected error happens, or MEDIA_CODEC_OK
   // otherwise.
   virtual MediaCodecStatus Reset() = 0;
 
   // Calls start() against the media codec instance. Returns whether media
   // codec was successfully started.
   virtual bool Start() = 0;
 
   // Finishes the decode/encode session. The instance remains active
   // 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.
   virtual void Stop() = 0;
 
-  // Used for getting output format. This is valid after DequeueInputBuffer()
-  // returns a format change by returning INFO_OUTPUT_FORMAT_CHANGED
-  virtual void GetOutputFormat(int* width, int* height) = 0;
+  // Used for getting the output size. This is valid after DequeueInputBuffer()
+  // returns a format change by returning INFO_OUTPUT_FORMAT_CHANGED.
+  // Returns MEDIA_CODEC_ERROR if an error occurs, or MEDIA_CODEC_OK otherwise.
+  virtual MediaCodecStatus GetOutputSize(gfx::Size* size) = 0;
 
   // Used for checking for new sampling rate after DequeueInputBuffer() returns
   // INFO_OUTPUT_FORMAT_CHANGED
-  virtual int GetOutputSamplingRate() = 0;
+  // Returns MEDIA_CODEC_ERROR if an error occurs, or MEDIA_CODEC_OK otherwise.
+  virtual MediaCodecStatus GetOutputSamplingRate(int* sampling_rate) = 0;
 
   // 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).
   virtual MediaCodecStatus QueueInputBuffer(
       int index,
       const uint8_t* data,
       size_t data_size,
       const base::TimeDelta& presentation_time) = 0;
@@ skipping 53 matching lines @@
       size_t* size,
       base::TimeDelta* presentation_time,
       bool* end_of_stream,
       bool* key_frame) = 0;
 
   // Returns the buffer to the codec. If you previously specified a surface when
   // configuring this video decoder you can optionally render the buffer.
   virtual void ReleaseOutputBuffer(int index, bool render) = 0;
 
   // Returns an input buffer's base pointer and capacity.
-  virtual void GetInputBuffer(int input_buffer_index,
-                              uint8_t** data,
-                              size_t* capacity) = 0;
+  virtual MediaCodecStatus GetInputBuffer(int input_buffer_index,
+                                          uint8_t** data,
+                                          size_t* capacity) = 0;
 
   // Copy |num| bytes from output buffer |index|'s |offset| into the memory
-  // region pointed to by |*dst|. To avoid overflows, the size of both source
+  // region pointed to by |dst|. To avoid overflows, the size of both source
   // and destination must be at least |num| bytes, and should not overlap.
-  virtual void CopyFromOutputBuffer(int index,
-                                    size_t offset,
-                                    void* dst,
-                                    size_t num) = 0;
+  // Returns MEDIA_CODEC_ERROR if an error occurs, or MEDIA_CODEC_OK otherwise.
+  virtual MediaCodecStatus CopyFromOutputBuffer(int index,
+                                                size_t offset,
+                                                void* dst,
+                                                size_t num) = 0;
 
  protected:
   MediaCodecBridge();
 
   // Fills a particular input buffer; returns false if |data_size| exceeds the
   // input buffer's capacity (and doesn't touch the input buffer in that case).
   bool FillInputBuffer(int index,
                        const uint8_t* data,
                        size_t data_size) WARN_UNUSED_RESULT;
 
   DISALLOW_COPY_AND_ASSIGN(MediaCodecBridge);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_BASE_ANDROID_MEDIA_CODEC_BRIDGE_H_