Merge "CCodec: fix MAX_PTS_GAP behavior"
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/codec2/hidl/1.0/utils/Android.bp b/media/codec2/hidl/1.0/utils/Android.bp
index f5aa65b..0bb2418 100644
--- a/media/codec2/hidl/1.0/utils/Android.bp
+++ b/media/codec2/hidl/1.0/utils/Android.bp
@@ -27,6 +27,7 @@
shared_libs: [
"android.hardware.graphics.bufferqueue@1.0",
+ "android.hardware.graphics.bufferqueue@2.0",
"android.hardware.graphics.common@1.0",
"android.hardware.media@1.0",
"android.hardware.media.bufferpool@2.0",
@@ -36,6 +37,7 @@
"libcodec2",
"libcodec2_vndk",
"libcutils",
+ "libgui",
"libhidlbase",
"libhidltransport",
"libhwbinder",
diff --git a/media/codec2/hidl/1.0/utils/Component.cpp b/media/codec2/hidl/1.0/utils/Component.cpp
index f3bf6f7..5897dce 100644
--- a/media/codec2/hidl/1.0/utils/Component.cpp
+++ b/media/codec2/hidl/1.0/utils/Component.cpp
@@ -272,7 +272,7 @@
Return<Status> Component::setOutputSurface(
uint64_t blockPoolId,
- const sp<HGraphicBufferProducer>& surface) {
+ const sp<HGraphicBufferProducer2>& surface) {
std::shared_ptr<C2BlockPool> pool;
GetCodec2BlockPool(blockPoolId, mComponent, &pool);
if (pool && pool->getAllocatorId() == C2PlatformAllocatorStore::BUFFERQUEUE) {
@@ -312,7 +312,7 @@
}
Return<void> Component::connectToOmxInputSurface(
- const sp<HGraphicBufferProducer>& producer,
+ const sp<HGraphicBufferProducer1>& producer,
const sp<::android::hardware::media::omx::V1_0::
IGraphicBufferSource>& source,
connectToOmxInputSurface_cb _hidl_cb) {
diff --git a/media/codec2/hidl/1.0/utils/ComponentStore.cpp b/media/codec2/hidl/1.0/utils/ComponentStore.cpp
index bb5faa5..53bb6d2 100644
--- a/media/codec2/hidl/1.0/utils/ComponentStore.cpp
+++ b/media/codec2/hidl/1.0/utils/ComponentStore.cpp
@@ -23,7 +23,7 @@
#include <codec2/hidl/1.0/types.h>
#include <android-base/file.h>
-#include <media/stagefright/bqhelper/WGraphicBufferProducer.h>
+#include <gui/bufferqueue/2.0/B2HGraphicBufferProducer.h>
#include <media/stagefright/bqhelper/GraphicBufferSource.h>
#include <utils/Errors.h>
@@ -219,13 +219,11 @@
_hidl_cb(Status::CORRUPTED, nullptr);
return Void();
}
- typedef ::android::hardware::graphics::bufferqueue::V1_0::
- IGraphicBufferProducer HGbp;
- typedef ::android::TWGraphicBufferProducer<HGbp> B2HGbp;
sp<InputSurface> inputSurface = new InputSurface(
this,
std::make_shared<C2ReflectorHelper>(),
- new B2HGbp(source->getIGraphicBufferProducer()),
+ new ::android::hardware::graphics::bufferqueue::V2_0::utils::
+ B2HGraphicBufferProducer(source->getIGraphicBufferProducer()),
source);
_hidl_cb(inputSurface ? Status::OK : Status::NO_MEMORY,
inputSurface);
diff --git a/media/codec2/hidl/1.0/utils/InputSurface.cpp b/media/codec2/hidl/1.0/utils/InputSurface.cpp
index 85c44c3..2b4ca85 100644
--- a/media/codec2/hidl/1.0/utils/InputSurface.cpp
+++ b/media/codec2/hidl/1.0/utils/InputSurface.cpp
@@ -151,8 +151,6 @@
return Void();
}
-// Derived methods from IGraphicBufferProducer
-
// Constructor is exclusive to ComponentStore.
InputSurface::InputSurface(
const sp<ComponentStore>& store,
diff --git a/media/codec2/hidl/1.0/utils/include/codec2/hidl/1.0/Component.h b/media/codec2/hidl/1.0/utils/include/codec2/hidl/1.0/Component.h
index e444013..86dccd0 100644
--- a/media/codec2/hidl/1.0/utils/include/codec2/hidl/1.0/Component.h
+++ b/media/codec2/hidl/1.0/utils/include/codec2/hidl/1.0/Component.h
@@ -68,7 +68,9 @@
c2_status_t status() const;
typedef ::android::hardware::graphics::bufferqueue::V1_0::
- IGraphicBufferProducer HGraphicBufferProducer;
+ IGraphicBufferProducer HGraphicBufferProducer1;
+ typedef ::android::hardware::graphics::bufferqueue::V2_0::
+ IGraphicBufferProducer HGraphicBufferProducer2;
// Methods from IComponent follow.
virtual Return<Status> queue(const WorkBundle& workBundle) override;
@@ -76,12 +78,12 @@
virtual Return<Status> drain(bool withEos) override;
virtual Return<Status> setOutputSurface(
uint64_t blockPoolId,
- const sp<HGraphicBufferProducer>& surface) override;
+ const sp<HGraphicBufferProducer2>& surface) override;
virtual Return<void> connectToInputSurface(
const sp<IInputSurface>& inputSurface,
connectToInputSurface_cb _hidl_cb) override;
virtual Return<void> connectToOmxInputSurface(
- const sp<HGraphicBufferProducer>& producer,
+ const sp<HGraphicBufferProducer1>& producer,
const sp<::android::hardware::media::omx::V1_0::
IGraphicBufferSource>& source,
connectToOmxInputSurface_cb _hidl_cb) override;
diff --git a/media/codec2/hidl/1.0/utils/include/codec2/hidl/1.0/InputSurface.h b/media/codec2/hidl/1.0/utils/include/codec2/hidl/1.0/InputSurface.h
index 2682c13..34ea959 100644
--- a/media/codec2/hidl/1.0/utils/include/codec2/hidl/1.0/InputSurface.h
+++ b/media/codec2/hidl/1.0/utils/include/codec2/hidl/1.0/InputSurface.h
@@ -19,7 +19,7 @@
#include <codec2/hidl/1.0/ComponentStore.h>
-#include <android/hardware/graphics/bufferqueue/1.0/IGraphicBufferProducer.h>
+#include <android/hardware/graphics/bufferqueue/2.0/IGraphicBufferProducer.h>
#include <android/hardware/media/c2/1.0/IInputSink.h>
#include <android/hardware/media/c2/1.0/IInputSurface.h>
#include <gui/IGraphicBufferProducer.h>
@@ -44,7 +44,7 @@
struct InputSurface : public IInputSurface {
- typedef ::android::hardware::graphics::bufferqueue::V1_0::
+ typedef ::android::hardware::graphics::bufferqueue::V2_0::
IGraphicBufferProducer HGraphicBufferProducer;
typedef ::android::
diff --git a/media/codec2/hidl/1.0/utils/types.cpp b/media/codec2/hidl/1.0/utils/types.cpp
index 343bcb5..031e637 100644
--- a/media/codec2/hidl/1.0/utils/types.cpp
+++ b/media/codec2/hidl/1.0/utils/types.cpp
@@ -18,9 +18,9 @@
#define LOG_TAG "Codec2-types"
#include <android-base/logging.h>
+#include <android/hardware/graphics/bufferqueue/2.0/IGraphicBufferProducer.h>
#include <codec2/hidl/1.0/types.h>
-
-#include <media/stagefright/bqhelper/WGraphicBufferProducer.h>
+#include <gui/bufferqueue/2.0/B2HGraphicBufferProducer.h>
#include <media/stagefright/foundation/AUtils.h>
#include <C2AllocatorIon.h>
@@ -46,7 +46,6 @@
namespace V1_0 {
namespace utils {
-using namespace ::android;
using ::android::hardware::Return;
using ::android::hardware::media::bufferpool::BufferPoolData;
using ::android::hardware::media::bufferpool::V2_0::BufferStatusMessage;
@@ -55,7 +54,10 @@
ClientManager;
using ::android::hardware::media::bufferpool::V2_0::implementation::
TransactionId;
-using ::android::TWGraphicBufferProducer;
+using HGraphicBufferProducer = ::android::hardware::graphics::bufferqueue::
+ V2_0::IGraphicBufferProducer;
+using B2HGraphicBufferProducer = ::android::hardware::graphics::bufferqueue::
+ V2_0::utils::B2HGraphicBufferProducer;
const char* asString(Status status, const char* def) {
return asString(static_cast<c2_status_t>(status), def);
@@ -1806,7 +1808,7 @@
sp<HGraphicBufferProducer> hgbp =
igbp->getHalInterface<HGraphicBufferProducer>();
return hgbp ? hgbp :
- new TWGraphicBufferProducer<HGraphicBufferProducer>(igbp);
+ new B2HGraphicBufferProducer(igbp);
}
} // unnamed namespace
diff --git a/media/codec2/hidl/client/client.cpp b/media/codec2/hidl/client/client.cpp
index 7a2e549..0fe8376 100644
--- a/media/codec2/hidl/client/client.cpp
+++ b/media/codec2/hidl/client/client.cpp
@@ -29,9 +29,9 @@
#include <android-base/properties.h>
#include <bufferpool/ClientManager.h>
#include <cutils/native_handle.h>
-#include <gui/bufferqueue/1.0/H2BGraphicBufferProducer.h>
+#include <gui/bufferqueue/2.0/B2HGraphicBufferProducer.h>
+#include <gui/bufferqueue/2.0/H2BGraphicBufferProducer.h>
#include <hidl/HidlSupport.h>
-#include <media/stagefright/bqhelper/WGraphicBufferProducer.h>
#include <android/hardware/media/bufferpool/2.0/IClientManager.h>
#include <android/hardware/media/c2/1.0/IComponent.h>
@@ -50,13 +50,21 @@
using ::android::hardware::hidl_string;
using ::android::hardware::Return;
using ::android::hardware::Void;
-using ::android::TWGraphicBufferProducer;
using namespace ::android::hardware::media::c2::V1_0;
using namespace ::android::hardware::media::c2::V1_0::utils;
using namespace ::android::hardware::media::bufferpool::V2_0;
using namespace ::android::hardware::media::bufferpool::V2_0::implementation;
+using HGraphicBufferProducer1 = ::android::hardware::graphics::bufferqueue::
+ V1_0::IGraphicBufferProducer;
+using HGraphicBufferProducer2 = ::android::hardware::graphics::bufferqueue::
+ V2_0::IGraphicBufferProducer;
+using B2HGraphicBufferProducer2 = ::android::hardware::graphics::bufferqueue::
+ V2_0::utils::B2HGraphicBufferProducer;
+using H2BGraphicBufferProducer2 = ::android::hardware::graphics::bufferqueue::
+ V2_0::utils::H2BGraphicBufferProducer;
+
namespace /* unnamed */ {
// c2_status_t value that corresponds to hwbinder transaction failure.
@@ -1064,11 +1072,11 @@
C2BlockPool::local_id_t blockPoolId,
const sp<IGraphicBufferProducer>& surface,
uint32_t generation) {
- sp<HGraphicBufferProducer> igbp =
- surface->getHalInterface<HGraphicBufferProducer>();
+ sp<HGraphicBufferProducer2> igbp =
+ surface->getHalInterface<HGraphicBufferProducer2>();
if (!igbp) {
- igbp = new TWGraphicBufferProducer<HGraphicBufferProducer>(surface);
+ igbp = new B2HGraphicBufferProducer2(surface);
}
Return<Status> transStatus = mBase->setOutputSurface(
@@ -1195,7 +1203,7 @@
}
c2_status_t Codec2Client::Component::connectToOmxInputSurface(
- const sp<HGraphicBufferProducer>& producer,
+ const sp<HGraphicBufferProducer1>& producer,
const sp<HGraphicBufferSource>& source,
std::shared_ptr<InputSurfaceConnection>* connection) {
c2_status_t status;
@@ -1284,12 +1292,11 @@
},
mBase{base},
mGraphicBufferProducer{new
- ::android::hardware::graphics::bufferqueue::V1_0::utils::
- H2BGraphicBufferProducer([base]() -> sp<HGraphicBufferProducer> {
- Return<sp<HGraphicBufferProducer>> transResult =
+ H2BGraphicBufferProducer2([base]() -> sp<HGraphicBufferProducer2> {
+ Return<sp<HGraphicBufferProducer2>> transResult =
base->getGraphicBufferProducer();
return transResult.isOk() ?
- static_cast<sp<HGraphicBufferProducer>>(transResult) :
+ static_cast<sp<HGraphicBufferProducer2>>(transResult) :
nullptr;
}())} {
}
diff --git a/media/codec2/hidl/client/include/codec2/hidl/client.h b/media/codec2/hidl/client/include/codec2/hidl/client.h
index 478ce6e..cd42205 100644
--- a/media/codec2/hidl/client/include/codec2/hidl/client.h
+++ b/media/codec2/hidl/client/include/codec2/hidl/client.h
@@ -63,55 +63,29 @@
* Codec2Client are all subclasses of Configurable.
*/
-// Forward declaration of Codec2.0 HIDL interfaces
-namespace android {
-namespace hardware {
-namespace media {
-namespace c2 {
-namespace V1_0 {
+// Forward declaration of relevant HIDL interfaces
+
+namespace android::hardware::media::c2::V1_0 {
struct IConfigurable;
struct IComponent;
struct IComponentInterface;
struct IComponentStore;
+struct IInputSink;
struct IInputSurface;
struct IInputSurfaceConnection;
-} // namespace V1_0
-} // namespace c2
-} // namespace media
-} // namespace hardware
-} // namespace android
+} // namespace android::hardware::media::c2::V1_0
-namespace android {
-namespace hardware {
-namespace media {
-namespace bufferpool {
-namespace V2_0 {
+namespace android::hardware::media::bufferpool::V2_0 {
struct IClientManager;
-} // namespace V2_0
-} // namespace bufferpool
-} // namespace media
-} // namespace hardware
-} // namespace android
+} // namespace android::hardware::media::bufferpool::V2_0
-// Forward declarations of other classes
-namespace android {
-namespace hardware {
-namespace graphics {
-namespace bufferqueue {
-namespace V1_0 {
+namespace android::hardware::graphics::bufferqueue::V1_0 {
struct IGraphicBufferProducer;
-} // namespace V1_0
-} // namespace bufferqueue
-} // namespace graphics
-namespace media {
-namespace omx {
-namespace V1_0 {
+} // android::hardware::graphics::bufferqueue::V1_0
+
+namespace android::hardware::media::omx::V1_0 {
struct IGraphicBufferSource;
-} // namespace V1_0
-} // namespace omx
-} // namespace media
-} // namespace hardware
-} // namespace android
+} // namespace android::hardware::media::omx::V1_0
namespace android {
@@ -324,7 +298,9 @@
QueueBufferOutput QueueBufferOutput;
typedef ::android::hardware::graphics::bufferqueue::V1_0::
- IGraphicBufferProducer HGraphicBufferProducer;
+ IGraphicBufferProducer HGraphicBufferProducer1;
+ typedef ::android::hardware::graphics::bufferqueue::V2_0::
+ IGraphicBufferProducer HGraphicBufferProducer2;
typedef ::android::hardware::media::omx::V1_0::
IGraphicBufferSource HGraphicBufferSource;
@@ -362,7 +338,7 @@
std::shared_ptr<InputSurfaceConnection>* connection);
c2_status_t connectToOmxInputSurface(
- const sp<HGraphicBufferProducer>& producer,
+ const sp<HGraphicBufferProducer1>& producer,
const sp<HGraphicBufferSource>& source,
std::shared_ptr<InputSurfaceConnection>* connection);
diff --git a/media/codec2/sfplugin/CCodecBufferChannel.cpp b/media/codec2/sfplugin/CCodecBufferChannel.cpp
index 7d0a021..a6fa333 100644
--- a/media/codec2/sfplugin/CCodecBufferChannel.cpp
+++ b/media/codec2/sfplugin/CCodecBufferChannel.cpp
@@ -2593,9 +2593,9 @@
return false;
}
- if (work->worklets.size() != 1u
+ if (mInputSurface == nullptr && (work->worklets.size() != 1u
|| !work->worklets.front()
- || !(work->worklets.front()->output.flags & C2FrameData::FLAG_INCOMPLETE)) {
+ || !(work->worklets.front()->output.flags & C2FrameData::FLAG_INCOMPLETE))) {
mPipelineWatcher.lock()->onWorkDone(work->input.ordinal.frameIndex.peeku());
}
diff --git a/media/codec2/vndk/Android.bp b/media/codec2/vndk/Android.bp
index ab6a105..c6ca670 100644
--- a/media/codec2/vndk/Android.bp
+++ b/media/codec2/vndk/Android.bp
@@ -38,6 +38,7 @@
export_shared_lib_headers: [
"libbase",
+ "libgui",
"android.hardware.media.bufferpool@2.0",
],
@@ -52,13 +53,14 @@
shared_libs: [
"android.hardware.graphics.allocator@2.0",
- "android.hardware.graphics.bufferqueue@1.0",
+ "android.hardware.graphics.bufferqueue@2.0",
"android.hardware.graphics.mapper@2.0",
"android.hardware.media.bufferpool@2.0",
"libbase",
"libbinder",
"libcutils",
"libdl",
+ "libgui",
"libhardware",
"libhidlbase",
"libion",
diff --git a/media/codec2/vndk/include/C2BqBufferPriv.h b/media/codec2/vndk/include/C2BqBufferPriv.h
index 9271a71..e1a8138 100644
--- a/media/codec2/vndk/include/C2BqBufferPriv.h
+++ b/media/codec2/vndk/include/C2BqBufferPriv.h
@@ -17,10 +17,11 @@
#ifndef STAGEFRIGHT_CODEC2_BQ_BUFFER_PRIV_H_
#define STAGEFRIGHT_CODEC2_BQ_BUFFER_PRIV_H_
-#include <functional>
+#include <android/hardware/graphics/bufferqueue/2.0/IGraphicBufferProducer.h>
#include <C2Buffer.h>
-#include <media/stagefright/bqhelper/WGraphicBufferProducer.h>
+
+#include <functional>
class C2BufferQueueBlockPool : public C2BlockPool {
public:
@@ -52,6 +53,8 @@
*/
virtual void setRenderCallback(const OnRenderCallback &renderCallback = OnRenderCallback());
+ typedef ::android::hardware::graphics::bufferqueue::V2_0::
+ IGraphicBufferProducer HGraphicBufferProducer;
/**
* Configures an IGBP in order to create blocks. A newly created block is
* dequeued from the configured IGBP. Unique Id of IGBP and the slot number of
@@ -62,7 +65,7 @@
*
* \param producer the IGBP, which will be used to fetch blocks
*/
- virtual void configureProducer(const android::sp<android::HGraphicBufferProducer> &producer);
+ virtual void configureProducer(const android::sp<HGraphicBufferProducer> &producer);
private:
const std::shared_ptr<C2Allocator> mAllocator;
diff --git a/media/codec2/vndk/internal/C2BlockInternal.h b/media/codec2/vndk/internal/C2BlockInternal.h
index 2abf3ac..84ce70a 100644
--- a/media/codec2/vndk/internal/C2BlockInternal.h
+++ b/media/codec2/vndk/internal/C2BlockInternal.h
@@ -17,7 +17,7 @@
#ifndef ANDROID_STAGEFRIGHT_C2BLOCK_INTERNAL_H_
#define ANDROID_STAGEFRIGHT_C2BLOCK_INTERNAL_H_
-#include <android/hardware/graphics/bufferqueue/1.0/IGraphicBufferProducer.h>
+#include <android/hardware/graphics/bufferqueue/2.0/IGraphicBufferProducer.h>
#include <C2Buffer.h>
@@ -291,7 +291,7 @@
bool AssignBlockToBufferQueue(
const std::shared_ptr<_C2BlockPoolData>& poolData,
const ::android::sp<::android::hardware::graphics::bufferqueue::
- V1_0::IGraphicBufferProducer>& igbp,
+ V2_0::IGraphicBufferProducer>& igbp,
uint32_t generation,
uint64_t bqId,
int32_t bqSlot,
@@ -314,7 +314,7 @@
bool HoldBlockFromBufferQueue(
const std::shared_ptr<_C2BlockPoolData>& poolData,
const ::android::sp<::android::hardware::graphics::bufferqueue::
- V1_0::IGraphicBufferProducer>& igbp = nullptr);
+ V2_0::IGraphicBufferProducer>& igbp = nullptr);
/**
* Yield a block to the designated bufferqueue. This causes the destruction
diff --git a/media/codec2/vndk/platform/C2BqBuffer.cpp b/media/codec2/vndk/platform/C2BqBuffer.cpp
index 41a5b3f..9cc5677 100644
--- a/media/codec2/vndk/platform/C2BqBuffer.cpp
+++ b/media/codec2/vndk/platform/C2BqBuffer.cpp
@@ -19,29 +19,37 @@
#include <utils/Log.h>
#include <gui/BufferQueueDefs.h>
-#include <list>
-#include <map>
-#include <mutex>
+#include <gui/bufferqueue/2.0/B2HGraphicBufferProducer.h>
+#include <hidl/HidlSupport.h>
#include <C2AllocatorGralloc.h>
#include <C2BqBufferPriv.h>
#include <C2BlockInternal.h>
-using ::android::AnwBuffer;
+#include <list>
+#include <map>
+#include <mutex>
+
using ::android::BufferQueueDefs::NUM_BUFFER_SLOTS;
using ::android::C2AllocatorGralloc;
using ::android::C2AndroidMemoryUsage;
using ::android::Fence;
using ::android::GraphicBuffer;
-using ::android::HGraphicBufferProducer;
using ::android::IGraphicBufferProducer;
-using ::android::hidl_handle;
using ::android::sp;
using ::android::status_t;
using ::android::wp;
-
+using ::android::hardware::hidl_handle;
using ::android::hardware::Return;
-using ::android::hardware::graphics::common::V1_0::PixelFormat;
+
+using HBuffer = ::android::hardware::graphics::common::V1_2::HardwareBuffer;
+using HStatus = ::android::hardware::graphics::bufferqueue::V2_0::Status;
+using ::android::hardware::graphics::bufferqueue::V2_0::utils::b2h;
+using ::android::hardware::graphics::bufferqueue::V2_0::utils::h2b;
+using ::android::hardware::graphics::bufferqueue::V2_0::utils::HFenceWrapper;
+
+using HGraphicBufferProducer = ::android::hardware::graphics::bufferqueue::V2_0
+ ::IGraphicBufferProducer;
struct C2BufferQueueBlockPoolData : public _C2BlockPoolData {
@@ -185,57 +193,67 @@
C2MemoryUsage usage,
std::shared_ptr<C2GraphicBlock> *block /* nonnull */) {
// We have an IGBP now.
- sp<Fence> fence = new Fence();
C2AndroidMemoryUsage androidUsage = usage;
- status_t status;
- PixelFormat pixelFormat = static_cast<PixelFormat>(format);
- int slot;
+ status_t status{};
+ int slot{};
+ bool bufferNeedsReallocation{};
+ sp<Fence> fence = new Fence();
ALOGV("tries to dequeue buffer");
- Return<void> transStatus = mProducer->dequeueBuffer(
- width, height, pixelFormat, androidUsage.asGrallocUsage(), false,
- [&status, &slot, &fence](
- int32_t tStatus, int32_t tSlot, hidl_handle const& tFence,
- HGraphicBufferProducer::FrameEventHistoryDelta const& tTs) {
- status = tStatus;
- slot = tSlot;
- if (!android::conversion::convertTo(fence.get(), tFence) &&
- status == android::NO_ERROR) {
- status = android::BAD_VALUE;
+
+ { // Call dequeueBuffer().
+ using Input = HGraphicBufferProducer::DequeueBufferInput;
+ using Output = HGraphicBufferProducer::DequeueBufferOutput;
+ Return<void> transResult = mProducer->dequeueBuffer(
+ Input{
+ width,
+ height,
+ format,
+ androidUsage.asGrallocUsage()},
+ [&status, &slot, &bufferNeedsReallocation,
+ &fence](HStatus hStatus,
+ int32_t hSlot,
+ Output const& hOutput) {
+ slot = static_cast<int>(hSlot);
+ if (!h2b(hStatus, &status) ||
+ !h2b(hOutput.fence, &fence)) {
+ status = ::android::BAD_VALUE;
+ } else {
+ bufferNeedsReallocation =
+ hOutput.bufferNeedsReallocation;
+ }
+ });
+ if (!transResult.isOk() || status != android::OK) {
+ ALOGD("cannot dequeue buffer %d", status);
+ if (transResult.isOk()) {
+ if (status == android::INVALID_OPERATION ||
+ status == android::TIMED_OUT ||
+ status == android::WOULD_BLOCK) {
+ // Dequeue buffer is blocked temporarily. Retrying is
+ // required.
+ return C2_BLOCKING;
}
- (void) tTs;
- });
- // dequeueBuffer returns flag.
- if (!transStatus.isOk() || status < android::OK) {
- ALOGD("cannot dequeue buffer %d", status);
- if (transStatus.isOk()) {
- if (status == android::INVALID_OPERATION ||
- status == android::TIMED_OUT ||
- status == android::WOULD_BLOCK) {
- // Dequeue buffer is blocked temporarily. Retrying is
- // required.
- return C2_BLOCKING;
}
+ return C2_BAD_VALUE;
}
+ }
+ HFenceWrapper hFenceWrapper{};
+ if (!b2h(fence, &hFenceWrapper)) {
+ ALOGE("Invalid fence received from dequeueBuffer.");
return C2_BAD_VALUE;
}
ALOGV("dequeued a buffer successfully");
- native_handle_t* nh = nullptr;
- hidl_handle fenceHandle;
- if (fence) {
- android::conversion::wrapAs(&fenceHandle, &nh, *fence);
- }
if (fence) {
static constexpr int kFenceWaitTimeMs = 10;
status_t status = fence->wait(kFenceWaitTimeMs);
if (status == -ETIME) {
// fence is not signalled yet.
- (void)mProducer->cancelBuffer(slot, fenceHandle).isOk();
+ (void)mProducer->cancelBuffer(slot, hFenceWrapper.getHandle()).isOk();
return C2_BLOCKING;
}
if (status != android::NO_ERROR) {
ALOGD("buffer fence wait error %d", status);
- (void)mProducer->cancelBuffer(slot, fenceHandle).isOk();
+ (void)mProducer->cancelBuffer(slot, hFenceWrapper.getHandle()).isOk();
return C2_BAD_VALUE;
} else if (mRenderCallback) {
nsecs_t signalTime = fence->getSignalTime();
@@ -248,27 +266,31 @@
}
sp<GraphicBuffer> &slotBuffer = mBuffers[slot];
- if (status & IGraphicBufferProducer::BUFFER_NEEDS_REALLOCATION || !slotBuffer) {
+ if (bufferNeedsReallocation || !slotBuffer) {
if (!slotBuffer) {
slotBuffer = new GraphicBuffer();
}
// N.B. This assumes requestBuffer# returns an existing allocation
// instead of a new allocation.
- Return<void> transStatus = mProducer->requestBuffer(
+ Return<void> transResult = mProducer->requestBuffer(
slot,
- [&status, &slotBuffer](int32_t tStatus, AnwBuffer const& tBuffer){
- status = tStatus;
- if (!android::conversion::convertTo(slotBuffer.get(), tBuffer) &&
- status == android::NO_ERROR) {
+ [&status, &slotBuffer](
+ HStatus hStatus,
+ HBuffer const& hBuffer,
+ uint32_t generationNumber){
+ if (h2b(hStatus, &status) &&
+ h2b(hBuffer, &slotBuffer) &&
+ slotBuffer) {
+ slotBuffer->setGenerationNumber(generationNumber);
+ } else {
status = android::BAD_VALUE;
}
});
-
- if (!transStatus.isOk()) {
+ if (!transResult.isOk()) {
return C2_BAD_VALUE;
} else if (status != android::NO_ERROR) {
slotBuffer.clear();
- (void)mProducer->cancelBuffer(slot, fenceHandle).isOk();
+ (void)mProducer->cancelBuffer(slot, hFenceWrapper.getHandle()).isOk();
return C2_BAD_VALUE;
}
}
@@ -292,13 +314,14 @@
std::shared_ptr<C2BufferQueueBlockPoolData> poolData =
std::make_shared<C2BufferQueueBlockPoolData>(
slotBuffer->getGenerationNumber(),
- mProducerId, slot, shared_from_this());
+ mProducerId, slot,
+ shared_from_this());
*block = _C2BlockFactory::CreateGraphicBlock(alloc, poolData);
return C2_OK;
}
// Block was not created. call requestBuffer# again next time.
slotBuffer.clear();
- (void)mProducer->cancelBuffer(slot, fenceHandle).isOk();
+ (void)mProducer->cancelBuffer(slot, hFenceWrapper.getHandle()).isOk();
}
return C2_BAD_VALUE;
}
@@ -312,10 +335,10 @@
bool noInit = false;
for (int i = 0; i < NUM_BUFFER_SLOTS; ++i) {
if (!noInit && mProducer) {
- Return<int32_t> transResult =
+ Return<HStatus> transResult =
mProducer->detachBuffer(static_cast<int32_t>(i));
noInit = !transResult.isOk() ||
- static_cast<int32_t>(transResult) == android::NO_INIT;
+ static_cast<HStatus>(transResult) == HStatus::NO_INIT;
}
mBuffers[i].clear();
}
@@ -373,32 +396,28 @@
}
void configureProducer(const sp<HGraphicBufferProducer> &producer) {
- int32_t status = android::OK;
uint64_t producerId = 0;
if (producer) {
- Return<void> transStatus = producer->getUniqueId(
- [&status, &producerId](int32_t tStatus, int64_t tProducerId) {
- status = tStatus;
- producerId = tProducerId;
- });
- if (!transStatus.isOk()) {
+ Return<uint64_t> transResult = producer->getUniqueId();
+ if (!transResult.isOk()) {
ALOGD("configureProducer -- failed to connect to the producer");
return;
}
+ producerId = static_cast<uint64_t>(transResult);
}
{
std::lock_guard<std::mutex> lock(mMutex);
bool noInit = false;
for (int i = 0; i < NUM_BUFFER_SLOTS; ++i) {
if (!noInit && mProducer) {
- Return<int32_t> transResult =
+ Return<HStatus> transResult =
mProducer->detachBuffer(static_cast<int32_t>(i));
noInit = !transResult.isOk() ||
- static_cast<int32_t>(transResult) == android::NO_INIT;
+ static_cast<HStatus>(transResult) == HStatus::NO_INIT;
}
mBuffers[i].clear();
}
- if (producer && status == android::OK) {
+ if (producer) {
mProducer = producer;
mProducerId = producerId;
} else {
@@ -414,7 +433,7 @@
void cancel(uint64_t igbp_id, int32_t igbp_slot) {
std::lock_guard<std::mutex> lock(mMutex);
if (igbp_id == mProducerId && mProducer) {
- (void)mProducer->cancelBuffer(igbp_slot, nullptr).isOk();
+ (void)mProducer->cancelBuffer(igbp_slot, hidl_handle{}).isOk();
}
}
@@ -455,7 +474,7 @@
if (local && localPool) {
localPool->cancel(bqId, bqSlot);
} else if (igbp) {
- igbp->cancelBuffer(bqSlot, nullptr);
+ igbp->cancelBuffer(bqSlot, hidl_handle{}).isOk();
}
}
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/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/libmedia/TypeConverter.cpp b/media/libmedia/TypeConverter.cpp
index 0301b21..469c5b6 100644
--- a/media/libmedia/TypeConverter.cpp
+++ b/media/libmedia/TypeConverter.cpp
@@ -217,6 +217,7 @@
MAKE_STRING_FROM_ENUM(AUDIO_FORMAT_APTX_ADAPTIVE),
MAKE_STRING_FROM_ENUM(AUDIO_FORMAT_LHDC),
MAKE_STRING_FROM_ENUM(AUDIO_FORMAT_LHDC_LL),
+ MAKE_STRING_FROM_ENUM(AUDIO_FORMAT_APTX_TWSP),
TERMINATOR
};
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/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/audiopolicy/managerdefault/AudioPolicyManager.cpp b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
index 5574e1c..e8e9fa6 100644
--- a/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
+++ b/services/audiopolicy/managerdefault/AudioPolicyManager.cpp
@@ -2389,14 +2389,9 @@
audio_devices_t device)
{
auto attributes = mEngine->getAttributesForStreamType(stream);
- auto volumeGroup = mEngine->getVolumeGroupForStreamType(stream);
- if (volumeGroup == VOLUME_GROUP_NONE) {
- ALOGE("%s: no group matching with stream %s", __FUNCTION__, toString(stream).c_str());
- return BAD_VALUE;
- }
ALOGV("%s: stream %s attributes=%s", __func__,
toString(stream).c_str(), toString(attributes).c_str());
- return setVolumeGroupIndex(getVolumeCurves(stream), volumeGroup, index, device, attributes);
+ return setVolumeIndexForAttributes(attributes, index, device);
}
status_t AudioPolicyManager::getStreamVolumeIndex(audio_stream_type_t stream,
@@ -2411,27 +2406,19 @@
return getVolumeIndex(getVolumeCurves(stream), *index, device);
}
-status_t AudioPolicyManager::setVolumeIndexForAttributes(const audio_attributes_t &attr,
+status_t AudioPolicyManager::setVolumeIndexForAttributes(const audio_attributes_t &attributes,
int index,
audio_devices_t device)
{
// Get Volume group matching the Audio Attributes
- auto volumeGroup = mEngine->getVolumeGroupForAttributes(attr);
- if (volumeGroup == VOLUME_GROUP_NONE) {
- ALOGD("%s: could not find group matching with %s", __FUNCTION__, toString(attr).c_str());
+ auto group = mEngine->getVolumeGroupForAttributes(attributes);
+ if (group == VOLUME_GROUP_NONE) {
+ ALOGD("%s: no group matching with %s", __FUNCTION__, toString(attributes).c_str());
return BAD_VALUE;
}
- ALOGV("%s: group %d matching with %s", __FUNCTION__, volumeGroup, toString(attr).c_str());
- return setVolumeGroupIndex(getVolumeCurves(attr), volumeGroup, index, device, attr);
-}
-
-status_t AudioPolicyManager::setVolumeGroupIndex(IVolumeCurves &curves, volume_group_t group,
- int index,
- audio_devices_t device,
- const audio_attributes_t attributes)
-{
- ALOGVV("%s: group=%d", __func__, group);
+ ALOGV("%s: group %d matching with %s", __FUNCTION__, group, toString(attributes).c_str());
status_t status = NO_ERROR;
+ IVolumeCurves &curves = getVolumeCurves(attributes);
VolumeSource vs = toVolumeSource(group);
product_strategy_t strategy = mEngine->getProductStrategyForAttributes(attributes);
@@ -2440,6 +2427,21 @@
ALOGE("%s failed to set curve index for group %d device 0x%X", __func__, group, device);
return status;
}
+
+ audio_devices_t curSrcDevice;
+ auto curCurvAttrs = curves.getAttributes();
+ if (!curCurvAttrs.empty() && curCurvAttrs.front() != defaultAttr) {
+ auto attr = curCurvAttrs.front();
+ curSrcDevice = mEngine->getOutputDevicesForAttributes(attr, nullptr, false).types();
+ } else if (!curves.getStreamTypes().empty()) {
+ auto stream = curves.getStreamTypes().front();
+ curSrcDevice = mEngine->getOutputDevicesForStream(stream, false).types();
+ } else {
+ ALOGE("%s: Invalid src %d: no valid attributes nor stream",__func__, vs);
+ return BAD_VALUE;
+ }
+ curSrcDevice = Volume::getDeviceForVolume(curSrcDevice);
+
// update volume on all outputs and streams matching the following:
// - The requested stream (or a stream matching for volume control) is active on the output
// - The device (or devices) selected by the engine for this stream includes
@@ -2450,7 +2452,7 @@
// no specific device volume value exists for currently selected device.
for (size_t i = 0; i < mOutputs.size(); i++) {
sp<SwAudioOutputDescriptor> desc = mOutputs.valueAt(i);
- audio_devices_t curDevice = Volume::getDeviceForVolume(desc->devices().types());
+ audio_devices_t curDevice = desc->devices().types();
// Inter / intra volume group priority management: Loop on strategies arranged by priority
// If a higher priority strategy is active, and the output is routed to a device with a
@@ -2501,48 +2503,28 @@
}
continue;
}
- for (auto curVolGroup : getVolumeGroups()) {
- VolumeSource curVolSrc = toVolumeSource(curVolGroup);
- if (curVolSrc != vs) {
- continue;
- }
- if (!(desc->isActive(vs) || isInCall())) {
- continue;
- }
- audio_devices_t curSrcDevice;
- auto &curCurves = getVolumeCurves(curVolSrc);
- auto curCurvAttrs = curCurves.getAttributes();
- if (!curCurvAttrs.empty() && curCurvAttrs.front() != defaultAttr) {
- auto attr = curCurvAttrs.front();
- curSrcDevice = mEngine->getOutputDevicesForAttributes(attr, nullptr, false).types();
- } else if (!curCurves.getStreamTypes().empty()) {
- auto stream = curCurves.getStreamTypes().front();
- curSrcDevice = mEngine->getOutputDevicesForStream(stream, false).types();
- } else {
- ALOGE("%s: Invalid src %d: no valid attributes nor stream",__func__, curVolSrc);
- continue;
- }
- curSrcDevice = Volume::getDeviceForVolume(curSrcDevice);
- if ((device != AUDIO_DEVICE_OUT_DEFAULT_FOR_VOLUME) && ((curDevice & device) == 0)) {
- continue;
- }
- if (device != AUDIO_DEVICE_OUT_DEFAULT_FOR_VOLUME) {
- curSrcDevice |= device;
- applyVolume = (curDevice & curSrcDevice) != 0;
- } else {
- applyVolume = !curves.hasVolumeIndexForDevice(curSrcDevice);
- }
- if (applyVolume) {
- //FIXME: workaround for truncated touch sounds
- // delayed volume change for system stream to be removed when the problem is
- // handled by system UI
- status_t volStatus = checkAndSetVolume(
- curCurves, curVolSrc, index, desc, curDevice,
- ((vs == toVolumeSource(AUDIO_STREAM_SYSTEM))?
- TOUCH_SOUND_FIXED_DELAY_MS : 0));
- if (volStatus != NO_ERROR) {
- status = volStatus;
- }
+ if (!(desc->isActive(vs) || isInCall())) {
+ continue;
+ }
+ if ((device != AUDIO_DEVICE_OUT_DEFAULT_FOR_VOLUME) && ((curDevice & device) == 0)) {
+ continue;
+ }
+ if (device != AUDIO_DEVICE_OUT_DEFAULT_FOR_VOLUME) {
+ curSrcDevice |= device;
+ applyVolume = (Volume::getDeviceForVolume(curDevice) & curSrcDevice) != 0;
+ } else {
+ applyVolume = !curves.hasVolumeIndexForDevice(curSrcDevice);
+ }
+ if (applyVolume) {
+ //FIXME: workaround for truncated touch sounds
+ // delayed volume change for system stream to be removed when the problem is
+ // handled by system UI
+ status_t volStatus = checkAndSetVolume(
+ curves, vs, index, desc, curDevice,
+ ((vs == toVolumeSource(AUDIO_STREAM_SYSTEM))?
+ TOUCH_SOUND_FIXED_DELAY_MS : 0));
+ if (volStatus != NO_ERROR) {
+ status = volStatus;
}
}
}
@@ -5730,14 +5712,14 @@
}
int AudioPolicyManager::rescaleVolumeIndex(int srcIndex,
- audio_stream_type_t srcStream,
- audio_stream_type_t dstStream)
+ VolumeSource fromVolumeSource,
+ VolumeSource toVolumeSource)
{
- if (srcStream == dstStream) {
+ if (fromVolumeSource == toVolumeSource) {
return srcIndex;
}
- auto &srcCurves = getVolumeCurves(srcStream);
- auto &dstCurves = getVolumeCurves(dstStream);
+ auto &srcCurves = getVolumeCurves(fromVolumeSource);
+ auto &dstCurves = getVolumeCurves(toVolumeSource);
float minSrc = (float)srcCurves.getVolumeIndexMin();
float maxSrc = (float)srcCurves.getVolumeIndexMax();
float minDst = (float)dstCurves.getVolumeIndexMin();
@@ -5851,12 +5833,8 @@
bool on,
const sp<AudioOutputDescriptor>& outputDesc,
int delayMs,
- audio_devices_t device,
- bool activeOnly)
+ audio_devices_t device)
{
- if (activeOnly && !outputDesc->isActive(volumeSource)) {
- return;
- }
if (device == AUDIO_DEVICE_NONE) {
device = outputDesc->devices().types();
}
diff --git a/services/audiopolicy/managerdefault/AudioPolicyManager.h b/services/audiopolicy/managerdefault/AudioPolicyManager.h
index 1fc61e5..1c98684 100644
--- a/services/audiopolicy/managerdefault/AudioPolicyManager.h
+++ b/services/audiopolicy/managerdefault/AudioPolicyManager.h
@@ -171,9 +171,6 @@
virtual status_t getMinVolumeIndexForAttributes(const audio_attributes_t &attr, int &index);
- status_t setVolumeGroupIndex(IVolumeCurves &volumeCurves, volume_group_t group, int index,
- audio_devices_t device, const audio_attributes_t attributes);
-
status_t setVolumeCurveIndex(int index,
audio_devices_t device,
IVolumeCurves &volumeCurves);
@@ -425,8 +422,8 @@
// rescale volume index from srcStream within range of dstStream
int rescaleVolumeIndex(int srcIndex,
- audio_stream_type_t srcStream,
- audio_stream_type_t dstStream);
+ VolumeSource fromVolumeSource,
+ VolumeSource toVolumeSource);
// check that volume change is permitted, compute and send new volume to audio hardware
virtual status_t checkAndSetVolume(IVolumeCurves &curves,
VolumeSource volumeSource, int index,
@@ -461,14 +458,12 @@
* @param outputDesc on which the client following the volume group shall be muted/umuted
* @param delayMs
* @param device
- * @param activeOnly if true, mute only if the volume group is active on the output.
*/
void setVolumeSourceMute(VolumeSource volumeSource,
bool on,
const sp<AudioOutputDescriptor>& outputDesc,
int delayMs = 0,
- audio_devices_t device = AUDIO_DEVICE_NONE,
- bool activeOnly = false);
+ audio_devices_t device = AUDIO_DEVICE_NONE);
audio_mode_t getPhoneState();
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/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