summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrint E. Kriebel <bekit@cyngn.com>2014-12-23 15:31:01 -0800
committerBrint E. Kriebel <bekit@cyngn.com>2014-12-23 15:31:01 -0800
commit44bfd087f2317419e1f3fad151d7e3f7079818df (patch)
treeaede37964d6a455d291065c9d544e91bbdec5d8b
parent2fa08d8a1e43aaab3986b187a02f425050aae7b9 (diff)
parentebdbd54cafa24515b57abf664c4f90f52603ad51 (diff)
downloadframeworks_av-stable/cm-11.0-XNF9X.tar.gz
frameworks_av-stable/cm-11.0-XNF9X.tar.bz2
frameworks_av-stable/cm-11.0-XNF9X.zip
-rw-r--r--camera/CameraParameters.cpp2
-rw-r--r--include/camera/CameraParameters.h2
-rw-r--r--include/media/MediaProfiles.h7
-rw-r--r--media/libstagefright/AwesomePlayer.cpp7
4 files changed, 10 insertions, 8 deletions
diff --git a/camera/CameraParameters.cpp b/camera/CameraParameters.cpp
index 371729a6b8..31be59deb2 100644
--- a/camera/CameraParameters.cpp
+++ b/camera/CameraParameters.cpp
@@ -21,7 +21,7 @@
#include <string.h>
#include <stdlib.h>
#include <camera/CameraParameters.h>
-#include <camera/CameraParametersExtra.h>
+#include "camera/CameraParametersExtra.h"
namespace android {
// Parameter keys to communicate between camera application and driver.
diff --git a/include/camera/CameraParameters.h b/include/camera/CameraParameters.h
index 39ccef352c..a5d9c65480 100644
--- a/include/camera/CameraParameters.h
+++ b/include/camera/CameraParameters.h
@@ -19,7 +19,7 @@
#include <utils/KeyedVector.h>
#include <utils/String8.h>
-#include <camera/CameraParametersExtra.h>
+#include "camera/CameraParametersExtra.h"
namespace android {
diff --git a/include/media/MediaProfiles.h b/include/media/MediaProfiles.h
index f84eed0d8b..1fa1d7dcfd 100644
--- a/include/media/MediaProfiles.h
+++ b/include/media/MediaProfiles.h
@@ -32,21 +32,16 @@ enum camcorder_quality {
CAMCORDER_QUALITY_480P = 4,
CAMCORDER_QUALITY_720P = 5,
CAMCORDER_QUALITY_1080P = 6,
-#ifdef QCOM_HARDWARE
CAMCORDER_QUALITY_QVGA = 7,
CAMCORDER_QUALITY_FWVGA = 8,
CAMCORDER_QUALITY_WVGA = 9,
CAMCORDER_QUALITY_VGA = 10,
CAMCORDER_QUALITY_WQVGA = 11,
+#ifdef QCOM_HARDWARE
CAMCORDER_QUALITY_4kUHD = 12,
CAMCORDER_QUALITY_4kDCI = 13,
CAMCORDER_QUALITY_LIST_END = 13,
#else
- CAMCORDER_QUALITY_QVGA = 11,
- CAMCORDER_QUALITY_FWVGA = 7,
- CAMCORDER_QUALITY_WVGA = 8,
- CAMCORDER_QUALITY_VGA = 9,
- CAMCORDER_QUALITY_WQVGA = 10,
CAMCORDER_QUALITY_LIST_END = 11,
#endif
diff --git a/media/libstagefright/AwesomePlayer.cpp b/media/libstagefright/AwesomePlayer.cpp
index 4b494bdeb6..1fc5e59aae 100644
--- a/media/libstagefright/AwesomePlayer.cpp
+++ b/media/libstagefright/AwesomePlayer.cpp
@@ -1348,6 +1348,13 @@ status_t AwesomePlayer::startAudioPlayer_l(bool sendErrorNotification) {
} else {
notifyIfMediaStarted_l();
}
+
+ // Kick off the text driver in audio in case we are playing an audio only file
+ if ((mFlags & TEXTPLAYER_INITIALIZED)
+ && !(mFlags & (TEXT_RUNNING | SEEK_PREVIEW))) {
+ mTextDriver->start();
+ modifyFlags(TEXT_RUNNING, SET);
+ }
} else {
err = mAudioPlayer->resume();
}