diff options
-rw-r--r-- | media/libmedia/ToneGenerator.cpp | 1 | ||||
-rw-r--r-- | media/libmediaplayerservice/MetadataRetrieverClient.cpp | 1 | ||||
-rw-r--r-- | media/libstagefright/AACWriter.cpp | 1 | ||||
-rw-r--r-- | media/libstagefright/AMRWriter.cpp | 1 | ||||
-rw-r--r-- | media/libstagefright/MPEG4Writer.cpp | 1 | ||||
-rw-r--r-- | media/libstagefright/OMXCodec.cpp | 19 | ||||
-rw-r--r-- | media/libstagefright/TimedEventQueue.cpp | 1 | ||||
-rw-r--r-- | media/libstagefright/omx/OMX.cpp | 1 |
8 files changed, 13 insertions, 13 deletions
diff --git a/media/libmedia/ToneGenerator.cpp b/media/libmedia/ToneGenerator.cpp index 9f1b3d6..7c2200e 100644 --- a/media/libmedia/ToneGenerator.cpp +++ b/media/libmedia/ToneGenerator.cpp @@ -21,7 +21,6 @@ #include <stdio.h> #include <math.h> #include <utils/Log.h> -#include <sys/resource.h> #include <utils/RefBase.h> #include <utils/Timers.h> #include <cutils/properties.h> diff --git a/media/libmediaplayerservice/MetadataRetrieverClient.cpp b/media/libmediaplayerservice/MetadataRetrieverClient.cpp index 06fb103..d574ea3 100644 --- a/media/libmediaplayerservice/MetadataRetrieverClient.cpp +++ b/media/libmediaplayerservice/MetadataRetrieverClient.cpp @@ -21,7 +21,6 @@ #include <sys/types.h> #include <sys/stat.h> -#include <sys/resource.h> #include <dirent.h> #include <unistd.h> diff --git a/media/libstagefright/AACWriter.cpp b/media/libstagefright/AACWriter.cpp index 8413208..d133e91 100644 --- a/media/libstagefright/AACWriter.cpp +++ b/media/libstagefright/AACWriter.cpp @@ -27,7 +27,6 @@ #include <media/stagefright/MetaData.h> #include <media/mediarecorder.h> #include <sys/prctl.h> -#include <sys/resource.h> #include <fcntl.h> namespace android { diff --git a/media/libstagefright/AMRWriter.cpp b/media/libstagefright/AMRWriter.cpp index b10d52c..6436071 100644 --- a/media/libstagefright/AMRWriter.cpp +++ b/media/libstagefright/AMRWriter.cpp @@ -23,7 +23,6 @@ #include <media/stagefright/MetaData.h> #include <media/mediarecorder.h> #include <sys/prctl.h> -#include <sys/resource.h> #include <sys/types.h> #include <sys/stat.h> #include <fcntl.h> diff --git a/media/libstagefright/MPEG4Writer.cpp b/media/libstagefright/MPEG4Writer.cpp index 58f03a0..58f6699 100644 --- a/media/libstagefright/MPEG4Writer.cpp +++ b/media/libstagefright/MPEG4Writer.cpp @@ -22,7 +22,6 @@ #include <pthread.h> #include <sys/prctl.h> -#include <sys/resource.h> #include <media/stagefright/MPEG4Writer.h> #include <media/stagefright/MediaBuffer.h> diff --git a/media/libstagefright/OMXCodec.cpp b/media/libstagefright/OMXCodec.cpp index c4fcc79..bb8a8be 100644 --- a/media/libstagefright/OMXCodec.cpp +++ b/media/libstagefright/OMXCodec.cpp @@ -1983,7 +1983,14 @@ OMXCodec::BufferInfo* OMXCodec::dequeueBufferFromNativeWindow() { int64_t OMXCodec::retrieveDecodingTimeUs(bool isCodecSpecific) { CHECK(mIsEncoder); - CHECK(!mDecodingTimeList.empty()); + + if (mDecodingTimeList.empty()) { + CHECK(mNoMoreOutputData); + // No corresponding input frame available. + // This could happen when EOS is reached. + return 0; + } + List<int64_t>::iterator it = mDecodingTimeList.begin(); int64_t timeUs = *it; @@ -2152,11 +2159,6 @@ void OMXCodec::on_message(const omx_message &msg) { buffer->meta_data()->setInt32(kKeyIsUnreadable, true); } - if (mIsEncoder) { - int64_t decodingTimeUs = retrieveDecodingTimeUs(isCodecSpecific); - buffer->meta_data()->setInt64(kKeyDecodingTime, decodingTimeUs); - } - buffer->meta_data()->setPointer( kKeyPlatformPrivate, msg.u.extended_buffer_data.platform_private); @@ -2170,6 +2172,11 @@ void OMXCodec::on_message(const omx_message &msg) { mNoMoreOutputData = true; } + if (mIsEncoder) { + int64_t decodingTimeUs = retrieveDecodingTimeUs(isCodecSpecific); + buffer->meta_data()->setInt64(kKeyDecodingTime, decodingTimeUs); + } + if (mTargetTimeUs >= 0) { CHECK(msg.u.extended_buffer_data.timestamp <= mTargetTimeUs); diff --git a/media/libstagefright/TimedEventQueue.cpp b/media/libstagefright/TimedEventQueue.cpp index a08eb7b..100d8a3 100644 --- a/media/libstagefright/TimedEventQueue.cpp +++ b/media/libstagefright/TimedEventQueue.cpp @@ -30,7 +30,6 @@ #include <sys/prctl.h> #include <sys/time.h> -#include <sys/resource.h> #include <media/stagefright/MediaDebug.h> diff --git a/media/libstagefright/omx/OMX.cpp b/media/libstagefright/omx/OMX.cpp index 14968e8..d23aa3a 100644 --- a/media/libstagefright/omx/OMX.cpp +++ b/media/libstagefright/omx/OMX.cpp @@ -21,7 +21,6 @@ #include <dlfcn.h> #include <sys/prctl.h> -#include <sys/resource.h> #include "../include/OMX.h" |