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

Commit 1c334da0 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "build core bufferqueue functionalities into bqhelper" into qt-dev

parents ed603204 0e4c08eb

media/codec2/core/include/media/stagefright/codec2/1.0/InputSurface.h

+0 −1
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ 
#include <memory>



#include <C2Component.h>

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

#include <media/stagefright/codec2/1.0/InputSurfaceConnection.h>



namespace android {

media/codec2/core/include/media/stagefright/codec2/1.0/InputSurfaceConnection.h

+0 −1
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ 


#include <C2Component.h>

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

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

#include <media/stagefright/codec2/1.0/InputSurfaceConnection.h>



namespace android {

media/codec2/hidl/1.0/utils/ComponentStore.cpp

+0 −1
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ 
#include <codec2/hidl/1.0/types.h>



#include <android-base/file.h>

#include <gui/bufferqueue/2.0/B2HGraphicBufferProducer.h>

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

#include <utils/Errors.h>

media/codec2/hidl/1.0/utils/include/codec2/hidl/1.0/InputSurface.h

+0 −1
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ 
#include <android/hardware/graphics/bufferqueue/2.0/IGraphicBufferProducer.h>

#include <android/hardware/media/c2/1.0/IInputSink.h>

#include <android/hardware/media/c2/1.0/IInputSurface.h>

#include <gui/IGraphicBufferProducer.h>

#include <hidl/Status.h>

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

media/libmedia/include/media/omx/1.0/Conversion.h

+9 −4
Original line number Diff line number Diff line
@@ -14,8 +14,8 @@ 
 * limitations under the License.

 */



#ifndef ANDROID_HARDWARE_MEDIA_OMX_V1_0__CONVERSION_H

#define ANDROID_HARDWARE_MEDIA_OMX_V1_0__CONVERSION_H

#ifndef ANDROID_HARDWARE_MEDIA_OMX_V1_0_UTILS_CONVERSION_H

#define ANDROID_HARDWARE_MEDIA_OMX_V1_0_UTILS_CONVERSION_H



#include <vector>

#include <list>
@@ -258,7 +258,12 @@ inline status_t toStatusT(Status const& t) { 
 */

// convert: Status -> status_t

inline status_t toStatusT(Return<Status> const& t) {

    return t.isOk() ? toStatusT(static_cast<Status>(t)) : UNKNOWN_ERROR;

    if (t.isOk()) {

        return toStatusT(static_cast<Status>(t));

    } else if (t.isDeadObject()) {

        return DEAD_OBJECT;

    }

    return UNKNOWN_ERROR;

}



/**
@@ -938,4 +943,4 @@ inline OMX_TICKS toOMXTicks(uint64_t t) { 
}  // namespace hardware

}  // namespace android



#endif  // ANDROID_HARDWARE_MEDIA_OMX_V1_0__CONVERSION_H
 
#endif  // ANDROID_HARDWARE_MEDIA_OMX_V1_0_UTILS_CONVERSION_H