diff options
author | Linux Build Service Account <lnxbuild@localhost> | 2015-11-03 17:48:54 -0800 |
---|---|---|
committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2015-11-03 17:48:54 -0800 |
commit | fc4da68969ef979905ce29018a22460fe8c73dba (patch) | |
tree | 51d6ef569397a4cfffc66af28581ba7f41e44c33 /media/libavextensions | |
parent | f140e521f51b2d48c1f983c2790f4ab55b6dfac9 (diff) | |
parent | a729f437f5f46efbd366721d7d4f398186ce77cd (diff) | |
download | frameworks_av-fc4da68969ef979905ce29018a22460fe8c73dba.zip frameworks_av-fc4da68969ef979905ce29018a22460fe8c73dba.tar.gz frameworks_av-fc4da68969ef979905ce29018a22460fe8c73dba.tar.bz2 |
Merge "nuplayer: Drop frames with DATACORRUPT flag"
Diffstat (limited to 'media/libavextensions')
-rw-r--r-- | media/libavextensions/mediaplayerservice/AVNuExtensions.h | 1 | ||||
-rw-r--r-- | media/libavextensions/mediaplayerservice/AVNuUtils.cpp | 2 | ||||
-rw-r--r-- | media/libavextensions/stagefright/AVExtensions.h | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/media/libavextensions/mediaplayerservice/AVNuExtensions.h b/media/libavextensions/mediaplayerservice/AVNuExtensions.h index 7aeb5c3..1d45c00 100644 --- a/media/libavextensions/mediaplayerservice/AVNuExtensions.h +++ b/media/libavextensions/mediaplayerservice/AVNuExtensions.h @@ -85,6 +85,7 @@ struct AVNuUtils { virtual void printFileName(int fd); virtual void checkFormatChange(bool *formatChange, const sp<ABuffer> &accessUnit); + virtual bool dropCorruptFrame(); // ----- NO TRESSPASSING BEYOND THIS LINE ------ DECLARE_LOADABLE_SINGLETON(AVNuUtils); diff --git a/media/libavextensions/mediaplayerservice/AVNuUtils.cpp b/media/libavextensions/mediaplayerservice/AVNuUtils.cpp index 51c4a37..95f6454 100644 --- a/media/libavextensions/mediaplayerservice/AVNuUtils.cpp +++ b/media/libavextensions/mediaplayerservice/AVNuUtils.cpp @@ -112,6 +112,8 @@ bool AVNuUtils::canUseSetBuffers(const sp<MetaData> &/*Meta*/) { return false; } +bool AVNuUtils::dropCorruptFrame() { return false; } + // ----- NO TRESSPASSING BEYOND THIS LINE ------ AVNuUtils::AVNuUtils() {} diff --git a/media/libavextensions/stagefright/AVExtensions.h b/media/libavextensions/stagefright/AVExtensions.h index 937180f..0b70c08 100644 --- a/media/libavextensions/stagefright/AVExtensions.h +++ b/media/libavextensions/stagefright/AVExtensions.h @@ -47,7 +47,6 @@ struct ACodec; struct ALooper; struct IMediaHTTPConnection; struct MediaCodec; -struct MediaSource; struct MediaHTTP; struct NuCachedSource2; class CameraParameters; |