Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(811)

Unified Diff: media/base/android/ndk_media_codec_bridge.h

Issue 1764813002: Catch CodecException in MediaCodecBridge and return MEDIA_CODEC_ERROR (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: dale's comment Created 4 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/base/android/media_codec_bridge.cc ('k') | media/base/android/ndk_media_codec_bridge.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/android/ndk_media_codec_bridge.h
diff --git a/media/base/android/ndk_media_codec_bridge.h b/media/base/android/ndk_media_codec_bridge.h
index 7621effa15f3dcf41e8387e53bdba255f74f5867..d7f2b108a1a5458d798fc50239fce1c99ac4bf58 100644
--- a/media/base/android/ndk_media_codec_bridge.h
+++ b/media/base/android/ndk_media_codec_bridge.h
@@ -14,6 +14,7 @@
#include "base/time/time.h"
#include "media/base/android/media_codec_bridge.h"
#include "media/base/media_export.h"
+#include "ui/gfx/geometry/size.h"
namespace media {
@@ -25,8 +26,8 @@ class MEDIA_EXPORT NdkMediaCodecBridge : public MediaCodecBridge {
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,
@@ -53,13 +54,13 @@ class MEDIA_EXPORT NdkMediaCodecBridge : public MediaCodecBridge {
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;
protected:
NdkMediaCodecBridge(const std::string& mime,
« no previous file with comments | « media/base/android/media_codec_bridge.cc ('k') | media/base/android/ndk_media_codec_bridge.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698