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

Commit 4d1522bd authored by Chih-Hung Hsieh's avatar Chih-Hung Hsieh
Browse files

resolve merge conflicts of 53529cf9 to nyc-dev-plus-aosp 

Change-Id: Iae19c31b9ce2d9c604040e54d6fbf125a3d3d362
parents cc516cdd 53529cf9

services/audioflinger/AudioMixer.cpp

+2 −2
Original line number Diff line number Diff line
@@ -1679,8 +1679,8 @@ void AudioMixer::process__OneTrack16BitsStereoNoResampling(state_t* state) 


// Needs to derive a compile time constant (constexpr).  Could be targeted to go

// to a MONOVOL mixtype based on MAX_NUM_VOLUMES, but that's an unnecessary complication.

#define MIXTYPE_MONOVOL(mixtype) (mixtype == MIXTYPE_MULTI ? MIXTYPE_MULTI_MONOVOL : \

        mixtype == MIXTYPE_MULTI_SAVEONLY ? MIXTYPE_MULTI_SAVEONLY_MONOVOL : mixtype)

#define MIXTYPE_MONOVOL(mixtype) ((mixtype) == MIXTYPE_MULTI ? MIXTYPE_MULTI_MONOVOL : \

        (mixtype) == MIXTYPE_MULTI_SAVEONLY ? MIXTYPE_MULTI_SAVEONLY_MONOVOL : (mixtype))



/* MIXTYPE     (see AudioMixerOps.h MIXTYPE_* enumeration)

 * TO: int32_t (Q4.27) or float

services/audioflinger/Threads.cpp

+1 −1
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ static inline T min(const T& a, const T& b) 
}



#ifndef ARRAY_SIZE

#define ARRAY_SIZE(a) (sizeof(a) / sizeof(a[0]))

#define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0]))

#endif



namespace android {

services/camera/libcameraservice/device1/CameraHardwareInterface.h

+2 −2
Original line number Diff line number Diff line
@@ -606,9 +606,9 @@ private: 
                reinterpret_cast<CameraHardwareInterface *>(user);

        return __this->mPreviewWindow.get();

    }

#define anw(n) __to_anw(((struct camera_preview_window *)n)->user)

#define anw(n) __to_anw(((struct camera_preview_window *)(n))->user)

#define hwi(n) reinterpret_cast<CameraHardwareInterface *>(\

        ((struct camera_preview_window *)n)->user)

        ((struct camera_preview_window *)(n))->user)



    static int __dequeue_buffer(struct preview_stream_ops* w,

                                buffer_handle_t** buffer, int *stride)