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

Commit dd92d7e3 authored by Sanna Catherine de Treville Wager's avatar Sanna Catherine de Treville Wager
Browse files

Fixed order for NBLog::FormatEntry::begin() 

Test: dumpsys media.log
Change-Id: I9579e8d41a5fd97b4c9c3b697bd8c13ee3b8c295
parent f7e2da4c

media/libnbaio/NBLog.cpp

+4 −4
Original line number Original line 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 {

const char *NBLog::FormatEntry::formatString() const {

    return (const char*) mEntry + offsetof(entry, data);

    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)]);

    memcpy((void*) dst, ptr + offsetof(entry, data), ptr[offsetof(entry, length)]);

}

}





NBLog::EntryIterator NBLog::FormatEntry::begin() const {

    return EntryIterator(mEntry);

}



NBLog::EntryIterator::EntryIterator()

NBLog::EntryIterator::EntryIterator()

    : ptr(nullptr) {}

    : ptr(nullptr) {}

media/libnbaio/include/NBLog.h

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

    explicit FormatEntry(const uint8_t *ptr) : AbstractEntry(ptr) {}

    virtual ~FormatEntry() {}

    virtual ~FormatEntry() {}





    EntryIterator begin() const;



    // Entry's format string

    // Entry's format string

    const   char* formatString() const;

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

    virtual EntryIterator    copyWithAuthor(std::unique_ptr<audio_utils_fifo_writer> &dst,

                                       int author) const override;

                                       int author) const override;





            EntryIterator    begin() const;

};

};





class HistogramEntry : public AbstractEntry {

class HistogramEntry : public AbstractEntry {