NdkMediaCodec: implement createPersistenInputSurface and setInputSurface
Expose createPersistentInputSurface() and setInputSurface via
NDK-mediaCodec to enable native encoder apps to record from a
persistent input surface.
Bug: 32746065
Change-Id: Ia152f43dacfe376a89c550ecbeaf6d4016ec07b5
diff --git a/include/ndk/NdkMediaCodec.h b/include/ndk/NdkMediaCodec.h
index 2ecbfcf..528cd62 100644
--- a/include/ndk/NdkMediaCodec.h
+++ b/include/ndk/NdkMediaCodec.h
@@ -190,7 +190,39 @@
*
* For more details, see the Java documentation for MediaCodec.createInputSurface.
*/
-media_status_t AMediaCodec_createInputSurface(AMediaCodec*, ANativeWindow** surface);
+media_status_t AMediaCodec_createInputSurface(
+ AMediaCodec *mData, ANativeWindow **surface);
+
+/**
+ * Creates a persistent Surface that can be used as the input to encoder
+ *
+ * Persistent surface can be reused by MediaCodec instances and can be set
+ * on a new instance via AMediaCodec_setInputSurface().
+ * A persistent surface can be connected to at most one instance of MediaCodec
+ * at any point in time.
+ *
+ * The application is responsible for releasing the surface by calling
+ * ANativeWindow_release() when done.
+ *
+ * For more details, see the Java documentation for MediaCodec.createPersistentInputSurface.
+ */
+media_status_t AMediaCodec_createPersistentInputSurface(
+ ANativeWindow **surface);
+
+/**
+ * Set a persistent-surface that can be used as the input to encoder, in place of input buffers
+ *
+ * The surface provided *must* be a persistent surface created via
+ * AMediaCodec_createPersistentInputSurface()
+ * This can only be called after the codec has been configured by calling
+ * AMediaCodec_configure(..); and before AMediaCodec_start() has been called.
+ *
+ * For more details, see the Java documentation for MediaCodec.setInputSurface.
+ */
+media_status_t AMediaCodec_setInputSurface(
+ AMediaCodec *mData, ANativeWindow *surface);
+
+
typedef enum {
AMEDIACODECRYPTOINFO_MODE_CLEAR = 0,
diff --git a/media/ndk/Android.mk b/media/ndk/Android.mk
index 01c9610..692ce27 100644
--- a/media/ndk/Android.mk
+++ b/media/ndk/Android.mk
@@ -39,6 +39,7 @@
frameworks/base/media/jni \
frameworks/av/include/ndk \
frameworks/native/include \
+ frameworks/native/include/media/openmax \
system/media/camera/include \
$(call include-path-for, libhardware)/hardware \
diff --git a/media/ndk/NdkMediaCodec.cpp b/media/ndk/NdkMediaCodec.cpp
index ecbdc2e..040e585 100644
--- a/media/ndk/NdkMediaCodec.cpp
+++ b/media/ndk/NdkMediaCodec.cpp
@@ -31,6 +31,7 @@
#include <media/stagefright/foundation/ALooper.h>
#include <media/stagefright/foundation/AMessage.h>
+#include <media/stagefright/PersistentSurface.h>
#include <media/stagefright/MediaCodec.h>
#include <media/stagefright/MediaErrors.h>
#include <media/MediaCodecBuffer.h>
@@ -55,6 +56,18 @@
kWhatStopActivityNotifications,
};
+struct AMediaCodecPersistentSurface : public Surface {
+ sp<PersistentSurface> mPersistentSurface;
+ AMediaCodecPersistentSurface(
+ const sp<IGraphicBufferProducer>& igbp,
+ const sp<PersistentSurface>& ps)
+ : Surface(igbp) {
+ mPersistentSurface = ps;
+ }
+ virtual ~AMediaCodecPersistentSurface() {
+ //mPersistentSurface ref will be let go off here
+ }
+};
class CodecHandler: public AHandler {
private:
@@ -396,6 +409,47 @@
return AMEDIA_OK;
}
+EXPORT
+media_status_t AMediaCodec_createPersistentInputSurface(ANativeWindow **surface) {
+ if (surface == NULL) {
+ return AMEDIA_ERROR_INVALID_PARAMETER;
+ }
+ *surface = NULL;
+
+ sp<PersistentSurface> ps = MediaCodec::CreatePersistentInputSurface();
+ if (ps == NULL) {
+ return AMEDIA_ERROR_UNKNOWN;
+ }
+
+ sp<IGraphicBufferProducer> igbp = ps->getBufferProducer();
+ if (igbp == NULL) {
+ return AMEDIA_ERROR_UNKNOWN;
+ }
+
+ *surface = new AMediaCodecPersistentSurface(igbp, ps);
+ ANativeWindow_acquire(*surface);
+
+ return AMEDIA_OK;
+}
+
+EXPORT
+media_status_t AMediaCodec_setInputSurface(
+ AMediaCodec *mData, ANativeWindow *surface) {
+
+ if (surface == NULL || mData == NULL) {
+ return AMEDIA_ERROR_INVALID_PARAMETER;
+ }
+
+ AMediaCodecPersistentSurface *aMediaPersistentSurface =
+ static_cast<AMediaCodecPersistentSurface *>(surface);
+ if (aMediaPersistentSurface->mPersistentSurface == NULL) {
+ return AMEDIA_ERROR_INVALID_PARAMETER;
+ }
+
+ return translate_error(mData->mCodec->setInputSurface(
+ aMediaPersistentSurface->mPersistentSurface));
+}
+
//EXPORT
media_status_t AMediaCodec_setNotificationCallback(AMediaCodec *mData, OnCodecEvent callback,
void *userdata) {