Merge "audiopolicy: optimize set volume call sequence"
diff --git a/apex/ld.config.txt b/apex/ld.config.txt
index 7f9aad2..b342206 100644
--- a/apex/ld.config.txt
+++ b/apex/ld.config.txt
@@ -61,8 +61,7 @@
namespace.platform.search.paths = /system/${LIB}
namespace.platform.asan.search.paths = /data/asan/system/${LIB}
-# /system/lib/libc.so, etc are symlinks to
-/apex/com.android.lib/lib/bionic/libc.so, etc.
+# /system/lib/libc.so, etc are symlinks to /apex/com.android.lib/lib/bionic/libc.so, etc.
# Add /apex/... pat to the permitted paths because linker uses realpath(3)
# to check the accessibility of the lib. We could add this to search.paths
# instead but that makes the resolution of bionic libs be dependent on
diff --git a/camera/ndk/include/camera/NdkCameraMetadataTags.h b/camera/ndk/include/camera/NdkCameraMetadataTags.h
index c26ca69..acf6999 100644
--- a/camera/ndk/include/camera/NdkCameraMetadataTags.h
+++ b/camera/ndk/include/camera/NdkCameraMetadataTags.h
@@ -7762,7 +7762,9 @@
typedef enum acamera_metadata_enum_acamera_scaler_available_recommended_stream_configurations {
/**
* <p>Preview must only include non-stalling processed stream configurations with
- * output formats like YUV_420_888, IMPLEMENTATION_DEFINED, etc.</p>
+ * output formats like
+ * {@link AIMAGE_FORMAT_YUV_420_888 },
+ * {@link AIMAGE_FORMAT_PRIVATE }, etc.</p>
*/
ACAMERA_SCALER_AVAILABLE_RECOMMENDED_STREAM_CONFIGURATIONS_PREVIEW
= 0x0,
@@ -7777,19 +7779,20 @@
/**
* <p>Video snapshot must include stream configurations at least as big as
- * the maximum RECORD resolutions and only with format BLOB + DATASPACE_JFIF
- * format/dataspace combination (JPEG). Additionally the configurations shouldn't cause
- * preview glitches and also be able to run at 30 fps.</p>
+ * the maximum RECORD resolutions and only with
+ * {@link AIMAGE_FORMAT_JPEG JPEG output format}.
+ * Additionally the configurations shouldn't cause preview glitches and also be able to
+ * run at 30 fps.</p>
*/
ACAMERA_SCALER_AVAILABLE_RECOMMENDED_STREAM_CONFIGURATIONS_VIDEO_SNAPSHOT
= 0x2,
/**
* <p>Recommended snapshot stream configurations must include at least one with
- * size close to ACAMERA_SENSOR_INFO_ACTIVE_ARRAY_SIZE with BLOB + DATASPACE_JFIF
- * format/dataspace combination (JPEG). Taking into account restrictions on aspect
- * ratio, alignment etc. the area of the maximum suggested size shouldn’t be less than
- * 97% of the sensor array size area.</p>
+ * size close to ACAMERA_SENSOR_INFO_ACTIVE_ARRAY_SIZE and
+ * {@link AIMAGE_FORMAT_JPEG JPEG output format}.
+ * Taking into account restrictions on aspect ratio, alignment etc. the area of the
+ * maximum suggested size shouldn’t be less than 97% of the sensor array size area.</p>
*
* @see ACAMERA_SENSOR_INFO_ACTIVE_ARRAY_SIZE
*/
@@ -7808,9 +7811,20 @@
*/
ACAMERA_SCALER_AVAILABLE_RECOMMENDED_STREAM_CONFIGURATIONS_RAW = 0x5,
- ACAMERA_SCALER_AVAILABLE_RECOMMENDED_STREAM_CONFIGURATIONS_PUBLIC_END
+ /**
+ * <p>If supported, the recommended low latency stream configurations must have
+ * end-to-end latency that does not exceed 200 ms. under standard operating conditions
+ * (reasonable light levels, not loaded system) and using template
+ * TEMPLATE_STILL_CAPTURE. This is primarily for listing configurations for the
+ * {@link AIMAGE_FORMAT_JPEG JPEG output format}
+ * however other supported output formats can be added as well.</p>
+ */
+ ACAMERA_SCALER_AVAILABLE_RECOMMENDED_STREAM_CONFIGURATIONS_LOW_LATENCY_SNAPSHOT
= 0x6,
+ ACAMERA_SCALER_AVAILABLE_RECOMMENDED_STREAM_CONFIGURATIONS_PUBLIC_END
+ = 0x7,
+
/**
* <p>Vendor defined use cases. These depend on the vendor implementation.</p>
*/
diff --git a/media/extractors/mkv/MatroskaExtractor.cpp b/media/extractors/mkv/MatroskaExtractor.cpp
index f8aa784..20cc643 100644
--- a/media/extractors/mkv/MatroskaExtractor.cpp
+++ b/media/extractors/mkv/MatroskaExtractor.cpp
@@ -32,6 +32,7 @@
#include <media/stagefright/MediaDefs.h>
#include <media/stagefright/MediaErrors.h>
#include <media/stagefright/MetaDataUtils.h>
+#include <media/stagefright/foundation/avc_utils.h>
#include <utils/String8.h>
#include <arpa/inet.h>
@@ -147,6 +148,7 @@
AVC,
AAC,
HEVC,
+ MP3,
OTHER
};
@@ -159,6 +161,15 @@
List<MediaBufferHelper *> mPendingFrames;
+ int64_t mCurrentTS; // add for mp3
+ uint32_t mMP3Header;
+
+ media_status_t findMP3Header(uint32_t * header,
+ const uint8_t *dataSource, int length, int *outStartPos);
+ media_status_t mp3FrameRead(
+ MediaBufferHelper **out, const ReadOptions *options,
+ int64_t targetSampleTimeUs);
+
status_t advance();
status_t setWebmBlockCryptoInfo(MediaBufferHelper *mbuf);
@@ -225,7 +236,9 @@
mBlockIter(mExtractor,
mExtractor->mTracks.itemAt(index).mTrackNum,
index),
- mNALSizeLen(-1) {
+ mNALSizeLen(-1),
+ mCurrentTS(0),
+ mMP3Header(0) {
MatroskaExtractor::TrackInfo &trackInfo = mExtractor->mTracks.editItemAt(index);
AMediaFormat *meta = trackInfo.mMeta;
@@ -254,6 +267,8 @@
}
} else if (!strcasecmp(mime, MEDIA_MIMETYPE_AUDIO_AAC)) {
mType = AAC;
+ } else if (!strcasecmp(mime, MEDIA_MIMETYPE_AUDIO_MPEG)) {
+ mType = MP3;
}
}
@@ -270,6 +285,16 @@
mBufferGroup->init(1 /* number of buffers */, 1024 /* buffer size */, 64 /* growth limit */);
mBlockIter.reset();
+ if (mType == MP3 && mMP3Header == 0) {
+ int start = -1;
+ media_status_t err = findMP3Header(&mMP3Header, NULL, 0, &start);
+ if (err != OK) {
+ ALOGE("No mp3 header found");
+ clearPendingFrames();
+ return err;
+ }
+ }
+
return AMEDIA_OK;
}
@@ -796,6 +821,188 @@
return AMEDIA_OK;
}
+//the value of kMP3HeaderMask is from MP3Extractor
+static const uint32_t kMP3HeaderMask = 0xfffe0c00;
+
+media_status_t MatroskaSource::findMP3Header(uint32_t * header,
+ const uint8_t *dataSource, int length, int *outStartPos) {
+ if (NULL == header) {
+ ALOGE("header is null!");
+ return AMEDIA_ERROR_END_OF_STREAM;
+ }
+
+ //to find header start position
+ if (0 != *header) {
+ if (NULL == dataSource) {
+ *outStartPos = -1;
+ return AMEDIA_OK;
+ }
+ uint32_t tmpCode = 0;
+ for (int i = 0; i < length; i++) {
+ tmpCode = (tmpCode << 8) + dataSource[i];
+ if ((tmpCode & kMP3HeaderMask) == (*header & kMP3HeaderMask)) {
+ *outStartPos = i - 3;
+ return AMEDIA_OK;
+ }
+ }
+ *outStartPos = -1;
+ return AMEDIA_OK;
+ }
+
+ //to find mp3 header
+ uint32_t code = 0;
+ while (0 == *header) {
+ while (mPendingFrames.empty()) {
+ media_status_t err = readBlock();
+ if (err != OK) {
+ clearPendingFrames();
+ return err;
+ }
+ }
+ MediaBufferHelper *frame = *mPendingFrames.begin();
+ size_t size = frame->range_length();
+ size_t offset = frame->range_offset();
+ size_t i;
+ size_t frame_size;
+ for (i = 0; i < size; i++) {
+ ALOGV("data[%zu]=%x", i, *((uint8_t*)frame->data() + offset + i));
+ code = (code << 8) + *((uint8_t*)frame->data() + offset + i);
+ if (GetMPEGAudioFrameSize(code, &frame_size, NULL, NULL, NULL)) {
+ *header = code;
+ mBlockIter.reset();
+ clearPendingFrames();
+ return AMEDIA_OK;
+ }
+ }
+ }
+
+ return AMEDIA_ERROR_END_OF_STREAM;
+}
+
+media_status_t MatroskaSource::mp3FrameRead(
+ MediaBufferHelper **out, const ReadOptions *options,
+ int64_t targetSampleTimeUs) {
+ MediaBufferHelper *frame = *mPendingFrames.begin();
+ int64_t seekTimeUs;
+ ReadOptions::SeekMode mode;
+ if (options && options->getSeekTo(&seekTimeUs, &mode)) {
+ CHECK(AMediaFormat_getInt64(frame->meta_data(),
+ AMEDIAFORMAT_KEY_TIME_US, &mCurrentTS));
+ if (mCurrentTS < 0) {
+ mCurrentTS = 0;
+ AMediaFormat_setInt64(frame->meta_data(),
+ AMEDIAFORMAT_KEY_TIME_US, mCurrentTS);
+ }
+ }
+
+ int32_t start = -1;
+ while (start < 0) {
+ //find header start position
+ findMP3Header(&mMP3Header,
+ (const uint8_t*)frame->data() + frame->range_offset(),
+ frame->range_length(), &start);
+ ALOGV("start=%d, frame->range_length() = %zu, frame->range_offset() =%zu",
+ start, frame->range_length(), frame->range_offset());
+ if (start >= 0)
+ break;
+ frame->release();
+ mPendingFrames.erase(mPendingFrames.begin());
+ while (mPendingFrames.empty()) {
+ media_status_t err = readBlock();
+ if (err != OK) {
+ clearPendingFrames();
+ return err;
+ }
+ }
+ frame = *mPendingFrames.begin();
+ }
+
+ frame->set_range(frame->range_offset() + start, frame->range_length() - start);
+
+ uint32_t header = *(uint32_t*)((uint8_t*)frame->data() + frame->range_offset());
+ header = ((header >> 24) & 0xff) | ((header >> 8) & 0xff00) |
+ ((header << 8) & 0xff0000) | ((header << 24) & 0xff000000);
+ size_t frame_size;
+ int out_sampling_rate;
+ int out_channels;
+ int out_bitrate;
+ if (!GetMPEGAudioFrameSize(header, &frame_size,
+ &out_sampling_rate, &out_channels, &out_bitrate)) {
+ ALOGE("MP3 Header read fail!!");
+ return AMEDIA_ERROR_UNSUPPORTED;
+ }
+
+ MediaBufferHelper *buffer;
+ mBufferGroup->acquire_buffer(&buffer, false /* nonblocking */, frame_size /* requested size */);
+ buffer->set_range(0, frame_size);
+
+ uint8_t *data = static_cast<uint8_t *>(buffer->data());
+ ALOGV("MP3 frame %zu frame->range_length() %zu", frame_size, frame->range_length());
+
+ if (frame_size > frame->range_length()) {
+ memcpy(data, (uint8_t*)(frame->data()) + frame->range_offset(), frame->range_length());
+ size_t sumSize = 0;
+ sumSize += frame->range_length();
+ size_t needSize = frame_size - frame->range_length();
+ frame->release();
+ mPendingFrames.erase(mPendingFrames.begin());
+ while (mPendingFrames.empty()) {
+ media_status_t err = readBlock();
+ if (err != OK) {
+ clearPendingFrames();
+ return err;
+ }
+ }
+ frame = *mPendingFrames.begin();
+ size_t offset = frame->range_offset();
+ size_t size = frame->range_length();
+
+ // the next buffer frame is not enough to fullfill mp3 frame,
+ // we have to read until mp3 frame is completed.
+ while (size < needSize) {
+ memcpy(data + sumSize, (uint8_t*)(frame->data()) + offset, size);
+ needSize -= size;
+ sumSize += size;
+ frame->release();
+ mPendingFrames.erase(mPendingFrames.begin());
+ while (mPendingFrames.empty()) {
+ media_status_t err = readBlock();
+ if (err != OK) {
+ clearPendingFrames();
+ return err;
+ }
+ }
+ frame = *mPendingFrames.begin();
+ offset = frame->range_offset();
+ size = frame->range_length();
+ }
+ memcpy(data + sumSize, (uint8_t*)(frame->data()) + offset, needSize);
+ frame->set_range(offset + needSize, size - needSize);
+ } else {
+ size_t offset = frame->range_offset();
+ size_t size = frame->range_length();
+ memcpy(data, (uint8_t*)(frame->data()) + offset, frame_size);
+ frame->set_range(offset + frame_size, size - frame_size);
+ }
+ if (frame->range_length() < 4) {
+ frame->release();
+ frame = NULL;
+ mPendingFrames.erase(mPendingFrames.begin());
+ }
+ ALOGV("MatroskaSource::read MP3 frame kKeyTime=%lld,kKeyTargetTime=%lld",
+ (long long)mCurrentTS, (long long)targetSampleTimeUs);
+ AMediaFormat_setInt64(buffer->meta_data(),
+ AMEDIAFORMAT_KEY_TIME_US, mCurrentTS);
+ mCurrentTS += (int64_t)frame_size * 8000ll / out_bitrate;
+
+ if (targetSampleTimeUs >= 0ll)
+ AMediaFormat_setInt64(buffer->meta_data(),
+ AMEDIAFORMAT_KEY_TARGET_TIME, targetSampleTimeUs);
+ *out = buffer;
+ ALOGV("MatroskaSource::read MP3, keyTime=%lld for next frame", (long long)mCurrentTS);
+ return AMEDIA_OK;
+}
+
media_status_t MatroskaSource::read(
MediaBufferHelper **out, const ReadOptions *options) {
*out = NULL;
@@ -833,6 +1040,10 @@
}
}
+ if (mType == MP3) {
+ return mp3FrameRead(out, options, targetSampleTimeUs);
+ }
+
MediaBufferHelper *frame = *mPendingFrames.begin();
mPendingFrames.erase(mPendingFrames.begin());
diff --git a/media/extractors/mp4/MPEG4Extractor.cpp b/media/extractors/mp4/MPEG4Extractor.cpp
index 93f34a8..22819cb 100755
--- a/media/extractors/mp4/MPEG4Extractor.cpp
+++ b/media/extractors/mp4/MPEG4Extractor.cpp
@@ -6124,6 +6124,7 @@
FOURCC("mp41"),
FOURCC("mp42"),
FOURCC("dash"),
+ FOURCC("nvr1"),
// Won't promise that the following file types can be played.
// Just give these file types a chance.
diff --git a/media/libmedia/Android.bp b/media/libmedia/Android.bp
index 9799cad..a529628 100644
--- a/media/libmedia/Android.bp
+++ b/media/libmedia/Android.bp
@@ -1,3 +1,10 @@
+cc_defaults {
+ name: "libmedia_defaults",
+ include_dirs: [
+ "bionic/libc/private",
+ ],
+}
+
cc_library_headers {
name: "libmedia_headers",
vendor_available: true,
@@ -86,6 +93,7 @@
export_shared_lib_headers: [
"android.hidl.token@1.0-utils",
"android.hardware.media.omx@1.0",
+ "libgui",
"libstagefright_foundation",
"libui",
],
@@ -148,6 +156,8 @@
cc_library {
name: "libmedia",
+ defaults: [ "libmedia_defaults" ],
+
srcs: [
"IDataSource.cpp",
"BufferingSettings.cpp",
@@ -258,6 +268,8 @@
cc_library_static {
name: "libmedia_player2_util",
+ defaults: [ "libmedia_defaults" ],
+
srcs: [
"AudioParameter.cpp",
"BufferingSettings.cpp",
diff --git a/media/libmedia/MediaUtils.cpp b/media/libmedia/MediaUtils.cpp
index bcc7ebf..31972fa 100644
--- a/media/libmedia/MediaUtils.cpp
+++ b/media/libmedia/MediaUtils.cpp
@@ -22,23 +22,16 @@
#include <sys/resource.h>
#include <unistd.h>
+#include <bionic_malloc.h>
+
#include "MediaUtils.h"
-extern "C" size_t __cfi_shadow_size();
extern "C" void __scudo_set_rss_limit(size_t, int) __attribute__((weak));
namespace android {
-void limitProcessMemory(
- const char *property,
- size_t numberOfBytes,
- size_t percentageOfTotalMem) {
-
- if (running_with_asan()) {
- ALOGW("Running with (HW)ASan, skip enforcing memory limitations.");
- return;
- }
-
+void limitProcessMemory(const char *property, size_t numberOfBytes,
+ size_t percentageOfTotalMem) {
long pageSize = sysconf(_SC_PAGESIZE);
long numPages = sysconf(_SC_PHYS_PAGES);
size_t maxMem = SIZE_MAX;
@@ -66,38 +59,17 @@
maxMem = propVal;
}
- // If 64-bit Scudo is in use, enforce the hard RSS limit (in MB).
- if (maxMem != SIZE_MAX && sizeof(void *) == 8 &&
- &__scudo_set_rss_limit != 0) {
+ // If Scudo is in use, enforce the hard RSS limit (in MB).
+ if (maxMem != SIZE_MAX && &__scudo_set_rss_limit != 0) {
__scudo_set_rss_limit(maxMem >> 20, 1);
ALOGV("Scudo hard RSS limit set to %zu MB", maxMem >> 20);
return;
}
- // Increase by the size of the CFI shadow mapping. Most of the shadow is not
- // backed with physical pages, and it is possible for the result to be
- // higher than total physical memory. This is fine for RLIMIT_AS.
- size_t cfi_size = __cfi_shadow_size();
- if (cfi_size) {
- ALOGV("cfi shadow size: %zu", cfi_size);
- if (maxMem <= SIZE_MAX - cfi_size) {
- maxMem += cfi_size;
- } else {
- maxMem = SIZE_MAX;
- }
+ if (!android_mallopt(M_SET_ALLOCATION_LIMIT_BYTES, &maxMem,
+ sizeof(maxMem))) {
+ ALOGW("couldn't set allocation limit");
}
- ALOGV("actual limit: %zu", maxMem);
-
- struct rlimit limit;
- getrlimit(RLIMIT_AS, &limit);
- ALOGV("original limits: %lld/%lld", (long long)limit.rlim_cur, (long long)limit.rlim_max);
- limit.rlim_cur = maxMem;
- setrlimit(RLIMIT_AS, &limit);
- limit.rlim_cur = -1;
- limit.rlim_max = -1;
- getrlimit(RLIMIT_AS, &limit);
- ALOGV("new limits: %lld/%lld", (long long)limit.rlim_cur, (long long)limit.rlim_max);
-
}
} // namespace android
diff --git a/media/libmedia/MediaUtils.h b/media/libmedia/MediaUtils.h
index 26075c4..f80dd30 100644
--- a/media/libmedia/MediaUtils.h
+++ b/media/libmedia/MediaUtils.h
@@ -19,13 +19,6 @@
namespace android {
-extern "C" void __asan_init(void) __attribute__((weak));
-extern "C" void __hwasan_init(void) __attribute__((weak));
-
-static inline int running_with_asan() {
- return &__asan_init != 0 || &__hwasan_init != 0;
-}
-
/**
Limit the amount of memory a process can allocate using setrlimit(RLIMIT_AS).
The value to use will be read from the specified system property, or if the
diff --git a/media/libstagefright/Android.bp b/media/libstagefright/Android.bp
index d8b825d..dc51b16 100644
--- a/media/libstagefright/Android.bp
+++ b/media/libstagefright/Android.bp
@@ -225,6 +225,7 @@
],
export_shared_lib_headers: [
+ "libgui",
"libmedia",
"android.hidl.allocator@1.0",
],
diff --git a/media/libstagefright/Utils.cpp b/media/libstagefright/Utils.cpp
index 64bbf08..2aa9ed8 100644
--- a/media/libstagefright/Utils.cpp
+++ b/media/libstagefright/Utils.cpp
@@ -646,6 +646,14 @@
}
};
+static std::vector<std::pair<const char *, uint32_t>> CSDMappings {
+ {
+ { "csd-0", kKeyOpaqueCSD0 },
+ { "csd-1", kKeyOpaqueCSD1 },
+ { "csd-2", kKeyOpaqueCSD2 },
+ }
+};
+
void convertMessageToMetaDataFromMappings(const sp<AMessage> &msg, sp<MetaData> &meta) {
for (auto elem : stringMappings) {
AString value;
@@ -682,6 +690,14 @@
MetaDataBase::Type::TYPE_NONE, value->data(), value->size());
}
}
+
+ for (auto elem : CSDMappings) {
+ sp<ABuffer> value;
+ if (msg->findBuffer(elem.first, &value)) {
+ meta->setData(elem.second,
+ MetaDataBase::Type::TYPE_NONE, value->data(), value->size());
+ }
+ }
}
void convertMetaDataToMessageFromMappings(const MetaDataBase *meta, sp<AMessage> format) {
@@ -722,6 +738,18 @@
format->setBuffer(elem.first, buf);
}
}
+
+ for (auto elem : CSDMappings) {
+ uint32_t type;
+ const void* data;
+ size_t size;
+ if (meta->findData(elem.second, &type, &data, &size)) {
+ sp<ABuffer> buf = ABuffer::CreateAsCopy(data, size);
+ buf->meta()->setInt32("csd", true);
+ buf->meta()->setInt64("timeUs", 0);
+ format->setBuffer(elem.first, buf);
+ }
+ }
}
status_t convertMetaDataToMessage(
@@ -1249,30 +1277,6 @@
} else if (meta->findData(kKeyD263, &type, &data, &size)) {
const uint8_t *ptr = (const uint8_t *)data;
parseH263ProfileLevelFromD263(ptr, size, msg);
- } else if (meta->findData(kKeyVorbisInfo, &type, &data, &size)) {
- sp<ABuffer> buffer = new (std::nothrow) ABuffer(size);
- if (buffer.get() == NULL || buffer->base() == NULL) {
- return NO_MEMORY;
- }
- memcpy(buffer->data(), data, size);
-
- buffer->meta()->setInt32("csd", true);
- buffer->meta()->setInt64("timeUs", 0);
- msg->setBuffer("csd-0", buffer);
-
- if (!meta->findData(kKeyVorbisBooks, &type, &data, &size)) {
- return -EINVAL;
- }
-
- buffer = new (std::nothrow) ABuffer(size);
- if (buffer.get() == NULL || buffer->base() == NULL) {
- return NO_MEMORY;
- }
- memcpy(buffer->data(), data, size);
-
- buffer->meta()->setInt32("csd", true);
- buffer->meta()->setInt64("timeUs", 0);
- msg->setBuffer("csd-1", buffer);
} else if (meta->findData(kKeyOpusHeader, &type, &data, &size)) {
sp<ABuffer> buffer = new (std::nothrow) ABuffer(size);
if (buffer.get() == NULL || buffer->base() == NULL) {
@@ -1311,16 +1315,6 @@
buffer->meta()->setInt32("csd", true);
buffer->meta()->setInt64("timeUs", 0);
msg->setBuffer("csd-2", buffer);
- } else if (meta->findData(kKeyFlacMetadata, &type, &data, &size)) {
- sp<ABuffer> buffer = new (std::nothrow) ABuffer(size);
- if (buffer.get() == NULL || buffer->base() == NULL) {
- return NO_MEMORY;
- }
- memcpy(buffer->data(), data, size);
-
- buffer->meta()->setInt32("csd", true);
- buffer->meta()->setInt64("timeUs", 0);
- msg->setBuffer("csd-0", buffer);
} else if (meta->findData(kKeyVp9CodecPrivate, &type, &data, &size)) {
sp<ABuffer> buffer = new (std::nothrow) ABuffer(size);
if (buffer.get() == NULL || buffer->base() == NULL) {
@@ -1797,11 +1791,6 @@
if (seekPreRollBuf) {
meta->setData(kKeyOpusSeekPreRoll, 0, seekPreRollBuf, seekPreRollBufSize);
}
- } else if (mime == MEDIA_MIMETYPE_AUDIO_VORBIS) {
- meta->setData(kKeyVorbisInfo, 0, csd0->data(), csd0->size());
- if (msg->findBuffer("csd-1", &csd1)) {
- meta->setData(kKeyVorbisBooks, 0, csd1->data(), csd1->size());
- }
} else if (mime == MEDIA_MIMETYPE_AUDIO_ALAC) {
meta->setData(kKeyAlacMagicCookie, 0, csd0->data(), csd0->size());
}
diff --git a/media/libstagefright/include/media/stagefright/MetaDataBase.h b/media/libstagefright/include/media/stagefright/MetaDataBase.h
index a0407af..75fd0d9 100644
--- a/media/libstagefright/include/media/stagefright/MetaDataBase.h
+++ b/media/libstagefright/include/media/stagefright/MetaDataBase.h
@@ -67,7 +67,6 @@
kKeyOpusHeader = 'ohdr', // raw data
kKeyOpusCodecDelay = 'ocod', // uint64_t (codec delay in ns)
kKeyOpusSeekPreRoll = 'ospr', // uint64_t (seek preroll in ns)
- kKeyFlacMetadata = 'flMd', // raw data
kKeyVp9CodecPrivate = 'vp9p', // raw data (vp9 csd information)
kKeyIsSyncFrame = 'sync', // int32_t (bool)
kKeyIsCodecConfig = 'conf', // int32_t (bool)
@@ -234,6 +233,11 @@
// AC-4 AudioPresentationInfo
kKeyAudioPresentationInfo = 'audP', // raw data
+
+ // opaque codec specific data being passed from extractor to codec
+ kKeyOpaqueCSD0 = 'csd0',
+ kKeyOpaqueCSD1 = 'csd1',
+ kKeyOpaqueCSD2 = 'csd2',
};
enum {
diff --git a/media/mediaserver/Android.bp b/media/mediaserver/Android.bp
index 8377723..6a1cc71 100644
--- a/media/mediaserver/Android.bp
+++ b/media/mediaserver/Android.bp
@@ -25,7 +25,6 @@
],
static_libs: [
- "libicuandroid_utils",
"libregistermsext",
],
diff --git a/media/mediaserver/main_mediaserver.cpp b/media/mediaserver/main_mediaserver.cpp
index ecddc48..7b22b05 100644
--- a/media/mediaserver/main_mediaserver.cpp
+++ b/media/mediaserver/main_mediaserver.cpp
@@ -18,6 +18,7 @@
#define LOG_TAG "mediaserver"
//#define LOG_NDEBUG 0
+#include <aicu/AIcu.h>
#include <binder/IPCThreadState.h>
#include <binder/ProcessState.h>
#include <binder/IServiceManager.h>
@@ -25,7 +26,6 @@
#include "RegisterExtensions.h"
// from LOCAL_C_INCLUDES
-#include "IcuUtils.h"
#include "MediaPlayerService.h"
#include "ResourceManagerService.h"
@@ -38,7 +38,7 @@
sp<ProcessState> proc(ProcessState::self());
sp<IServiceManager> sm(defaultServiceManager());
ALOGI("ServiceManager: %p", sm.get());
- InitializeIcuOrDie();
+ AIcu_initializeIcuOrDie();
MediaPlayerService::instantiate();
ResourceManagerService::instantiate();
registerExtensions();
diff --git a/media/ndk/Android.bp b/media/ndk/Android.bp
index f9f1acc..f4cc704 100644
--- a/media/ndk/Android.bp
+++ b/media/ndk/Android.bp
@@ -101,6 +101,10 @@
export_include_dirs: ["include"],
+ export_shared_lib_headers: [
+ "libgui",
+ ],
+
product_variables: {
pdk: {
enabled: false,
diff --git a/media/ndk/tests/AImageReaderWindowHandleTest.cpp b/media/ndk/tests/AImageReaderWindowHandleTest.cpp
index 5f11252..5b65064 100644
--- a/media/ndk/tests/AImageReaderWindowHandleTest.cpp
+++ b/media/ndk/tests/AImageReaderWindowHandleTest.cpp
@@ -27,6 +27,8 @@
namespace android {
+using HGraphicBufferProducer = hardware::graphics::bufferqueue::V1_0::
+ IGraphicBufferProducer;
using hardware::graphics::bufferqueue::V1_0::utils::H2BGraphicBufferProducer;
using aimg::AImageReader_getHGBPFromHandle;
diff --git a/services/audioflinger/AudioFlinger.cpp b/services/audioflinger/AudioFlinger.cpp
index 735885c..b8f88cf 100644
--- a/services/audioflinger/AudioFlinger.cpp
+++ b/services/audioflinger/AudioFlinger.cpp
@@ -3216,24 +3216,44 @@
goto Exit;
}
- // check audio settings permission for global effects
- if (sessionId == AUDIO_SESSION_OUTPUT_MIX && !settingsAllowed()) {
- lStatus = PERMISSION_DENIED;
- goto Exit;
- }
-
- // Session AUDIO_SESSION_OUTPUT_STAGE is reserved for output stage effects
- // that can only be created by audio policy manager
- if (sessionId == AUDIO_SESSION_OUTPUT_STAGE && !isAudioServerUid(callingUid)) {
- lStatus = PERMISSION_DENIED;
- goto Exit;
- }
-
if (mEffectsFactoryHal == 0) {
+ ALOGE("%s: no effects factory hal", __func__);
lStatus = NO_INIT;
goto Exit;
}
+ // check audio settings permission for global effects
+ if (sessionId == AUDIO_SESSION_OUTPUT_MIX) {
+ if (!settingsAllowed()) {
+ ALOGE("%s: no permission for AUDIO_SESSION_OUTPUT_MIX", __func__);
+ lStatus = PERMISSION_DENIED;
+ goto Exit;
+ }
+ } else if (sessionId == AUDIO_SESSION_OUTPUT_STAGE) {
+ if (!isAudioServerUid(callingUid)) {
+ ALOGE("%s: only APM can create using AUDIO_SESSION_OUTPUT_STAGE", __func__);
+ lStatus = PERMISSION_DENIED;
+ goto Exit;
+ }
+
+ if (io == AUDIO_IO_HANDLE_NONE) {
+ ALOGE("%s: APM must specify output when using AUDIO_SESSION_OUTPUT_STAGE", __func__);
+ lStatus = BAD_VALUE;
+ goto Exit;
+ }
+ } else {
+ // general sessionId.
+
+ if (audio_unique_id_get_use(sessionId) != AUDIO_UNIQUE_ID_USE_SESSION) {
+ ALOGE("%s: invalid sessionId %d", __func__, sessionId);
+ lStatus = BAD_VALUE;
+ goto Exit;
+ }
+
+ // TODO: should we check if the callingUid (limited to pid) is in mAudioSessionRefs
+ // to prevent creating an effect when one doesn't actually have track with that session?
+ }
+
{
// Get the full effect descriptor from the uuid/type.
// If the session is the output mix, prefer an auxiliary effect,
@@ -3279,12 +3299,6 @@
// because of code checking output when entering the function.
// Note: io is never 0 when creating an effect on an input
if (io == AUDIO_IO_HANDLE_NONE) {
- if (sessionId == AUDIO_SESSION_OUTPUT_STAGE) {
- // output must be specified by AudioPolicyManager when using session
- // AUDIO_SESSION_OUTPUT_STAGE
- lStatus = BAD_VALUE;
- goto Exit;
- }
// look for the thread where the specified audio session is present
io = findIoHandleBySessionId_l(sessionId, mPlaybackThreads);
if (io == AUDIO_IO_HANDLE_NONE) {
diff --git a/services/camera/libcameraservice/api2/CameraDeviceClient.cpp b/services/camera/libcameraservice/api2/CameraDeviceClient.cpp
index b512f2b..c7a4f2b 100644
--- a/services/camera/libcameraservice/api2/CameraDeviceClient.cpp
+++ b/services/camera/libcameraservice/api2/CameraDeviceClient.cpp
@@ -604,6 +604,7 @@
stream->v3_2.usage = Camera3Device::mapToConsumerUsage(u);
stream->v3_2.dataSpace = Camera3Device::mapToHidlDataspace(streamInfo.dataSpace);
stream->v3_2.rotation = Camera3Device::mapToStreamRotation(rotation);
+ stream->v3_2.id = -1; // Invalid stream id
stream->physicalCameraId = std::string(physicalId.string());
stream->bufferSize = 0;
}
diff --git a/services/camera/libcameraservice/api2/HeicCompositeStream.cpp b/services/camera/libcameraservice/api2/HeicCompositeStream.cpp
index 9fd0e8b..743c816 100644
--- a/services/camera/libcameraservice/api2/HeicCompositeStream.cpp
+++ b/services/camera/libcameraservice/api2/HeicCompositeStream.cpp
@@ -1177,7 +1177,7 @@
outputFormat->setInt32(KEY_BITRATE_MODE, BITRATE_MODE_CQ);
outputFormat->setInt32(KEY_QUALITY, kDefaultJpegQuality);
// Ask codec to skip timestamp check and encode all frames.
- outputFormat->setInt64("max-pts-gap-to-encoder", kNoFrameDropMaxPtsGap);
+ outputFormat->setInt64(KEY_MAX_PTS_GAP_TO_ENCODER, kNoFrameDropMaxPtsGap);
int32_t gridWidth, gridHeight, gridRows, gridCols;
if (useGrid || mUseHeic) {
diff --git a/services/mediaextractor/Android.mk b/services/mediaextractor/Android.mk
index 661a475..fd34d5b 100644
--- a/services/mediaextractor/Android.mk
+++ b/services/mediaextractor/Android.mk
@@ -22,7 +22,6 @@
LOCAL_SRC_FILES := main_extractorservice.cpp
LOCAL_SHARED_LIBRARIES := libmedia libmediaextractorservice libbinder libutils \
liblog libandroidicu libavservices_minijail
-LOCAL_STATIC_LIBRARIES := libicuandroid_utils
LOCAL_MODULE:= mediaextractor
LOCAL_INIT_RC := mediaextractor.rc
LOCAL_C_INCLUDES := frameworks/av/media/libmedia
diff --git a/services/mediaextractor/main_extractorservice.cpp b/services/mediaextractor/main_extractorservice.cpp
index 3c15bfd..06b532d 100644
--- a/services/mediaextractor/main_extractorservice.cpp
+++ b/services/mediaextractor/main_extractorservice.cpp
@@ -15,6 +15,7 @@
** limitations under the License.
*/
+#include <aicu/AIcu.h>
#include <fcntl.h>
#include <sys/prctl.h>
#include <sys/wait.h>
@@ -29,7 +30,6 @@
#include <utils/misc.h>
// from LOCAL_C_INCLUDES
-#include "IcuUtils.h"
#include "MediaExtractorService.h"
#include "MediaUtils.h"
#include "minijail.h"
@@ -64,7 +64,7 @@
SetUpMinijail(kSystemSeccompPolicyPath, kVendorSeccompPolicyPath);
- InitializeIcuOrDie();
+ AIcu_initializeIcuOrDie();
strcpy(argv[0], "media.extractor");
sp<ProcessState> proc(ProcessState::self());
diff --git a/services/mediaextractor/seccomp_policy/mediaextractor-arm.policy b/services/mediaextractor/seccomp_policy/mediaextractor-arm.policy
index 87018ed..964acf4 100644
--- a/services/mediaextractor/seccomp_policy/mediaextractor-arm.policy
+++ b/services/mediaextractor/seccomp_policy/mediaextractor-arm.policy
@@ -14,6 +14,7 @@
setpriority: 1
sigaltstack: 1
openat: 1
+open: 1
clone: 1
read: 1
clock_gettime: 1
diff --git a/services/mediaextractor/seccomp_policy/mediaextractor-x86.policy b/services/mediaextractor/seccomp_policy/mediaextractor-x86.policy
index d739ba1..56ad8df 100644
--- a/services/mediaextractor/seccomp_policy/mediaextractor-x86.policy
+++ b/services/mediaextractor/seccomp_policy/mediaextractor-x86.policy
@@ -11,6 +11,7 @@
mmap2: 1
madvise: 1
openat: 1
+open: 1
clock_gettime: 1
writev: 1
brk: 1