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

Commit 19c93d60 authored by Chong Zhang's avatar Chong Zhang Committed by Automerger Merge Worker
Browse files

transcoding: check API31 as it's available am: 5945dbe3 

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

Change-Id: Iff85d3b16372c6abde8eafaa7dbc189a4ed3d046
parents 04075a76 5945dbe3

media/libmediatranscoding/TranscodingThermalPolicy.cpp

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
//#define LOG_NDEBUG 0

#define LOG_TAG "TranscodingThermalPolicy"



#include <media/TranscodingDefs.h>

#include <media/TranscodingThermalPolicy.h>

#include <media/TranscodingUidPolicy.h>

#include <utils/Log.h>

media/libmediatranscoding/TranscodingUidPolicy.cpp

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include <android/binder_manager.h>

#include <android/binder_process.h>

#include <inttypes.h>

#include <media/TranscodingDefs.h>

#include <media/TranscodingUidPolicy.h>

#include <utils/Log.h>

media/libmediatranscoding/include/media/TranscodingDefs.h

+3 −0
Original line number Diff line number Diff line
@@ -20,6 +20,9 @@ 
#include <aidl/android/media/ITranscodingClientCallback.h>

#include <aidl/android/media/TranscodingRequestParcel.h>



// Transcoding uses some APIs available on API31+.

#define __TRANSCODING_MIN_API__ 31



namespace android {



using ClientIdType = uintptr_t;

media/libmediatranscoding/include/media/TranscodingRequest.h

+0 −3
Original line number Diff line number Diff line
@@ -24,9 +24,6 @@ namespace android { 


using ::aidl::android::media::TranscodingRequestParcel;



// TODO: replace __ANDROID_API_FUTURE__with 31 when it's official (b/178144708)

#define __TRANSCODING_MIN_API__ __ANDROID_API_FUTURE__



// Helper class for duplicating a TranscodingRequestParcel

class TranscodingRequest : public TranscodingRequestParcel {

public:

media/libmediatranscoding/include/media/TranscodingUidPolicy.h

+0 −3
Original line number Diff line number Diff line
@@ -28,9 +28,6 @@ 
#include <unordered_map>

#include <unordered_set>



// TODO: replace __ANDROID_API_FUTURE__with 31 when it's official (b/178144708)

#define __TRANSCODING_MIN_API__ __ANDROID_API_FUTURE__



struct AActivityManager_UidImportanceListener;



namespace android {