summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/Utils.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'media/libstagefright/Utils.cpp')
-rw-r--r--media/libstagefright/Utils.cpp51
1 files changed, 51 insertions, 0 deletions
diff --git a/media/libstagefright/Utils.cpp b/media/libstagefright/Utils.cpp
index 74e9222..7bd2032 100644
--- a/media/libstagefright/Utils.cpp
+++ b/media/libstagefright/Utils.cpp
@@ -28,6 +28,17 @@
#include <media/stagefright/MetaData.h>
#include <media/stagefright/Utils.h>
+#ifdef QCOM_ENHANCED_AUDIO
+#include <QCMediaDefs.h>
+#include <QCMetaData.h>
+#include <QOMX_AudioExtensions.h>
+#include <OMX_QCOMExtns.h>
+#include "include/avc_utils.h"
+
+#include "include/QCUtilityClass.h"
+#endif
+
+
namespace android {
uint16_t U16_AT(const uint8_t *ptr) {
@@ -111,6 +122,46 @@ status_t convertMetaDataToMessage(
if (meta->findInt32(kKeyIsADTS, &isADTS)) {
msg->setInt32("is-adts", true);
}
+#ifdef QCOM_ENHANCED_AUDIO
+ int32_t keyWMAVersion;
+ if (meta->findInt32(kKeyWMAVersion, &keyWMAVersion)) {
+ msg->setInt32("WMA-Version", keyWMAVersion);
+ }
+ int32_t bitRate;
+ int32_t encodeOptions;
+ int32_t blockAlign;
+ int32_t bitspersample;
+ int32_t formattag;
+ int32_t advencopt1;
+ int32_t advencopt2;
+ int32_t VirtualPktSize;
+
+ if (meta->findInt32(kKeyWMABitspersample, &bitspersample)) {
+ msg->setInt32("bsps", bitspersample);
+ }
+ if (meta->findInt32(kKeyWMAFormatTag, &formattag)) {
+ msg->setInt32("fmtt", formattag);
+ }
+ if (meta->findInt32(kKeyWMAAdvEncOpt1, &advencopt1)) {
+ msg->setInt32("ade1", advencopt1);
+ }
+
+ if (meta->findInt32(kKeyWMAAdvEncOpt2, &advencopt2)) {
+ msg->setInt32("ade2", advencopt2);
+ }
+ if (meta->findInt32(kKeyWMAVirPktSize, &VirtualPktSize)) {
+ msg->setInt32("vpks", VirtualPktSize);
+ }
+ if (meta->findInt32(kKeyBitRate, &bitRate)) {
+ msg->setInt32("brte", bitRate);
+ }
+ if (meta->findInt32(kKeyWMAEncodeOpt, &encodeOptions)) {
+ msg->setInt32("eopt", encodeOptions);
+ }
+ if (meta->findInt32(kKeyWMABlockAlign, &blockAlign)) {
+ msg->setInt32("blka", blockAlign);
+ }
+#endif
}
int32_t maxInputSize;