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

Commit 36d936d7 authored by Steve Kondik's avatar Steve Kondik Committed by Gerrit Code Review
Browse files

Merge "stagefright: Only use stride/slice height for decode on MSM/QSD" into froyo

parents 768292c7 1f0716e6

media/libstagefright/Android.mk

+7 −0
Original line number Diff line number Diff line
@@ -103,6 +103,13 @@ endif 


endif



ifeq ($(TARGET_BOARD_PLATFORM),qsd8k)

        LOCAL_CFLAGS += -DUSE_QCOM_OMX_FIX

endif

ifeq ($(TARGET_BOARD_PLATFORM),msm7k)

        LOCAL_CFLAGS += -DUSE_QCOM_OMX_FIX

endif



ifeq ($(TARGET_OS)-$(TARGET_SIMULATOR),linux-true)

        LOCAL_LDLIBS += -lpthread

endif

media/libstagefright/OMXCodec.cpp

+6 −0
Original line number Diff line number Diff line
@@ -2999,10 +2999,16 @@ void OMXCodec::initOutputFormat(const sp<MetaData> &inputFormat) { 
                mOutputFormat->setInt32(

                        kKeyHeight, (video_def->nFrameHeight + 15) & -16);

            } else {

#ifdef USE_QCOM_OMX_FIX

                //Update the Stride and Slice Height

                //Allows creation of Renderer with correct height and width

                mOutputFormat->setInt32(kKeyWidth, video_def->nStride);

                mOutputFormat->setInt32(kKeyHeight, video_def->nSliceHeight);

#else

                //Some hardware expects the old behavior

                mOutputFormat->setInt32(kKeyWidth, video_def->nFrameWidth);

                mOutputFormat->setInt32(kKeyHeight, video_def->nFrameHeight);

#endif

            }



            mOutputFormat->setInt32(kKeyColorFormat, video_def->eColorFormat);