frameworks/av: Fix errors from upstream CAF merge
Change-Id: I1d1a515f75366ae8c1989aeea1eed0ef036ce96d
diff --git a/media/libstagefright/ExtendedCodec.cpp b/media/libstagefright/ExtendedCodec.cpp
index ab2d839..8cde8bd 100644
--- a/media/libstagefright/ExtendedCodec.cpp
+++ b/media/libstagefright/ExtendedCodec.cpp
@@ -304,7 +304,6 @@
//setAC3Format(numChannels, sampleRate, OMXhandle, nodeID);
CHECK(msg->findInt32("channel-count", &numChannels));
CHECK(msg->findInt32("sample-rate", &sampleRate));
- setAC3Format(numChannels, sampleRate, OMXhandle, nodeID);
} else if (!strcasecmp(MEDIA_MIMETYPE_AUDIO_EVRC, mime)) {
int32_t numChannels, sampleRate;
CHECK(msg->findInt32("channel-count", &numChannels));
diff --git a/media/libstagefright/ExtendedUtils.cpp b/media/libstagefright/ExtendedUtils.cpp
index 1da6c9d..1799784 100644
--- a/media/libstagefright/ExtendedUtils.cpp
+++ b/media/libstagefright/ExtendedUtils.cpp
@@ -614,13 +614,13 @@
return defaultExt;
}
-void QCUtils::helper_addMediaCodec(Vector<MediaCodecList::CodecInfo> &mCodecInfos,
+void ExtendedUtils::helper_addMediaCodec(Vector<MediaCodecList::CodecInfo> &mCodecInfos,
KeyedVector<AString, size_t> &mTypes,
bool encoder, const char *name,
const char *type, uint32_t quirks) {
}
-uint32_t QCUtils::helper_getCodecSpecificQuirks(KeyedVector<AString, size_t> &mCodecQuirks,
+uint32_t ExtendedUtils::helper_getCodecSpecificQuirks(KeyedVector<AString, size_t> &mCodecQuirks,
Vector<AString> quirks) {
return 0;
}
diff --git a/media/libstagefright/MPEG4Extractor.cpp b/media/libstagefright/MPEG4Extractor.cpp
index f810e53..b887588 100644
--- a/media/libstagefright/MPEG4Extractor.cpp
+++ b/media/libstagefright/MPEG4Extractor.cpp
@@ -3252,9 +3252,6 @@
return ERROR_IO;
}
-#ifdef ENABLE_AV_ENHANCEMENTS
-// ExtendedUtils::helper_mpeg4extractor_checkAC3EAC3(mBuffer, mFormat, size);
-#endif
CHECK(mBuffer != NULL);
mBuffer->set_range(0, size);
mBuffer->meta_data()->clear();