Merge "Use PublicFormat from libui"

#include <cutils/atomic.h>

#include <utils/Log.h>

#include <android_media_Utils.h>

#include <android_runtime/android_view_Surface.h>

#include <ui/PublicFormat.h>

#include <private/android/AHardwareBufferHelpers.h>

#include <grallocusage/GrallocUsageConversion.h>

#include <media/stagefright/bqhelper/WGraphicBufferProducer.h>

media_status_t

AImageReader::init() {

    PublicFormat publicFormat = static_cast<PublicFormat>(mFormat);

    mHalFormat = android_view_Surface_mapPublicFormatToHalFormat(publicFormat);

    mHalDataSpace = android_view_Surface_mapPublicFormatToHalDataspace(publicFormat);

    mHalFormat = mapPublicFormatToHalFormat(publicFormat);

    mHalDataSpace = mapPublicFormatToHalDataspace(publicFormat);

    mHalUsage = AHardwareBuffer_convertToGrallocUsageBits(mUsage);

    sp<IGraphicBufferProducer> gbProducer;