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

Commit 37a30e86 authored by Yin-Chia Yeh's avatar Yin-Chia Yeh Committed by android-build-merger
Browse files

Merge "Camera: use framework VideoNativeHandleMetadata header" into oc-dev

am: 1b1e248f

Change-Id: Ieffb2a2fbda180d033aa06188e7b3b2ad648e2e0
parents c53ae3c9 1b1e248f
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@
//#define LOG_NDEBUG 0

#include <inttypes.h>
#include <media/hardware/HardwareAPI.h> // For VideoNativeHandleMetadata
#include "CameraHardwareInterface.h"

namespace android {
+0 −10
Original line number Diff line number Diff line
@@ -317,16 +317,6 @@ private:
                             const camera_memory_t *data, unsigned index,
                             void *user);

    // TODO: b/35625849
    // Meta data buffer layout for passing a native_handle to codec
    // matching frameworks/native/include/media/hardware/MetadataBufferType.h and
    //          frameworks/native/include/media/hardware/HardwareAPI.h
    struct VideoNativeHandleMetadata {
        static const uint32_t kMetadataBufferTypeNativeHandleSource = 3;
        uint32_t eType; // must be kMetadataBufferTypeNativeHandleSource
        native_handle_t* pHandle;
    };

    // This is a utility class that combines a MemoryHeapBase and a MemoryBase
    // in one.  Since we tend to use them in a one-to-one relationship, this is
    // handy.