Merge "Fixed order for NBLog::FormatEntry::begin()" (07def20c) · Commits · e / os / android_frameworks_av

media/libnbaio/NBLog.cpp

+4 −4

Original line number	Diff line number	Diff line
		@@ -72,6 +72,10 @@ NBLog::AbstractEntry::AbstractEntry(const uint8_t *entry) : mEntry(entry) {

		// ---------------------------------------------------------------------------

		NBLog::EntryIterator NBLog::FormatEntry::begin() const {
		return EntryIterator(mEntry);
		}

		const char *NBLog::FormatEntry::formatString() const {
		return (const char*) mEntry + offsetof(entry, data);
		}
		@@ -165,10 +169,6 @@ void NBLog::EntryIterator::copyData(uint8_t *dst) const {
		memcpy((void*) dst, ptr + offsetof(entry, data), ptr[offsetof(entry, length)]);
		}

		NBLog::EntryIterator NBLog::FormatEntry::begin() const {
		return EntryIterator(mEntry);
		}

		NBLog::EntryIterator::EntryIterator()
		: ptr(nullptr) {}

+2 −1

Original line number	Diff line number	Diff line
		@@ -167,6 +167,8 @@ public:
		explicit FormatEntry(const uint8_t *ptr) : AbstractEntry(ptr) {}
		virtual ~FormatEntry() {}

		EntryIterator begin() const;

		// Entry's format string
		const char* formatString() const;

		@@ -191,7 +193,6 @@ public:
		virtual EntryIterator copyWithAuthor(std::unique_ptr<audio_utils_fifo_writer> &dst,
		int author) const override;

		EntryIterator begin() const;
		};

		class HistogramEntry : public AbstractEntry {