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

Commit b3db7e49 authored by Andy Hung's avatar Andy Hung Committed by Android (Google) Code Review
Browse files

Merge "Fix unsigned long cast for 64 bit" into nyc-dev

parents c8589872 7171da26

hal/audio_hw.c

+6 −3
Original line number Diff line number Diff line
@@ -1724,8 +1724,10 @@ static int out_get_render_position(const struct audio_stream_out *stream, 
    if ((out->usecase == USECASE_AUDIO_PLAYBACK_OFFLOAD) && (dsp_frames != NULL)) {

        lock_output_stream(out);

        if (out->compr != NULL) {

            compress_get_tstamp(out->compr, (unsigned long *)dsp_frames,

                    &out->sample_rate);

            unsigned long frames = 0;

            // TODO: check return value

            compress_get_tstamp(out->compr, &frames, &out->sample_rate);

            *dsp_frames = (uint32_t)frames;

            ALOGVV("%s rendered frames %d sample_rate %d",

                   __func__, *dsp_frames, out->sample_rate);

        }
@@ -1757,13 +1759,14 @@ static int out_get_presentation_position(const struct audio_stream_out *stream, 
                                   uint64_t *frames, struct timespec *timestamp)

{

    struct stream_out *out = (struct stream_out *)stream;

    int ret = -1;

    int ret = -EINVAL;

    unsigned long dsp_frames;



    lock_output_stream(out);



    if (out->usecase == USECASE_AUDIO_PLAYBACK_OFFLOAD) {

        if (out->compr != NULL) {

            // TODO: check return value

            compress_get_tstamp(out->compr, &dsp_frames,

                    &out->sample_rate);

            ALOGVV("%s rendered frames %ld sample_rate %d",