Merge "Code refactoring: remove include/private/media/ directory." (ffae0e40) · Commits · e / os / android_frameworks_av

media/ndk/NdkImagePriv.h

+12 −0

Original line number	Diff line number	Diff line
		@@ -30,6 +30,18 @@

		using namespace android;

		// Formats not listed in the public API, but still available to AImageReader
		enum AIMAGE_PRIVATE_FORMATS {
		/**
		* Unprocessed implementation-dependent raw
		* depth measurements, opaque with 16 bit
		* samples.
		*
		*/

		AIMAGE_FORMAT_RAW_DEPTH = 0x1002,
		};

		// TODO: this only supports ImageReader
		struct AImage {
		AImage(AImageReader* reader, int32_t format, uint64_t usage, BufferItem* buffer,

+0 −1

Original line number	Diff line number	Diff line
		@@ -21,7 +21,6 @@

		#include "NdkImagePriv.h"
		#include "NdkImageReaderPriv.h"
		#include <private/media/NdkImage.h>

		#include <cutils/atomic.h>
		#include <utils/Log.h>

deleted100644 → 0

+0 −30

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2019 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		#ifndef _PRIVATE_MEDIA_NDKIMAGE_H_
		#define _PRIVATE_MEDIA_NDKIMAGE_H_
		// Formats not listed in the public API, but still available to AImageReader
		enum AIMAGE_PRIVATE_FORMATS {
		/**
		* Unprocessed implementation-dependent raw
		* depth measurements, opaque with 16 bit
		* samples.
		*
		*/

		AIMAGE_FORMAT_RAW_DEPTH = 0x1002,
		};
		#endif // _PRIVATE_MEDIA_NDKIMAGE

+1 −1

Original line number	Diff line number	Diff line
		@@ -17,10 +17,10 @@
		#include <gtest/gtest.h>
		#include <media/NdkImageReader.h>
		#include <media/NdkImage.h>
		#include <private/media/NdkImage.h>
		#include <mediautils/AImageReaderUtils.h>
		#include <gui/IGraphicBufferProducer.h>
		#include <gui/bufferqueue/1.0/H2BGraphicBufferProducer.h>
		#include <NdkImagePriv.h>
		#include <NdkImageReaderPriv.h>
		#include <vndk/hardware_buffer.h>
		#include <memory>