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

Commit 5e8e7026 authored by Glenn Kasten's avatar Glenn Kasten Committed by Android (Google) Code Review
Browse files

Merge "Revert "Logging to investigate a crash"" into jb-mr2-dev

parents aebd9bbe 3c3c527a
Loading
Loading
Loading
Loading
+1 −11
Original line number Diff line number Diff line
@@ -36,11 +36,8 @@ public:
        size_t frameCount;
    };

protected:
    AudioBufferProvider() : mValid(kValid) { }
    virtual ~AudioBufferProvider() { mValid = kDead; }
    virtual ~AudioBufferProvider() {}

public:
    // value representing an invalid presentation timestamp
    static const int64_t kInvalidPTS = 0x7FFFFFFFFFFFFFFFLL;    // <stdint.h> is too painful

@@ -50,13 +47,6 @@ public:
    virtual status_t getNextBuffer(Buffer* buffer, int64_t pts = kInvalidPTS) = 0;

    virtual void releaseBuffer(Buffer* buffer) = 0;

    int getValid() const { return mValid; }
    static const int kValid = 'GOOD';
    static const int kDead = 'DEAD';

private:
    int mValid;
};

// ----------------------------------------------------------------------------
+0 −6
Original line number Diff line number Diff line
@@ -1113,12 +1113,6 @@ void AudioMixer::process__genericNoResampling(state_t* state, int64_t pts)
        e0 &= ~(1<<i);
        track_t& t = state->tracks[i];
        t.buffer.frameCount = state->frameCount;
        int valid = t.bufferProvider->getValid();
        if (valid != AudioBufferProvider::kValid) {
            ALOGE("invalid bufferProvider=%p name=%d frameCount=%d valid=%#x enabledTracks=%#x",
                    t.bufferProvider, i, t.buffer.frameCount, valid, enabledTracks);
            // expect to crash
        }
        t.bufferProvider->getNextBuffer(&t.buffer, pts);
        t.frameCount = t.buffer.frameCount;
        t.in = t.buffer.raw;