Merge "Default W, H allowed in SurfaceMediaSource dequeue"

    // TODO: Currently just uses mDefaultWidth/Height. In the future

    // we might declare mHeight and mWidth and check against those here.

    if ((w != 0) || (h != 0)) {

        if ((w != mDefaultWidth) || (h != mDefaultHeight)) {

            LOGE("dequeuebuffer: invalid buffer size! Req: %dx%d, Found: %dx%d",

                    mDefaultWidth, mDefaultHeight, w, h);

            return BAD_VALUE;

        }

    }

    status_t returnFlags(OK);

    int found, foundSync;