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

Commit 99fafb71 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "C2SoftMp3Dec: Treat timestamps as signed values" into sc-dev am: 8d043d8c 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/av/+/15340733

Change-Id: I79242506be05028ebd4dcf2887e8359da10aa02c
parents 9b3c5bee 8d043d8c

media/codec2/components/mp3/C2SoftMp3Dec.cpp

+4 −3
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


//#define LOG_NDEBUG 0

#define LOG_TAG "C2SoftMp3Dec"

#include <inttypes.h>

#include <log/log.h>



#include <numeric>
@@ -485,10 +486,10 @@ void C2SoftMP3::process( 
        }

    }



    uint64_t outTimeStamp = mProcessedSamples * 1000000ll / samplingRate;

    int64_t outTimeStamp = mProcessedSamples * 1000000ll / samplingRate;

    mProcessedSamples += ((outSize - outOffset) / (numChannels * sizeof(int16_t)));

    ALOGV("out buffer attr. offset %d size %d timestamp %u", outOffset, outSize - outOffset,

          (uint32_t)(mAnchorTimeStamp + outTimeStamp));

    ALOGV("out buffer attr. offset %d size %d timestamp %" PRId64 " ", outOffset,

          outSize - outOffset, mAnchorTimeStamp + outTimeStamp);

    decodedSizes.clear();

    work->worklets.front()->output.flags = work->input.flags;

    work->worklets.front()->output.buffers.clear();

media/codec2/components/mp3/C2SoftMp3Dec.h

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ private: 
    bool mSignalledError;

    bool mSignalledOutputEos;

    bool mGaplessBytes;

    uint64_t mAnchorTimeStamp;

    int64_t mAnchorTimeStamp;

    uint64_t mProcessedSamples;



    status_t initDecoder();