Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 11b72100 authored by Wonsik Kim's avatar Wonsik Kim
Browse files

MediaCodec refactoring part 2-b: introduce BufferChannel 

- MediaCodec stops tracking the whole buffer array from OMX.
- BufferChannel handles array management instead, if necessary.
- MediaCodec delegates secure buffer management to BufferChannel.
- Remove sf2.

Bug: 32133435
Test: adb shell am instrument -e size small -w 'android.media.cts/android.support.test.runner.AndroidJUnitRunner'
Test: Play an encrypted content in Play Movies
Test: Mirror the screen via Cast.
Change-Id: Idc9fdee42ea0cdd3b5f15ba5c51647c3e16504a1
parent c2d29c48

cmds/stagefright/Android.mk

+0 −23
Original line number Diff line number Diff line
@@ -124,29 +124,6 @@ include $(BUILD_EXECUTABLE) 


include $(CLEAR_VARS)



LOCAL_SRC_FILES:=         \

	sf2.cpp    \



LOCAL_SHARED_LIBRARIES := \

	libstagefright liblog libutils libbinder libstagefright_foundation \

	libmedia libgui libcutils



LOCAL_C_INCLUDES:= \

	frameworks/av/media/libstagefright \

	$(TOP)/frameworks/native/include/media/openmax



LOCAL_CFLAGS += -Wno-multichar -Werror -Wall



LOCAL_MODULE_TAGS := optional



LOCAL_MODULE:= sf2



include $(BUILD_EXECUTABLE)



################################################################################



include $(CLEAR_VARS)



LOCAL_SRC_FILES:=               \

	codec.cpp               \

	SimplePlayer.cpp        \

cmds/stagefright/sf2.cpp

deleted100644 → 0
+0 −788

File deleted.

Preview size limit exceeded, changes collapsed.

include/media/stagefright/ACodec.h

+4 −21

File changed.

Preview size limit exceeded, changes collapsed.

include/media/stagefright/CodecBase.h

+132 −55

File changed.

Preview size limit exceeded, changes collapsed.

include/media/stagefright/MediaCodec.h

+9 −8

File changed.

Preview size limit exceeded, changes collapsed.