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

Commit 256fcc6a authored by Haynes Mathew George's avatar Haynes Mathew George Committed by Ricardo Cerqueira
Browse files

libmedia: Update media profile cap for video codecs 



- Update H.263, MPEG4 and H.264 profile caps
- Changes made to max width, height, bitrate and fps

Patchset 1: Add QCOM_HARDWARE ifdefs.
Patchset 2: Fix non-qcom createDefaults.

Change-Id: I0d50221a9e38a45fcccb70b7455412abe9a7a48b
Signed-off-by: default avatarEvan McClain <aeroevan@gmail.com>
parent c69a465e

include/media/MediaProfiles.h

+3 −0
Original line number Diff line number Diff line
@@ -455,6 +455,9 @@ private: 


    static VideoEncoderCap* createDefaultH263VideoEncoderCap();

    static VideoEncoderCap* createDefaultM4vVideoEncoderCap();

#ifdef QCOM_HARDWARE

    static VideoEncoderCap* createDefaultH264VideoEncoderCap();

#endif

    static AudioEncoderCap* createDefaultAmrNBEncoderCap();



    static int findTagForName(const NameToTagMap *map, size_t nMappings, const char *name);

media/libmedia/Android.mk

+10 −0
Original line number Diff line number Diff line
@@ -4,6 +4,12 @@ include $(CLEAR_VARS) 


LOCAL_SRC_FILES:= \

    AudioParameter.cpp



ifeq ($(BOARD_USES_QCOM_HARDWARE),true)

    LOCAL_CFLAGS += -DQCOM_HARDWARE

endif





LOCAL_MODULE:= libmedia_helper

LOCAL_MODULE_TAGS := optional
@@ -46,6 +52,10 @@ LOCAL_SRC_FILES:= \ 
    MemoryLeakTrackUtil.cpp \

    fixedfft.cpp.arm



ifeq ($(BOARD_USES_QCOM_HARDWARE),true)

    LOCAL_CFLAGS += -DQCOM_HARDWARE

endif



ifeq ($(BOARD_USES_AUDIO_LEGACY),true)

    LOCAL_SRC_FILES+= \

        AudioParameter.cpp

media/libmedia/MediaProfiles.cpp

+19 −0
Original line number Diff line number Diff line
@@ -641,22 +641,41 @@ MediaProfiles::getInstance() 
MediaProfiles::createDefaultH263VideoEncoderCap()

{

    return new MediaProfiles::VideoEncoderCap(

#ifdef QCOM_HARDWARE

        VIDEO_ENCODER_H263, 192000, 6000000, 176, 800, 144, 480, 1, 30);

#else

        VIDEO_ENCODER_H263, 192000, 420000, 176, 352, 144, 288, 1, 20);

#endif

}



/*static*/ MediaProfiles::VideoEncoderCap*

MediaProfiles::createDefaultM4vVideoEncoderCap()

{

    return new MediaProfiles::VideoEncoderCap(

#ifdef QCOM_HARDWARE

        VIDEO_ENCODER_MPEG_4_SP, 192000, 20 * 1000 * 1000, 176, 1920, 144, 1088, 1, 30);

#else

        VIDEO_ENCODER_MPEG_4_SP, 192000, 420000, 176, 352, 144, 288, 1, 20);

#endif

}



#ifdef QCOM_HARDWARE

/*static*/ MediaProfiles::VideoEncoderCap*

MediaProfiles::createDefaultH264VideoEncoderCap()

{

    return new MediaProfiles::VideoEncoderCap(

        VIDEO_ENCODER_H264, 192000, 20 * 1000 * 1000, 176, 1920, 144, 1088, 1, 30);

}

#endif



/*static*/ void

MediaProfiles::createDefaultVideoEncoders(MediaProfiles *profiles)

{

    profiles->mVideoEncoders.add(createDefaultH263VideoEncoderCap());

    profiles->mVideoEncoders.add(createDefaultM4vVideoEncoderCap());

#ifdef QCOM_HARDWARE

    profiles->mVideoEncoders.add(createDefaultH264VideoEncoderCap());

#endif

}



/*static*/ MediaProfiles::CamcorderProfile*