Merge "BufferQueues: clean up BufferItemConsumer constructors" into main

    ASSERT_NE(nullptr, bufferItemConsumer);

    ASSERT_NE(nullptr, bufferHandler);

#if COM_ANDROID_GRAPHICS_LIBGUI_FLAGS(WB_CONSUMER_BASE_OWNS_BQ)

    *bufferItemConsumer = new BufferItemConsumer(

            GraphicBuffer::USAGE_HW_TEXTURE);  // Use GLConsumer default usage flags

#else

    sp<IGraphicBufferProducer> producer;

    sp<IGraphicBufferConsumer> consumer;

    BufferQueue::createBufferQueue(&producer, &consumer);

    *bufferItemConsumer = new BufferItemConsumer(consumer,

            GraphicBuffer::USAGE_HW_TEXTURE); //Use GLConsumer default usage flags

#endif  // COM_ANDROID_GRAPHICS_LIBGUI_FLAGS(WB_CONSUMER_BASE_OWNS_BQ)

    sp<Surface> surface;

    std::tie(*bufferItemConsumer, surface) =

            BufferItemConsumer::create(GraphicBuffer::USAGE_HW_TEXTURE);

    ASSERT_NE(nullptr, (*bufferItemConsumer).get());

    *bufferHandler = new BufferItemHander(*bufferItemConsumer);

    ASSERT_NE(nullptr, (*bufferHandler).get());

    (*bufferItemConsumer)->setFrameAvailableListener(*bufferHandler);

#if COM_ANDROID_GRAPHICS_LIBGUI_FLAGS(WB_CONSUMER_BASE_OWNS_BQ)

    sp<Surface> surface = (*bufferItemConsumer)->getSurface();

#else

    sp<Surface> surface = new Surface(producer);

#endif  // COM_ANDROID_GRAPHICS_LIBGUI_FLAGS(WB_CONSUMER_BASE_OWNS_BQ)

    sp<PreviewWindowCb> previewCb = new PreviewWindowCb(surface);

    auto rc = device->setPreviewWindow(previewCb);