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

Commit e4ba346f authored by Andreas Huber's avatar Andreas Huber Committed by Android (Google) Code Review
Browse files

Merge "Squashed commit of the following:"

parents 90bf2625 4b3913a3

include/media/stagefright/OMXCodec.h

+1 −0
Original line number Diff line number Diff line
@@ -214,6 +214,7 @@ private: 


    void setAMRFormat(bool isWAMR, int32_t bitRate);

    void setAACFormat(int32_t numChannels, int32_t sampleRate, int32_t bitRate);

    void setG711Format(int32_t numChannels);



    status_t setVideoPortFormatType(

            OMX_U32 portIndex,

include/media/stagefright/openmax/OMX_Video.h

+1 −0
Original line number Diff line number Diff line
@@ -85,6 +85,7 @@ typedef enum OMX_VIDEO_CODINGTYPE { 
    OMX_VIDEO_CodingRV,         /**< all versions of Real Video */

    OMX_VIDEO_CodingAVC,        /**< H.264/AVC */

    OMX_VIDEO_CodingMJPEG,      /**< Motion JPEG */

    OMX_VIDEO_CodingVPX,        /**< Google VPX, formerly known as On2 VP8 */

    OMX_VIDEO_CodingKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ 

    OMX_VIDEO_CodingVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */

    OMX_VIDEO_CodingMax = 0x7FFFFFFF

media/libstagefright/ACodec.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1644,7 +1644,7 @@ void ACodec::UninitializedState::onSetup( 
    if (!strcasecmp(mime.c_str(), MEDIA_MIMETYPE_VIDEO_AVC)) {

        componentName = "OMX.Nvidia.h264.decode";

    } else if (!strcasecmp(mime.c_str(), MEDIA_MIMETYPE_AUDIO_AAC)) {

        componentName = "OMX.Nvidia.aac.decoder";

        componentName = "OMX.google.aac.decoder";

    } else if (!strcasecmp(mime.c_str(), MEDIA_MIMETYPE_AUDIO_MPEG)) {

        componentName = "OMX.Nvidia.mp3.decoder";

    } else {

media/libstagefright/Android.mk

+26 −10
Original line number Diff line number Diff line
@@ -3,6 +3,8 @@ include $(CLEAR_VARS) 


include frameworks/base/media/libstagefright/codecs/common/Config.mk



BUILD_WITH_SOFTWARE_DECODERS := true



LOCAL_SRC_FILES:=                         \

        ACodec.cpp                        \

        AACExtractor.cpp                  \
@@ -45,7 +47,6 @@ LOCAL_SRC_FILES:= \ 
        ShoutcastSource.cpp               \

        StagefrightMediaScanner.cpp       \

        StagefrightMetadataRetriever.cpp  \

        ThreadedSource.cpp                \

        ThrottledSource.cpp               \

        TimeSource.cpp                    \

        TimedEventQueue.cpp               \
@@ -82,28 +83,39 @@ LOCAL_SHARED_LIBRARIES := \ 


LOCAL_STATIC_LIBRARIES := \

        libstagefright_color_conversion \

        libstagefright_aacdec \

        libstagefright_aacenc \

        libstagefright_amrnbdec \

        libstagefright_amrnbenc \

        libstagefright_amrwbdec \

        libstagefright_amrwbenc \

        libstagefright_avcdec \

        libstagefright_avcenc \

        libstagefright_m4vh263dec \

        libstagefright_m4vh263enc \

        libstagefright_mp3dec \

        libstagefright_vorbisdec \

        libstagefright_matroska \

        libstagefright_vpxdec \

        libvpx \

        libstagefright_mpeg2ts \

        libstagefright_httplive \

        libstagefright_rtsp \

        libstagefright_id3 \

        libstagefright_g711dec \

        libFLAC \



ifeq ($(BUILD_WITH_SOFTWARE_DECODERS),true)



LOCAL_SRC_FILES += \

        ThreadedSource.cpp                \



LOCAL_STATIC_LIBRARIES += \

        libstagefright_aacdec \

        libstagefright_amrnbdec \

        libstagefright_amrwbdec \

        libstagefright_avcdec \

        libstagefright_g711dec \

        libstagefright_mp3dec \

        libstagefright_m4vh263dec \

        libstagefright_vorbisdec \

        libstagefright_vpxdec \

        libvpx \



endif





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



# The following was shamelessly copied from external/webkit/Android.mk and
@@ -180,6 +192,10 @@ endif 


LOCAL_CFLAGS += -Wno-multichar



ifeq ($(BUILD_WITH_SOFTWARE_DECODERS),true)

    LOCAL_CFLAGS += -DHAVE_SOFTWARE_DECODERS

endif



LOCAL_MODULE:= libstagefright



include $(BUILD_SHARED_LIBRARY)

media/libstagefright/AwesomePlayer.cpp

+3 −1
Original line number Diff line number Diff line
@@ -942,7 +942,9 @@ void AwesomePlayer::initRenderer_l() { 
    // before creating a new one.

    IPCThreadState::self()->flushCommands();



    if (USE_SURFACE_ALLOC && strncmp(component, "OMX.", 4) == 0) {

    if (USE_SURFACE_ALLOC

            && !strncmp(component, "OMX.", 4)

            && strncmp(component, "OMX.google.", 11)) {

        // Hardware decoders avoid the CPU color conversion by decoding

        // directly to ANativeBuffers, so we must use a renderer that

        // just pushes those buffers to the ANativeWindow.