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

Commit b64aaccf authored by The Android Open Source Project's avatar The Android Open Source Project
Browse files

Merge branch 'eclair' into eclair-release

parents 5817be45 6270d52c

core/res/res/layout/media_controller.xml

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ 
            style="?android:attr/progressBarStyleHorizontal"

            android:layout_width="0dip"

            android:layout_weight="1"

            android:layout_height="30px"

            android:layout_height="30dip"

            android:layout_alignParentLeft="true"

            android:layout_alignParentRight="true" />

include/media/stagefright/OMXCodec.h

+1 −0
Original line number Diff line number Diff line
@@ -90,6 +90,7 @@ private: 
        kRequiresFlushCompleteEmulation      = 16,

        kRequiresAllocateBufferOnOutputPorts = 32,

        kRequiresFlushBeforeShutdown         = 64,

        kOutputDimensionsAre16Aligned        = 128,

    };



    struct BufferInfo {

media/libstagefright/OMXCodec.cpp

+3 −1
Original line number Diff line number Diff line
@@ -210,6 +210,7 @@ sp<OMXCodec> OMXCodec::Create( 
    uint32_t quirks = 0;

    if (!strcmp(componentName, "OMX.PV.avcdec")) {

        quirks |= kWantsNALFragments;

        quirks |= kOutputDimensionsAre16Aligned;

    }

    if (!strcmp(componentName, "OMX.TI.MP3.decode")) {

        quirks |= kNeedsFlushBeforeDisable;
@@ -231,6 +232,7 @@ sp<OMXCodec> OMXCodec::Create( 
        // XXX Required on P....on only.

        quirks |= kRequiresAllocateBufferOnInputPorts;

        quirks |= kRequiresAllocateBufferOnOutputPorts;

        quirks |= kOutputDimensionsAre16Aligned;

    }



    if (!strncmp(componentName, "OMX.TI.", 7)) {
@@ -2386,7 +2388,7 @@ void OMXCodec::initOutputFormat(const sp<MetaData> &inputFormat) { 
                CHECK(!"Unknown compression format.");

            }



            if (!strcmp(mComponentName, "OMX.PV.avcdec")) {

            if (mQuirks & kOutputDimensionsAre16Aligned) {

                // This component appears to be lying to me.

                mOutputFormat->setInt32(

                        kKeyWidth, (video_def->nFrameWidth + 15) & -16);

media/libstagefright/omx/QComHardwareRenderer.cpp

+5 −0
Original line number Diff line number Diff line
@@ -83,6 +83,11 @@ void QComHardwareRenderer::render( 
    }



    mISurface->postBuffer(offset);



    // Since we cannot tell how long it'll take until surface flinger

    // has displayed the data onscreen, we'll just have to guess...

    // We must not return the buffer to the decoder before it's been displayed.

    usleep(25000);

}



bool QComHardwareRenderer::getOffset(void *platformPrivate, size_t *offset) {

services/java/com/android/server/InputDevice.java

+6 −0
Original line number Diff line number Diff line
@@ -65,6 +65,7 @@ public class InputDevice { 
        

        // This is the last generated pointer data, ordered to match

        // mPointerIds.

        boolean mSkipLastPointers;

        int mLastNumPointers = 0;

        final int[] mLastData = new int[MotionEvent.NUM_SAMPLE_DATA * MAX_POINTERS];
@@ -511,6 +512,11 @@ public class InputDevice { 
                long curTimeNano, Display display, int orientation,

                int metaState) {

            

            if (mSkipLastPointers) {

                mSkipLastPointers = false;

                mLastNumPointers = 0;

            }

            

            if (mNextNumPointers <= 0 && mLastNumPointers <= 0) {

                return null;

            }