Remove a hack for 1.0/1.1 bitmap compatibility. (5be4c2b6) · Commits · e / os / android_hardware_interfaces

broadcastradio/1.1/default/Tuner.cpp

+12 −6

Original line number	Original line	Diff line number	Diff line
	@@ -34,6 +34,7 @@ using namespace std::chrono_literals;
	using V1_0::Band;		using V1_0::Band;
	using V1_0::BandConfig;		using V1_0::BandConfig;
	using V1_0::Direction;		using V1_0::Direction;
			using utils::HalRevision;

	using std::chrono::milliseconds;		using std::chrono::milliseconds;
	using std::lock_guard;		using std::lock_guard;
	@@ -53,10 +54,7 @@ Tuner::Tuner(const sp<V1_0::ITunerCallback>& callback)
	: mCallback(callback),		: mCallback(callback),
	mCallback1_1(ITunerCallback::castFrom(callback).withDefault(nullptr)),		mCallback1_1(ITunerCallback::castFrom(callback).withDefault(nullptr)),
	mVirtualFm(make_fm_radio()),		mVirtualFm(make_fm_radio()),
	mIsAnalogForced(false) {		mIsAnalogForced(false) {}
	// TODO (b/36864090): inject this data in a more elegant way
	setCompatibilityLevel(mCallback1_1 == nullptr ? 1 : 2);
	}

	void Tuner::forceClose() {		void Tuner::forceClose() {
	lock_guard<mutex> lk(mMut);		lock_guard<mutex> lk(mMut);
	@@ -111,6 +109,14 @@ static ProgramInfo makeDummyProgramInfo(const ProgramSelector& selector) {
	return info11;		return info11;
	}		}

			HalRevision Tuner::getHalRev() const {
			if (mCallback1_1 != nullptr) {
			return HalRevision::V1_1;
			} else {
			return HalRevision::V1_0;
			}
			}

	bool Tuner::isFmLocked() {		bool Tuner::isFmLocked() {
	if (!utils::isAmFm(utils::getType(mCurrentProgram))) return false;		if (!utils::isAmFm(utils::getType(mCurrentProgram))) return false;
	return mAmfmConfig.type == Band::FM_HD \|\| mAmfmConfig.type == Band::FM;		return mAmfmConfig.type == Band::FM_HD \|\| mAmfmConfig.type == Band::FM;
	@@ -125,7 +131,7 @@ void Tuner::tuneInternalLocked(const ProgramSelector& sel) {
	VirtualProgram virtualProgram;		VirtualProgram virtualProgram;
	if (virtualRadio != nullptr && virtualRadio->getProgram(sel, virtualProgram)) {		if (virtualRadio != nullptr && virtualRadio->getProgram(sel, virtualProgram)) {
	mCurrentProgram = virtualProgram.selector;		mCurrentProgram = virtualProgram.selector;
	mCurrentProgramInfo = static_cast<ProgramInfo>(virtualProgram);		mCurrentProgramInfo = virtualProgram.getProgramInfo(getHalRev());
	} else {		} else {
	mCurrentProgram = sel;		mCurrentProgram = sel;
	mCurrentProgramInfo = makeDummyProgramInfo(sel);		mCurrentProgramInfo = makeDummyProgramInfo(sel);
	@@ -335,7 +341,7 @@ Return<void> Tuner::getProgramList(const hidl_string& filter, getProgramList_cb

	auto list = virtualRadio.getProgramList();		auto list = virtualRadio.getProgramList();
	ALOGD("returning a list of %zu programs", list.size());		ALOGD("returning a list of %zu programs", list.size());
	_hidl_cb(ProgramListResult::OK, hidl_vec<ProgramInfo>(list.begin(), list.end()));		_hidl_cb(ProgramListResult::OK, getProgramInfoVector(list, getHalRev()));
	return {};		return {};
	}		}

broadcastradio/1.1/default/Tuner.h

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -67,6 +67,7 @@ struct Tuner : public ITuner {
	ProgramInfo mCurrentProgramInfo = {};		ProgramInfo mCurrentProgramInfo = {};
	std::atomic<bool> mIsAnalogForced;		std::atomic<bool> mIsAnalogForced;

			utils::HalRevision getHalRev() const;
	void tuneInternalLocked(const ProgramSelector& sel);		void tuneInternalLocked(const ProgramSelector& sel);
	bool isFmLocked(); // TODO(b/36864090): make it generic, not FM only		bool isFmLocked(); // TODO(b/36864090): make it generic, not FM only
	};		};

broadcastradio/1.1/default/VirtualProgram.cpp

+17 −12

Original line number	Original line	Diff line number	Diff line
	@@ -25,20 +25,16 @@ namespace broadcastradio {
	namespace V1_1 {		namespace V1_1 {
	namespace implementation {		namespace implementation {

			using std::vector;

	using V1_0::MetaData;		using V1_0::MetaData;
	using V1_0::MetadataKey;		using V1_0::MetadataKey;
	using V1_0::MetadataType;		using V1_0::MetadataType;
			using utils::HalRevision;

	// TODO (b/36864090): inject this data in a more elegant way		static MetaData createDemoBitmap(MetadataKey key, HalRevision halRev) {
	static int gHalVersion = 2; // 1 = 1.0, 2 = 1.1

	void setCompatibilityLevel(int halversion) {
	gHalVersion = halversion;
	}

	static MetaData createDemoBitmap(MetadataKey key) {
	MetaData bmp = {MetadataType::INT, key, resources::demoPngId, {}, {}, {}};		MetaData bmp = {MetadataType::INT, key, resources::demoPngId, {}, {}, {}};
	if (gHalVersion < 2) {		if (halRev < HalRevision::V1_1) {
	bmp.type = MetadataType::RAW;		bmp.type = MetadataType::RAW;
	bmp.intValue = 0;		bmp.intValue = 0;
	bmp.rawValue = hidl_vec<uint8_t>(resources::demoPng, std::end(resources::demoPng));		bmp.rawValue = hidl_vec<uint8_t>(resources::demoPng, std::end(resources::demoPng));
	@@ -46,7 +42,7 @@ static MetaData createDemoBitmap(MetadataKey key) {
	return bmp;		return bmp;
	}		}

	VirtualProgram::operator ProgramInfo() const {		ProgramInfo VirtualProgram::getProgramInfo(HalRevision halRev) const {
	ProgramInfo info11 = {};		ProgramInfo info11 = {};
	auto& info10 = info11.base;		auto& info10 = info11.base;

	@@ -61,8 +57,8 @@ VirtualProgram::operator ProgramInfo() const {
	{MetadataType::TEXT, MetadataKey::RDS_PS, {}, {}, programName, {}},		{MetadataType::TEXT, MetadataKey::RDS_PS, {}, {}, programName, {}},
	{MetadataType::TEXT, MetadataKey::TITLE, {}, {}, songTitle, {}},		{MetadataType::TEXT, MetadataKey::TITLE, {}, {}, songTitle, {}},
	{MetadataType::TEXT, MetadataKey::ARTIST, {}, {}, songArtist, {}},		{MetadataType::TEXT, MetadataKey::ARTIST, {}, {}, songArtist, {}},
	createDemoBitmap(MetadataKey::ICON),		createDemoBitmap(MetadataKey::ICON, halRev),
	createDemoBitmap(MetadataKey::ART),		createDemoBitmap(MetadataKey::ART, halRev),
	});		});

	return info11;		return info11;
	@@ -89,6 +85,15 @@ bool operator<(const VirtualProgram& lhs, const VirtualProgram& rhs) {
	return false;		return false;
	}		}

			vector<ProgramInfo> getProgramInfoVector(const vector<VirtualProgram>& vec, HalRevision halRev) {
			vector<ProgramInfo> out;
			out.reserve(vec.size());
			for (auto&& program : vec) {
			out.push_back(program.getProgramInfo(halRev));
			}
			return out;
			}

	} // namespace implementation		} // namespace implementation
	} // namespace V1_1		} // namespace V1_1
	} // namespace broadcastradio		} // namespace broadcastradio

broadcastradio/1.1/default/VirtualProgram.h

+6 −5

Original line number	Original line	Diff line number	Diff line
	@@ -17,7 +17,7 @@
	#define ANDROID_HARDWARE_BROADCASTRADIO_V1_1_VIRTUALPROGRAM_H		#define ANDROID_HARDWARE_BROADCASTRADIO_V1_1_VIRTUALPROGRAM_H

	#include <android/hardware/broadcastradio/1.1/types.h>		#include <android/hardware/broadcastradio/1.1/types.h>
	#include <cstdint>		#include <broadcastradio-utils/Utils.h>

	namespace android {		namespace android {
	namespace hardware {		namespace hardware {
	@@ -25,9 +25,6 @@ namespace broadcastradio {
	namespace V1_1 {		namespace V1_1 {
	namespace implementation {		namespace implementation {

	// TODO (b/36864090): inject this data in a more elegant way
	void setCompatibilityLevel(int halversion);

	struct VirtualProgram {		struct VirtualProgram {
	ProgramSelector selector;		ProgramSelector selector;

	@@ -35,10 +32,14 @@ struct VirtualProgram {
	std::string songArtist = "";		std::string songArtist = "";
	std::string songTitle = "";		std::string songTitle = "";

	explicit operator ProgramInfo() const;		ProgramInfo getProgramInfo(utils::HalRevision halRev) const;

	friend bool operator<(const VirtualProgram& lhs, const VirtualProgram& rhs);		friend bool operator<(const VirtualProgram& lhs, const VirtualProgram& rhs);
	};		};

			std::vector<ProgramInfo> getProgramInfoVector(const std::vector<VirtualProgram>& vec,
			utils::HalRevision halRev);

	} // namespace implementation		} // namespace implementation
	} // namespace V1_1		} // namespace V1_1
	} // namespace broadcastradio		} // namespace broadcastradio

broadcastradio/1.1/utils/include/broadcastradio-utils/Utils.h

+6 −0

Original line number	Original line	Diff line number	Diff line
	@@ -27,6 +27,12 @@ namespace broadcastradio {
	namespace V1_1 {		namespace V1_1 {
	namespace utils {		namespace utils {

			// TODO(b/64115813): move it out from frameworks/base/services/core/jni/BroadcastRadio/types.h
			enum class HalRevision : uint32_t {
			V1_0 = 1,
			V1_1,
			};

	/**		/**
	* Checks, if {@code pointer} tunes to {@channel}.		* Checks, if {@code pointer} tunes to {@channel}.
	*		*