From bd019775a921ae9165e924e4d37bc838a7ef5781 Mon Sep 17 00:00:00 2001
From: Surajit Podder <spodder@codeaurora.org>
Date: Wed, 22 Jul 2015 18:58:29 +0530
Subject: video: Port AOSP fixes

Includes following fixes:
f510d0c libstagefright: Disable multi slice mode for video encode
ca46843 audio: Fix for failure in CTS MediaRecorderTest cases
b4d0490 libstagefright: check the audio source when adding to MPEG4Writer
89c6c3f libstagefright: Allocate cached camera buffers for sw encoders
f2c387b libstagefright: Choose target specific media_codecs.xml
f3e7122 libstagefright: Implement fallback mechanism to SW decoder

Change-Id: I90398b2fead1f4e163935bf1db342e24275f7933
---
 media/libmediaplayerservice/StagefrightRecorder.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'media/libmediaplayerservice/StagefrightRecorder.cpp')

diff --git a/media/libmediaplayerservice/StagefrightRecorder.cpp b/media/libmediaplayerservice/StagefrightRecorder.cpp
index d64f814..4f3e2ea 100644
--- a/media/libmediaplayerservice/StagefrightRecorder.cpp
+++ b/media/libmediaplayerservice/StagefrightRecorder.cpp
@@ -56,6 +56,7 @@
 #include <system/audio.h>
 
 #include "ARTPWriter.h"
+#include <stagefright/AVExtensions.h>
 
 namespace android {
 
@@ -1476,6 +1477,7 @@ status_t StagefrightRecorder::setupCameraSource(
                 videoSize, mFrameRate,
                 mPreviewSurface);
     }
+    AVUtils::get()->cacheCaptureBuffers(mCamera, mVideoEncoder);
     mCamera.clear();
     mCameraProxy.clear();
     if (*cameraSource == NULL) {
-- 
cgit v1.1