VertexOS · vibhoothi · Nov 15, 2016 · Nov 25, 2016 · Nov 28, 2016 · Nov 30, 2016
diff --git a/camera/cameraserver/cameraserver.rc b/camera/cameraserver/cameraserver.rc
@@ -3,4 +3,4 @@ service cameraserver /system/bin/cameraserver
     user cameraserver
     group audio camera input drmrpc
     ioprio rt 4
-    writepid /dev/cpuset/camera-daemon/tasks /dev/stune/top-app/tasks
+    writepid /dev/cpuset/camera-daemon/tasks /dev/stune/foreground/tasks
diff --git a/include/media/IMediaExtractorService.h b/include/media/IMediaExtractorService.h
@@ -30,7 +30,8 @@ class IMediaExtractorService: public IInterface
 public:
     DECLARE_META_INTERFACE(MediaExtractorService);
 
-    virtual sp<IMediaExtractor> makeExtractor(const sp<IDataSource> &source, const char *mime) = 0;
+    virtual sp<IMediaExtractor> makeExtractor(const sp<IDataSource> &source, const char *mime,
+                                            const uint32_t extFlags) = 0;
 
 };
 

diff --git a/include/media/stagefright/CameraSource.h b/include/media/stagefright/CameraSource.h
@@ -127,6 +127,8 @@ class CameraSource : public MediaSource, public MediaBufferObserver {
 
     virtual void signalBufferReturned(MediaBuffer* buffer);
 
+    virtual void notifyPerformanceMode() {}
+
 protected:
 
     /**

diff --git a/include/media/stagefright/ExtendedMediaDefs.h b/include/media/stagefright/ExtendedMediaDefs.h
@@ -66,7 +66,7 @@ extern const char *MEDIA_MIMETYPE_VIDEO_MPEG4_DP;
 extern const char *MEDIA_MIMETYPE_AUDIO_DSD;
 extern const char *MEDIA_MIMETYPE_CONTAINER_DSF;
 extern const char *MEDIA_MIMETYPE_CONTAINER_DFF;
-
+extern const char *MEDIA_MIMETYPE_CONTAINER_MOV;
 
 }  // namespace android
 

diff --git a/include/media/stagefright/MPEG4Writer.h b/include/media/stagefright/MPEG4Writer.h
@@ -225,6 +225,10 @@ class MPEG4Writer : public MediaWriter {
 
     static uint32_t getMpeg4Time();
 
+    int64_t mLastAudioTimeStampUs;
+    void setLastAudioTimeStamp(int64_t ts) {mLastAudioTimeStampUs = ts;}
+    int64_t getLastAudioTimeStamp() {return mLastAudioTimeStampUs;}
+
     MPEG4Writer(const MPEG4Writer &);
     MPEG4Writer &operator=(const MPEG4Writer &);
 };

diff --git a/include/media/stagefright/MediaCodecSource.h b/include/media/stagefright/MediaCodecSource.h
@@ -68,6 +68,8 @@ struct MediaCodecSource : public MediaSource,
     // for AHandlerReflector
     void onMessageReceived(const sp<AMessage> &msg);
 
+    void notifyPerformanceMode();
+
 protected:
     virtual ~MediaCodecSource();
 
@@ -145,6 +147,10 @@ struct MediaCodecSource : public MediaSource,
 
     int32_t mGeneration;
 
+    int64_t mPrevBufferTimestampUs;
+    bool mIsHFR;
+    int32_t mBatchSize;
+
     DISALLOW_EVIL_CONSTRUCTORS(MediaCodecSource);
 };
 

diff --git a/include/media/stagefright/MediaExtractor.h b/include/media/stagefright/MediaExtractor.h
@@ -30,9 +30,11 @@ class MetaData;
 class MediaExtractor : public BnMediaExtractor {
 public:
     static sp<IMediaExtractor> Create(
-            const sp<DataSource> &source, const char *mime = NULL);
+            const sp<DataSource> &source, const char *mime = NULL,
+            const uint32_t flags = 0);
     static sp<MediaExtractor> CreateFromService(
-            const sp<DataSource> &source, const char *mime = NULL);
+            const sp<DataSource> &source, const char *mime = NULL,
+            const uint32_t flags = 0);
 
     virtual size_t countTracks() = 0;
     virtual sp<IMediaSource> getTrack(size_t index) = 0;
@@ -73,6 +75,8 @@ class MediaExtractor : public BnMediaExtractor {
 
     virtual const char * name() { return "<unspecified>"; }
 
+    virtual void setExtraFlags(uint32_t flags) {}
+
 protected:
     MediaExtractor();
     virtual ~MediaExtractor() {}

diff --git a/media/audioserver/Android.mk b/media/audioserver/Android.mk
@@ -76,4 +76,10 @@ ifeq ($(strip $(DOLBY_ENABLE)),true)
 endif
 # DOLBY_END
 
+ifeq ($(strip $(SPATIAL_AUDIO_ENABLED)), true)
+    LOCAL_CFLAGS += -DVRAUDIOSERVICE_ENABLE
+    LOCAL_C_INCLUDES += $(vr_audio_includes)
+    LOCAL_SHARED_LIBRARIES += libvraudio
+endif
+
 include $(BUILD_EXECUTABLE)
diff --git a/media/audioserver/main_audioserver.cpp b/media/audioserver/main_audioserver.cpp
@@ -56,6 +56,10 @@
 #include "DolbyMemoryService.h"
 #endif
 
+#ifdef VRAUDIOSERVICE_ENABLE
+#include "VRAudioService.h"
+#endif
+
 using namespace android;
 
 int main(int argc __unused, char **argv)
@@ -154,6 +158,9 @@ int main(int argc __unused, char **argv)
         DolbyMemoryService::instantiate();
 #endif
         SoundTriggerHwService::instantiate();
+#ifdef VRAUDIOSERVICE_ENABLE
+        VRAudioServiceNative::instantiate();
+#endif
         ProcessState::self()->startThreadPool();
         IPCThreadState::self()->joinThreadPool();
     }

diff --git a/media/libavextensions/mediaplayerservice/AVNuExtensions.h b/media/libavextensions/mediaplayerservice/AVNuExtensions.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 - 2016, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2013 - 2017, The Linux Foundation. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
@@ -75,6 +75,7 @@ struct AVNuUtils {
     virtual audio_format_t getPCMFormat(const sp<AMessage> &);
     virtual void setCodecOutputFormat(const sp<AMessage> &);
     virtual bool isByteStreamModeEnabled(const sp<MetaData> &);
+    virtual uint32_t getFlags();
 
     // ----- NO TRESSPASSING BEYOND THIS LINE ------
     DECLARE_LOADABLE_SINGLETON(AVNuUtils);

diff --git a/media/libavextensions/mediaplayerservice/AVNuUtils.cpp b/media/libavextensions/mediaplayerservice/AVNuUtils.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 - 2016, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2013 - 2017, The Linux Foundation. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
@@ -103,6 +103,10 @@ bool AVNuUtils::isByteStreamModeEnabled(const sp<MetaData> &) {
 }
 #endif
 
+uint32_t AVNuUtils::getFlags() {
+    return 0;
+}
+
 // ----- NO TRESSPASSING BEYOND THIS LINE ------
 AVNuUtils::AVNuUtils() {}
 

diff --git a/media/libavextensions/stagefright/AVExtensions.h b/media/libavextensions/stagefright/AVExtensions.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 - 2016, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2013 - 2017, The Linux Foundation. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
@@ -35,6 +35,7 @@
 #include <media/IOMX.h>
 #include <camera/android/hardware/ICamera.h>
 #include <media/mediarecorder.h>
+#include <media/stagefright/MediaCodecSource.h>
 #include "ESQueue.h"
 
 namespace android {
@@ -60,7 +61,8 @@ struct AudioSource;
 struct AVFactory {
     virtual sp<ACodec> createACodec();
     virtual MediaExtractor* createExtendedExtractor(
-            const sp<DataSource> &source, const char *mime, const sp<AMessage> &meta);
+            const sp<DataSource> &source, const char *mime, const sp<AMessage> &meta,
+            const uint32_t flags);
     virtual ElementaryStreamQueue* createESQueue(
             ElementaryStreamQueue::Mode mode, uint32_t flags = 0);
     virtual CameraSource *CreateCameraSourceFromCamera(
@@ -152,6 +154,8 @@ struct AVUtils {
 
     virtual bool isAudioMuxFormatSupported(const char *mime);
     virtual void cacheCaptureBuffers(sp<hardware::ICamera> camera, video_encoder encoder);
+    virtual void getHFRParams(bool*, int32_t*, sp<AMessage>);
+    virtual int64_t overwriteTimeOffset(bool, int64_t, int64_t *, int64_t, int32_t);
     virtual const char *getCustomCodecsLocation();
     virtual const char *getCustomCodecsPerformanceLocation();
 

diff --git a/media/libavextensions/stagefright/AVFactory.cpp b/media/libavextensions/stagefright/AVFactory.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 - 2016, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2013 - 2017, The Linux Foundation. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
@@ -54,7 +54,8 @@ sp<ACodec> AVFactory::createACodec() {
 }
 
 MediaExtractor* AVFactory::createExtendedExtractor(
-         const sp<DataSource> &, const char *, const sp<AMessage> &) {
+         const sp<DataSource> &, const char *, const sp<AMessage> &,
+         const uint32_t) {
     return NULL;
 }
 

diff --git a/media/libavextensions/stagefright/AVUtils.cpp b/media/libavextensions/stagefright/AVUtils.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013 - 2016, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2013 - 2017, The Linux Foundation. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
@@ -135,6 +135,15 @@ void AVUtils::cacheCaptureBuffers(sp<hardware::ICamera>, video_encoder) {
     return;
 }
 
+void AVUtils::getHFRParams(bool*, int32_t*, sp<AMessage>) {
+    return;
+}
+
+int64_t AVUtils::overwriteTimeOffset(bool, int64_t inputBufferTimeOffsetUs, int64_t*,
+           int64_t, int32_t) {
+    return inputBufferTimeOffsetUs;
+}
+
 const char *AVUtils::getCustomCodecsLocation() {
     return "/etc/media_codecs.xml";
 }

diff --git a/media/libavextensions/stagefright/ExtendedMediaDefs.cpp b/media/libavextensions/stagefright/ExtendedMediaDefs.cpp
@@ -67,6 +67,6 @@ const char *MEDIA_MIMETYPE_VIDEO_MPEG4_DP = "video/mp4v-esdp";
 const char *MEDIA_MIMETYPE_CONTAINER_DSF = "audio/x-dsf"; // For DSF clip
 const char *MEDIA_MIMETYPE_CONTAINER_DFF = "audio/x-dff"; // For DFF or DIF clip
 const char *MEDIA_MIMETYPE_AUDIO_DSD = "audio/dsd";
-
+const char *MEDIA_MIMETYPE_CONTAINER_MOV = "video/quicktime"; //mov clip
 
 }  // namespace android
diff --git a/media/libmedia/AudioRecord.cpp b/media/libmedia/AudioRecord.cpp
@@ -274,9 +274,9 @@ status_t AudioRecord::set(
     // TODO: add audio hardware input latency here
     if (mTransfer == TRANSFER_CALLBACK ||
             mTransfer == TRANSFER_SYNC) {
-        mLatency = (1000 * mNotificationFramesAct) / sampleRate;
+        mLatency = (1000 * mNotificationFramesAct) / mSampleRate;
     } else {
-        mLatency = (1000 * mFrameCount) / sampleRate;
+        mLatency = (1000 * mFrameCount) / mSampleRate;
     }
     mMarkerPosition = 0;
     mMarkerReached = false;
@@ -875,7 +875,7 @@ audio_io_handle_t AudioRecord::getInputPrivate() const
 
 ssize_t AudioRecord::read(void* buffer, size_t userSize, bool blocking)
 {
-    if (mTransfer != TRANSFER_SYNC) {
+    if ((mTransfer != TRANSFER_SYNC) || !mActive) {
         return INVALID_OPERATION;
     }
 

diff --git a/media/libmedia/IMediaExtractorService.cpp b/media/libmedia/IMediaExtractorService.cpp
@@ -38,10 +38,12 @@ class BpMediaExtractorService : public BpInterface<IMediaExtractorService>
     {
     }
 
-    virtual sp<IMediaExtractor> makeExtractor(const sp<IDataSource> &source, const char *mime) {
+    virtual sp<IMediaExtractor> makeExtractor(const sp<IDataSource> &source, const char *mime,
+                                            const uint32_t extFlags) {
         Parcel data, reply;
         data.writeInterfaceToken(IMediaExtractorService::getInterfaceDescriptor());
         data.writeStrongBinder(IInterface::asBinder(source));
+        data.writeUint32(extFlags);
         if (mime != NULL) {
             data.writeCString(mime);
         }
@@ -75,8 +77,10 @@ status_t BnMediaExtractorService::onTransact(
             // for MediaBuffers for this process.
             MediaBuffer::useSharedMemory();
             sp<IDataSource> source = interface_cast<IDataSource>(b);
+            uint32_t extFlags;
+            data.readUint32(&extFlags);
             const char *mime = data.readCString();
-            sp<IMediaExtractor> ex = makeExtractor(source, mime);
+            sp<IMediaExtractor> ex = makeExtractor(source, mime, extFlags);
             reply->writeStrongBinder(IInterface::asBinder(ex));
             return NO_ERROR;
         }

diff --git a/media/libmediaplayerservice/StagefrightRecorder.cpp b/media/libmediaplayerservice/StagefrightRecorder.cpp
@@ -19,6 +19,7 @@
 #include <inttypes.h>
 #include <utils/Log.h>
 
+#include <cutils/properties.h>
 #include <inttypes.h>
 #include "WebmWriter.h"
 #include "StagefrightRecorder.h"
@@ -1464,7 +1465,7 @@ status_t StagefrightRecorder::setupCameraSource(
     Size videoSize;
     videoSize.width = mVideoWidth;
     videoSize.height = mVideoHeight;
-    if (mCaptureFpsEnable) {
+    if (mCaptureFpsEnable && mCaptureFps != mFrameRate ) {
         if (mTimeBetweenCaptureUs < 0) {
             ALOGE("Invalid mTimeBetweenTimeLapseFrameCaptureUs value: %" PRId64 "",
                 mTimeBetweenCaptureUs);
@@ -1477,10 +1478,11 @@ status_t StagefrightRecorder::setupCameraSource(
                 mTimeBetweenCaptureUs);
         *cameraSource = mCameraSourceTimeLapse;
     } else {
-        *cameraSource = AVFactory::get()->CreateCameraSourceFromCamera(
+        mCameraSource = AVFactory::get()->CreateCameraSourceFromCamera(
                 mCamera, mCameraProxy, mCameraId, mClientName, mClientUid, mClientPid,
                 videoSize, mFrameRate,
                 mPreviewSurface);
+        *cameraSource = mCameraSource;
     }
     AVUtils::get()->cacheCaptureBuffers(mCamera, mVideoEncoder);
     mCamera.clear();
@@ -1609,6 +1611,7 @@ status_t StagefrightRecorder::setupVideoEncoder(
             preferBFrames = false;
             tsLayers = 2; // use at least two layers as resulting video will likely be sped up
         } else if (mCaptureFps > maxPlaybackFps) { // slow-mo
+            format->setInt32("high-frame-rate", 1);
             maxPlaybackFps = mCaptureFps; // assume video will be played back at full capture speed
             preferBFrames = false;
         }
@@ -1882,6 +1885,13 @@ status_t StagefrightRecorder::stop() {
         mCameraSourceTimeLapse = NULL;
     }
 
+    if (mVideoEncoderSource != NULL) {
+        mVideoEncoderSource->notifyPerformanceMode();
+    }
+    if (mCameraSource != NULL) {
+        mCameraSource->notifyPerformanceMode();
+    }
+
     if (mWriter != NULL) {
         err = mWriter->stop();
         mWriter.clear();
@@ -1960,6 +1970,7 @@ status_t StagefrightRecorder::reset() {
     mCaptureFps = 0.0f;
     mTimeBetweenCaptureUs = -1;
     mCameraSourceTimeLapse = NULL;
+    mCameraSource = NULL;
     mMetaDataStoredInVideoBuffers = kMetadataBufferTypeInvalid;
     mEncoderProfiles = MediaProfiles::getInstance();
     mRotationDegrees = 0;

diff --git a/media/libmediaplayerservice/StagefrightRecorder.h b/media/libmediaplayerservice/StagefrightRecorder.h
@@ -121,6 +121,7 @@ struct StagefrightRecorder : public MediaRecorderBase {
     float mCaptureFps;
     int64_t mTimeBetweenCaptureUs;
     sp<CameraSourceTimeLapse> mCameraSourceTimeLapse;
+    sp<CameraSource> mCameraSource;
 
     String8 mParams;
 

diff --git a/media/libmediaplayerservice/nuplayer/GenericSource.cpp b/media/libmediaplayerservice/nuplayer/GenericSource.cpp
@@ -180,7 +180,8 @@ status_t NuPlayer::GenericSource::initFromDataSource() {
         extractor = mWVMExtractor;
     } else {
         extractor = MediaExtractor::Create(mDataSource,
-                mimeType.isEmpty() ? NULL : mimeType.string());
+                mimeType.isEmpty() ? NULL : mimeType.string(),
+                mIsStreaming ? 0 : AVNuUtils::get()->getFlags());
     }
 
     if (extractor == NULL) {

diff --git a/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp b/media/libmediaplayerservice/nuplayer/NuPlayerRenderer.cpp
@@ -1132,10 +1132,10 @@ void NuPlayer::Renderer::onNewAudioMediaTime(int64_t mediaTimeUs) {
         if (nowUs >= mNextAudioClockUpdateTimeUs) {
             int64_t nowMediaUs = mediaTimeUs - getPendingAudioPlayoutDurationUs(nowUs);
             mMediaClock->updateAnchor(nowMediaUs, nowUs, mediaTimeUs);
-            mAnchorTimeMediaUs = mediaTimeUs;
             mUseVirtualAudioSink = false;
             mNextAudioClockUpdateTimeUs = nowUs + kMinimumAudioClockUpdatePeriodUs;
         }
+        mAnchorTimeMediaUs = mediaTimeUs;
     } else {
         int64_t unused;
         if ((mMediaClock->getMediaTime(nowUs, &unused) != OK)
@@ -1792,10 +1792,12 @@ void NuPlayer::Renderer::onAudioTearDown(AudioTearDownReason reason) {
 
 void NuPlayer::Renderer::startAudioOffloadPauseTimeout() {
     if (offloadingAudio()) {
+        int64_t pauseTimeOutDuration = property_get_int64(
+            "audio.offload.pstimeout.secs",(kOffloadPauseMaxUs/1000000)/*default*/);
         mWakeLock->acquire();
         sp<AMessage> msg = new AMessage(kWhatAudioOffloadPauseTimeout, this);
         msg->setInt32("drainGeneration", mAudioOffloadPauseTimeoutGeneration);
-        msg->post(kOffloadPauseMaxUs);
+        msg->post(pauseTimeOutDuration*1000000);
     }
 }
-Original file line number
+Diff line change
@@ Expand Up @@
         virtual void signalBufferReturned(MediaBuffer* buffer);
+        virtual void notifyPerformanceMode() {}
     protected:
         /**
@@ Expand Down @@