Merge "NdkMediaExtractor: remove `disconnect` from NDK headers" into pi-dev (036e93aa) · Commits · e / os / android_frameworks_av

media/libmedia/NdkWrapper.cpp

+12 −0

Original line number	Diff line number	Diff line
		@@ -31,6 +31,18 @@
		#include <media/stagefright/foundation/AMessage.h>
		#include <utils/Errors.h>

		// TODO: remove forward declaration when AMediaExtractor_disconnect is offcially added to NDK

		#ifdef __cplusplus
		extern "C" {
		#endif

		media_status_t AMediaExtractor_disconnect(AMediaExtractor *);

		#ifdef __cplusplus
		} // extern "C"
		#endif

		namespace android {

		static const size_t kAESBlockSize = 16; // AES_BLOCK_SIZE

+0 −6

Original line number	Diff line number	Diff line
		@@ -216,12 +216,6 @@ media_status_t AMediaExtractor_getSampleFormat(AMediaExtractor *ex, AMediaFormat

		#endif /* __ANDROID_API__ >= 28 */

		#if __ANDROID_API__ >= 29

		media_status_t AMediaExtractor_disconnect(AMediaExtractor *ex);

		#endif /* __ANDROID_API__ >= 29 */

		#endif /* __ANDROID_API__ >= 21 */

		__END_DECLS