transcoding: renaming to session controller to avoid confusion
No functional change.
bug:154733526
Change-Id: I8731a721ab3a6ae2937e1ac24e4f1a2f1e27da85
diff --git a/media/libmediatranscoding/Android.bp b/media/libmediatranscoding/Android.bp
index 128d0d8..7329c63 100644
--- a/media/libmediatranscoding/Android.bp
+++ b/media/libmediatranscoding/Android.bp
@@ -21,12 +21,12 @@
"aidl/android/media/ITranscodingClient.aidl",
"aidl/android/media/ITranscodingClientCallback.aidl",
"aidl/android/media/TranscodingErrorCode.aidl",
- "aidl/android/media/TranscodingJobPriority.aidl",
- "aidl/android/media/TranscodingJobStats.aidl",
+ "aidl/android/media/TranscodingSessionPriority.aidl",
+ "aidl/android/media/TranscodingSessionStats.aidl",
"aidl/android/media/TranscodingType.aidl",
"aidl/android/media/TranscodingVideoCodecType.aidl",
"aidl/android/media/TranscodingVideoTrackFormat.aidl",
- "aidl/android/media/TranscodingJobParcel.aidl",
+ "aidl/android/media/TranscodingSessionParcel.aidl",
"aidl/android/media/TranscodingRequestParcel.aidl",
"aidl/android/media/TranscodingResultParcel.aidl",
"aidl/android/media/TranscodingTestConfig.aidl",
@@ -53,7 +53,7 @@
srcs: [
"TranscodingClientManager.cpp",
- "TranscodingJobScheduler.cpp",
+ "TranscodingSessionController.cpp",
"TranscodingResourcePolicy.cpp",
"TranscodingUidPolicy.cpp",
"TranscoderWrapper.cpp",
diff --git a/media/libmediatranscoding/TranscoderWrapper.cpp b/media/libmediatranscoding/TranscoderWrapper.cpp
index 8062fcf..61e767c 100644
--- a/media/libmediatranscoding/TranscoderWrapper.cpp
+++ b/media/libmediatranscoding/TranscoderWrapper.cpp
@@ -117,7 +117,7 @@
return "(unknown)";
}
std::string result;
- result = "job {" + std::to_string(event.clientId) + "," + std::to_string(event.jobId) +
+ result = "session {" + std::to_string(event.clientId) + "," + std::to_string(event.sessionId) +
"}: " + typeStr;
if (event.type == Event::Error || event.type == Event::Progress) {
result += " " + std::to_string(event.arg);
@@ -128,13 +128,13 @@
class TranscoderWrapper::CallbackImpl : public MediaTranscoder::CallbackInterface {
public:
CallbackImpl(const std::shared_ptr<TranscoderWrapper>& owner, ClientIdType clientId,
- JobIdType jobId)
- : mOwner(owner), mClientId(clientId), mJobId(jobId) {}
+ SessionIdType sessionId)
+ : mOwner(owner), mClientId(clientId), mSessionId(sessionId) {}
virtual void onFinished(const MediaTranscoder* transcoder __unused) override {
auto owner = mOwner.lock();
if (owner != nullptr) {
- owner->onFinish(mClientId, mJobId);
+ owner->onFinish(mClientId, mSessionId);
}
}
@@ -142,7 +142,7 @@
media_status_t error) override {
auto owner = mOwner.lock();
if (owner != nullptr) {
- owner->onError(mClientId, mJobId, error);
+ owner->onError(mClientId, mSessionId, error);
}
}
@@ -150,23 +150,23 @@
int32_t progress) override {
auto owner = mOwner.lock();
if (owner != nullptr) {
- owner->onProgress(mClientId, mJobId, progress);
+ owner->onProgress(mClientId, mSessionId, progress);
}
}
virtual void onCodecResourceLost(const MediaTranscoder* transcoder __unused,
const std::shared_ptr<const Parcel>& pausedState
__unused) override {
- ALOGV("%s: job {%lld, %d}", __FUNCTION__, (long long)mClientId, mJobId);
+ ALOGV("%s: session {%lld, %d}", __FUNCTION__, (long long)mClientId, mSessionId);
}
private:
std::weak_ptr<TranscoderWrapper> mOwner;
ClientIdType mClientId;
- JobIdType mJobId;
+ SessionIdType mSessionId;
};
-TranscoderWrapper::TranscoderWrapper() : mCurrentClientId(0), mCurrentJobId(-1) {
+TranscoderWrapper::TranscoderWrapper() : mCurrentClientId(0), mCurrentSessionId(-1) {
std::thread(&TranscoderWrapper::threadLoop, this).detach();
}
@@ -178,83 +178,85 @@
return err == AMEDIACODEC_ERROR_RECLAIMED || err == AMEDIACODEC_ERROR_INSUFFICIENT_RESOURCE;
}
-void TranscoderWrapper::reportError(ClientIdType clientId, JobIdType jobId, media_status_t err) {
+void TranscoderWrapper::reportError(ClientIdType clientId, SessionIdType sessionId,
+ media_status_t err) {
auto callback = mCallback.lock();
if (callback != nullptr) {
if (isResourceError(err)) {
// Add a placeholder pause state to mPausedStateMap. This is required when resuming.
// TODO: remove this when transcoder pause/resume logic is ready. New logic will
// no longer use the pause states.
- auto it = mPausedStateMap.find(JobKeyType(clientId, jobId));
+ auto it = mPausedStateMap.find(SessionKeyType(clientId, sessionId));
if (it == mPausedStateMap.end()) {
- mPausedStateMap.emplace(JobKeyType(clientId, jobId),
+ mPausedStateMap.emplace(SessionKeyType(clientId, sessionId),
std::shared_ptr<const Parcel>());
}
callback->onResourceLost();
} else {
- callback->onError(clientId, jobId, toTranscodingError(err));
+ callback->onError(clientId, sessionId, toTranscodingError(err));
}
}
}
-void TranscoderWrapper::start(ClientIdType clientId, JobIdType jobId,
+void TranscoderWrapper::start(ClientIdType clientId, SessionIdType sessionId,
const TranscodingRequestParcel& request,
const std::shared_ptr<ITranscodingClientCallback>& clientCb) {
- queueEvent(Event::Start, clientId, jobId, [=] {
- media_status_t err = handleStart(clientId, jobId, request, clientCb);
+ queueEvent(Event::Start, clientId, sessionId, [=] {
+ media_status_t err = handleStart(clientId, sessionId, request, clientCb);
if (err != AMEDIA_OK) {
cleanup();
- reportError(clientId, jobId, err);
+ reportError(clientId, sessionId, err);
} else {
auto callback = mCallback.lock();
if (callback != nullptr) {
- callback->onStarted(clientId, jobId);
+ callback->onStarted(clientId, sessionId);
}
}
});
}
-void TranscoderWrapper::pause(ClientIdType clientId, JobIdType jobId) {
- queueEvent(Event::Pause, clientId, jobId, [=] {
- media_status_t err = handlePause(clientId, jobId);
+void TranscoderWrapper::pause(ClientIdType clientId, SessionIdType sessionId) {
+ queueEvent(Event::Pause, clientId, sessionId, [=] {
+ media_status_t err = handlePause(clientId, sessionId);
cleanup();
if (err != AMEDIA_OK) {
- reportError(clientId, jobId, err);
+ reportError(clientId, sessionId, err);
} else {
auto callback = mCallback.lock();
if (callback != nullptr) {
- callback->onPaused(clientId, jobId);
+ callback->onPaused(clientId, sessionId);
}
}
});
}
-void TranscoderWrapper::resume(ClientIdType clientId, JobIdType jobId,
+void TranscoderWrapper::resume(ClientIdType clientId, SessionIdType sessionId,
const TranscodingRequestParcel& request,
const std::shared_ptr<ITranscodingClientCallback>& clientCb) {
- queueEvent(Event::Resume, clientId, jobId, [=] {
- media_status_t err = handleResume(clientId, jobId, request, clientCb);
+ queueEvent(Event::Resume, clientId, sessionId, [=] {
+ media_status_t err = handleResume(clientId, sessionId, request, clientCb);
if (err != AMEDIA_OK) {
cleanup();
- reportError(clientId, jobId, err);
+ reportError(clientId, sessionId, err);
} else {
auto callback = mCallback.lock();
if (callback != nullptr) {
- callback->onResumed(clientId, jobId);
+ callback->onResumed(clientId, sessionId);
}
}
});
}
-void TranscoderWrapper::stop(ClientIdType clientId, JobIdType jobId) {
- queueEvent(Event::Stop, clientId, jobId, [=] {
- if (mTranscoder != nullptr && clientId == mCurrentClientId && jobId == mCurrentJobId) {
- // Cancelling the currently running job.
+void TranscoderWrapper::stop(ClientIdType clientId, SessionIdType sessionId) {
+ queueEvent(Event::Stop, clientId, sessionId, [=] {
+ if (mTranscoder != nullptr && clientId == mCurrentClientId &&
+ sessionId == mCurrentSessionId) {
+ // Cancelling the currently running session.
media_status_t err = mTranscoder->cancel();
if (err != AMEDIA_OK) {
ALOGW("failed to stop transcoder: %d", err);
@@ -263,53 +265,56 @@
}
cleanup();
} else {
- // For jobs that's not currently running, release any pausedState for the job.
- mPausedStateMap.erase(JobKeyType(clientId, jobId));
+ // For sessions that's not currently running, release any pausedState for the session.
+ mPausedStateMap.erase(SessionKeyType(clientId, sessionId));
}
// No callback needed for stop.
});
}
-void TranscoderWrapper::onFinish(ClientIdType clientId, JobIdType jobId) {
- queueEvent(Event::Finish, clientId, jobId, [=] {
- if (mTranscoder != nullptr && clientId == mCurrentClientId && jobId == mCurrentJobId) {
+void TranscoderWrapper::onFinish(ClientIdType clientId, SessionIdType sessionId) {
+ queueEvent(Event::Finish, clientId, sessionId, [=] {
+ if (mTranscoder != nullptr && clientId == mCurrentClientId &&
+ sessionId == mCurrentSessionId) {
cleanup();
}
auto callback = mCallback.lock();
if (callback != nullptr) {
- callback->onFinish(clientId, jobId);
+ callback->onFinish(clientId, sessionId);
}
});
}
-void TranscoderWrapper::onError(ClientIdType clientId, JobIdType jobId, media_status_t error) {
+void TranscoderWrapper::onError(ClientIdType clientId, SessionIdType sessionId,
+ media_status_t error) {
queueEvent(
- Event::Error, clientId, jobId,
+ Event::Error, clientId, sessionId,
[=] {
if (mTranscoder != nullptr && clientId == mCurrentClientId &&
- jobId == mCurrentJobId) {
+ sessionId == mCurrentSessionId) {
cleanup();
}
- reportError(clientId, jobId, error);
+ reportError(clientId, sessionId, error);
},
error);
}
-void TranscoderWrapper::onProgress(ClientIdType clientId, JobIdType jobId, int32_t progress) {
+void TranscoderWrapper::onProgress(ClientIdType clientId, SessionIdType sessionId,
+ int32_t progress) {
queueEvent(
- Event::Progress, clientId, jobId,
+ Event::Progress, clientId, sessionId,
[=] {
auto callback = mCallback.lock();
if (callback != nullptr) {
- callback->onProgressUpdate(clientId, jobId, progress);
+ callback->onProgressUpdate(clientId, sessionId, progress);
}
},
progress);
}
media_status_t TranscoderWrapper::setupTranscoder(
- ClientIdType clientId, JobIdType jobId, const TranscodingRequestParcel& request,
+ ClientIdType clientId, SessionIdType sessionId, const TranscodingRequestParcel& request,
const std::shared_ptr<ITranscodingClientCallback>& clientCb,
const std::shared_ptr<const Parcel>& pausedState) {
if (clientCb == nullptr) {
@@ -340,8 +345,8 @@
}
mCurrentClientId = clientId;
- mCurrentJobId = jobId;
- mTranscoderCb = std::make_shared<CallbackImpl>(shared_from_this(), clientId, jobId);
+ mCurrentSessionId = sessionId;
+ mTranscoderCb = std::make_shared<CallbackImpl>(shared_from_this(), clientId, sessionId);
mTranscoder = MediaTranscoder::create(mTranscoderCb, pausedState);
if (mTranscoder == nullptr) {
ALOGE("failed to create transcoder");
@@ -389,10 +394,10 @@
}
media_status_t TranscoderWrapper::handleStart(
- ClientIdType clientId, JobIdType jobId, const TranscodingRequestParcel& request,
+ ClientIdType clientId, SessionIdType sessionId, const TranscodingRequestParcel& request,
const std::shared_ptr<ITranscodingClientCallback>& clientCb) {
ALOGI("%s: setting up transcoder for start", __FUNCTION__);
- media_status_t err = setupTranscoder(clientId, jobId, request, clientCb);
+ media_status_t err = setupTranscoder(clientId, sessionId, request, clientCb);
if (err != AMEDIA_OK) {
ALOGI("%s: failed to setup transcoder", __FUNCTION__);
return err;
@@ -408,15 +413,15 @@
return AMEDIA_OK;
}
-media_status_t TranscoderWrapper::handlePause(ClientIdType clientId, JobIdType jobId) {
+media_status_t TranscoderWrapper::handlePause(ClientIdType clientId, SessionIdType sessionId) {
if (mTranscoder == nullptr) {
ALOGE("%s: transcoder is not running", __FUNCTION__);
return AMEDIA_ERROR_INVALID_OPERATION;
}
- if (clientId != mCurrentClientId || jobId != mCurrentJobId) {
- ALOGW("%s: stopping job {%lld, %d} that's not current job {%lld, %d}", __FUNCTION__,
- (long long)clientId, jobId, (long long)mCurrentClientId, mCurrentJobId);
+ if (clientId != mCurrentClientId || sessionId != mCurrentSessionId) {
+ ALOGW("%s: stopping session {%lld, %d} that's not current session {%lld, %d}", __FUNCTION__,
+ (long long)clientId, sessionId, (long long)mCurrentClientId, mCurrentSessionId);
}
ALOGI("%s: pausing transcoder", __FUNCTION__);
@@ -427,17 +432,17 @@
ALOGE("%s: failed to pause transcoder: %d", __FUNCTION__, err);
return err;
}
- mPausedStateMap[JobKeyType(clientId, jobId)] = pauseStates;
+ mPausedStateMap[SessionKeyType(clientId, sessionId)] = pauseStates;
ALOGI("%s: transcoder paused", __FUNCTION__);
return AMEDIA_OK;
}
media_status_t TranscoderWrapper::handleResume(
- ClientIdType clientId, JobIdType jobId, const TranscodingRequestParcel& request,
+ ClientIdType clientId, SessionIdType sessionId, const TranscodingRequestParcel& request,
const std::shared_ptr<ITranscodingClientCallback>& clientCb) {
std::shared_ptr<const Parcel> pausedState;
- auto it = mPausedStateMap.find(JobKeyType(clientId, jobId));
+ auto it = mPausedStateMap.find(SessionKeyType(clientId, sessionId));
if (it != mPausedStateMap.end()) {
pausedState = it->second;
mPausedStateMap.erase(it);
@@ -447,7 +452,7 @@
}
ALOGI("%s: setting up transcoder for resume", __FUNCTION__);
- media_status_t err = setupTranscoder(clientId, jobId, request, clientCb, pausedState);
+ media_status_t err = setupTranscoder(clientId, sessionId, request, clientCb, pausedState);
if (err != AMEDIA_OK) {
ALOGE("%s: failed to setup transcoder: %d", __FUNCTION__, err);
return err;
@@ -465,16 +470,16 @@
void TranscoderWrapper::cleanup() {
mCurrentClientId = 0;
- mCurrentJobId = -1;
+ mCurrentSessionId = -1;
mTranscoderCb = nullptr;
mTranscoder = nullptr;
}
-void TranscoderWrapper::queueEvent(Event::Type type, ClientIdType clientId, JobIdType jobId,
+void TranscoderWrapper::queueEvent(Event::Type type, ClientIdType clientId, SessionIdType sessionId,
const std::function<void()> runnable, int32_t arg) {
std::scoped_lock lock{mLock};
- mQueue.push_back({type, clientId, jobId, runnable, arg});
+ mQueue.push_back({type, clientId, sessionId, runnable, arg});
mCondition.notify_one();
}
diff --git a/media/libmediatranscoding/TranscodingClientManager.cpp b/media/libmediatranscoding/TranscodingClientManager.cpp
index 82a6dde..b57baa5 100644
--- a/media/libmediatranscoding/TranscodingClientManager.cpp
+++ b/media/libmediatranscoding/TranscodingClientManager.cpp
@@ -35,8 +35,8 @@
using ::aidl::android::media::BnTranscodingClient;
using ::aidl::android::media::IMediaTranscodingService; // For service error codes
-using ::aidl::android::media::TranscodingJobParcel;
using ::aidl::android::media::TranscodingRequestParcel;
+using ::aidl::android::media::TranscodingSessionParcel;
using Status = ::ndk::ScopedAStatus;
using ::ndk::SpAIBinder;
@@ -74,8 +74,8 @@
std::string mClientName;
std::string mClientOpPackageName;
- // Next jobId to assign.
- std::atomic<int32_t> mNextJobId;
+ // Next sessionId to assign.
+ std::atomic<int32_t> mNextSessionId;
// Whether this client has been unregistered already.
std::atomic<bool> mAbandoned;
// Weak pointer to the client manager for this client.
@@ -86,12 +86,13 @@
const std::weak_ptr<TranscodingClientManager>& owner);
Status submitRequest(const TranscodingRequestParcel& /*in_request*/,
- TranscodingJobParcel* /*out_job*/, bool* /*_aidl_return*/) override;
+ TranscodingSessionParcel* /*out_session*/,
+ bool* /*_aidl_return*/) override;
- Status cancelJob(int32_t /*in_jobId*/, bool* /*_aidl_return*/) override;
+ Status cancelSession(int32_t /*in_sessionId*/, bool* /*_aidl_return*/) override;
- Status getJobWithId(int32_t /*in_jobId*/, TranscodingJobParcel* /*out_job*/,
- bool* /*_aidl_return*/) override;
+ Status getSessionWithId(int32_t /*in_sessionId*/, TranscodingSessionParcel* /*out_session*/,
+ bool* /*_aidl_return*/) override;
Status unregister() override;
};
@@ -104,12 +105,12 @@
mClientId(sCookieCounter.fetch_add(1, std::memory_order_relaxed)),
mClientName(clientName),
mClientOpPackageName(opPackageName),
- mNextJobId(0),
+ mNextSessionId(0),
mAbandoned(false),
mOwner(owner) {}
Status TranscodingClientManager::ClientImpl::submitRequest(
- const TranscodingRequestParcel& in_request, TranscodingJobParcel* out_job,
+ const TranscodingRequestParcel& in_request, TranscodingSessionParcel* out_session,
bool* _aidl_return) {
*_aidl_return = false;
@@ -161,23 +162,24 @@
in_clientPid, in_clientUid, callingUid);
}
- int32_t jobId = mNextJobId.fetch_add(1);
+ int32_t sessionId = mNextSessionId.fetch_add(1);
- *_aidl_return = owner->mJobScheduler->submit(mClientId, jobId, in_clientUid, in_request,
- mClientCallback);
+ *_aidl_return = owner->mSessionController->submit(mClientId, sessionId, in_clientUid,
+ in_request, mClientCallback);
if (*_aidl_return) {
- out_job->jobId = jobId;
+ out_session->sessionId = sessionId;
- // TODO(chz): is some of this coming from JobScheduler?
- *(TranscodingRequest*)&out_job->request = in_request;
- out_job->awaitNumberOfJobs = 0;
+ // TODO(chz): is some of this coming from SessionController?
+ *(TranscodingRequest*)&out_session->request = in_request;
+ out_session->awaitNumberOfSessions = 0;
}
return Status::ok();
}
-Status TranscodingClientManager::ClientImpl::cancelJob(int32_t in_jobId, bool* _aidl_return) {
+Status TranscodingClientManager::ClientImpl::cancelSession(int32_t in_sessionId,
+ bool* _aidl_return) {
*_aidl_return = false;
std::shared_ptr<TranscodingClientManager> owner;
@@ -185,17 +187,17 @@
return Status::fromServiceSpecificError(IMediaTranscodingService::ERROR_DISCONNECTED);
}
- if (in_jobId < 0) {
+ if (in_sessionId < 0) {
return Status::ok();
}
- *_aidl_return = owner->mJobScheduler->cancel(mClientId, in_jobId);
+ *_aidl_return = owner->mSessionController->cancel(mClientId, in_sessionId);
return Status::ok();
}
-Status TranscodingClientManager::ClientImpl::getJobWithId(int32_t in_jobId,
- TranscodingJobParcel* out_job,
- bool* _aidl_return) {
+Status TranscodingClientManager::ClientImpl::getSessionWithId(int32_t in_sessionId,
+ TranscodingSessionParcel* out_session,
+ bool* _aidl_return) {
*_aidl_return = false;
std::shared_ptr<TranscodingClientManager> owner;
@@ -203,15 +205,16 @@
return Status::fromServiceSpecificError(IMediaTranscodingService::ERROR_DISCONNECTED);
}
- if (in_jobId < 0) {
+ if (in_sessionId < 0) {
return Status::ok();
}
- *_aidl_return = owner->mJobScheduler->getJob(mClientId, in_jobId, &out_job->request);
+ *_aidl_return =
+ owner->mSessionController->getSession(mClientId, in_sessionId, &out_session->request);
if (*_aidl_return) {
- out_job->jobId = in_jobId;
- out_job->awaitNumberOfJobs = 0;
+ out_session->sessionId = in_sessionId;
+ out_session->awaitNumberOfSessions = 0;
}
return Status::ok();
}
@@ -224,8 +227,8 @@
return Status::fromServiceSpecificError(IMediaTranscodingService::ERROR_DISCONNECTED);
}
- // Use jobId == -1 to cancel all realtime jobs for this client with the scheduler.
- owner->mJobScheduler->cancel(mClientId, -1);
+ // Use sessionId == -1 to cancel all realtime sessions for this client with the controller.
+ owner->mSessionController->cancel(mClientId, -1);
owner->removeClient(mClientId);
return Status::ok();
@@ -256,9 +259,9 @@
}
TranscodingClientManager::TranscodingClientManager(
- const std::shared_ptr<SchedulerClientInterface>& scheduler)
+ const std::shared_ptr<ControllerClientInterface>& controller)
: mDeathRecipient(AIBinder_DeathRecipient_new(BinderDiedCallback)),
- mJobScheduler(scheduler),
+ mSessionController(controller),
mMediaProviderUid(-1) {
ALOGD("TranscodingClientManager started");
uid_t mpuid;
diff --git a/media/libmediatranscoding/TranscodingJobScheduler.cpp b/media/libmediatranscoding/TranscodingJobScheduler.cpp
deleted file mode 100644
index d3a1836..0000000
--- a/media/libmediatranscoding/TranscodingJobScheduler.cpp
+++ /dev/null
@@ -1,567 +0,0 @@
-/*
- * Copyright (C) 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-//#define LOG_NDEBUG 0
-#define LOG_TAG "TranscodingJobScheduler"
-
-#define VALIDATE_STATE 1
-
-#include <inttypes.h>
-#include <media/TranscodingJobScheduler.h>
-#include <media/TranscodingUidPolicy.h>
-#include <utils/Log.h>
-
-#include <utility>
-
-namespace android {
-
-static_assert((JobIdType)-1 < 0, "JobIdType should be signed");
-
-constexpr static uid_t OFFLINE_UID = -1;
-
-//static
-String8 TranscodingJobScheduler::jobToString(const JobKeyType& jobKey) {
- return String8::format("{client:%lld, job:%d}", (long long)jobKey.first, jobKey.second);
-}
-
-//static
-const char* TranscodingJobScheduler::jobStateToString(const Job::State jobState) {
- switch (jobState) {
- case Job::State::NOT_STARTED:
- return "NOT_STARTED";
- case Job::State::RUNNING:
- return "RUNNING";
- case Job::State::PAUSED:
- return "PAUSED";
- default:
- break;
- }
- return "(unknown)";
-}
-
-TranscodingJobScheduler::TranscodingJobScheduler(
- const std::shared_ptr<TranscoderInterface>& transcoder,
- const std::shared_ptr<UidPolicyInterface>& uidPolicy,
- const std::shared_ptr<ResourcePolicyInterface>& resourcePolicy)
- : mTranscoder(transcoder),
- mUidPolicy(uidPolicy),
- mResourcePolicy(resourcePolicy),
- mCurrentJob(nullptr),
- mResourceLost(false) {
- // Only push empty offline queue initially. Realtime queues are added when requests come in.
- mUidSortedList.push_back(OFFLINE_UID);
- mOfflineUidIterator = mUidSortedList.begin();
- mJobQueues.emplace(OFFLINE_UID, JobQueueType());
-}
-
-TranscodingJobScheduler::~TranscodingJobScheduler() {}
-
-void TranscodingJobScheduler::dumpAllJobs(int fd, const Vector<String16>& args __unused) {
- String8 result;
-
- const size_t SIZE = 256;
- char buffer[SIZE];
- std::scoped_lock lock{mLock};
-
- snprintf(buffer, SIZE, "\n========== Dumping all jobs queues =========\n");
- result.append(buffer);
- snprintf(buffer, SIZE, " Total num of Jobs: %zu\n", mJobMap.size());
- result.append(buffer);
-
- std::vector<int32_t> uids(mUidSortedList.begin(), mUidSortedList.end());
- // Exclude last uid, which is for offline queue
- uids.pop_back();
- std::vector<std::string> packageNames;
- if (TranscodingUidPolicy::getNamesForUids(uids, &packageNames)) {
- uids.push_back(OFFLINE_UID);
- packageNames.push_back("(offline)");
- }
-
- for (int32_t i = 0; i < uids.size(); i++) {
- const uid_t uid = uids[i];
-
- if (mJobQueues[uid].empty()) {
- continue;
- }
- snprintf(buffer, SIZE, " Uid: %d, pkg: %s\n", uid,
- packageNames.empty() ? "(unknown)" : packageNames[i].c_str());
- result.append(buffer);
- snprintf(buffer, SIZE, " Num of jobs: %zu\n", mJobQueues[uid].size());
- result.append(buffer);
- for (auto& jobKey : mJobQueues[uid]) {
- auto jobIt = mJobMap.find(jobKey);
- if (jobIt == mJobMap.end()) {
- snprintf(buffer, SIZE, "Failed to look up Job %s \n", jobToString(jobKey).c_str());
- result.append(buffer);
- continue;
- }
- Job& job = jobIt->second;
- TranscodingRequestParcel& request = job.request;
- snprintf(buffer, SIZE, " Job: %s, %s, %d%%\n", jobToString(jobKey).c_str(),
- jobStateToString(job.state), job.lastProgress);
- result.append(buffer);
- snprintf(buffer, SIZE, " Src: %s\n", request.sourceFilePath.c_str());
- result.append(buffer);
- snprintf(buffer, SIZE, " Dst: %s\n", request.destinationFilePath.c_str());
- result.append(buffer);
- }
- }
-
- write(fd, result.string(), result.size());
-}
-
-TranscodingJobScheduler::Job* TranscodingJobScheduler::getTopJob_l() {
- if (mJobMap.empty()) {
- return nullptr;
- }
- uid_t topUid = *mUidSortedList.begin();
- JobKeyType topJobKey = *mJobQueues[topUid].begin();
- return &mJobMap[topJobKey];
-}
-
-void TranscodingJobScheduler::updateCurrentJob_l() {
- Job* topJob = getTopJob_l();
- Job* curJob = mCurrentJob;
- ALOGV("updateCurrentJob: topJob is %s, curJob is %s",
- topJob == nullptr ? "null" : jobToString(topJob->key).c_str(),
- curJob == nullptr ? "null" : jobToString(curJob->key).c_str());
-
- // If we found a topJob that should be run, and it's not already running,
- // take some actions to ensure it's running.
- if (topJob != nullptr && (topJob != curJob || topJob->state != Job::RUNNING)) {
- // If another job is currently running, pause it first.
- if (curJob != nullptr && curJob->state == Job::RUNNING) {
- mTranscoder->pause(curJob->key.first, curJob->key.second);
- curJob->state = Job::PAUSED;
- }
- // If we are not experiencing resource loss, we can start or resume
- // the topJob now.
- if (!mResourceLost) {
- if (topJob->state == Job::NOT_STARTED) {
- mTranscoder->start(topJob->key.first, topJob->key.second, topJob->request,
- topJob->callback.lock());
- } else if (topJob->state == Job::PAUSED) {
- mTranscoder->resume(topJob->key.first, topJob->key.second, topJob->request,
- topJob->callback.lock());
- }
- topJob->state = Job::RUNNING;
- }
- }
- mCurrentJob = topJob;
-}
-
-void TranscodingJobScheduler::removeJob_l(const JobKeyType& jobKey) {
- ALOGV("%s: job %s", __FUNCTION__, jobToString(jobKey).c_str());
-
- if (mJobMap.count(jobKey) == 0) {
- ALOGE("job %s doesn't exist", jobToString(jobKey).c_str());
- return;
- }
-
- // Remove job from uid's queue.
- const uid_t uid = mJobMap[jobKey].uid;
- JobQueueType& jobQueue = mJobQueues[uid];
- auto it = std::find(jobQueue.begin(), jobQueue.end(), jobKey);
- if (it == jobQueue.end()) {
- ALOGE("couldn't find job %s in queue for uid %d", jobToString(jobKey).c_str(), uid);
- return;
- }
- jobQueue.erase(it);
-
- // If this is the last job in a real-time queue, remove this uid's queue.
- if (uid != OFFLINE_UID && jobQueue.empty()) {
- mUidSortedList.remove(uid);
- mJobQueues.erase(uid);
- mUidPolicy->unregisterMonitorUid(uid);
-
- std::unordered_set<uid_t> topUids = mUidPolicy->getTopUids();
- moveUidsToTop_l(topUids, false /*preserveTopUid*/);
- }
-
- // Clear current job.
- if (mCurrentJob == &mJobMap[jobKey]) {
- mCurrentJob = nullptr;
- }
-
- // Remove job from job map.
- mJobMap.erase(jobKey);
-}
-
-/**
- * Moves the set of uids to the front of mUidSortedList (which is used to pick
- * the next job to run).
- *
- * This is called when 1) we received a onTopUidsChanged() callbcak from UidPolicy,
- * or 2) we removed the job queue for a uid because it becomes empty.
- *
- * In case of 1), if there are multiple uids in the set, and the current front
- * uid in mUidSortedList is still in the set, we try to keep that uid at front
- * so that current job run is not interrupted. (This is not a concern for case 2)
- * because the queue for a uid was just removed entirely.)
- */
-void TranscodingJobScheduler::moveUidsToTop_l(const std::unordered_set<uid_t>& uids,
- bool preserveTopUid) {
- // If uid set is empty, nothing to do. Do not change the queue status.
- if (uids.empty()) {
- return;
- }
-
- // Save the current top uid.
- uid_t curTopUid = *mUidSortedList.begin();
- bool pushCurTopToFront = false;
- int32_t numUidsMoved = 0;
-
- // Go through the sorted uid list once, and move the ones in top set to front.
- for (auto it = mUidSortedList.begin(); it != mUidSortedList.end();) {
- uid_t uid = *it;
-
- if (uid != OFFLINE_UID && uids.count(uid) > 0) {
- it = mUidSortedList.erase(it);
-
- // If this is the top we're preserving, don't push it here, push
- // it after the for-loop.
- if (uid == curTopUid && preserveTopUid) {
- pushCurTopToFront = true;
- } else {
- mUidSortedList.push_front(uid);
- }
-
- // If we found all uids in the set, break out.
- if (++numUidsMoved == uids.size()) {
- break;
- }
- } else {
- ++it;
- }
- }
-
- if (pushCurTopToFront) {
- mUidSortedList.push_front(curTopUid);
- }
-}
-
-bool TranscodingJobScheduler::submit(ClientIdType clientId, JobIdType jobId, uid_t uid,
- const TranscodingRequestParcel& request,
- const std::weak_ptr<ITranscodingClientCallback>& callback) {
- JobKeyType jobKey = std::make_pair(clientId, jobId);
-
- ALOGV("%s: job %s, uid %d, prioirty %d", __FUNCTION__, jobToString(jobKey).c_str(), uid,
- (int32_t)request.priority);
-
- std::scoped_lock lock{mLock};
-
- if (mJobMap.count(jobKey) > 0) {
- ALOGE("job %s already exists", jobToString(jobKey).c_str());
- return false;
- }
-
- // TODO(chz): only support offline vs real-time for now. All kUnspecified jobs
- // go to offline queue.
- if (request.priority == TranscodingJobPriority::kUnspecified) {
- uid = OFFLINE_UID;
- }
-
- // Add job to job map.
- mJobMap[jobKey].key = jobKey;
- mJobMap[jobKey].uid = uid;
- mJobMap[jobKey].state = Job::NOT_STARTED;
- mJobMap[jobKey].lastProgress = 0;
- mJobMap[jobKey].request = request;
- mJobMap[jobKey].callback = callback;
-
- // If it's an offline job, the queue was already added in constructor.
- // If it's a real-time jobs, check if a queue is already present for the uid,
- // and add a new queue if needed.
- if (uid != OFFLINE_UID) {
- if (mJobQueues.count(uid) == 0) {
- mUidPolicy->registerMonitorUid(uid);
- if (mUidPolicy->isUidOnTop(uid)) {
- mUidSortedList.push_front(uid);
- } else {
- // Shouldn't be submitting real-time requests from non-top app,
- // put it in front of the offline queue.
- mUidSortedList.insert(mOfflineUidIterator, uid);
- }
- } else if (uid != *mUidSortedList.begin()) {
- if (mUidPolicy->isUidOnTop(uid)) {
- mUidSortedList.remove(uid);
- mUidSortedList.push_front(uid);
- }
- }
- }
- // Append this job to the uid's queue.
- mJobQueues[uid].push_back(jobKey);
-
- updateCurrentJob_l();
-
- validateState_l();
- return true;
-}
-
-bool TranscodingJobScheduler::cancel(ClientIdType clientId, JobIdType jobId) {
- JobKeyType jobKey = std::make_pair(clientId, jobId);
-
- ALOGV("%s: job %s", __FUNCTION__, jobToString(jobKey).c_str());
-
- std::list<JobKeyType> jobsToRemove;
-
- std::scoped_lock lock{mLock};
-
- if (jobId < 0) {
- for (auto it = mJobMap.begin(); it != mJobMap.end(); ++it) {
- if (it->first.first == clientId && it->second.uid != OFFLINE_UID) {
- jobsToRemove.push_back(it->first);
- }
- }
- } else {
- if (mJobMap.count(jobKey) == 0) {
- ALOGE("job %s doesn't exist", jobToString(jobKey).c_str());
- return false;
- }
- jobsToRemove.push_back(jobKey);
- }
-
- for (auto it = jobsToRemove.begin(); it != jobsToRemove.end(); ++it) {
- // If the job has ever been started, stop it now.
- // Note that stop() is needed even if the job is currently paused. This instructs
- // the transcoder to discard any states for the job, otherwise the states may
- // never be discarded.
- if (mJobMap[*it].state != Job::NOT_STARTED) {
- mTranscoder->stop(it->first, it->second);
- }
-
- // Remove the job.
- removeJob_l(*it);
- }
-
- // Start next job.
- updateCurrentJob_l();
-
- validateState_l();
- return true;
-}
-
-bool TranscodingJobScheduler::getJob(ClientIdType clientId, JobIdType jobId,
- TranscodingRequestParcel* request) {
- JobKeyType jobKey = std::make_pair(clientId, jobId);
-
- std::scoped_lock lock{mLock};
-
- if (mJobMap.count(jobKey) == 0) {
- ALOGE("job %s doesn't exist", jobToString(jobKey).c_str());
- return false;
- }
-
- *(TranscodingRequest*)request = mJobMap[jobKey].request;
- return true;
-}
-
-void TranscodingJobScheduler::notifyClient(ClientIdType clientId, JobIdType jobId,
- const char* reason,
- std::function<void(const JobKeyType&)> func) {
- JobKeyType jobKey = std::make_pair(clientId, jobId);
-
- std::scoped_lock lock{mLock};
-
- if (mJobMap.count(jobKey) == 0) {
- ALOGW("%s: ignoring %s for job %s that doesn't exist", __FUNCTION__, reason,
- jobToString(jobKey).c_str());
- return;
- }
-
- // Only ignore if job was never started. In particular, propagate the status
- // to client if the job is paused. Transcoder could have posted finish when
- // we're pausing it, and the finish arrived after we changed current job.
- if (mJobMap[jobKey].state == Job::NOT_STARTED) {
- ALOGW("%s: ignoring %s for job %s that was never started", __FUNCTION__, reason,
- jobToString(jobKey).c_str());
- return;
- }
-
- ALOGV("%s: job %s %s", __FUNCTION__, jobToString(jobKey).c_str(), reason);
- func(jobKey);
-}
-
-void TranscodingJobScheduler::onStarted(ClientIdType clientId, JobIdType jobId) {
- notifyClient(clientId, jobId, "started", [=](const JobKeyType& jobKey) {
- auto callback = mJobMap[jobKey].callback.lock();
- if (callback != nullptr) {
- callback->onTranscodingStarted(jobId);
- }
- });
-}
-
-void TranscodingJobScheduler::onPaused(ClientIdType clientId, JobIdType jobId) {
- notifyClient(clientId, jobId, "paused", [=](const JobKeyType& jobKey) {
- auto callback = mJobMap[jobKey].callback.lock();
- if (callback != nullptr) {
- callback->onTranscodingPaused(jobId);
- }
- });
-}
-
-void TranscodingJobScheduler::onResumed(ClientIdType clientId, JobIdType jobId) {
- notifyClient(clientId, jobId, "resumed", [=](const JobKeyType& jobKey) {
- auto callback = mJobMap[jobKey].callback.lock();
- if (callback != nullptr) {
- callback->onTranscodingResumed(jobId);
- }
- });
-}
-
-void TranscodingJobScheduler::onFinish(ClientIdType clientId, JobIdType jobId) {
- notifyClient(clientId, jobId, "finish", [=](const JobKeyType& jobKey) {
- {
- auto clientCallback = mJobMap[jobKey].callback.lock();
- if (clientCallback != nullptr) {
- clientCallback->onTranscodingFinished(
- jobId, TranscodingResultParcel({jobId, -1 /*actualBitrateBps*/,
- std::nullopt /*jobStats*/}));
- }
- }
-
- // Remove the job.
- removeJob_l(jobKey);
-
- // Start next job.
- updateCurrentJob_l();
-
- validateState_l();
- });
-}
-
-void TranscodingJobScheduler::onError(ClientIdType clientId, JobIdType jobId,
- TranscodingErrorCode err) {
- notifyClient(clientId, jobId, "error", [=](const JobKeyType& jobKey) {
- {
- auto clientCallback = mJobMap[jobKey].callback.lock();
- if (clientCallback != nullptr) {
- clientCallback->onTranscodingFailed(jobId, err);
- }
- }
-
- // Remove the job.
- removeJob_l(jobKey);
-
- // Start next job.
- updateCurrentJob_l();
-
- validateState_l();
- });
-}
-
-void TranscodingJobScheduler::onProgressUpdate(ClientIdType clientId, JobIdType jobId,
- int32_t progress) {
- notifyClient(clientId, jobId, "progress", [=](const JobKeyType& jobKey) {
- auto callback = mJobMap[jobKey].callback.lock();
- if (callback != nullptr) {
- callback->onProgressUpdate(jobId, progress);
- }
- mJobMap[jobKey].lastProgress = progress;
- });
-}
-
-void TranscodingJobScheduler::onResourceLost() {
- ALOGI("%s", __FUNCTION__);
-
- std::scoped_lock lock{mLock};
-
- if (mResourceLost) {
- return;
- }
-
- // If we receive a resource loss event, the TranscoderLibrary already paused
- // the transcoding, so we don't need to call onPaused to notify it to pause.
- // Only need to update the job state here.
- if (mCurrentJob != nullptr && mCurrentJob->state == Job::RUNNING) {
- mCurrentJob->state = Job::PAUSED;
- // Notify the client as a paused event.
- auto clientCallback = mCurrentJob->callback.lock();
- if (clientCallback != nullptr) {
- clientCallback->onTranscodingPaused(mCurrentJob->key.second);
- }
- }
- mResourceLost = true;
-
- validateState_l();
-}
-
-void TranscodingJobScheduler::onTopUidsChanged(const std::unordered_set<uid_t>& uids) {
- if (uids.empty()) {
- ALOGW("%s: ignoring empty uids", __FUNCTION__);
- return;
- }
-
- std::string uidStr;
- for (auto it = uids.begin(); it != uids.end(); it++) {
- if (!uidStr.empty()) {
- uidStr += ", ";
- }
- uidStr += std::to_string(*it);
- }
-
- ALOGD("%s: topUids: size %zu, uids: %s", __FUNCTION__, uids.size(), uidStr.c_str());
-
- std::scoped_lock lock{mLock};
-
- moveUidsToTop_l(uids, true /*preserveTopUid*/);
-
- updateCurrentJob_l();
-
- validateState_l();
-}
-
-void TranscodingJobScheduler::onResourceAvailable() {
- std::scoped_lock lock{mLock};
-
- if (!mResourceLost) {
- return;
- }
-
- ALOGI("%s", __FUNCTION__);
-
- mResourceLost = false;
- updateCurrentJob_l();
-
- validateState_l();
-}
-
-void TranscodingJobScheduler::validateState_l() {
-#ifdef VALIDATE_STATE
- LOG_ALWAYS_FATAL_IF(mJobQueues.count(OFFLINE_UID) != 1,
- "mJobQueues offline queue number is not 1");
- LOG_ALWAYS_FATAL_IF(*mOfflineUidIterator != OFFLINE_UID,
- "mOfflineUidIterator not pointing to offline uid");
- LOG_ALWAYS_FATAL_IF(mUidSortedList.size() != mJobQueues.size(),
- "mUidList and mJobQueues size mismatch");
-
- int32_t totalJobs = 0;
- for (auto uid : mUidSortedList) {
- LOG_ALWAYS_FATAL_IF(mJobQueues.count(uid) != 1, "mJobQueues count for uid %d is not 1",
- uid);
- for (auto& jobKey : mJobQueues[uid]) {
- LOG_ALWAYS_FATAL_IF(mJobMap.count(jobKey) != 1, "mJobs count for job %s is not 1",
- jobToString(jobKey).c_str());
- }
-
- totalJobs += mJobQueues[uid].size();
- }
- LOG_ALWAYS_FATAL_IF(mJobMap.size() != totalJobs,
- "mJobs size doesn't match total jobs counted from uid queues");
-#endif // VALIDATE_STATE
-}
-
-} // namespace android
diff --git a/media/libmediatranscoding/TranscodingSessionController.cpp b/media/libmediatranscoding/TranscodingSessionController.cpp
new file mode 100644
index 0000000..2306395
--- /dev/null
+++ b/media/libmediatranscoding/TranscodingSessionController.cpp
@@ -0,0 +1,574 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+//#define LOG_NDEBUG 0
+#define LOG_TAG "TranscodingSessionController"
+
+#define VALIDATE_STATE 1
+
+#include <inttypes.h>
+#include <media/TranscodingSessionController.h>
+#include <media/TranscodingUidPolicy.h>
+#include <utils/Log.h>
+
+#include <utility>
+
+namespace android {
+
+static_assert((SessionIdType)-1 < 0, "SessionIdType should be signed");
+
+constexpr static uid_t OFFLINE_UID = -1;
+
+//static
+String8 TranscodingSessionController::sessionToString(const SessionKeyType& sessionKey) {
+ return String8::format("{client:%lld, session:%d}", (long long)sessionKey.first,
+ sessionKey.second);
+}
+
+//static
+const char* TranscodingSessionController::sessionStateToString(const Session::State sessionState) {
+ switch (sessionState) {
+ case Session::State::NOT_STARTED:
+ return "NOT_STARTED";
+ case Session::State::RUNNING:
+ return "RUNNING";
+ case Session::State::PAUSED:
+ return "PAUSED";
+ default:
+ break;
+ }
+ return "(unknown)";
+}
+
+TranscodingSessionController::TranscodingSessionController(
+ const std::shared_ptr<TranscoderInterface>& transcoder,
+ const std::shared_ptr<UidPolicyInterface>& uidPolicy,
+ const std::shared_ptr<ResourcePolicyInterface>& resourcePolicy)
+ : mTranscoder(transcoder),
+ mUidPolicy(uidPolicy),
+ mResourcePolicy(resourcePolicy),
+ mCurrentSession(nullptr),
+ mResourceLost(false) {
+ // Only push empty offline queue initially. Realtime queues are added when requests come in.
+ mUidSortedList.push_back(OFFLINE_UID);
+ mOfflineUidIterator = mUidSortedList.begin();
+ mSessionQueues.emplace(OFFLINE_UID, SessionQueueType());
+}
+
+TranscodingSessionController::~TranscodingSessionController() {}
+
+void TranscodingSessionController::dumpAllSessions(int fd, const Vector<String16>& args __unused) {
+ String8 result;
+
+ const size_t SIZE = 256;
+ char buffer[SIZE];
+ std::scoped_lock lock{mLock};
+
+ snprintf(buffer, SIZE, "\n========== Dumping all sessions queues =========\n");
+ result.append(buffer);
+ snprintf(buffer, SIZE, " Total num of Sessions: %zu\n", mSessionMap.size());
+ result.append(buffer);
+
+ std::vector<int32_t> uids(mUidSortedList.begin(), mUidSortedList.end());
+ // Exclude last uid, which is for offline queue
+ uids.pop_back();
+ std::vector<std::string> packageNames;
+ if (TranscodingUidPolicy::getNamesForUids(uids, &packageNames)) {
+ uids.push_back(OFFLINE_UID);
+ packageNames.push_back("(offline)");
+ }
+
+ for (int32_t i = 0; i < uids.size(); i++) {
+ const uid_t uid = uids[i];
+
+ if (mSessionQueues[uid].empty()) {
+ continue;
+ }
+ snprintf(buffer, SIZE, " Uid: %d, pkg: %s\n", uid,
+ packageNames.empty() ? "(unknown)" : packageNames[i].c_str());
+ result.append(buffer);
+ snprintf(buffer, SIZE, " Num of sessions: %zu\n", mSessionQueues[uid].size());
+ result.append(buffer);
+ for (auto& sessionKey : mSessionQueues[uid]) {
+ auto sessionIt = mSessionMap.find(sessionKey);
+ if (sessionIt == mSessionMap.end()) {
+ snprintf(buffer, SIZE, "Failed to look up Session %s \n",
+ sessionToString(sessionKey).c_str());
+ result.append(buffer);
+ continue;
+ }
+ Session& session = sessionIt->second;
+ TranscodingRequestParcel& request = session.request;
+ snprintf(buffer, SIZE, " Session: %s, %s, %d%%\n",
+ sessionToString(sessionKey).c_str(), sessionStateToString(session.state),
+ session.lastProgress);
+ result.append(buffer);
+ snprintf(buffer, SIZE, " Src: %s\n", request.sourceFilePath.c_str());
+ result.append(buffer);
+ snprintf(buffer, SIZE, " Dst: %s\n", request.destinationFilePath.c_str());
+ result.append(buffer);
+ }
+ }
+
+ write(fd, result.string(), result.size());
+}
+
+TranscodingSessionController::Session* TranscodingSessionController::getTopSession_l() {
+ if (mSessionMap.empty()) {
+ return nullptr;
+ }
+ uid_t topUid = *mUidSortedList.begin();
+ SessionKeyType topSessionKey = *mSessionQueues[topUid].begin();
+ return &mSessionMap[topSessionKey];
+}
+
+void TranscodingSessionController::updateCurrentSession_l() {
+ Session* topSession = getTopSession_l();
+ Session* curSession = mCurrentSession;
+ ALOGV("updateCurrentSession: topSession is %s, curSession is %s",
+ topSession == nullptr ? "null" : sessionToString(topSession->key).c_str(),
+ curSession == nullptr ? "null" : sessionToString(curSession->key).c_str());
+
+ // If we found a topSession that should be run, and it's not already running,
+ // take some actions to ensure it's running.
+ if (topSession != nullptr &&
+ (topSession != curSession || topSession->state != Session::RUNNING)) {
+ // If another session is currently running, pause it first.
+ if (curSession != nullptr && curSession->state == Session::RUNNING) {
+ mTranscoder->pause(curSession->key.first, curSession->key.second);
+ curSession->state = Session::PAUSED;
+ }
+ // If we are not experiencing resource loss, we can start or resume
+ // the topSession now.
+ if (!mResourceLost) {
+ if (topSession->state == Session::NOT_STARTED) {
+ mTranscoder->start(topSession->key.first, topSession->key.second,
+ topSession->request, topSession->callback.lock());
+ } else if (topSession->state == Session::PAUSED) {
+ mTranscoder->resume(topSession->key.first, topSession->key.second,
+ topSession->request, topSession->callback.lock());
+ }
+ topSession->state = Session::RUNNING;
+ }
+ }
+ mCurrentSession = topSession;
+}
+
+void TranscodingSessionController::removeSession_l(const SessionKeyType& sessionKey) {
+ ALOGV("%s: session %s", __FUNCTION__, sessionToString(sessionKey).c_str());
+
+ if (mSessionMap.count(sessionKey) == 0) {
+ ALOGE("session %s doesn't exist", sessionToString(sessionKey).c_str());
+ return;
+ }
+
+ // Remove session from uid's queue.
+ const uid_t uid = mSessionMap[sessionKey].uid;
+ SessionQueueType& sessionQueue = mSessionQueues[uid];
+ auto it = std::find(sessionQueue.begin(), sessionQueue.end(), sessionKey);
+ if (it == sessionQueue.end()) {
+ ALOGE("couldn't find session %s in queue for uid %d", sessionToString(sessionKey).c_str(),
+ uid);
+ return;
+ }
+ sessionQueue.erase(it);
+
+ // If this is the last session in a real-time queue, remove this uid's queue.
+ if (uid != OFFLINE_UID && sessionQueue.empty()) {
+ mUidSortedList.remove(uid);
+ mSessionQueues.erase(uid);
+ mUidPolicy->unregisterMonitorUid(uid);
+
+ std::unordered_set<uid_t> topUids = mUidPolicy->getTopUids();
+ moveUidsToTop_l(topUids, false /*preserveTopUid*/);
+ }
+
+ // Clear current session.
+ if (mCurrentSession == &mSessionMap[sessionKey]) {
+ mCurrentSession = nullptr;
+ }
+
+ // Remove session from session map.
+ mSessionMap.erase(sessionKey);
+}
+
+/**
+ * Moves the set of uids to the front of mUidSortedList (which is used to pick
+ * the next session to run).
+ *
+ * This is called when 1) we received a onTopUidsChanged() callback from UidPolicy,
+ * or 2) we removed the session queue for a uid because it becomes empty.
+ *
+ * In case of 1), if there are multiple uids in the set, and the current front
+ * uid in mUidSortedList is still in the set, we try to keep that uid at front
+ * so that current session run is not interrupted. (This is not a concern for case 2)
+ * because the queue for a uid was just removed entirely.)
+ */
+void TranscodingSessionController::moveUidsToTop_l(const std::unordered_set<uid_t>& uids,
+ bool preserveTopUid) {
+ // If uid set is empty, nothing to do. Do not change the queue status.
+ if (uids.empty()) {
+ return;
+ }
+
+ // Save the current top uid.
+ uid_t curTopUid = *mUidSortedList.begin();
+ bool pushCurTopToFront = false;
+ int32_t numUidsMoved = 0;
+
+ // Go through the sorted uid list once, and move the ones in top set to front.
+ for (auto it = mUidSortedList.begin(); it != mUidSortedList.end();) {
+ uid_t uid = *it;
+
+ if (uid != OFFLINE_UID && uids.count(uid) > 0) {
+ it = mUidSortedList.erase(it);
+
+ // If this is the top we're preserving, don't push it here, push
+ // it after the for-loop.
+ if (uid == curTopUid && preserveTopUid) {
+ pushCurTopToFront = true;
+ } else {
+ mUidSortedList.push_front(uid);
+ }
+
+ // If we found all uids in the set, break out.
+ if (++numUidsMoved == uids.size()) {
+ break;
+ }
+ } else {
+ ++it;
+ }
+ }
+
+ if (pushCurTopToFront) {
+ mUidSortedList.push_front(curTopUid);
+ }
+}
+
+bool TranscodingSessionController::submit(
+ ClientIdType clientId, SessionIdType sessionId, uid_t uid,
+ const TranscodingRequestParcel& request,
+ const std::weak_ptr<ITranscodingClientCallback>& callback) {
+ SessionKeyType sessionKey = std::make_pair(clientId, sessionId);
+
+ ALOGV("%s: session %s, uid %d, prioirty %d", __FUNCTION__, sessionToString(sessionKey).c_str(),
+ uid, (int32_t)request.priority);
+
+ std::scoped_lock lock{mLock};
+
+ if (mSessionMap.count(sessionKey) > 0) {
+ ALOGE("session %s already exists", sessionToString(sessionKey).c_str());
+ return false;
+ }
+
+ // TODO(chz): only support offline vs real-time for now. All kUnspecified sessions
+ // go to offline queue.
+ if (request.priority == TranscodingSessionPriority::kUnspecified) {
+ uid = OFFLINE_UID;
+ }
+
+ // Add session to session map.
+ mSessionMap[sessionKey].key = sessionKey;
+ mSessionMap[sessionKey].uid = uid;
+ mSessionMap[sessionKey].state = Session::NOT_STARTED;
+ mSessionMap[sessionKey].lastProgress = 0;
+ mSessionMap[sessionKey].request = request;
+ mSessionMap[sessionKey].callback = callback;
+
+ // If it's an offline session, the queue was already added in constructor.
+ // If it's a real-time sessions, check if a queue is already present for the uid,
+ // and add a new queue if needed.
+ if (uid != OFFLINE_UID) {
+ if (mSessionQueues.count(uid) == 0) {
+ mUidPolicy->registerMonitorUid(uid);
+ if (mUidPolicy->isUidOnTop(uid)) {
+ mUidSortedList.push_front(uid);
+ } else {
+ // Shouldn't be submitting real-time requests from non-top app,
+ // put it in front of the offline queue.
+ mUidSortedList.insert(mOfflineUidIterator, uid);
+ }
+ } else if (uid != *mUidSortedList.begin()) {
+ if (mUidPolicy->isUidOnTop(uid)) {
+ mUidSortedList.remove(uid);
+ mUidSortedList.push_front(uid);
+ }
+ }
+ }
+ // Append this session to the uid's queue.
+ mSessionQueues[uid].push_back(sessionKey);
+
+ updateCurrentSession_l();
+
+ validateState_l();
+ return true;
+}
+
+bool TranscodingSessionController::cancel(ClientIdType clientId, SessionIdType sessionId) {
+ SessionKeyType sessionKey = std::make_pair(clientId, sessionId);
+
+ ALOGV("%s: session %s", __FUNCTION__, sessionToString(sessionKey).c_str());
+
+ std::list<SessionKeyType> sessionsToRemove;
+
+ std::scoped_lock lock{mLock};
+
+ if (sessionId < 0) {
+ for (auto it = mSessionMap.begin(); it != mSessionMap.end(); ++it) {
+ if (it->first.first == clientId && it->second.uid != OFFLINE_UID) {
+ sessionsToRemove.push_back(it->first);
+ }
+ }
+ } else {
+ if (mSessionMap.count(sessionKey) == 0) {
+ ALOGE("session %s doesn't exist", sessionToString(sessionKey).c_str());
+ return false;
+ }
+ sessionsToRemove.push_back(sessionKey);
+ }
+
+ for (auto it = sessionsToRemove.begin(); it != sessionsToRemove.end(); ++it) {
+ // If the session has ever been started, stop it now.
+ // Note that stop() is needed even if the session is currently paused. This instructs
+ // the transcoder to discard any states for the session, otherwise the states may
+ // never be discarded.
+ if (mSessionMap[*it].state != Session::NOT_STARTED) {
+ mTranscoder->stop(it->first, it->second);
+ }
+
+ // Remove the session.
+ removeSession_l(*it);
+ }
+
+ // Start next session.
+ updateCurrentSession_l();
+
+ validateState_l();
+ return true;
+}
+
+bool TranscodingSessionController::getSession(ClientIdType clientId, SessionIdType sessionId,
+ TranscodingRequestParcel* request) {
+ SessionKeyType sessionKey = std::make_pair(clientId, sessionId);
+
+ std::scoped_lock lock{mLock};
+
+ if (mSessionMap.count(sessionKey) == 0) {
+ ALOGE("session %s doesn't exist", sessionToString(sessionKey).c_str());
+ return false;
+ }
+
+ *(TranscodingRequest*)request = mSessionMap[sessionKey].request;
+ return true;
+}
+
+void TranscodingSessionController::notifyClient(ClientIdType clientId, SessionIdType sessionId,
+ const char* reason,
+ std::function<void(const SessionKeyType&)> func) {
+ SessionKeyType sessionKey = std::make_pair(clientId, sessionId);
+
+ std::scoped_lock lock{mLock};
+
+ if (mSessionMap.count(sessionKey) == 0) {
+ ALOGW("%s: ignoring %s for session %s that doesn't exist", __FUNCTION__, reason,
+ sessionToString(sessionKey).c_str());
+ return;
+ }
+
+ // Only ignore if session was never started. In particular, propagate the status
+ // to client if the session is paused. Transcoder could have posted finish when
+ // we're pausing it, and the finish arrived after we changed current session.
+ if (mSessionMap[sessionKey].state == Session::NOT_STARTED) {
+ ALOGW("%s: ignoring %s for session %s that was never started", __FUNCTION__, reason,
+ sessionToString(sessionKey).c_str());
+ return;
+ }
+
+ ALOGV("%s: session %s %s", __FUNCTION__, sessionToString(sessionKey).c_str(), reason);
+ func(sessionKey);
+}
+
+void TranscodingSessionController::onStarted(ClientIdType clientId, SessionIdType sessionId) {
+ notifyClient(clientId, sessionId, "started", [=](const SessionKeyType& sessionKey) {
+ auto callback = mSessionMap[sessionKey].callback.lock();
+ if (callback != nullptr) {
+ callback->onTranscodingStarted(sessionId);
+ }
+ });
+}
+
+void TranscodingSessionController::onPaused(ClientIdType clientId, SessionIdType sessionId) {
+ notifyClient(clientId, sessionId, "paused", [=](const SessionKeyType& sessionKey) {
+ auto callback = mSessionMap[sessionKey].callback.lock();
+ if (callback != nullptr) {
+ callback->onTranscodingPaused(sessionId);
+ }
+ });
+}
+
+void TranscodingSessionController::onResumed(ClientIdType clientId, SessionIdType sessionId) {
+ notifyClient(clientId, sessionId, "resumed", [=](const SessionKeyType& sessionKey) {
+ auto callback = mSessionMap[sessionKey].callback.lock();
+ if (callback != nullptr) {
+ callback->onTranscodingResumed(sessionId);
+ }
+ });
+}
+
+void TranscodingSessionController::onFinish(ClientIdType clientId, SessionIdType sessionId) {
+ notifyClient(clientId, sessionId, "finish", [=](const SessionKeyType& sessionKey) {
+ {
+ auto clientCallback = mSessionMap[sessionKey].callback.lock();
+ if (clientCallback != nullptr) {
+ clientCallback->onTranscodingFinished(
+ sessionId, TranscodingResultParcel({sessionId, -1 /*actualBitrateBps*/,
+ std::nullopt /*sessionStats*/}));
+ }
+ }
+
+ // Remove the session.
+ removeSession_l(sessionKey);
+
+ // Start next session.
+ updateCurrentSession_l();
+
+ validateState_l();
+ });
+}
+
+void TranscodingSessionController::onError(ClientIdType clientId, SessionIdType sessionId,
+ TranscodingErrorCode err) {
+ notifyClient(clientId, sessionId, "error", [=](const SessionKeyType& sessionKey) {
+ {
+ auto clientCallback = mSessionMap[sessionKey].callback.lock();
+ if (clientCallback != nullptr) {
+ clientCallback->onTranscodingFailed(sessionId, err);
+ }
+ }
+
+ // Remove the session.
+ removeSession_l(sessionKey);
+
+ // Start next session.
+ updateCurrentSession_l();
+
+ validateState_l();
+ });
+}
+
+void TranscodingSessionController::onProgressUpdate(ClientIdType clientId, SessionIdType sessionId,
+ int32_t progress) {
+ notifyClient(clientId, sessionId, "progress", [=](const SessionKeyType& sessionKey) {
+ auto callback = mSessionMap[sessionKey].callback.lock();
+ if (callback != nullptr) {
+ callback->onProgressUpdate(sessionId, progress);
+ }
+ mSessionMap[sessionKey].lastProgress = progress;
+ });
+}
+
+void TranscodingSessionController::onResourceLost() {
+ ALOGI("%s", __FUNCTION__);
+
+ std::scoped_lock lock{mLock};
+
+ if (mResourceLost) {
+ return;
+ }
+
+ // If we receive a resource loss event, the TranscoderLibrary already paused
+ // the transcoding, so we don't need to call onPaused to notify it to pause.
+ // Only need to update the session state here.
+ if (mCurrentSession != nullptr && mCurrentSession->state == Session::RUNNING) {
+ mCurrentSession->state = Session::PAUSED;
+ // Notify the client as a paused event.
+ auto clientCallback = mCurrentSession->callback.lock();
+ if (clientCallback != nullptr) {
+ clientCallback->onTranscodingPaused(mCurrentSession->key.second);
+ }
+ }
+ mResourceLost = true;
+
+ validateState_l();
+}
+
+void TranscodingSessionController::onTopUidsChanged(const std::unordered_set<uid_t>& uids) {
+ if (uids.empty()) {
+ ALOGW("%s: ignoring empty uids", __FUNCTION__);
+ return;
+ }
+
+ std::string uidStr;
+ for (auto it = uids.begin(); it != uids.end(); it++) {
+ if (!uidStr.empty()) {
+ uidStr += ", ";
+ }
+ uidStr += std::to_string(*it);
+ }
+
+ ALOGD("%s: topUids: size %zu, uids: %s", __FUNCTION__, uids.size(), uidStr.c_str());
+
+ std::scoped_lock lock{mLock};
+
+ moveUidsToTop_l(uids, true /*preserveTopUid*/);
+
+ updateCurrentSession_l();
+
+ validateState_l();
+}
+
+void TranscodingSessionController::onResourceAvailable() {
+ std::scoped_lock lock{mLock};
+
+ if (!mResourceLost) {
+ return;
+ }
+
+ ALOGI("%s", __FUNCTION__);
+
+ mResourceLost = false;
+ updateCurrentSession_l();
+
+ validateState_l();
+}
+
+void TranscodingSessionController::validateState_l() {
+#ifdef VALIDATE_STATE
+ LOG_ALWAYS_FATAL_IF(mSessionQueues.count(OFFLINE_UID) != 1,
+ "mSessionQueues offline queue number is not 1");
+ LOG_ALWAYS_FATAL_IF(*mOfflineUidIterator != OFFLINE_UID,
+ "mOfflineUidIterator not pointing to offline uid");
+ LOG_ALWAYS_FATAL_IF(mUidSortedList.size() != mSessionQueues.size(),
+ "mUidList and mSessionQueues size mismatch");
+
+ int32_t totalSessions = 0;
+ for (auto uid : mUidSortedList) {
+ LOG_ALWAYS_FATAL_IF(mSessionQueues.count(uid) != 1,
+ "mSessionQueues count for uid %d is not 1", uid);
+ for (auto& sessionKey : mSessionQueues[uid]) {
+ LOG_ALWAYS_FATAL_IF(mSessionMap.count(sessionKey) != 1,
+ "mSessions count for session %s is not 1",
+ sessionToString(sessionKey).c_str());
+ }
+
+ totalSessions += mSessionQueues[uid].size();
+ }
+ LOG_ALWAYS_FATAL_IF(mSessionMap.size() != totalSessions,
+ "mSessions size doesn't match total sessions counted from uid queues");
+#endif // VALIDATE_STATE
+}
+
+} // namespace android
diff --git a/media/libmediatranscoding/aidl/android/media/IMediaTranscodingService.aidl b/media/libmediatranscoding/aidl/android/media/IMediaTranscodingService.aidl
index 7fc7748..ad2358e 100644
--- a/media/libmediatranscoding/aidl/android/media/IMediaTranscodingService.aidl
+++ b/media/libmediatranscoding/aidl/android/media/IMediaTranscodingService.aidl
@@ -18,7 +18,7 @@
import android.media.ITranscodingClient;
import android.media.ITranscodingClientCallback;
-import android.media.TranscodingJobParcel;
+import android.media.TranscodingSessionParcel;
import android.media.TranscodingRequestParcel;
/**
diff --git a/media/libmediatranscoding/aidl/android/media/ITranscodingClient.aidl b/media/libmediatranscoding/aidl/android/media/ITranscodingClient.aidl
index 37b5147..151e3d0 100644
--- a/media/libmediatranscoding/aidl/android/media/ITranscodingClient.aidl
+++ b/media/libmediatranscoding/aidl/android/media/ITranscodingClient.aidl
@@ -16,7 +16,7 @@
package android.media;
-import android.media.TranscodingJobParcel;
+import android.media.TranscodingSessionParcel;
import android.media.TranscodingRequestParcel;
/**
@@ -31,28 +31,28 @@
* Submits a transcoding request to MediaTranscodingService.
*
* @param request a TranscodingRequest contains transcoding configuration.
- * @param job(output variable) a TranscodingJob generated by the MediaTranscodingService.
+ * @param session(output variable) a TranscodingSession generated by MediaTranscodingService.
* @return true if success, false otherwise.
*/
boolean submitRequest(in TranscodingRequestParcel request,
- out TranscodingJobParcel job);
+ out TranscodingSessionParcel session);
/**
- * Cancels a transcoding job.
+ * Cancels a transcoding session.
*
- * @param jobId a TranscodingJob generated by the MediaTranscodingService.
+ * @param sessionId a TranscodingSession generated by the MediaTranscodingService.
* @return true if succeeds, false otherwise.
*/
- boolean cancelJob(in int jobId);
+ boolean cancelSession(in int sessionId);
/**
- * Queries the job detail associated with a jobId.
+ * Queries the session detail associated with a sessionId.
*
- * @param jobId a TranscodingJob generated by the MediaTranscodingService.
- * @param job(output variable) the TranscodingJob associated with the jobId.
+ * @param sessionId a TranscodingSession generated by the MediaTranscodingService.
+ * @param session(output variable) the TranscodingSession associated with the sessionId.
* @return true if succeeds, false otherwise.
*/
- boolean getJobWithId(in int jobId, out TranscodingJobParcel job);
+ boolean getSessionWithId(in int sessionId, out TranscodingSessionParcel session);
/**
* Unregister the client with the MediaTranscodingService.
diff --git a/media/libmediatranscoding/aidl/android/media/ITranscodingClientCallback.aidl b/media/libmediatranscoding/aidl/android/media/ITranscodingClientCallback.aidl
index 73edb95..d7d9b6f 100644
--- a/media/libmediatranscoding/aidl/android/media/ITranscodingClientCallback.aidl
+++ b/media/libmediatranscoding/aidl/android/media/ITranscodingClientCallback.aidl
@@ -17,7 +17,7 @@
package android.media;
import android.media.TranscodingErrorCode;
-import android.media.TranscodingJobParcel;
+import android.media.TranscodingSessionParcel;
import android.media.TranscodingResultParcel;
import android.os.ParcelFileDescriptor;
@@ -40,68 +40,68 @@
in @utf8InCpp String mode);
/**
- * Called when the transcoding associated with the jobId finished.
- * This will only be called if client request to get all the status of the job.
+ * Called when the transcoding associated with the sessionId finished.
+ * This will only be called if client request to get all the status of the session.
*
- * @param jobId jobId assigned by the MediaTranscodingService upon receiving request.
+ * @param sessionId sessionId assigned by the MediaTranscodingService upon receiving request.
*/
- oneway void onTranscodingStarted(in int jobId);
+ oneway void onTranscodingStarted(in int sessionId);
/**
- * Called when the transcoding associated with the jobId is paused.
- * This will only be called if client request to get all the status of the job.
+ * Called when the transcoding associated with the sessionId is paused.
+ * This will only be called if client request to get all the status of the session.
*
- * @param jobId jobId assigned by the MediaTranscodingService upon receiving request.
+ * @param sessionId sessionId assigned by the MediaTranscodingService upon receiving request.
*/
- oneway void onTranscodingPaused(in int jobId);
+ oneway void onTranscodingPaused(in int sessionId);
/**
- * Called when the transcoding associated with the jobId is resumed.
- * This will only be called if client request to get all the status of the job.
+ * Called when the transcoding associated with the sessionId is resumed.
+ * This will only be called if client request to get all the status of the session.
*
- * @param jobId jobId assigned by the MediaTranscodingService upon receiving request.
+ * @param sessionId sessionId assigned by the MediaTranscodingService upon receiving request.
*/
- oneway void onTranscodingResumed(in int jobId);
+ oneway void onTranscodingResumed(in int sessionId);
/**
- * Called when the transcoding associated with the jobId finished.
+ * Called when the transcoding associated with the sessionId finished.
*
- * @param jobId jobId assigned by the MediaTranscodingService upon receiving request.
+ * @param sessionId sessionId assigned by the MediaTranscodingService upon receiving request.
* @param result contains the transcoded file stats and other transcoding metrics if requested.
*/
- oneway void onTranscodingFinished(in int jobId, in TranscodingResultParcel result);
+ oneway void onTranscodingFinished(in int sessionId, in TranscodingResultParcel result);
/**
- * Called when the transcoding associated with the jobId failed.
+ * Called when the transcoding associated with the sessionId failed.
*
- * @param jobId jobId assigned by the MediaTranscodingService upon receiving request.
+ * @param sessionId sessionId assigned by the MediaTranscodingService upon receiving request.
* @param errorCode error code that indicates the error.
*/
- oneway void onTranscodingFailed(in int jobId, in TranscodingErrorCode errorCode);
+ oneway void onTranscodingFailed(in int sessionId, in TranscodingErrorCode errorCode);
/**
- * Called when the transcoding configuration associated with the jobId gets updated, i.e. wait
- * number in the job queue.
+ * Called when the transcoding configuration associated with the sessionId gets updated, i.e. wait
+ * number in the session queue.
*
* <p> This will only be called if client set requestUpdate to be true in the TranscodingRequest
* submitted to the MediaTranscodingService.
*
- * @param jobId jobId assigned by the MediaTranscodingService upon receiving request.
- * @param oldAwaitNumber previous number of jobs ahead of current job.
- * @param newAwaitNumber updated number of jobs ahead of current job.
+ * @param sessionId sessionId assigned by the MediaTranscodingService upon receiving request.
+ * @param oldAwaitNumber previous number of sessions ahead of current session.
+ * @param newAwaitNumber updated number of sessions ahead of current session.
*/
- oneway void onAwaitNumberOfJobsChanged(in int jobId,
+ oneway void onAwaitNumberOfSessionsChanged(in int sessionId,
in int oldAwaitNumber,
in int newAwaitNumber);
/**
- * Called when there is an update on the progress of the TranscodingJob.
+ * Called when there is an update on the progress of the TranscodingSession.
*
* <p> This will only be called if client set requestUpdate to be true in the TranscodingRequest
* submitted to the MediaTranscodingService.
*
- * @param jobId jobId assigned by the MediaTranscodingService upon receiving request.
+ * @param sessionId sessionId assigned by the MediaTranscodingService upon receiving request.
* @param progress an integer number ranging from 0 ~ 100 inclusive.
*/
- oneway void onProgressUpdate(in int jobId, in int progress);
+ oneway void onProgressUpdate(in int sessionId, in int progress);
}
diff --git a/media/libmediatranscoding/aidl/android/media/TranscodingRequestParcel.aidl b/media/libmediatranscoding/aidl/android/media/TranscodingRequestParcel.aidl
index 14d19ba..03c24f0 100644
--- a/media/libmediatranscoding/aidl/android/media/TranscodingRequestParcel.aidl
+++ b/media/libmediatranscoding/aidl/android/media/TranscodingRequestParcel.aidl
@@ -16,7 +16,7 @@
package android.media;
-import android.media.TranscodingJobPriority;
+import android.media.TranscodingSessionPriority;
import android.media.TranscodingTestConfig;
import android.media.TranscodingType;
import android.media.TranscodingVideoTrackFormat;
@@ -61,26 +61,26 @@
* Requested video track format for the transcoding.
* Note that the transcoding service will try to fulfill the requested format as much as
* possbile, while subject to hardware and software limitation. The final video track format
- * will be available in the TranscodingJobParcel when the job is finished.
+ * will be available in the TranscodingSessionParcel when the session is finished.
*/
@nullable TranscodingVideoTrackFormat requestedVideoTrackFormat;
/**
* Priority of this transcoding. Service will schedule the transcoding based on the priority.
*/
- TranscodingJobPriority priority;
+ TranscodingSessionPriority priority;
/**
- * Whether to receive update on progress and change of awaitNumJobs.
+ * Whether to receive update on progress and change of awaitNumSessions.
* Default to false.
*/
boolean requestProgressUpdate = false;
/**
- * Whether to receive update on job's start/stop/pause/resume.
+ * Whether to receive update on session's start/stop/pause/resume.
* Default to false.
*/
- boolean requestJobEventUpdate = false;
+ boolean requestSessionEventUpdate = false;
/**
* Whether this request is for testing.
@@ -94,7 +94,7 @@
/**
* Whether to get the stats of the transcoding.
- * If this is enabled, the TranscodingJobStats will be returned in TranscodingResultParcel
+ * If this is enabled, the TranscodingSessionStats will be returned in TranscodingResultParcel
* upon transcoding finishes.
*/
boolean enableStats = false;
diff --git a/media/libmediatranscoding/aidl/android/media/TranscodingResultParcel.aidl b/media/libmediatranscoding/aidl/android/media/TranscodingResultParcel.aidl
index a20c8b1..7826e25 100644
--- a/media/libmediatranscoding/aidl/android/media/TranscodingResultParcel.aidl
+++ b/media/libmediatranscoding/aidl/android/media/TranscodingResultParcel.aidl
@@ -16,7 +16,7 @@
package android.media;
-import android.media.TranscodingJobStats;
+import android.media.TranscodingSessionStats;
/**
* Result of the transcoding.
@@ -26,9 +26,9 @@
//TODO(hkuang): Implement the parcelable.
parcelable TranscodingResultParcel {
/**
- * The jobId associated with the TranscodingResult.
+ * The sessionId associated with the TranscodingResult.
*/
- int jobId;
+ int sessionId;
/**
* Actual bitrate of the transcoded video in bits per second. This will only present for video
@@ -37,8 +37,8 @@
int actualBitrateBps;
/**
- * Stats of the transcoding job. This will only be available when client requests to get the
+ * Stats of the transcoding session. This will only be available when client requests to get the
* stats in TranscodingRequestParcel.
*/
- @nullable TranscodingJobStats jobStats;
+ @nullable TranscodingSessionStats sessionStats;
}
\ No newline at end of file
diff --git a/media/libmediatranscoding/aidl/android/media/TranscodingJobParcel.aidl b/media/libmediatranscoding/aidl/android/media/TranscodingSessionParcel.aidl
similarity index 61%
rename from media/libmediatranscoding/aidl/android/media/TranscodingJobParcel.aidl
rename to media/libmediatranscoding/aidl/android/media/TranscodingSessionParcel.aidl
index baf4381..3a4a500 100644
--- a/media/libmediatranscoding/aidl/android/media/TranscodingJobParcel.aidl
+++ b/media/libmediatranscoding/aidl/android/media/TranscodingSessionParcel.aidl
@@ -20,34 +20,34 @@
import android.media.TranscodingVideoTrackFormat;
/**
- * TranscodingJob is generated by the MediaTranscodingService upon receiving a TranscodingRequest.
- * It contains all the necessary configuration generated by the MediaTranscodingService for the
- * TranscodingRequest.
+ * TranscodingSession is generated by the MediaTranscodingService upon receiving a
+ * TranscodingRequest. It contains all the necessary configuration generated by the
+ * MediaTranscodingService for the TranscodingRequest.
*
* {@hide}
*/
//TODO(hkuang): Implement the parcelable.
-parcelable TranscodingJobParcel {
+parcelable TranscodingSessionParcel {
/**
* A unique positive Id generated by the MediaTranscodingService.
*/
- int jobId;
+ int sessionId;
/**
- * The request associated with the TranscodingJob.
+ * The request associated with the TranscodingSession.
*/
TranscodingRequestParcel request;
/**
* Output video track's format. This will only be avaiable for video transcoding and it will
- * be avaiable when the job is finished.
+ * be avaiable when the session is finished.
*/
@nullable TranscodingVideoTrackFormat videoTrackFormat;
/**
- * Current number of jobs ahead of this job. The service schedules the job based on the priority
- * passed from the client. Client could specify whether to receive updates when the
- * awaitNumberOfJobs changes through setting requestProgressUpdate in the TranscodingRequest.
+ * Current number of sessions ahead of this session. The service schedules the session based on
+ * the priority passed from the client. Client could specify whether to receive updates when the
+ * awaitNumberOfSessions changes through setting requestProgressUpdate in the TranscodingRequest.
*/
- int awaitNumberOfJobs;
+ int awaitNumberOfSessions;
}
diff --git a/media/libmediatranscoding/aidl/android/media/TranscodingJobPriority.aidl b/media/libmediatranscoding/aidl/android/media/TranscodingSessionPriority.aidl
similarity index 92%
rename from media/libmediatranscoding/aidl/android/media/TranscodingJobPriority.aidl
rename to media/libmediatranscoding/aidl/android/media/TranscodingSessionPriority.aidl
index 1a5d81a..f001484 100644
--- a/media/libmediatranscoding/aidl/android/media/TranscodingJobPriority.aidl
+++ b/media/libmediatranscoding/aidl/android/media/TranscodingSessionPriority.aidl
@@ -17,12 +17,12 @@
package android.media;
/**
- * Priority of a transcoding job.
+ * Priority of a transcoding session.
*
* {@hide}
*/
@Backing(type="int")
-enum TranscodingJobPriority {
+enum TranscodingSessionPriority {
// TODO(hkuang): define what each priority level actually mean.
kUnspecified = 0,
kLow = 1,
diff --git a/media/libmediatranscoding/aidl/android/media/TranscodingJobStats.aidl b/media/libmediatranscoding/aidl/android/media/TranscodingSessionStats.aidl
similarity index 65%
rename from media/libmediatranscoding/aidl/android/media/TranscodingJobStats.aidl
rename to media/libmediatranscoding/aidl/android/media/TranscodingSessionStats.aidl
index 1b41b87..b3e7eea 100644
--- a/media/libmediatranscoding/aidl/android/media/TranscodingJobStats.aidl
+++ b/media/libmediatranscoding/aidl/android/media/TranscodingSessionStats.aidl
@@ -17,20 +17,20 @@
package android.media;
/**
- * TranscodingJobStats encapsulated the stats of the a TranscodingJob.
+ * TranscodingSessionStats encapsulated the stats of the a TranscodingSession.
*
* {@hide}
*/
-parcelable TranscodingJobStats {
+parcelable TranscodingSessionStats {
/**
- * System time of when the job is created.
+ * System time of when the session is created.
*/
- long jobCreatedTimeUs;
+ long sessionCreatedTimeUs;
/**
- * System time of when the job is finished.
+ * System time of when the session is finished.
*/
- long jobFinishedTimeUs;
+ long sessionFinishedTimeUs;
/**
* Total time spend on transcoding, exclude the time in pause.
@@ -38,8 +38,8 @@
long totalProcessingTimeUs;
/**
- * Total time spend on handling the job, include the time in pause.
- * The totaltimeUs is actually the same as jobFinishedTimeUs - jobCreatedTimeUs.
+ * Total time spend on handling the session, include the time in pause.
+ * The totaltimeUs is actually the same as sessionFinishedTimeUs - sessionCreatedTimeUs.
*/
long totalTimeUs;
}
diff --git a/media/libmediatranscoding/aidl/android/media/TranscodingTestConfig.aidl b/media/libmediatranscoding/aidl/android/media/TranscodingTestConfig.aidl
index a564799..12e0e94 100644
--- a/media/libmediatranscoding/aidl/android/media/TranscodingTestConfig.aidl
+++ b/media/libmediatranscoding/aidl/android/media/TranscodingTestConfig.aidl
@@ -24,7 +24,7 @@
parcelable TranscodingTestConfig {
/**
* Whether to use SimulatedTranscoder for testing. Note that SimulatedTranscoder does not send
- * transcoding jobs to real MediaTranscoder.
+ * transcoding sessions to real MediaTranscoder.
*/
boolean useSimulatedTranscoder = false;
@@ -35,9 +35,10 @@
boolean passThroughMode = false;
/**
- * Time of processing the job in milliseconds. Service will return the job result at least after
- * processingTotalTimeMs from the time it starts to process the job. Note that if service uses
- * real MediaTranscoder to do transcoding, the time spent on transcoding may be more than that.
+ * Time of processing the session in milliseconds. Service will return the session result at
+ * least after processingTotalTimeMs from the time it starts to process the session. Note that
+ * if service uses real MediaTranscoder to do transcoding, the time spent on transcoding may be
+ * more than that.
*/
int processingTotalTimeMs = 0;
}
diff --git a/media/libmediatranscoding/aidl/android/media/TranscodingVideoTrackFormat.aidl b/media/libmediatranscoding/aidl/android/media/TranscodingVideoTrackFormat.aidl
index 90502cd..8ed241a 100644
--- a/media/libmediatranscoding/aidl/android/media/TranscodingVideoTrackFormat.aidl
+++ b/media/libmediatranscoding/aidl/android/media/TranscodingVideoTrackFormat.aidl
@@ -25,13 +25,13 @@
* aidl_interface
*
* Note that TranscodingVideoTrackFormat is used in TranscodingRequestParcel for the client to
- * specify the desired transcoded video format, and is also used in TranscodingJobParcel for the
+ * specify the desired transcoded video format, and is also used in TranscodingSessionParcel for the
* service to notify client of the final video format for transcoding.
* When used as input in TranscodingRequestParcel, the client only needs to specify the config that
* they want to change, e.g. codec or resolution, and all the missing configs will be extracted
* from the source video and applied to the destination video.
- * When used as output in TranscodingJobParcel, all the configs will be populated to indicate the
- * final encoder configs used for transcoding.
+ * When used as output in TranscodingSessionParcel, all the configs will be populated to indicate
+ * the final encoder configs used for transcoding.
*
* {@hide}
*/
diff --git a/media/libmediatranscoding/include/media/AdjustableMaxPriorityQueue.h b/media/libmediatranscoding/include/media/AdjustableMaxPriorityQueue.h
index 9ca2ee9..5ba1ee2 100644
--- a/media/libmediatranscoding/include/media/AdjustableMaxPriorityQueue.h
+++ b/media/libmediatranscoding/include/media/AdjustableMaxPriorityQueue.h
@@ -26,7 +26,7 @@
namespace android {
/*
- * AdjustableMaxPriorityQueue is a custom max priority queue that helps managing jobs for
+ * AdjustableMaxPriorityQueue is a custom max priority queue that helps managing sessions for
* MediaTranscodingService.
*
* AdjustableMaxPriorityQueue is a wrapper template around the STL's *_heap() functions.
diff --git a/media/libmediatranscoding/include/media/ControllerClientInterface.h b/media/libmediatranscoding/include/media/ControllerClientInterface.h
new file mode 100644
index 0000000..3fd4f0c
--- /dev/null
+++ b/media/libmediatranscoding/include/media/ControllerClientInterface.h
@@ -0,0 +1,68 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef ANDROID_MEDIA_CONTROLLER_CLIENT_INTERFACE_H
+#define ANDROID_MEDIA_CONTROLLER_CLIENT_INTERFACE_H
+
+#include <aidl/android/media/ITranscodingClientCallback.h>
+#include <aidl/android/media/TranscodingRequestParcel.h>
+#include <media/TranscodingDefs.h>
+
+namespace android {
+
+using ::aidl::android::media::ITranscodingClientCallback;
+using ::aidl::android::media::TranscodingRequestParcel;
+
+// Interface for a client to call the controller to schedule or retrieve
+// the status of a session.
+class ControllerClientInterface {
+public:
+ /**
+ * Submits one request to the controller.
+ *
+ * Returns true on success and false on failure. This call will fail is a session identified
+ * by <clientId, sessionId> already exists.
+ */
+ virtual bool submit(ClientIdType clientId, SessionIdType sessionId, uid_t uid,
+ const TranscodingRequestParcel& request,
+ const std::weak_ptr<ITranscodingClientCallback>& clientCallback) = 0;
+
+ /**
+ * Cancels a session identified by <clientId, sessionId>.
+ *
+ * If sessionId is negative (<0), all sessions with a specified priority (that's not
+ * TranscodingSessionPriority::kUnspecified) will be cancelled. Otherwise, only the single
+ * session <clientId, sessionId> will be cancelled.
+ *
+ * Returns false if a single session is being cancelled but it doesn't exist. Returns
+ * true otherwise.
+ */
+ virtual bool cancel(ClientIdType clientId, SessionIdType sessionId) = 0;
+
+ /**
+ * Retrieves information about a session.
+ *
+ * Returns true and the session if it exists, and false otherwise.
+ */
+ virtual bool getSession(ClientIdType clientId, SessionIdType sessionId,
+ TranscodingRequestParcel* request) = 0;
+
+protected:
+ virtual ~ControllerClientInterface() = default;
+};
+
+} // namespace android
+#endif // ANDROID_MEDIA_CONTROLLER_CLIENT_INTERFACE_H
diff --git a/media/libmediatranscoding/include/media/ResourcePolicyInterface.h b/media/libmediatranscoding/include/media/ResourcePolicyInterface.h
index 8bd7d6b..4a92af8 100644
--- a/media/libmediatranscoding/include/media/ResourcePolicyInterface.h
+++ b/media/libmediatranscoding/include/media/ResourcePolicyInterface.h
@@ -21,7 +21,7 @@
class ResourcePolicyCallbackInterface;
-// Interface for the JobScheduler to control the resource status updates.
+// Interface for the SessionController to control the resource status updates.
class ResourcePolicyInterface {
public:
// Set the associated callback interface to send the events when resource
@@ -32,11 +32,11 @@
virtual ~ResourcePolicyInterface() = default;
};
-// Interface for notifying the JobScheduler of a change in resource status.
+// Interface for notifying the SessionController of a change in resource status.
class ResourcePolicyCallbackInterface {
public:
- // Called when codec resources become available. The scheduler may use this
- // as a signal to attempt restart transcoding jobs that were previously
+ // Called when codec resources become available. The controller may use this
+ // as a signal to attempt restart transcoding sessions that were previously
// paused due to temporary resource loss.
virtual void onResourceAvailable() = 0;
diff --git a/media/libmediatranscoding/include/media/SchedulerClientInterface.h b/media/libmediatranscoding/include/media/SchedulerClientInterface.h
deleted file mode 100644
index e00cfb2..0000000
--- a/media/libmediatranscoding/include/media/SchedulerClientInterface.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright (C) 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef ANDROID_MEDIA_SCHEDULER_CLIENT_INTERFACE_H
-#define ANDROID_MEDIA_SCHEDULER_CLIENT_INTERFACE_H
-
-#include <aidl/android/media/ITranscodingClientCallback.h>
-#include <aidl/android/media/TranscodingRequestParcel.h>
-#include <media/TranscodingDefs.h>
-
-namespace android {
-
-using ::aidl::android::media::ITranscodingClientCallback;
-using ::aidl::android::media::TranscodingRequestParcel;
-
-// Interface for a client to call the scheduler to schedule or retrieve
-// the status of a job.
-class SchedulerClientInterface {
-public:
- /**
- * Submits one request to the scheduler.
- *
- * Returns true on success and false on failure. This call will fail is a job identified
- * by <clientId, jobId> already exists.
- */
- virtual bool submit(ClientIdType clientId, JobIdType jobId, uid_t uid,
- const TranscodingRequestParcel& request,
- const std::weak_ptr<ITranscodingClientCallback>& clientCallback) = 0;
-
- /**
- * Cancels a job identified by <clientId, jobId>.
- *
- * If jobId is negative (<0), all jobs with a specified priority (that's not
- * TranscodingJobPriority::kUnspecified) will be cancelled. Otherwise, only the single job
- * <clientId, jobId> will be cancelled.
- *
- * Returns false if a single job is being cancelled but it doesn't exist. Returns
- * true otherwise.
- */
- virtual bool cancel(ClientIdType clientId, JobIdType jobId) = 0;
-
- /**
- * Retrieves information about a job.
- *
- * Returns true and the job if it exists, and false otherwise.
- */
- virtual bool getJob(ClientIdType clientId, JobIdType jobId,
- TranscodingRequestParcel* request) = 0;
-
-protected:
- virtual ~SchedulerClientInterface() = default;
-};
-
-} // namespace android
-#endif // ANDROID_MEDIA_SCHEDULER_CLIENT_INTERFACE_H
diff --git a/media/libmediatranscoding/include/media/TranscoderInterface.h b/media/libmediatranscoding/include/media/TranscoderInterface.h
index 1a3f505..e17cd5a 100644
--- a/media/libmediatranscoding/include/media/TranscoderInterface.h
+++ b/media/libmediatranscoding/include/media/TranscoderInterface.h
@@ -29,39 +29,41 @@
using ::aidl::android::media::TranscodingRequestParcel;
class TranscoderCallbackInterface;
-// Interface for the scheduler to call the transcoder to take actions.
+// Interface for the controller to call the transcoder to take actions.
class TranscoderInterface {
public:
virtual void setCallback(const std::shared_ptr<TranscoderCallbackInterface>& cb) = 0;
- virtual void start(ClientIdType clientId, JobIdType jobId,
+ virtual void start(ClientIdType clientId, SessionIdType sessionId,
const TranscodingRequestParcel& request,
const std::shared_ptr<ITranscodingClientCallback>& clientCallback) = 0;
- virtual void pause(ClientIdType clientId, JobIdType jobId) = 0;
- virtual void resume(ClientIdType clientId, JobIdType jobId,
+ virtual void pause(ClientIdType clientId, SessionIdType sessionId) = 0;
+ virtual void resume(ClientIdType clientId, SessionIdType sessionId,
const TranscodingRequestParcel& request,
const std::shared_ptr<ITranscodingClientCallback>& clientCallback) = 0;
- virtual void stop(ClientIdType clientId, JobIdType jobId) = 0;
+ virtual void stop(ClientIdType clientId, SessionIdType sessionId) = 0;
protected:
virtual ~TranscoderInterface() = default;
};
-// Interface for the transcoder to notify the scheduler of the status of
-// the currently running job, or temporary loss of transcoding resources.
+// Interface for the transcoder to notify the controller of the status of
+// the currently running session, or temporary loss of transcoding resources.
class TranscoderCallbackInterface {
public:
// TODO(chz): determine what parameters are needed here.
- virtual void onStarted(ClientIdType clientId, JobIdType jobId) = 0;
- virtual void onPaused(ClientIdType clientId, JobIdType jobId) = 0;
- virtual void onResumed(ClientIdType clientId, JobIdType jobId) = 0;
- virtual void onFinish(ClientIdType clientId, JobIdType jobId) = 0;
- virtual void onError(ClientIdType clientId, JobIdType jobId, TranscodingErrorCode err) = 0;
- virtual void onProgressUpdate(ClientIdType clientId, JobIdType jobId, int32_t progress) = 0;
+ virtual void onStarted(ClientIdType clientId, SessionIdType sessionId) = 0;
+ virtual void onPaused(ClientIdType clientId, SessionIdType sessionId) = 0;
+ virtual void onResumed(ClientIdType clientId, SessionIdType sessionId) = 0;
+ virtual void onFinish(ClientIdType clientId, SessionIdType sessionId) = 0;
+ virtual void onError(ClientIdType clientId, SessionIdType sessionId,
+ TranscodingErrorCode err) = 0;
+ virtual void onProgressUpdate(ClientIdType clientId, SessionIdType sessionId,
+ int32_t progress) = 0;
// Called when transcoding becomes temporarily inaccessible due to loss of resource.
- // If there is any job currently running, it will be paused. When resource contention
- // is solved, the scheduler should call TranscoderInterface's to either start a new job,
- // or resume a paused job.
+ // If there is any session currently running, it will be paused. When resource contention
+ // is solved, the controller should call TranscoderInterface's to either start a new session,
+ // or resume a paused session.
virtual void onResourceLost() = 0;
protected:
diff --git a/media/libmediatranscoding/include/media/TranscoderWrapper.h b/media/libmediatranscoding/include/media/TranscoderWrapper.h
index c956042..6bf6b56 100644
--- a/media/libmediatranscoding/include/media/TranscoderWrapper.h
+++ b/media/libmediatranscoding/include/media/TranscoderWrapper.h
@@ -32,7 +32,7 @@
/*
* Wrapper class around MediaTranscoder.
- * Implements TranscoderInterface for TranscodingJobScheduler to use.
+ * Implements TranscoderInterface for TranscodingSessionController to use.
*/
class TranscoderWrapper : public TranscoderInterface,
public std::enable_shared_from_this<TranscoderWrapper> {
@@ -40,25 +40,25 @@
TranscoderWrapper();
virtual void setCallback(const std::shared_ptr<TranscoderCallbackInterface>& cb) override;
- virtual void start(ClientIdType clientId, JobIdType jobId,
+ virtual void start(ClientIdType clientId, SessionIdType sessionId,
const TranscodingRequestParcel& request,
const std::shared_ptr<ITranscodingClientCallback>& clientCallback) override;
- virtual void pause(ClientIdType clientId, JobIdType jobId) override;
- virtual void resume(ClientIdType clientId, JobIdType jobId,
+ virtual void pause(ClientIdType clientId, SessionIdType sessionId) override;
+ virtual void resume(ClientIdType clientId, SessionIdType sessionId,
const TranscodingRequestParcel& request,
const std::shared_ptr<ITranscodingClientCallback>& clientCallback) override;
- virtual void stop(ClientIdType clientId, JobIdType jobId) override;
+ virtual void stop(ClientIdType clientId, SessionIdType sessionId) override;
private:
class CallbackImpl;
struct Event {
enum Type { NoEvent, Start, Pause, Resume, Stop, Finish, Error, Progress } type;
ClientIdType clientId;
- JobIdType jobId;
+ SessionIdType sessionId;
std::function<void()> runnable;
int32_t arg;
};
- using JobKeyType = std::pair<ClientIdType, JobIdType>;
+ using SessionKeyType = std::pair<ClientIdType, SessionIdType>;
std::shared_ptr<CallbackImpl> mTranscoderCb;
std::shared_ptr<MediaTranscoder> mTranscoder;
@@ -66,30 +66,30 @@
std::mutex mLock;
std::condition_variable mCondition;
std::list<Event> mQueue; // GUARDED_BY(mLock);
- std::map<JobKeyType, std::shared_ptr<const Parcel>> mPausedStateMap;
+ std::map<SessionKeyType, std::shared_ptr<const Parcel>> mPausedStateMap;
ClientIdType mCurrentClientId;
- JobIdType mCurrentJobId;
+ SessionIdType mCurrentSessionId;
static std::string toString(const Event& event);
- void onFinish(ClientIdType clientId, JobIdType jobId);
- void onError(ClientIdType clientId, JobIdType jobId, media_status_t status);
- void onProgress(ClientIdType clientId, JobIdType jobId, int32_t progress);
+ void onFinish(ClientIdType clientId, SessionIdType sessionId);
+ void onError(ClientIdType clientId, SessionIdType sessionId, media_status_t status);
+ void onProgress(ClientIdType clientId, SessionIdType sessionId, int32_t progress);
- media_status_t handleStart(ClientIdType clientId, JobIdType jobId,
+ media_status_t handleStart(ClientIdType clientId, SessionIdType sessionId,
const TranscodingRequestParcel& request,
const std::shared_ptr<ITranscodingClientCallback>& callback);
- media_status_t handlePause(ClientIdType clientId, JobIdType jobId);
- media_status_t handleResume(ClientIdType clientId, JobIdType jobId,
+ media_status_t handlePause(ClientIdType clientId, SessionIdType sessionId);
+ media_status_t handleResume(ClientIdType clientId, SessionIdType sessionId,
const TranscodingRequestParcel& request,
const std::shared_ptr<ITranscodingClientCallback>& callback);
- media_status_t setupTranscoder(ClientIdType clientId, JobIdType jobId,
+ media_status_t setupTranscoder(ClientIdType clientId, SessionIdType sessionId,
const TranscodingRequestParcel& request,
const std::shared_ptr<ITranscodingClientCallback>& callback,
const std::shared_ptr<const Parcel>& pausedState = nullptr);
void cleanup();
- void reportError(ClientIdType clientId, JobIdType jobId, media_status_t err);
- void queueEvent(Event::Type type, ClientIdType clientId, JobIdType jobId,
+ void reportError(ClientIdType clientId, SessionIdType sessionId, media_status_t err);
+ void queueEvent(Event::Type type, ClientIdType clientId, SessionIdType sessionId,
const std::function<void()> runnable, int32_t arg = 0);
void threadLoop();
};
diff --git a/media/libmediatranscoding/include/media/TranscodingClientManager.h b/media/libmediatranscoding/include/media/TranscodingClientManager.h
index be03bc4..5feeae9 100644
--- a/media/libmediatranscoding/include/media/TranscodingClientManager.h
+++ b/media/libmediatranscoding/include/media/TranscodingClientManager.h
@@ -29,7 +29,7 @@
#include <unordered_map>
#include <unordered_set>
-#include "SchedulerClientInterface.h"
+#include "ControllerClientInterface.h"
namespace android {
@@ -84,9 +84,9 @@
struct ClientImpl;
// Only allow MediaTranscodingService and unit tests to instantiate.
- TranscodingClientManager(const std::shared_ptr<SchedulerClientInterface>& scheduler);
+ TranscodingClientManager(const std::shared_ptr<ControllerClientInterface>& controller);
- // Checks if a user is trusted (and allowed to submit jobs on behalf of other uids)
+ // Checks if a user is trusted (and allowed to submit sessions on behalf of other uids)
bool isTrustedCallingUid(uid_t uid);
/**
@@ -108,7 +108,7 @@
::ndk::ScopedAIBinder_DeathRecipient mDeathRecipient;
- std::shared_ptr<SchedulerClientInterface> mJobScheduler;
+ std::shared_ptr<ControllerClientInterface> mSessionController;
uid_t mMediaProviderUid;
static std::atomic<ClientIdType> sCookieCounter;
diff --git a/media/libmediatranscoding/include/media/TranscodingDefs.h b/media/libmediatranscoding/include/media/TranscodingDefs.h
index 31d83ac..8e02dd2 100644
--- a/media/libmediatranscoding/include/media/TranscodingDefs.h
+++ b/media/libmediatranscoding/include/media/TranscodingDefs.h
@@ -23,7 +23,7 @@
namespace android {
using ClientIdType = uintptr_t;
-using JobIdType = int32_t;
+using SessionIdType = int32_t;
} // namespace android
#endif // ANDROID_MEDIA_TRANSCODING_DEFS_H
diff --git a/media/libmediatranscoding/include/media/TranscodingJobScheduler.h b/media/libmediatranscoding/include/media/TranscodingJobScheduler.h
deleted file mode 100644
index 7a656d5..0000000
--- a/media/libmediatranscoding/include/media/TranscodingJobScheduler.h
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * Copyright (C) 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#ifndef ANDROID_MEDIA_TRANSCODING_JOB_SCHEDULER_H
-#define ANDROID_MEDIA_TRANSCODING_JOB_SCHEDULER_H
-
-#include <aidl/android/media/TranscodingJobPriority.h>
-#include <media/ResourcePolicyInterface.h>
-#include <media/SchedulerClientInterface.h>
-#include <media/TranscoderInterface.h>
-#include <media/TranscodingRequest.h>
-#include <media/UidPolicyInterface.h>
-#include <utils/String8.h>
-#include <utils/Vector.h>
-
-#include <list>
-#include <map>
-#include <mutex>
-
-namespace android {
-using ::aidl::android::media::TranscodingJobPriority;
-using ::aidl::android::media::TranscodingResultParcel;
-
-class TranscodingJobScheduler : public UidPolicyCallbackInterface,
- public SchedulerClientInterface,
- public TranscoderCallbackInterface,
- public ResourcePolicyCallbackInterface {
-public:
- virtual ~TranscodingJobScheduler();
-
- // SchedulerClientInterface
- bool submit(ClientIdType clientId, JobIdType jobId, uid_t uid,
- const TranscodingRequestParcel& request,
- const std::weak_ptr<ITranscodingClientCallback>& clientCallback) override;
- bool cancel(ClientIdType clientId, JobIdType jobId) override;
- bool getJob(ClientIdType clientId, JobIdType jobId, TranscodingRequestParcel* request) override;
- // ~SchedulerClientInterface
-
- // TranscoderCallbackInterface
- void onStarted(ClientIdType clientId, JobIdType jobId) override;
- void onPaused(ClientIdType clientId, JobIdType jobId) override;
- void onResumed(ClientIdType clientId, JobIdType jobId) override;
- void onFinish(ClientIdType clientId, JobIdType jobId) override;
- void onError(ClientIdType clientId, JobIdType jobId, TranscodingErrorCode err) override;
- void onProgressUpdate(ClientIdType clientId, JobIdType jobId, int32_t progress) override;
- void onResourceLost() override;
- // ~TranscoderCallbackInterface
-
- // UidPolicyCallbackInterface
- void onTopUidsChanged(const std::unordered_set<uid_t>& uids) override;
- // ~UidPolicyCallbackInterface
-
- // ResourcePolicyCallbackInterface
- void onResourceAvailable() override;
- // ~ResourcePolicyCallbackInterface
-
- /**
- * Dump all the job information to the fd.
- */
- void dumpAllJobs(int fd, const Vector<String16>& args);
-
-private:
- friend class MediaTranscodingService;
- friend class TranscodingJobSchedulerTest;
-
- using JobKeyType = std::pair<ClientIdType, JobIdType>;
- using JobQueueType = std::list<JobKeyType>;
-
- struct Job {
- JobKeyType key;
- uid_t uid;
- enum State {
- NOT_STARTED,
- RUNNING,
- PAUSED,
- } state;
- int32_t lastProgress;
- TranscodingRequest request;
- std::weak_ptr<ITranscodingClientCallback> callback;
- };
-
- // TODO(chz): call transcoder without global lock.
- // Use mLock for all entrypoints for now.
- mutable std::mutex mLock;
-
- std::map<JobKeyType, Job> mJobMap;
-
- // uid->JobQueue map (uid == -1: offline queue)
- std::map<uid_t, JobQueueType> mJobQueues;
-
- // uids, with the head being the most-recently-top app, 2nd item is the
- // previous top app, etc.
- std::list<uid_t> mUidSortedList;
- std::list<uid_t>::iterator mOfflineUidIterator;
-
- std::shared_ptr<TranscoderInterface> mTranscoder;
- std::shared_ptr<UidPolicyInterface> mUidPolicy;
- std::shared_ptr<ResourcePolicyInterface> mResourcePolicy;
-
- Job* mCurrentJob;
- bool mResourceLost;
-
- // Only allow MediaTranscodingService and unit tests to instantiate.
- TranscodingJobScheduler(const std::shared_ptr<TranscoderInterface>& transcoder,
- const std::shared_ptr<UidPolicyInterface>& uidPolicy,
- const std::shared_ptr<ResourcePolicyInterface>& resourcePolicy);
-
- Job* getTopJob_l();
- void updateCurrentJob_l();
- void removeJob_l(const JobKeyType& jobKey);
- void moveUidsToTop_l(const std::unordered_set<uid_t>& uids, bool preserveTopUid);
- void notifyClient(ClientIdType clientId, JobIdType jobId, const char* reason,
- std::function<void(const JobKeyType&)> func);
- // Internal state verifier (debug only)
- void validateState_l();
-
- static String8 jobToString(const JobKeyType& jobKey);
- static const char* jobStateToString(const Job::State jobState);
-};
-
-} // namespace android
-#endif // ANDROID_MEDIA_TRANSCODING_JOB_SCHEDULER_H
diff --git a/media/libmediatranscoding/include/media/TranscodingRequest.h b/media/libmediatranscoding/include/media/TranscodingRequest.h
index a6cfed2..aae621f 100644
--- a/media/libmediatranscoding/include/media/TranscodingRequest.h
+++ b/media/libmediatranscoding/include/media/TranscodingRequest.h
@@ -43,7 +43,7 @@
requestedVideoTrackFormat = parcel.requestedVideoTrackFormat;
priority = parcel.priority;
requestProgressUpdate = parcel.requestProgressUpdate;
- requestJobEventUpdate = parcel.requestJobEventUpdate;
+ requestSessionEventUpdate = parcel.requestSessionEventUpdate;
isForTesting = parcel.isForTesting;
testConfig = parcel.testConfig;
}
diff --git a/media/libmediatranscoding/include/media/TranscodingSessionController.h b/media/libmediatranscoding/include/media/TranscodingSessionController.h
new file mode 100644
index 0000000..9ab3518
--- /dev/null
+++ b/media/libmediatranscoding/include/media/TranscodingSessionController.h
@@ -0,0 +1,137 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef ANDROID_MEDIA_TRANSCODING_SESSION_CONTROLLER_H
+#define ANDROID_MEDIA_TRANSCODING_SESSION_CONTROLLER_H
+
+#include <aidl/android/media/TranscodingSessionPriority.h>
+#include <media/ControllerClientInterface.h>
+#include <media/ResourcePolicyInterface.h>
+#include <media/TranscoderInterface.h>
+#include <media/TranscodingRequest.h>
+#include <media/UidPolicyInterface.h>
+#include <utils/String8.h>
+#include <utils/Vector.h>
+
+#include <list>
+#include <map>
+#include <mutex>
+
+namespace android {
+using ::aidl::android::media::TranscodingResultParcel;
+using ::aidl::android::media::TranscodingSessionPriority;
+
+class TranscodingSessionController : public UidPolicyCallbackInterface,
+ public ControllerClientInterface,
+ public TranscoderCallbackInterface,
+ public ResourcePolicyCallbackInterface {
+public:
+ virtual ~TranscodingSessionController();
+
+ // ControllerClientInterface
+ bool submit(ClientIdType clientId, SessionIdType sessionId, uid_t uid,
+ const TranscodingRequestParcel& request,
+ const std::weak_ptr<ITranscodingClientCallback>& clientCallback) override;
+ bool cancel(ClientIdType clientId, SessionIdType sessionId) override;
+ bool getSession(ClientIdType clientId, SessionIdType sessionId,
+ TranscodingRequestParcel* request) override;
+ // ~ControllerClientInterface
+
+ // TranscoderCallbackInterface
+ void onStarted(ClientIdType clientId, SessionIdType sessionId) override;
+ void onPaused(ClientIdType clientId, SessionIdType sessionId) override;
+ void onResumed(ClientIdType clientId, SessionIdType sessionId) override;
+ void onFinish(ClientIdType clientId, SessionIdType sessionId) override;
+ void onError(ClientIdType clientId, SessionIdType sessionId, TranscodingErrorCode err) override;
+ void onProgressUpdate(ClientIdType clientId, SessionIdType sessionId,
+ int32_t progress) override;
+ void onResourceLost() override;
+ // ~TranscoderCallbackInterface
+
+ // UidPolicyCallbackInterface
+ void onTopUidsChanged(const std::unordered_set<uid_t>& uids) override;
+ // ~UidPolicyCallbackInterface
+
+ // ResourcePolicyCallbackInterface
+ void onResourceAvailable() override;
+ // ~ResourcePolicyCallbackInterface
+
+ /**
+ * Dump all the session information to the fd.
+ */
+ void dumpAllSessions(int fd, const Vector<String16>& args);
+
+private:
+ friend class MediaTranscodingService;
+ friend class TranscodingSessionControllerTest;
+
+ using SessionKeyType = std::pair<ClientIdType, SessionIdType>;
+ using SessionQueueType = std::list<SessionKeyType>;
+
+ struct Session {
+ SessionKeyType key;
+ uid_t uid;
+ enum State {
+ NOT_STARTED,
+ RUNNING,
+ PAUSED,
+ } state;
+ int32_t lastProgress;
+ TranscodingRequest request;
+ std::weak_ptr<ITranscodingClientCallback> callback;
+ };
+
+ // TODO(chz): call transcoder without global lock.
+ // Use mLock for all entrypoints for now.
+ mutable std::mutex mLock;
+
+ std::map<SessionKeyType, Session> mSessionMap;
+
+ // uid->SessionQueue map (uid == -1: offline queue)
+ std::map<uid_t, SessionQueueType> mSessionQueues;
+
+ // uids, with the head being the most-recently-top app, 2nd item is the
+ // previous top app, etc.
+ std::list<uid_t> mUidSortedList;
+ std::list<uid_t>::iterator mOfflineUidIterator;
+
+ std::shared_ptr<TranscoderInterface> mTranscoder;
+ std::shared_ptr<UidPolicyInterface> mUidPolicy;
+ std::shared_ptr<ResourcePolicyInterface> mResourcePolicy;
+
+ Session* mCurrentSession;
+ bool mResourceLost;
+
+ // Only allow MediaTranscodingService and unit tests to instantiate.
+ TranscodingSessionController(const std::shared_ptr<TranscoderInterface>& transcoder,
+ const std::shared_ptr<UidPolicyInterface>& uidPolicy,
+ const std::shared_ptr<ResourcePolicyInterface>& resourcePolicy);
+
+ Session* getTopSession_l();
+ void updateCurrentSession_l();
+ void removeSession_l(const SessionKeyType& sessionKey);
+ void moveUidsToTop_l(const std::unordered_set<uid_t>& uids, bool preserveTopUid);
+ void notifyClient(ClientIdType clientId, SessionIdType sessionId, const char* reason,
+ std::function<void(const SessionKeyType&)> func);
+ // Internal state verifier (debug only)
+ void validateState_l();
+
+ static String8 sessionToString(const SessionKeyType& sessionKey);
+ static const char* sessionStateToString(const Session::State sessionState);
+};
+
+} // namespace android
+#endif // ANDROID_MEDIA_TRANSCODING_SESSION_CONTROLLER_H
diff --git a/media/libmediatranscoding/include/media/TranscodingUidPolicy.h b/media/libmediatranscoding/include/media/TranscodingUidPolicy.h
index f02b591..946770c 100644
--- a/media/libmediatranscoding/include/media/TranscodingUidPolicy.h
+++ b/media/libmediatranscoding/include/media/TranscodingUidPolicy.h
@@ -35,7 +35,7 @@
class ActivityManager;
// Observer for UID lifecycle and provide information about the uid's app
-// priority used by the job scheduler.
+// priority used by the session controller.
class TranscodingUidPolicy : public UidPolicyInterface {
public:
explicit TranscodingUidPolicy();
diff --git a/media/libmediatranscoding/include/media/UidPolicyInterface.h b/media/libmediatranscoding/include/media/UidPolicyInterface.h
index f88c1ed..05d8db0 100644
--- a/media/libmediatranscoding/include/media/UidPolicyInterface.h
+++ b/media/libmediatranscoding/include/media/UidPolicyInterface.h
@@ -23,7 +23,7 @@
class UidPolicyCallbackInterface;
-// Interface for the scheduler to query a uid's info.
+// Interface for the controller to query a uid's info.
class UidPolicyInterface {
public:
// Instruct the uid policy to start monitoring a uid.
@@ -41,7 +41,7 @@
virtual ~UidPolicyInterface() = default;
};
-// Interface for notifying the scheduler of a change in uid states.
+// Interface for notifying the controller of a change in uid states.
class UidPolicyCallbackInterface {
public:
// Called when the set of uids that's top priority among the uids of interest
diff --git a/media/libmediatranscoding/tests/AdjustableMaxPriorityQueue_tests.cpp b/media/libmediatranscoding/tests/AdjustableMaxPriorityQueue_tests.cpp
index 2e49f32..a35ca53 100644
--- a/media/libmediatranscoding/tests/AdjustableMaxPriorityQueue_tests.cpp
+++ b/media/libmediatranscoding/tests/AdjustableMaxPriorityQueue_tests.cpp
@@ -223,19 +223,19 @@
}
// Test the heap property and make sure it is the same as std::priority_queue.
-TEST(AdjustableMaxPriorityQueueTest, TranscodingJobTest) {
- // Test data structure that mimics the Transcoding job.
- struct TranscodingJob {
+TEST(AdjustableMaxPriorityQueueTest, TranscodingSessionTest) {
+ // Test data structure that mimics the Transcoding session.
+ struct TranscodingSession {
int32_t priority;
int64_t createTimeUs;
};
- // The job is arranging according to priority with highest priority comes first.
- // For the job with the same priority, the job with early createTime will come first.
- class TranscodingJobComp {
+ // The session is arranging according to priority with highest priority comes first.
+ // For the session with the same priority, the session with early createTime will come first.
+ class TranscodingSessionComp {
public:
- bool operator()(const std::unique_ptr<TranscodingJob>& lhs,
- const std::unique_ptr<TranscodingJob>& rhs) const {
+ bool operator()(const std::unique_ptr<TranscodingSession>& lhs,
+ const std::unique_ptr<TranscodingSession>& rhs) const {
if (lhs->priority != rhs->priority) {
return lhs->priority < rhs->priority;
}
@@ -244,46 +244,47 @@
};
// Map to save each value's position in the heap.
- std::unordered_map<int, TranscodingJob*> jobIdToJobMap;
+ std::unordered_map<int, TranscodingSession*> sessionIdToSessionMap;
- TranscodingJob testJobs[] = {
- {1 /*priority*/, 66 /*createTimeUs*/}, // First job,
- {2 /*priority*/, 67 /*createTimeUs*/}, // Second job,
- {2 /*priority*/, 66 /*createTimeUs*/}, // Third job,
- {3 /*priority*/, 68 /*createTimeUs*/}, // Fourth job.
+ TranscodingSession testSessions[] = {
+ {1 /*priority*/, 66 /*createTimeUs*/}, // First session,
+ {2 /*priority*/, 67 /*createTimeUs*/}, // Second session,
+ {2 /*priority*/, 66 /*createTimeUs*/}, // Third session,
+ {3 /*priority*/, 68 /*createTimeUs*/}, // Fourth session.
};
- AdjustableMaxPriorityQueue<std::unique_ptr<TranscodingJob>, TranscodingJobComp> jobQueue;
+ AdjustableMaxPriorityQueue<std::unique_ptr<TranscodingSession>, TranscodingSessionComp>
+ sessionQueue;
- // Pushes all the jobs into the heap.
- for (int jobId = 0; jobId < 4; ++jobId) {
- auto newJob = std::make_unique<TranscodingJob>(testJobs[jobId]);
- jobIdToJobMap[jobId] = newJob.get();
- EXPECT_TRUE(jobQueue.push(std::move(newJob)));
+ // Pushes all the sessions into the heap.
+ for (int sessionId = 0; sessionId < 4; ++sessionId) {
+ auto newSession = std::make_unique<TranscodingSession>(testSessions[sessionId]);
+ sessionIdToSessionMap[sessionId] = newSession.get();
+ EXPECT_TRUE(sessionQueue.push(std::move(newSession)));
}
- // Check the job queue size.
- EXPECT_EQ(4, jobQueue.size());
+ // Check the session queue size.
+ EXPECT_EQ(4, sessionQueue.size());
- // Check the top and it should be Forth job: (3, 68)
- const std::unique_ptr<TranscodingJob>& topJob = jobQueue.top();
- EXPECT_EQ(3, topJob->priority);
- EXPECT_EQ(68, topJob->createTimeUs);
+ // Check the top and it should be Forth session: (3, 68)
+ const std::unique_ptr<TranscodingSession>& topSession = sessionQueue.top();
+ EXPECT_EQ(3, topSession->priority);
+ EXPECT_EQ(68, topSession->createTimeUs);
// Consume the top.
- std::unique_ptr<TranscodingJob> consumeJob = jobQueue.consume_top();
+ std::unique_ptr<TranscodingSession> consumeSession = sessionQueue.consume_top();
- // Check the top and it should be Third Job (2, 66)
- const std::unique_ptr<TranscodingJob>& topJob2 = jobQueue.top();
- EXPECT_EQ(2, topJob2->priority);
- EXPECT_EQ(66, topJob2->createTimeUs);
+ // Check the top and it should be Third Session (2, 66)
+ const std::unique_ptr<TranscodingSession>& topSession2 = sessionQueue.top();
+ EXPECT_EQ(2, topSession2->priority);
+ EXPECT_EQ(66, topSession2->createTimeUs);
- // Change the Second job's priority to 4 from (2, 67) -> (4, 67). It should becomes top of the
- // queue.
- jobIdToJobMap[1]->priority = 4;
- jobQueue.rebuild();
- const std::unique_ptr<TranscodingJob>& topJob3 = jobQueue.top();
- EXPECT_EQ(4, topJob3->priority);
- EXPECT_EQ(67, topJob3->createTimeUs);
+ // Change the Second session's priority to 4 from (2, 67) -> (4, 67). It should becomes
+ // top of the queue.
+ sessionIdToSessionMap[1]->priority = 4;
+ sessionQueue.rebuild();
+ const std::unique_ptr<TranscodingSession>& topSession3 = sessionQueue.top();
+ EXPECT_EQ(4, topSession3->priority);
+ EXPECT_EQ(67, topSession3->createTimeUs);
}
} // namespace android
\ No newline at end of file
diff --git a/media/libmediatranscoding/tests/Android.bp b/media/libmediatranscoding/tests/Android.bp
index b54022a..7b15b1b 100644
--- a/media/libmediatranscoding/tests/Android.bp
+++ b/media/libmediatranscoding/tests/Android.bp
@@ -38,13 +38,13 @@
}
//
-// TranscodingJobScheduler unit test
+// TranscodingSessionController unit test
//
cc_test {
- name: "TranscodingJobScheduler_tests",
+ name: "TranscodingSessionController_tests",
defaults: ["libmediatranscoding_test_defaults"],
- srcs: ["TranscodingJobScheduler_tests.cpp"],
+ srcs: ["TranscodingSessionController_tests.cpp"],
}
//
diff --git a/media/libmediatranscoding/tests/TranscodingClientManager_tests.cpp b/media/libmediatranscoding/tests/TranscodingClientManager_tests.cpp
index c2ca9b4..1a50923 100644
--- a/media/libmediatranscoding/tests/TranscodingClientManager_tests.cpp
+++ b/media/libmediatranscoding/tests/TranscodingClientManager_tests.cpp
@@ -25,7 +25,7 @@
#include <android/binder_manager.h>
#include <android/binder_process.h>
#include <gtest/gtest.h>
-#include <media/SchedulerClientInterface.h>
+#include <media/ControllerClientInterface.h>
#include <media/TranscodingClientManager.h>
#include <media/TranscodingRequest.h>
#include <utils/Log.h>
@@ -38,10 +38,10 @@
using ::aidl::android::media::BnTranscodingClientCallback;
using ::aidl::android::media::IMediaTranscodingService;
using ::aidl::android::media::TranscodingErrorCode;
-using ::aidl::android::media::TranscodingJobParcel;
-using ::aidl::android::media::TranscodingJobPriority;
using ::aidl::android::media::TranscodingRequestParcel;
using ::aidl::android::media::TranscodingResultParcel;
+using ::aidl::android::media::TranscodingSessionParcel;
+using ::aidl::android::media::TranscodingSessionPriority;
constexpr pid_t kInvalidClientPid = -5;
constexpr pid_t kInvalidClientUid = -10;
@@ -51,7 +51,7 @@
constexpr const char* kClientName = "TestClientName";
constexpr const char* kClientPackage = "TestClientPackage";
-#define JOB(n) (n)
+#define SESSION(n) (n)
struct TestClientCallback : public BnTranscodingClientCallback {
TestClientCallback() { ALOGI("TestClientCallback Created"); }
@@ -63,30 +63,32 @@
return Status::ok();
}
- Status onTranscodingStarted(int32_t /*in_jobId*/) override { return Status::ok(); }
+ Status onTranscodingStarted(int32_t /*in_sessionId*/) override { return Status::ok(); }
- Status onTranscodingPaused(int32_t /*in_jobId*/) override { return Status::ok(); }
+ Status onTranscodingPaused(int32_t /*in_sessionId*/) override { return Status::ok(); }
- Status onTranscodingResumed(int32_t /*in_jobId*/) override { return Status::ok(); }
+ Status onTranscodingResumed(int32_t /*in_sessionId*/) override { return Status::ok(); }
- Status onTranscodingFinished(int32_t in_jobId,
+ Status onTranscodingFinished(int32_t in_sessionId,
const TranscodingResultParcel& in_result) override {
- EXPECT_EQ(in_jobId, in_result.jobId);
- mEventQueue.push_back(Finished(in_jobId));
+ EXPECT_EQ(in_sessionId, in_result.sessionId);
+ mEventQueue.push_back(Finished(in_sessionId));
return Status::ok();
}
- Status onTranscodingFailed(int32_t in_jobId, TranscodingErrorCode /*in_errorCode */) override {
- mEventQueue.push_back(Failed(in_jobId));
+ Status onTranscodingFailed(int32_t in_sessionId,
+ TranscodingErrorCode /*in_errorCode */) override {
+ mEventQueue.push_back(Failed(in_sessionId));
return Status::ok();
}
- Status onAwaitNumberOfJobsChanged(int32_t /* in_jobId */, int32_t /* in_oldAwaitNumber */,
- int32_t /* in_newAwaitNumber */) override {
+ Status onAwaitNumberOfSessionsChanged(int32_t /* in_sessionId */,
+ int32_t /* in_oldAwaitNumber */,
+ int32_t /* in_newAwaitNumber */) override {
return Status::ok();
}
- Status onProgressUpdate(int32_t /* in_jobId */, int32_t /* in_progress */) override {
+ Status onProgressUpdate(int32_t /* in_sessionId */, int32_t /* in_progress */) override {
return Status::ok();
}
@@ -96,12 +98,12 @@
Finished,
Failed,
} type;
- JobIdType jobId;
+ SessionIdType sessionId;
};
static constexpr Event NoEvent = {Event::NoEvent, 0};
#define DECLARE_EVENT(action) \
- static Event action(JobIdType jobId) { return {Event::action, jobId}; }
+ static Event action(SessionIdType sessionId) { return {Event::action, sessionId}; }
DECLARE_EVENT(Finished);
DECLARE_EVENT(Failed);
@@ -125,102 +127,102 @@
};
bool operator==(const TestClientCallback::Event& lhs, const TestClientCallback::Event& rhs) {
- return lhs.type == rhs.type && lhs.jobId == rhs.jobId;
+ return lhs.type == rhs.type && lhs.sessionId == rhs.sessionId;
}
-struct TestScheduler : public SchedulerClientInterface {
- TestScheduler() { ALOGI("TestScheduler Created"); }
+struct TestController : public ControllerClientInterface {
+ TestController() { ALOGI("TestController Created"); }
- virtual ~TestScheduler() { ALOGI("TestScheduler Destroyed"); }
+ virtual ~TestController() { ALOGI("TestController Destroyed"); }
- bool submit(ClientIdType clientId, JobIdType jobId, uid_t /*uid*/,
+ bool submit(ClientIdType clientId, SessionIdType sessionId, uid_t /*uid*/,
const TranscodingRequestParcel& request,
const std::weak_ptr<ITranscodingClientCallback>& clientCallback) override {
- JobKeyType jobKey = std::make_pair(clientId, jobId);
- if (mJobs.count(jobKey) > 0) {
+ SessionKeyType sessionKey = std::make_pair(clientId, sessionId);
+ if (mSessions.count(sessionKey) > 0) {
return false;
}
// This is the secret name we'll check, to test error propagation from
- // the scheduler back to client.
+ // the controller back to client.
if (request.sourceFilePath == "bad_source_file") {
return false;
}
- mJobs[jobKey].request = request;
- mJobs[jobKey].callback = clientCallback;
+ mSessions[sessionKey].request = request;
+ mSessions[sessionKey].callback = clientCallback;
- mLastJob = jobKey;
+ mLastSession = sessionKey;
return true;
}
- bool cancel(ClientIdType clientId, JobIdType jobId) override {
- JobKeyType jobKey = std::make_pair(clientId, jobId);
+ bool cancel(ClientIdType clientId, SessionIdType sessionId) override {
+ SessionKeyType sessionKey = std::make_pair(clientId, sessionId);
- if (mJobs.count(jobKey) == 0) {
+ if (mSessions.count(sessionKey) == 0) {
return false;
}
- mJobs.erase(jobKey);
+ mSessions.erase(sessionKey);
return true;
}
- bool getJob(ClientIdType clientId, JobIdType jobId,
- TranscodingRequestParcel* request) override {
- JobKeyType jobKey = std::make_pair(clientId, jobId);
- if (mJobs.count(jobKey) == 0) {
+ bool getSession(ClientIdType clientId, SessionIdType sessionId,
+ TranscodingRequestParcel* request) override {
+ SessionKeyType sessionKey = std::make_pair(clientId, sessionId);
+ if (mSessions.count(sessionKey) == 0) {
return false;
}
- *(TranscodingRequest*)request = mJobs[jobKey].request;
+ *(TranscodingRequest*)request = mSessions[sessionKey].request;
return true;
}
- void finishLastJob() {
- auto it = mJobs.find(mLastJob);
- if (it == mJobs.end()) {
+ void finishLastSession() {
+ auto it = mSessions.find(mLastSession);
+ if (it == mSessions.end()) {
return;
}
{
auto clientCallback = it->second.callback.lock();
if (clientCallback != nullptr) {
clientCallback->onTranscodingFinished(
- mLastJob.second,
- TranscodingResultParcel({mLastJob.second, 0, std::nullopt}));
+ mLastSession.second,
+ TranscodingResultParcel({mLastSession.second, 0, std::nullopt}));
}
}
- mJobs.erase(it);
+ mSessions.erase(it);
}
- void abortLastJob() {
- auto it = mJobs.find(mLastJob);
- if (it == mJobs.end()) {
+ void abortLastSession() {
+ auto it = mSessions.find(mLastSession);
+ if (it == mSessions.end()) {
return;
}
{
auto clientCallback = it->second.callback.lock();
if (clientCallback != nullptr) {
- clientCallback->onTranscodingFailed(mLastJob.second,
+ clientCallback->onTranscodingFailed(mLastSession.second,
TranscodingErrorCode::kUnknown);
}
}
- mJobs.erase(it);
+ mSessions.erase(it);
}
- struct Job {
+ struct Session {
TranscodingRequest request;
std::weak_ptr<ITranscodingClientCallback> callback;
};
- typedef std::pair<ClientIdType, JobIdType> JobKeyType;
- std::map<JobKeyType, Job> mJobs;
- JobKeyType mLastJob;
+ typedef std::pair<ClientIdType, SessionIdType> SessionKeyType;
+ std::map<SessionKeyType, Session> mSessions;
+ SessionKeyType mLastSession;
};
class TranscodingClientManagerTest : public ::testing::Test {
public:
TranscodingClientManagerTest()
- : mScheduler(new TestScheduler()),
- mClientManager(new TranscodingClientManager(mScheduler)) {
+ : mController(new TestController()),
+ mClientManager(new TranscodingClientManager(mController)) {
ALOGD("TranscodingClientManagerTest created");
}
@@ -260,7 +262,7 @@
EXPECT_EQ(mClientManager->getNumOfClients(), 0);
}
- std::shared_ptr<TestScheduler> mScheduler;
+ std::shared_ptr<TestController> mController;
std::shared_ptr<TranscodingClientManager> mClientManager;
std::shared_ptr<ITranscodingClient> mClient1;
std::shared_ptr<ITranscodingClient> mClient2;
@@ -349,36 +351,36 @@
unregisterMultipleClients();
}
-TEST_F(TranscodingClientManagerTest, TestSubmitCancelGetJobs) {
+TEST_F(TranscodingClientManagerTest, TestSubmitCancelGetSessions) {
addMultipleClients();
- // Test jobId assignment.
+ // Test sessionId assignment.
TranscodingRequestParcel request;
request.sourceFilePath = "test_source_file_0";
request.destinationFilePath = "test_desintaion_file_0";
- TranscodingJobParcel job;
+ TranscodingSessionParcel session;
bool result;
- EXPECT_TRUE(mClient1->submitRequest(request, &job, &result).isOk());
+ EXPECT_TRUE(mClient1->submitRequest(request, &session, &result).isOk());
EXPECT_TRUE(result);
- EXPECT_EQ(job.jobId, JOB(0));
+ EXPECT_EQ(session.sessionId, SESSION(0));
request.sourceFilePath = "test_source_file_1";
request.destinationFilePath = "test_desintaion_file_1";
- EXPECT_TRUE(mClient1->submitRequest(request, &job, &result).isOk());
+ EXPECT_TRUE(mClient1->submitRequest(request, &session, &result).isOk());
EXPECT_TRUE(result);
- EXPECT_EQ(job.jobId, JOB(1));
+ EXPECT_EQ(session.sessionId, SESSION(1));
request.sourceFilePath = "test_source_file_2";
request.destinationFilePath = "test_desintaion_file_2";
- EXPECT_TRUE(mClient1->submitRequest(request, &job, &result).isOk());
+ EXPECT_TRUE(mClient1->submitRequest(request, &session, &result).isOk());
EXPECT_TRUE(result);
- EXPECT_EQ(job.jobId, JOB(2));
+ EXPECT_EQ(session.sessionId, SESSION(2));
// Test submit bad request (no valid sourceFilePath) fails.
TranscodingRequestParcel badRequest;
badRequest.sourceFilePath = "bad_source_file";
badRequest.destinationFilePath = "bad_destination_file";
- EXPECT_TRUE(mClient1->submitRequest(badRequest, &job, &result).isOk());
+ EXPECT_TRUE(mClient1->submitRequest(badRequest, &session, &result).isOk());
EXPECT_FALSE(result);
// Test submit with bad pid/uid.
@@ -386,49 +388,49 @@
badRequest.destinationFilePath = "test_desintaion_file_3";
badRequest.clientPid = kInvalidClientPid;
badRequest.clientUid = kInvalidClientUid;
- EXPECT_TRUE(mClient1->submitRequest(badRequest, &job, &result).isOk());
+ EXPECT_TRUE(mClient1->submitRequest(badRequest, &session, &result).isOk());
EXPECT_FALSE(result);
- // Test get jobs by id.
- EXPECT_TRUE(mClient1->getJobWithId(JOB(2), &job, &result).isOk());
- EXPECT_EQ(job.jobId, JOB(2));
- EXPECT_EQ(job.request.sourceFilePath, "test_source_file_2");
+ // Test get sessions by id.
+ EXPECT_TRUE(mClient1->getSessionWithId(SESSION(2), &session, &result).isOk());
+ EXPECT_EQ(session.sessionId, SESSION(2));
+ EXPECT_EQ(session.request.sourceFilePath, "test_source_file_2");
EXPECT_TRUE(result);
- // Test get jobs by invalid id fails.
- EXPECT_TRUE(mClient1->getJobWithId(JOB(100), &job, &result).isOk());
+ // Test get sessions by invalid id fails.
+ EXPECT_TRUE(mClient1->getSessionWithId(SESSION(100), &session, &result).isOk());
EXPECT_FALSE(result);
- // Test cancel non-existent job fail.
- EXPECT_TRUE(mClient2->cancelJob(JOB(100), &result).isOk());
+ // Test cancel non-existent session fail.
+ EXPECT_TRUE(mClient2->cancelSession(SESSION(100), &result).isOk());
EXPECT_FALSE(result);
- // Test cancel valid jobId in arbitrary order.
- EXPECT_TRUE(mClient1->cancelJob(JOB(2), &result).isOk());
+ // Test cancel valid sessionId in arbitrary order.
+ EXPECT_TRUE(mClient1->cancelSession(SESSION(2), &result).isOk());
EXPECT_TRUE(result);
- EXPECT_TRUE(mClient1->cancelJob(JOB(0), &result).isOk());
+ EXPECT_TRUE(mClient1->cancelSession(SESSION(0), &result).isOk());
EXPECT_TRUE(result);
- EXPECT_TRUE(mClient1->cancelJob(JOB(1), &result).isOk());
+ EXPECT_TRUE(mClient1->cancelSession(SESSION(1), &result).isOk());
EXPECT_TRUE(result);
- // Test cancel job again fails.
- EXPECT_TRUE(mClient1->cancelJob(JOB(1), &result).isOk());
+ // Test cancel session again fails.
+ EXPECT_TRUE(mClient1->cancelSession(SESSION(1), &result).isOk());
EXPECT_FALSE(result);
- // Test get job after cancel fails.
- EXPECT_TRUE(mClient1->getJobWithId(JOB(2), &job, &result).isOk());
+ // Test get session after cancel fails.
+ EXPECT_TRUE(mClient1->getSessionWithId(SESSION(2), &session, &result).isOk());
EXPECT_FALSE(result);
- // Test jobId independence for each client.
- EXPECT_TRUE(mClient2->submitRequest(request, &job, &result).isOk());
+ // Test sessionId independence for each client.
+ EXPECT_TRUE(mClient2->submitRequest(request, &session, &result).isOk());
EXPECT_TRUE(result);
- EXPECT_EQ(job.jobId, JOB(0));
+ EXPECT_EQ(session.sessionId, SESSION(0));
- EXPECT_TRUE(mClient2->submitRequest(request, &job, &result).isOk());
+ EXPECT_TRUE(mClient2->submitRequest(request, &session, &result).isOk());
EXPECT_TRUE(result);
- EXPECT_EQ(job.jobId, JOB(1));
+ EXPECT_EQ(session.sessionId, SESSION(1));
unregisterMultipleClients();
}
@@ -439,32 +441,32 @@
TranscodingRequestParcel request;
request.sourceFilePath = "test_source_file_name";
request.destinationFilePath = "test_destination_file_name";
- TranscodingJobParcel job;
+ TranscodingSessionParcel session;
bool result;
- EXPECT_TRUE(mClient1->submitRequest(request, &job, &result).isOk());
+ EXPECT_TRUE(mClient1->submitRequest(request, &session, &result).isOk());
EXPECT_TRUE(result);
- EXPECT_EQ(job.jobId, JOB(0));
+ EXPECT_EQ(session.sessionId, SESSION(0));
- mScheduler->finishLastJob();
- EXPECT_EQ(mClientCallback1->popEvent(), TestClientCallback::Finished(job.jobId));
+ mController->finishLastSession();
+ EXPECT_EQ(mClientCallback1->popEvent(), TestClientCallback::Finished(session.sessionId));
- EXPECT_TRUE(mClient1->submitRequest(request, &job, &result).isOk());
+ EXPECT_TRUE(mClient1->submitRequest(request, &session, &result).isOk());
EXPECT_TRUE(result);
- EXPECT_EQ(job.jobId, JOB(1));
+ EXPECT_EQ(session.sessionId, SESSION(1));
- mScheduler->abortLastJob();
- EXPECT_EQ(mClientCallback1->popEvent(), TestClientCallback::Failed(job.jobId));
+ mController->abortLastSession();
+ EXPECT_EQ(mClientCallback1->popEvent(), TestClientCallback::Failed(session.sessionId));
- EXPECT_TRUE(mClient1->submitRequest(request, &job, &result).isOk());
+ EXPECT_TRUE(mClient1->submitRequest(request, &session, &result).isOk());
EXPECT_TRUE(result);
- EXPECT_EQ(job.jobId, JOB(2));
+ EXPECT_EQ(session.sessionId, SESSION(2));
- EXPECT_TRUE(mClient2->submitRequest(request, &job, &result).isOk());
+ EXPECT_TRUE(mClient2->submitRequest(request, &session, &result).isOk());
EXPECT_TRUE(result);
- EXPECT_EQ(job.jobId, JOB(0));
+ EXPECT_EQ(session.sessionId, SESSION(0));
- mScheduler->finishLastJob();
- EXPECT_EQ(mClientCallback2->popEvent(), TestClientCallback::Finished(job.jobId));
+ mController->finishLastSession();
+ EXPECT_EQ(mClientCallback2->popEvent(), TestClientCallback::Finished(session.sessionId));
unregisterMultipleClients();
}
@@ -479,20 +481,20 @@
// Submit 2 requests, 1 offline and 1 realtime.
TranscodingRequestParcel request;
- TranscodingJobParcel job;
+ TranscodingSessionParcel session;
bool result;
request.sourceFilePath = "test_source_file_0";
request.destinationFilePath = "test_destination_file_0";
- request.priority = TranscodingJobPriority::kUnspecified;
- EXPECT_TRUE(client->submitRequest(request, &job, &result).isOk() && result);
- EXPECT_EQ(job.jobId, JOB(0));
+ request.priority = TranscodingSessionPriority::kUnspecified;
+ EXPECT_TRUE(client->submitRequest(request, &session, &result).isOk() && result);
+ EXPECT_EQ(session.sessionId, SESSION(0));
request.sourceFilePath = "test_source_file_1";
request.destinationFilePath = "test_destination_file_1";
- request.priority = TranscodingJobPriority::kNormal;
- EXPECT_TRUE(client->submitRequest(request, &job, &result).isOk() && result);
- EXPECT_EQ(job.jobId, JOB(1));
+ request.priority = TranscodingSessionPriority::kNormal;
+ EXPECT_TRUE(client->submitRequest(request, &session, &result).isOk() && result);
+ EXPECT_EQ(session.sessionId, SESSION(1));
// Unregister client, should succeed.
Status status = client->unregister();
@@ -501,36 +503,36 @@
// Test submit new request after unregister, should fail with ERROR_DISCONNECTED.
request.sourceFilePath = "test_source_file_2";
request.destinationFilePath = "test_destination_file_2";
- request.priority = TranscodingJobPriority::kNormal;
- status = client->submitRequest(request, &job, &result);
+ request.priority = TranscodingSessionPriority::kNormal;
+ status = client->submitRequest(request, &session, &result);
EXPECT_FALSE(status.isOk());
EXPECT_EQ(status.getServiceSpecificError(), IMediaTranscodingService::ERROR_DISCONNECTED);
- // Test cancel jobs after unregister, should fail with ERROR_DISCONNECTED
- // regardless of realtime or offline job, or whether the jobId is valid.
- status = client->cancelJob(JOB(0), &result);
+ // Test cancel sessions after unregister, should fail with ERROR_DISCONNECTED
+ // regardless of realtime or offline session, or whether the sessionId is valid.
+ status = client->cancelSession(SESSION(0), &result);
EXPECT_FALSE(status.isOk());
EXPECT_EQ(status.getServiceSpecificError(), IMediaTranscodingService::ERROR_DISCONNECTED);
- status = client->cancelJob(JOB(1), &result);
+ status = client->cancelSession(SESSION(1), &result);
EXPECT_FALSE(status.isOk());
EXPECT_EQ(status.getServiceSpecificError(), IMediaTranscodingService::ERROR_DISCONNECTED);
- status = client->cancelJob(JOB(2), &result);
+ status = client->cancelSession(SESSION(2), &result);
EXPECT_FALSE(status.isOk());
EXPECT_EQ(status.getServiceSpecificError(), IMediaTranscodingService::ERROR_DISCONNECTED);
- // Test get jobs, should fail with ERROR_DISCONNECTED regardless of realtime
- // or offline job, or whether the jobId is valid.
- status = client->getJobWithId(JOB(0), &job, &result);
+ // Test get sessions, should fail with ERROR_DISCONNECTED regardless of realtime
+ // or offline session, or whether the sessionId is valid.
+ status = client->getSessionWithId(SESSION(0), &session, &result);
EXPECT_FALSE(status.isOk());
EXPECT_EQ(status.getServiceSpecificError(), IMediaTranscodingService::ERROR_DISCONNECTED);
- status = client->getJobWithId(JOB(1), &job, &result);
+ status = client->getSessionWithId(SESSION(1), &session, &result);
EXPECT_FALSE(status.isOk());
EXPECT_EQ(status.getServiceSpecificError(), IMediaTranscodingService::ERROR_DISCONNECTED);
- status = client->getJobWithId(JOB(2), &job, &result);
+ status = client->getSessionWithId(SESSION(2), &session, &result);
EXPECT_FALSE(status.isOk());
EXPECT_EQ(status.getServiceSpecificError(), IMediaTranscodingService::ERROR_DISCONNECTED);
}
diff --git a/media/libmediatranscoding/tests/TranscodingJobScheduler_tests.cpp b/media/libmediatranscoding/tests/TranscodingJobScheduler_tests.cpp
deleted file mode 100644
index 9b9df87..0000000
--- a/media/libmediatranscoding/tests/TranscodingJobScheduler_tests.cpp
+++ /dev/null
@@ -1,603 +0,0 @@
-/*
- * Copyright (C) 2020 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-// Unit Test for TranscodingJobScheduler
-
-// #define LOG_NDEBUG 0
-#define LOG_TAG "TranscodingJobSchedulerTest"
-
-#include <aidl/android/media/BnTranscodingClientCallback.h>
-#include <aidl/android/media/IMediaTranscodingService.h>
-#include <aidl/android/media/ITranscodingClient.h>
-#include <aidl/android/media/ITranscodingClientCallback.h>
-#include <android-base/logging.h>
-#include <android/binder_manager.h>
-#include <android/binder_process.h>
-#include <gtest/gtest.h>
-#include <media/TranscodingClientManager.h>
-#include <media/TranscodingJobScheduler.h>
-#include <utils/Log.h>
-
-#include <unordered_set>
-
-namespace android {
-
-using Status = ::ndk::ScopedAStatus;
-using aidl::android::media::BnTranscodingClientCallback;
-using aidl::android::media::IMediaTranscodingService;
-using aidl::android::media::ITranscodingClient;
-using aidl::android::media::TranscodingRequestParcel;
-
-constexpr ClientIdType kClientId = 1000;
-constexpr JobIdType kClientJobId = 0;
-constexpr uid_t kClientUid = 5000;
-constexpr uid_t kInvalidUid = (uid_t)-1;
-
-#define CLIENT(n) (kClientId + (n))
-#define JOB(n) (kClientJobId + (n))
-#define UID(n) (kClientUid + (n))
-
-class TestUidPolicy : public UidPolicyInterface {
-public:
- TestUidPolicy() = default;
- virtual ~TestUidPolicy() = default;
-
- // UidPolicyInterface
- void registerMonitorUid(uid_t /*uid*/) override {}
- void unregisterMonitorUid(uid_t /*uid*/) override {}
- bool isUidOnTop(uid_t uid) override { return mTopUids.count(uid) > 0; }
- std::unordered_set<uid_t> getTopUids() const override { return mTopUids; }
- void setCallback(const std::shared_ptr<UidPolicyCallbackInterface>& cb) override {
- mUidPolicyCallback = cb;
- }
- void setTop(uid_t uid) {
- std::unordered_set<uid_t> uids = {uid};
- setTop(uids);
- }
- void setTop(const std::unordered_set<uid_t>& uids) {
- mTopUids = uids;
- auto uidPolicyCb = mUidPolicyCallback.lock();
- if (uidPolicyCb != nullptr) {
- uidPolicyCb->onTopUidsChanged(mTopUids);
- }
- }
-
- std::unordered_set<uid_t> mTopUids;
- std::weak_ptr<UidPolicyCallbackInterface> mUidPolicyCallback;
-};
-
-class TestTranscoder : public TranscoderInterface {
-public:
- TestTranscoder() : mLastError(TranscodingErrorCode::kUnknown) {}
- virtual ~TestTranscoder() {}
-
- // TranscoderInterface
- void setCallback(const std::shared_ptr<TranscoderCallbackInterface>& /*cb*/) override {}
-
- void start(ClientIdType clientId, JobIdType jobId, const TranscodingRequestParcel& /*request*/,
- const std::shared_ptr<ITranscodingClientCallback>& /*clientCallback*/) override {
- mEventQueue.push_back(Start(clientId, jobId));
- }
- void pause(ClientIdType clientId, JobIdType jobId) override {
- mEventQueue.push_back(Pause(clientId, jobId));
- }
- void resume(ClientIdType clientId, JobIdType jobId, const TranscodingRequestParcel& /*request*/,
- const std::shared_ptr<ITranscodingClientCallback>& /*clientCallback*/) override {
- mEventQueue.push_back(Resume(clientId, jobId));
- }
- void stop(ClientIdType clientId, JobIdType jobId) override {
- mEventQueue.push_back(Stop(clientId, jobId));
- }
-
- void onFinished(ClientIdType clientId, JobIdType jobId) {
- mEventQueue.push_back(Finished(clientId, jobId));
- }
-
- void onFailed(ClientIdType clientId, JobIdType jobId, TranscodingErrorCode err) {
- mLastError = err;
- mEventQueue.push_back(Failed(clientId, jobId));
- }
-
- TranscodingErrorCode getLastError() {
- TranscodingErrorCode result = mLastError;
- mLastError = TranscodingErrorCode::kUnknown;
- return result;
- }
-
- struct Event {
- enum { NoEvent, Start, Pause, Resume, Stop, Finished, Failed } type;
- ClientIdType clientId;
- JobIdType jobId;
- };
-
- static constexpr Event NoEvent = {Event::NoEvent, 0, 0};
-
-#define DECLARE_EVENT(action) \
- static Event action(ClientIdType clientId, JobIdType jobId) { \
- return {Event::action, clientId, jobId}; \
- }
-
- DECLARE_EVENT(Start);
- DECLARE_EVENT(Pause);
- DECLARE_EVENT(Resume);
- DECLARE_EVENT(Stop);
- DECLARE_EVENT(Finished);
- DECLARE_EVENT(Failed);
-
- const Event& popEvent() {
- if (mEventQueue.empty()) {
- mPoppedEvent = NoEvent;
- } else {
- mPoppedEvent = *mEventQueue.begin();
- mEventQueue.pop_front();
- }
- return mPoppedEvent;
- }
-
-private:
- Event mPoppedEvent;
- std::list<Event> mEventQueue;
- TranscodingErrorCode mLastError;
-};
-
-bool operator==(const TestTranscoder::Event& lhs, const TestTranscoder::Event& rhs) {
- return lhs.type == rhs.type && lhs.clientId == rhs.clientId && lhs.jobId == rhs.jobId;
-}
-
-struct TestClientCallback : public BnTranscodingClientCallback {
- TestClientCallback(TestTranscoder* owner, int64_t clientId)
- : mOwner(owner), mClientId(clientId) {
- ALOGD("TestClient Created");
- }
-
- Status openFileDescriptor(const std::string& /*in_fileUri*/, const std::string& /*in_mode*/,
- ::ndk::ScopedFileDescriptor* /*_aidl_return*/) override {
- return Status::ok();
- }
-
- Status onTranscodingStarted(int32_t /*in_jobId*/) override { return Status::ok(); }
-
- Status onTranscodingPaused(int32_t /*in_jobId*/) override { return Status::ok(); }
-
- Status onTranscodingResumed(int32_t /*in_jobId*/) override { return Status::ok(); }
-
- Status onTranscodingFinished(int32_t in_jobId,
- const TranscodingResultParcel& in_result) override {
- EXPECT_EQ(in_jobId, in_result.jobId);
- ALOGD("TestClientCallback: received onTranscodingFinished");
- mOwner->onFinished(mClientId, in_jobId);
- return Status::ok();
- }
-
- Status onTranscodingFailed(int32_t in_jobId, TranscodingErrorCode in_errorCode) override {
- mOwner->onFailed(mClientId, in_jobId, in_errorCode);
- return Status::ok();
- }
-
- Status onAwaitNumberOfJobsChanged(int32_t /* in_jobId */, int32_t /* in_oldAwaitNumber */,
- int32_t /* in_newAwaitNumber */) override {
- return Status::ok();
- }
-
- Status onProgressUpdate(int32_t /* in_jobId */, int32_t /* in_progress */) override {
- return Status::ok();
- }
-
- virtual ~TestClientCallback() { ALOGI("TestClient destroyed"); };
-
-private:
- TestTranscoder* mOwner;
- int64_t mClientId;
- TestClientCallback(const TestClientCallback&) = delete;
- TestClientCallback& operator=(const TestClientCallback&) = delete;
-};
-
-class TranscodingJobSchedulerTest : public ::testing::Test {
-public:
- TranscodingJobSchedulerTest() { ALOGI("TranscodingJobSchedulerTest created"); }
-
- void SetUp() override {
- ALOGI("TranscodingJobSchedulerTest set up");
- mTranscoder.reset(new TestTranscoder());
- mUidPolicy.reset(new TestUidPolicy());
- mScheduler.reset(
- new TranscodingJobScheduler(mTranscoder, mUidPolicy, nullptr /*resourcePolicy*/));
- mUidPolicy->setCallback(mScheduler);
-
- // Set priority only, ignore other fields for now.
- mOfflineRequest.priority = TranscodingJobPriority::kUnspecified;
- mRealtimeRequest.priority = TranscodingJobPriority::kHigh;
- mClientCallback0 =
- ::ndk::SharedRefBase::make<TestClientCallback>(mTranscoder.get(), CLIENT(0));
- mClientCallback1 =
- ::ndk::SharedRefBase::make<TestClientCallback>(mTranscoder.get(), CLIENT(1));
- mClientCallback2 =
- ::ndk::SharedRefBase::make<TestClientCallback>(mTranscoder.get(), CLIENT(2));
- mClientCallback3 =
- ::ndk::SharedRefBase::make<TestClientCallback>(mTranscoder.get(), CLIENT(3));
- }
-
- void TearDown() override { ALOGI("TranscodingJobSchedulerTest tear down"); }
-
- ~TranscodingJobSchedulerTest() { ALOGD("TranscodingJobSchedulerTest destroyed"); }
-
- std::shared_ptr<TestTranscoder> mTranscoder;
- std::shared_ptr<TestUidPolicy> mUidPolicy;
- std::shared_ptr<TranscodingJobScheduler> mScheduler;
- TranscodingRequestParcel mOfflineRequest;
- TranscodingRequestParcel mRealtimeRequest;
- std::shared_ptr<TestClientCallback> mClientCallback0;
- std::shared_ptr<TestClientCallback> mClientCallback1;
- std::shared_ptr<TestClientCallback> mClientCallback2;
- std::shared_ptr<TestClientCallback> mClientCallback3;
-};
-
-TEST_F(TranscodingJobSchedulerTest, TestSubmitJob) {
- ALOGD("TestSubmitJob");
-
- // Start with UID(1) on top.
- mUidPolicy->setTop(UID(1));
-
- // Submit offline job to CLIENT(0) in UID(0).
- // Should start immediately (because this is the only job).
- mScheduler->submit(CLIENT(0), JOB(0), UID(0), mOfflineRequest, mClientCallback0);
- EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::Start(CLIENT(0), 0));
-
- // Submit real-time job to CLIENT(0).
- // Should pause offline job and start new job, even if UID(0) is not on top.
- mScheduler->submit(CLIENT(0), JOB(1), UID(0), mRealtimeRequest, mClientCallback0);
- EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::Pause(CLIENT(0), JOB(0)));
- EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::Start(CLIENT(0), JOB(1)));
-
- // Submit real-time job to CLIENT(0), should be queued after the previous job.
- mScheduler->submit(CLIENT(0), JOB(2), UID(0), mRealtimeRequest, mClientCallback0);
- EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::NoEvent);
-
- // Submit real-time job to CLIENT(1) in same uid, should be queued after the previous job.
- mScheduler->submit(CLIENT(1), JOB(0), UID(0), mRealtimeRequest, mClientCallback1);
- EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::NoEvent);
-
- // Submit real-time job to CLIENT(2) in UID(1).
- // Should pause previous job and start new job, because UID(1) is (has been) top.
- mScheduler->submit(CLIENT(2), JOB(0), UID(1), mRealtimeRequest, mClientCallback2);
- EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::Pause(CLIENT(0), JOB(1)));
- EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::Start(CLIENT(2), JOB(0)));
-
- // Submit offline job, shouldn't generate any event.
- mScheduler->submit(CLIENT(2), JOB(1), UID(1), mOfflineRequest, mClientCallback2);
- EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::NoEvent);
-
- // Bring UID(0) to top.
- mUidPolicy->setTop(UID(0));
- // Should pause current job, and resume last job in UID(0).
- EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::Pause(CLIENT(2), JOB(0)));
- EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::Resume(CLIENT(0), JOB(1)));
-}
-
-TEST_F(TranscodingJobSchedulerTest, TestCancelJob) {
- ALOGD("TestCancelJob");
-
- // Submit real-time job JOB(0), should start immediately.
- mScheduler->submit(CLIENT(0), JOB(0), UID(0), mRealtimeRequest, mClientCallback0);
- EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::Start(CLIENT(0), JOB(0)));
-
- // Submit real-time job JOB(1), should not start.
- mScheduler->submit(CLIENT(0), JOB(1), UID(0), mRealtimeRequest, mClientCallback0);
- EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::NoEvent);
-
- // Submit offline job JOB(2), should not start.
- mScheduler->submit(CLIENT(0), JOB(2), UID(0), mOfflineRequest, mClientCallback0);
- EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::NoEvent);
-
- // Cancel queued real-time job.
- // Cancel real-time job JOB(1), should be cancelled.
- EXPECT_TRUE(mScheduler->cancel(CLIENT(0), JOB(1)));
-
- // Cancel queued offline job.
- // Cancel offline job JOB(2), should be cancelled.
- EXPECT_TRUE(mScheduler->cancel(CLIENT(0), JOB(2)));
-
- // Submit offline job JOB(3), shouldn't cause any event.
- mScheduler->submit(CLIENT(0), JOB(3), UID(0), mOfflineRequest, mClientCallback0);
- EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::NoEvent);
-
- // Cancel running real-time job JOB(0).
- // - Should be stopped first then cancelled.
- // - Should also start offline job JOB(2) because real-time queue is empty.
- EXPECT_TRUE(mScheduler->cancel(CLIENT(0), JOB(0)));
- EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::Stop(CLIENT(0), JOB(0)));
- EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::Start(CLIENT(0), JOB(3)));
-
- // Submit real-time job JOB(4), offline JOB(3) should pause and JOB(4) should start.
- mScheduler->submit(CLIENT(0), JOB(4), UID(0), mRealtimeRequest, mClientCallback0);
- EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::Pause(CLIENT(0), JOB(3)));
- EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::Start(CLIENT(0), JOB(4)));
-
- // Cancel paused JOB(3). JOB(3) should be stopped.
- EXPECT_TRUE(mScheduler->cancel(CLIENT(0), JOB(3)));
- EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::Stop(CLIENT(0), JOB(3)));
-}
-
-TEST_F(TranscodingJobSchedulerTest, TestFinishJob) {
- ALOGD("TestFinishJob");
-
- // Start with unspecified top UID.
- // Finish without any jobs submitted, should be ignored.
- mScheduler->onFinish(CLIENT(0), JOB(0));
- EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::NoEvent);
-
- // Submit offline job JOB(0), should start immediately.
- mScheduler->submit(CLIENT(0), JOB(0), UID(0), mOfflineRequest, mClientCallback0);
- EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::Start(CLIENT(0), JOB(0)));
-
- // Submit real-time job JOB(1), should pause offline job and start immediately.
- mScheduler->submit(CLIENT(0), JOB(1), UID(0), mRealtimeRequest, mClientCallback0);
- EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::Pause(CLIENT(0), JOB(0)));
- EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::Start(CLIENT(0), JOB(1)));
-
- // Submit real-time job JOB(2), should not start.
- mScheduler->submit(CLIENT(0), JOB(2), UID(0), mRealtimeRequest, mClientCallback0);
- EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::NoEvent);
-
- // Finish when the job never started, should be ignored.
- mScheduler->onFinish(CLIENT(0), JOB(2));
- EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::NoEvent);
-
- // UID(1) moves to top.
- mUidPolicy->setTop(UID(1));
- // Submit real-time job to CLIENT(1) in UID(1), should pause previous job and start new job.
- mScheduler->submit(CLIENT(1), JOB(0), UID(1), mRealtimeRequest, mClientCallback1);
- EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::Pause(CLIENT(0), JOB(1)));
- EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::Start(CLIENT(1), JOB(0)));
-
- // Simulate Finish that arrived late, after pause issued by scheduler.
- // Should still be propagated to client, but shouldn't trigger any new start.
- mScheduler->onFinish(CLIENT(0), JOB(1));
- EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::Finished(CLIENT(0), JOB(1)));
-
- // Finish running real-time job, should start next real-time job in queue.
- mScheduler->onFinish(CLIENT(1), JOB(0));
- EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::Finished(CLIENT(1), JOB(0)));
- EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::Start(CLIENT(0), JOB(2)));
-
- // Finish running real-time job, should resume next job (offline job) in queue.
- mScheduler->onFinish(CLIENT(0), JOB(2));
- EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::Finished(CLIENT(0), JOB(2)));
- EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::Resume(CLIENT(0), JOB(0)));
-
- // Finish running offline job.
- mScheduler->onFinish(CLIENT(0), JOB(0));
- EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::Finished(CLIENT(0), JOB(0)));
-
- // Duplicate finish for last job, should be ignored.
- mScheduler->onFinish(CLIENT(0), JOB(0));
- EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::NoEvent);
-}
-
-TEST_F(TranscodingJobSchedulerTest, TestFailJob) {
- ALOGD("TestFailJob");
-
- // Start with unspecified top UID.
- // Fail without any jobs submitted, should be ignored.
- mScheduler->onError(CLIENT(0), JOB(0), TranscodingErrorCode::kUnknown);
- EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::NoEvent);
-
- // Submit offline job JOB(0), should start immediately.
- mScheduler->submit(CLIENT(0), JOB(0), UID(0), mOfflineRequest, mClientCallback0);
- EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::Start(CLIENT(0), JOB(0)));
-
- // Submit real-time job JOB(1), should pause offline job and start immediately.
- mScheduler->submit(CLIENT(0), JOB(1), UID(0), mRealtimeRequest, mClientCallback0);
- EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::Pause(CLIENT(0), JOB(0)));
- EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::Start(CLIENT(0), JOB(1)));
-
- // Submit real-time job JOB(2), should not start.
- mScheduler->submit(CLIENT(0), JOB(2), UID(0), mRealtimeRequest, mClientCallback0);
- EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::NoEvent);
-
- // Fail when the job never started, should be ignored.
- mScheduler->onError(CLIENT(0), JOB(2), TranscodingErrorCode::kUnknown);
- EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::NoEvent);
-
- // UID(1) moves to top.
- mUidPolicy->setTop(UID(1));
- // Submit real-time job to CLIENT(1) in UID(1), should pause previous job and start new job.
- mScheduler->submit(CLIENT(1), JOB(0), UID(1), mRealtimeRequest, mClientCallback1);
- EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::Pause(CLIENT(0), JOB(1)));
- EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::Start(CLIENT(1), JOB(0)));
-
- // Simulate Fail that arrived late, after pause issued by scheduler.
- // Should still be propagated to client, but shouldn't trigger any new start.
- mScheduler->onError(CLIENT(0), JOB(1), TranscodingErrorCode::kUnknown);
- EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::Failed(CLIENT(0), JOB(1)));
-
- // Fail running real-time job, should start next real-time job in queue.
- mScheduler->onError(CLIENT(1), JOB(0), TranscodingErrorCode::kUnknown);
- EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::Failed(CLIENT(1), JOB(0)));
- EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::Start(CLIENT(0), JOB(2)));
-
- // Fail running real-time job, should resume next job (offline job) in queue.
- mScheduler->onError(CLIENT(0), JOB(2), TranscodingErrorCode::kUnknown);
- EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::Failed(CLIENT(0), JOB(2)));
- EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::Resume(CLIENT(0), JOB(0)));
-
- // Fail running offline job, and test error code propagation.
- mScheduler->onError(CLIENT(0), JOB(0), TranscodingErrorCode::kInvalidOperation);
- EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::Failed(CLIENT(0), JOB(0)));
- EXPECT_EQ(mTranscoder->getLastError(), TranscodingErrorCode::kInvalidOperation);
-
- // Duplicate fail for last job, should be ignored.
- mScheduler->onError(CLIENT(0), JOB(0), TranscodingErrorCode::kUnknown);
- EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::NoEvent);
-}
-
-TEST_F(TranscodingJobSchedulerTest, TestTopUidChanged) {
- ALOGD("TestTopUidChanged");
-
- // Start with unspecified top UID.
- // Submit real-time job to CLIENT(0), job should start immediately.
- mScheduler->submit(CLIENT(0), JOB(0), UID(0), mRealtimeRequest, mClientCallback0);
- EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::Start(CLIENT(0), JOB(0)));
-
- // Submit offline job to CLIENT(0), should not start.
- mScheduler->submit(CLIENT(1), JOB(0), UID(0), mOfflineRequest, mClientCallback1);
- EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::NoEvent);
-
- // Move UID(1) to top.
- mUidPolicy->setTop(UID(1));
- EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::NoEvent);
-
- // Submit real-time job to CLIENT(2) in different uid UID(1).
- // Should pause previous job and start new job.
- mScheduler->submit(CLIENT(2), JOB(0), UID(1), mRealtimeRequest, mClientCallback2);
- EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::Pause(CLIENT(0), JOB(0)));
- EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::Start(CLIENT(2), JOB(0)));
-
- // Bring UID(0) back to top.
- mUidPolicy->setTop(UID(0));
- EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::Pause(CLIENT(2), JOB(0)));
- EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::Resume(CLIENT(0), JOB(0)));
-
- // Bring invalid uid to top.
- mUidPolicy->setTop(kInvalidUid);
- EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::NoEvent);
-
- // Finish job, next real-time job should resume.
- mScheduler->onFinish(CLIENT(0), JOB(0));
- EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::Finished(CLIENT(0), JOB(0)));
- EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::Resume(CLIENT(2), JOB(0)));
-
- // Finish job, offline job should start.
- mScheduler->onFinish(CLIENT(2), JOB(0));
- EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::Finished(CLIENT(2), JOB(0)));
- EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::Start(CLIENT(1), JOB(0)));
-}
-
-TEST_F(TranscodingJobSchedulerTest, TestTopUidSetChanged) {
- ALOGD("TestTopUidChanged_MultipleUids");
-
- // Start with unspecified top UID.
- // Submit real-time job to CLIENT(0), job should start immediately.
- mScheduler->submit(CLIENT(0), JOB(0), UID(0), mRealtimeRequest, mClientCallback0);
- EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::Start(CLIENT(0), JOB(0)));
-
- // Submit offline job to CLIENT(0), should not start.
- mScheduler->submit(CLIENT(1), JOB(0), UID(0), mOfflineRequest, mClientCallback1);
- EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::NoEvent);
-
- // Set UID(0), UID(1) to top set.
- // UID(0) should continue to run.
- mUidPolicy->setTop({UID(0), UID(1)});
- EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::NoEvent);
-
- // Submit real-time job to CLIENT(2) in different uid UID(1).
- // UID(0) should pause and UID(1) should start.
- mScheduler->submit(CLIENT(2), JOB(0), UID(1), mRealtimeRequest, mClientCallback2);
- EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::Pause(CLIENT(0), JOB(0)));
- EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::Start(CLIENT(2), JOB(0)));
-
- // Remove UID(0) from top set, and only leave UID(1) in the set.
- // UID(1) should continue to run.
- mUidPolicy->setTop(UID(1));
- EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::NoEvent);
-
- // Set UID(0), UID(2) to top set.
- // UID(1) should continue to run.
- mUidPolicy->setTop({UID(1), UID(2)});
- EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::NoEvent);
-
- // Bring UID(0) back to top.
- mUidPolicy->setTop(UID(0));
- EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::Pause(CLIENT(2), JOB(0)));
- EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::Resume(CLIENT(0), JOB(0)));
-
- // Bring invalid uid to top.
- mUidPolicy->setTop(kInvalidUid);
- EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::NoEvent);
-
- // Finish job, next real-time job from UID(1) should resume, even if UID(1) no longer top.
- mScheduler->onFinish(CLIENT(0), JOB(0));
- EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::Finished(CLIENT(0), JOB(0)));
- EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::Resume(CLIENT(2), JOB(0)));
-
- // Finish job, offline job should start.
- mScheduler->onFinish(CLIENT(2), JOB(0));
- EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::Finished(CLIENT(2), JOB(0)));
- EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::Start(CLIENT(1), JOB(0)));
-}
-
-TEST_F(TranscodingJobSchedulerTest, TestResourceLost) {
- ALOGD("TestResourceLost");
-
- // Start with unspecified top UID.
- // Submit real-time job to CLIENT(0), job should start immediately.
- mScheduler->submit(CLIENT(0), JOB(0), UID(0), mRealtimeRequest, mClientCallback0);
- EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::Start(CLIENT(0), JOB(0)));
-
- // Submit offline job to CLIENT(0), should not start.
- mScheduler->submit(CLIENT(1), JOB(0), UID(0), mOfflineRequest, mClientCallback1);
- EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::NoEvent);
-
- // Move UID(1) to top.
- mUidPolicy->setTop(UID(1));
- EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::NoEvent);
-
- // Submit real-time job to CLIENT(2) in different uid UID(1).
- // Should pause previous job and start new job.
- mScheduler->submit(CLIENT(2), JOB(0), UID(1), mRealtimeRequest, mClientCallback2);
- EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::Pause(CLIENT(0), JOB(0)));
- EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::Start(CLIENT(2), JOB(0)));
-
- // Test 1: No queue change during resource loss.
- // Signal resource lost.
- mScheduler->onResourceLost();
- EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::NoEvent);
-
- // Signal resource available, CLIENT(2) should resume.
- mScheduler->onResourceAvailable();
- EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::Resume(CLIENT(2), JOB(0)));
-
- // Test 2: Change of queue order during resource loss.
- // Signal resource lost.
- mScheduler->onResourceLost();
- EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::NoEvent);
-
- // Move UID(0) back to top, should have no resume due to no resource.
- mUidPolicy->setTop(UID(0));
- EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::NoEvent);
-
- // Signal resource available, CLIENT(0) should resume.
- mScheduler->onResourceAvailable();
- EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::Resume(CLIENT(0), JOB(0)));
-
- // Test 3: Adding new queue during resource loss.
- // Signal resource lost.
- mScheduler->onResourceLost();
- EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::NoEvent);
-
- // Move UID(2) to top.
- mUidPolicy->setTop(UID(2));
-
- // Submit real-time job to CLIENT(3) in UID(2), job shouldn't start due to no resource.
- mScheduler->submit(CLIENT(3), JOB(0), UID(2), mRealtimeRequest, mClientCallback3);
- EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::NoEvent);
-
- // Signal resource available, CLIENT(3)'s job should start.
- mScheduler->onResourceAvailable();
- EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::Start(CLIENT(3), JOB(0)));
-}
-
-} // namespace android
diff --git a/media/libmediatranscoding/tests/TranscodingSessionController_tests.cpp b/media/libmediatranscoding/tests/TranscodingSessionController_tests.cpp
new file mode 100644
index 0000000..4809d7a
--- /dev/null
+++ b/media/libmediatranscoding/tests/TranscodingSessionController_tests.cpp
@@ -0,0 +1,611 @@
+/*
+ * Copyright (C) 2020 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+// Unit Test for TranscodingSessionController
+
+// #define LOG_NDEBUG 0
+#define LOG_TAG "TranscodingSessionControllerTest"
+
+#include <aidl/android/media/BnTranscodingClientCallback.h>
+#include <aidl/android/media/IMediaTranscodingService.h>
+#include <aidl/android/media/ITranscodingClient.h>
+#include <aidl/android/media/ITranscodingClientCallback.h>
+#include <android-base/logging.h>
+#include <android/binder_manager.h>
+#include <android/binder_process.h>
+#include <gtest/gtest.h>
+#include <media/TranscodingClientManager.h>
+#include <media/TranscodingSessionController.h>
+#include <utils/Log.h>
+
+#include <unordered_set>
+
+namespace android {
+
+using Status = ::ndk::ScopedAStatus;
+using aidl::android::media::BnTranscodingClientCallback;
+using aidl::android::media::IMediaTranscodingService;
+using aidl::android::media::ITranscodingClient;
+using aidl::android::media::TranscodingRequestParcel;
+
+constexpr ClientIdType kClientId = 1000;
+constexpr SessionIdType kClientSessionId = 0;
+constexpr uid_t kClientUid = 5000;
+constexpr uid_t kInvalidUid = (uid_t)-1;
+
+#define CLIENT(n) (kClientId + (n))
+#define SESSION(n) (kClientSessionId + (n))
+#define UID(n) (kClientUid + (n))
+
+class TestUidPolicy : public UidPolicyInterface {
+public:
+ TestUidPolicy() = default;
+ virtual ~TestUidPolicy() = default;
+
+ // UidPolicyInterface
+ void registerMonitorUid(uid_t /*uid*/) override {}
+ void unregisterMonitorUid(uid_t /*uid*/) override {}
+ bool isUidOnTop(uid_t uid) override { return mTopUids.count(uid) > 0; }
+ std::unordered_set<uid_t> getTopUids() const override { return mTopUids; }
+ void setCallback(const std::shared_ptr<UidPolicyCallbackInterface>& cb) override {
+ mUidPolicyCallback = cb;
+ }
+ void setTop(uid_t uid) {
+ std::unordered_set<uid_t> uids = {uid};
+ setTop(uids);
+ }
+ void setTop(const std::unordered_set<uid_t>& uids) {
+ mTopUids = uids;
+ auto uidPolicyCb = mUidPolicyCallback.lock();
+ if (uidPolicyCb != nullptr) {
+ uidPolicyCb->onTopUidsChanged(mTopUids);
+ }
+ }
+
+ std::unordered_set<uid_t> mTopUids;
+ std::weak_ptr<UidPolicyCallbackInterface> mUidPolicyCallback;
+};
+
+class TestTranscoder : public TranscoderInterface {
+public:
+ TestTranscoder() : mLastError(TranscodingErrorCode::kUnknown) {}
+ virtual ~TestTranscoder() {}
+
+ // TranscoderInterface
+ void setCallback(const std::shared_ptr<TranscoderCallbackInterface>& /*cb*/) override {}
+
+ void start(ClientIdType clientId, SessionIdType sessionId,
+ const TranscodingRequestParcel& /*request*/,
+ const std::shared_ptr<ITranscodingClientCallback>& /*clientCallback*/) override {
+ mEventQueue.push_back(Start(clientId, sessionId));
+ }
+ void pause(ClientIdType clientId, SessionIdType sessionId) override {
+ mEventQueue.push_back(Pause(clientId, sessionId));
+ }
+ void resume(ClientIdType clientId, SessionIdType sessionId,
+ const TranscodingRequestParcel& /*request*/,
+ const std::shared_ptr<ITranscodingClientCallback>& /*clientCallback*/) override {
+ mEventQueue.push_back(Resume(clientId, sessionId));
+ }
+ void stop(ClientIdType clientId, SessionIdType sessionId) override {
+ mEventQueue.push_back(Stop(clientId, sessionId));
+ }
+
+ void onFinished(ClientIdType clientId, SessionIdType sessionId) {
+ mEventQueue.push_back(Finished(clientId, sessionId));
+ }
+
+ void onFailed(ClientIdType clientId, SessionIdType sessionId, TranscodingErrorCode err) {
+ mLastError = err;
+ mEventQueue.push_back(Failed(clientId, sessionId));
+ }
+
+ TranscodingErrorCode getLastError() {
+ TranscodingErrorCode result = mLastError;
+ mLastError = TranscodingErrorCode::kUnknown;
+ return result;
+ }
+
+ struct Event {
+ enum { NoEvent, Start, Pause, Resume, Stop, Finished, Failed } type;
+ ClientIdType clientId;
+ SessionIdType sessionId;
+ };
+
+ static constexpr Event NoEvent = {Event::NoEvent, 0, 0};
+
+#define DECLARE_EVENT(action) \
+ static Event action(ClientIdType clientId, SessionIdType sessionId) { \
+ return {Event::action, clientId, sessionId}; \
+ }
+
+ DECLARE_EVENT(Start);
+ DECLARE_EVENT(Pause);
+ DECLARE_EVENT(Resume);
+ DECLARE_EVENT(Stop);
+ DECLARE_EVENT(Finished);
+ DECLARE_EVENT(Failed);
+
+ const Event& popEvent() {
+ if (mEventQueue.empty()) {
+ mPoppedEvent = NoEvent;
+ } else {
+ mPoppedEvent = *mEventQueue.begin();
+ mEventQueue.pop_front();
+ }
+ return mPoppedEvent;
+ }
+
+private:
+ Event mPoppedEvent;
+ std::list<Event> mEventQueue;
+ TranscodingErrorCode mLastError;
+};
+
+bool operator==(const TestTranscoder::Event& lhs, const TestTranscoder::Event& rhs) {
+ return lhs.type == rhs.type && lhs.clientId == rhs.clientId && lhs.sessionId == rhs.sessionId;
+}
+
+struct TestClientCallback : public BnTranscodingClientCallback {
+ TestClientCallback(TestTranscoder* owner, int64_t clientId)
+ : mOwner(owner), mClientId(clientId) {
+ ALOGD("TestClient Created");
+ }
+
+ Status openFileDescriptor(const std::string& /*in_fileUri*/, const std::string& /*in_mode*/,
+ ::ndk::ScopedFileDescriptor* /*_aidl_return*/) override {
+ return Status::ok();
+ }
+
+ Status onTranscodingStarted(int32_t /*in_sessionId*/) override { return Status::ok(); }
+
+ Status onTranscodingPaused(int32_t /*in_sessionId*/) override { return Status::ok(); }
+
+ Status onTranscodingResumed(int32_t /*in_sessionId*/) override { return Status::ok(); }
+
+ Status onTranscodingFinished(int32_t in_sessionId,
+ const TranscodingResultParcel& in_result) override {
+ EXPECT_EQ(in_sessionId, in_result.sessionId);
+ ALOGD("TestClientCallback: received onTranscodingFinished");
+ mOwner->onFinished(mClientId, in_sessionId);
+ return Status::ok();
+ }
+
+ Status onTranscodingFailed(int32_t in_sessionId, TranscodingErrorCode in_errorCode) override {
+ mOwner->onFailed(mClientId, in_sessionId, in_errorCode);
+ return Status::ok();
+ }
+
+ Status onAwaitNumberOfSessionsChanged(int32_t /* in_sessionId */,
+ int32_t /* in_oldAwaitNumber */,
+ int32_t /* in_newAwaitNumber */) override {
+ return Status::ok();
+ }
+
+ Status onProgressUpdate(int32_t /* in_sessionId */, int32_t /* in_progress */) override {
+ return Status::ok();
+ }
+
+ virtual ~TestClientCallback() { ALOGI("TestClient destroyed"); };
+
+private:
+ TestTranscoder* mOwner;
+ int64_t mClientId;
+ TestClientCallback(const TestClientCallback&) = delete;
+ TestClientCallback& operator=(const TestClientCallback&) = delete;
+};
+
+class TranscodingSessionControllerTest : public ::testing::Test {
+public:
+ TranscodingSessionControllerTest() { ALOGI("TranscodingSessionControllerTest created"); }
+
+ void SetUp() override {
+ ALOGI("TranscodingSessionControllerTest set up");
+ mTranscoder.reset(new TestTranscoder());
+ mUidPolicy.reset(new TestUidPolicy());
+ mController.reset(new TranscodingSessionController(mTranscoder, mUidPolicy,
+ nullptr /*resourcePolicy*/));
+ mUidPolicy->setCallback(mController);
+
+ // Set priority only, ignore other fields for now.
+ mOfflineRequest.priority = TranscodingSessionPriority::kUnspecified;
+ mRealtimeRequest.priority = TranscodingSessionPriority::kHigh;
+ mClientCallback0 =
+ ::ndk::SharedRefBase::make<TestClientCallback>(mTranscoder.get(), CLIENT(0));
+ mClientCallback1 =
+ ::ndk::SharedRefBase::make<TestClientCallback>(mTranscoder.get(), CLIENT(1));
+ mClientCallback2 =
+ ::ndk::SharedRefBase::make<TestClientCallback>(mTranscoder.get(), CLIENT(2));
+ mClientCallback3 =
+ ::ndk::SharedRefBase::make<TestClientCallback>(mTranscoder.get(), CLIENT(3));
+ }
+
+ void TearDown() override { ALOGI("TranscodingSessionControllerTest tear down"); }
+
+ ~TranscodingSessionControllerTest() { ALOGD("TranscodingSessionControllerTest destroyed"); }
+
+ std::shared_ptr<TestTranscoder> mTranscoder;
+ std::shared_ptr<TestUidPolicy> mUidPolicy;
+ std::shared_ptr<TranscodingSessionController> mController;
+ TranscodingRequestParcel mOfflineRequest;
+ TranscodingRequestParcel mRealtimeRequest;
+ std::shared_ptr<TestClientCallback> mClientCallback0;
+ std::shared_ptr<TestClientCallback> mClientCallback1;
+ std::shared_ptr<TestClientCallback> mClientCallback2;
+ std::shared_ptr<TestClientCallback> mClientCallback3;
+};
+
+TEST_F(TranscodingSessionControllerTest, TestSubmitSession) {
+ ALOGD("TestSubmitSession");
+
+ // Start with UID(1) on top.
+ mUidPolicy->setTop(UID(1));
+
+ // Submit offline session to CLIENT(0) in UID(0).
+ // Should start immediately (because this is the only session).
+ mController->submit(CLIENT(0), SESSION(0), UID(0), mOfflineRequest, mClientCallback0);
+ EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::Start(CLIENT(0), 0));
+
+ // Submit real-time session to CLIENT(0).
+ // Should pause offline session and start new session, even if UID(0) is not on top.
+ mController->submit(CLIENT(0), SESSION(1), UID(0), mRealtimeRequest, mClientCallback0);
+ EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::Pause(CLIENT(0), SESSION(0)));
+ EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::Start(CLIENT(0), SESSION(1)));
+
+ // Submit real-time session to CLIENT(0), should be queued after the previous session.
+ mController->submit(CLIENT(0), SESSION(2), UID(0), mRealtimeRequest, mClientCallback0);
+ EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::NoEvent);
+
+ // Submit real-time session to CLIENT(1) in same uid, should be queued after the previous
+ // session.
+ mController->submit(CLIENT(1), SESSION(0), UID(0), mRealtimeRequest, mClientCallback1);
+ EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::NoEvent);
+
+ // Submit real-time session to CLIENT(2) in UID(1).
+ // Should pause previous session and start new session, because UID(1) is (has been) top.
+ mController->submit(CLIENT(2), SESSION(0), UID(1), mRealtimeRequest, mClientCallback2);
+ EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::Pause(CLIENT(0), SESSION(1)));
+ EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::Start(CLIENT(2), SESSION(0)));
+
+ // Submit offline session, shouldn't generate any event.
+ mController->submit(CLIENT(2), SESSION(1), UID(1), mOfflineRequest, mClientCallback2);
+ EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::NoEvent);
+
+ // Bring UID(0) to top.
+ mUidPolicy->setTop(UID(0));
+ // Should pause current session, and resume last session in UID(0).
+ EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::Pause(CLIENT(2), SESSION(0)));
+ EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::Resume(CLIENT(0), SESSION(1)));
+}
+
+TEST_F(TranscodingSessionControllerTest, TestCancelSession) {
+ ALOGD("TestCancelSession");
+
+ // Submit real-time session SESSION(0), should start immediately.
+ mController->submit(CLIENT(0), SESSION(0), UID(0), mRealtimeRequest, mClientCallback0);
+ EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::Start(CLIENT(0), SESSION(0)));
+
+ // Submit real-time session SESSION(1), should not start.
+ mController->submit(CLIENT(0), SESSION(1), UID(0), mRealtimeRequest, mClientCallback0);
+ EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::NoEvent);
+
+ // Submit offline session SESSION(2), should not start.
+ mController->submit(CLIENT(0), SESSION(2), UID(0), mOfflineRequest, mClientCallback0);
+ EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::NoEvent);
+
+ // Cancel queued real-time session.
+ // Cancel real-time session SESSION(1), should be cancelled.
+ EXPECT_TRUE(mController->cancel(CLIENT(0), SESSION(1)));
+
+ // Cancel queued offline session.
+ // Cancel offline session SESSION(2), should be cancelled.
+ EXPECT_TRUE(mController->cancel(CLIENT(0), SESSION(2)));
+
+ // Submit offline session SESSION(3), shouldn't cause any event.
+ mController->submit(CLIENT(0), SESSION(3), UID(0), mOfflineRequest, mClientCallback0);
+ EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::NoEvent);
+
+ // Cancel running real-time session SESSION(0).
+ // - Should be stopped first then cancelled.
+ // - Should also start offline session SESSION(2) because real-time queue is empty.
+ EXPECT_TRUE(mController->cancel(CLIENT(0), SESSION(0)));
+ EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::Stop(CLIENT(0), SESSION(0)));
+ EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::Start(CLIENT(0), SESSION(3)));
+
+ // Submit real-time session SESSION(4), offline SESSION(3) should pause and SESSION(4)
+ // should start.
+ mController->submit(CLIENT(0), SESSION(4), UID(0), mRealtimeRequest, mClientCallback0);
+ EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::Pause(CLIENT(0), SESSION(3)));
+ EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::Start(CLIENT(0), SESSION(4)));
+
+ // Cancel paused SESSION(3). SESSION(3) should be stopped.
+ EXPECT_TRUE(mController->cancel(CLIENT(0), SESSION(3)));
+ EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::Stop(CLIENT(0), SESSION(3)));
+}
+
+TEST_F(TranscodingSessionControllerTest, TestFinishSession) {
+ ALOGD("TestFinishSession");
+
+ // Start with unspecified top UID.
+ // Finish without any sessions submitted, should be ignored.
+ mController->onFinish(CLIENT(0), SESSION(0));
+ EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::NoEvent);
+
+ // Submit offline session SESSION(0), should start immediately.
+ mController->submit(CLIENT(0), SESSION(0), UID(0), mOfflineRequest, mClientCallback0);
+ EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::Start(CLIENT(0), SESSION(0)));
+
+ // Submit real-time session SESSION(1), should pause offline session and start immediately.
+ mController->submit(CLIENT(0), SESSION(1), UID(0), mRealtimeRequest, mClientCallback0);
+ EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::Pause(CLIENT(0), SESSION(0)));
+ EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::Start(CLIENT(0), SESSION(1)));
+
+ // Submit real-time session SESSION(2), should not start.
+ mController->submit(CLIENT(0), SESSION(2), UID(0), mRealtimeRequest, mClientCallback0);
+ EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::NoEvent);
+
+ // Finish when the session never started, should be ignored.
+ mController->onFinish(CLIENT(0), SESSION(2));
+ EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::NoEvent);
+
+ // UID(1) moves to top.
+ mUidPolicy->setTop(UID(1));
+ // Submit real-time session to CLIENT(1) in UID(1), should pause previous session and start
+ // new session.
+ mController->submit(CLIENT(1), SESSION(0), UID(1), mRealtimeRequest, mClientCallback1);
+ EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::Pause(CLIENT(0), SESSION(1)));
+ EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::Start(CLIENT(1), SESSION(0)));
+
+ // Simulate Finish that arrived late, after pause issued by controller.
+ // Should still be propagated to client, but shouldn't trigger any new start.
+ mController->onFinish(CLIENT(0), SESSION(1));
+ EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::Finished(CLIENT(0), SESSION(1)));
+
+ // Finish running real-time session, should start next real-time session in queue.
+ mController->onFinish(CLIENT(1), SESSION(0));
+ EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::Finished(CLIENT(1), SESSION(0)));
+ EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::Start(CLIENT(0), SESSION(2)));
+
+ // Finish running real-time session, should resume next session (offline session) in queue.
+ mController->onFinish(CLIENT(0), SESSION(2));
+ EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::Finished(CLIENT(0), SESSION(2)));
+ EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::Resume(CLIENT(0), SESSION(0)));
+
+ // Finish running offline session.
+ mController->onFinish(CLIENT(0), SESSION(0));
+ EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::Finished(CLIENT(0), SESSION(0)));
+
+ // Duplicate finish for last session, should be ignored.
+ mController->onFinish(CLIENT(0), SESSION(0));
+ EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::NoEvent);
+}
+
+TEST_F(TranscodingSessionControllerTest, TestFailSession) {
+ ALOGD("TestFailSession");
+
+ // Start with unspecified top UID.
+ // Fail without any sessions submitted, should be ignored.
+ mController->onError(CLIENT(0), SESSION(0), TranscodingErrorCode::kUnknown);
+ EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::NoEvent);
+
+ // Submit offline session SESSION(0), should start immediately.
+ mController->submit(CLIENT(0), SESSION(0), UID(0), mOfflineRequest, mClientCallback0);
+ EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::Start(CLIENT(0), SESSION(0)));
+
+ // Submit real-time session SESSION(1), should pause offline session and start immediately.
+ mController->submit(CLIENT(0), SESSION(1), UID(0), mRealtimeRequest, mClientCallback0);
+ EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::Pause(CLIENT(0), SESSION(0)));
+ EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::Start(CLIENT(0), SESSION(1)));
+
+ // Submit real-time session SESSION(2), should not start.
+ mController->submit(CLIENT(0), SESSION(2), UID(0), mRealtimeRequest, mClientCallback0);
+ EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::NoEvent);
+
+ // Fail when the session never started, should be ignored.
+ mController->onError(CLIENT(0), SESSION(2), TranscodingErrorCode::kUnknown);
+ EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::NoEvent);
+
+ // UID(1) moves to top.
+ mUidPolicy->setTop(UID(1));
+ // Submit real-time session to CLIENT(1) in UID(1), should pause previous session and start
+ // new session.
+ mController->submit(CLIENT(1), SESSION(0), UID(1), mRealtimeRequest, mClientCallback1);
+ EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::Pause(CLIENT(0), SESSION(1)));
+ EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::Start(CLIENT(1), SESSION(0)));
+
+ // Simulate Fail that arrived late, after pause issued by controller.
+ // Should still be propagated to client, but shouldn't trigger any new start.
+ mController->onError(CLIENT(0), SESSION(1), TranscodingErrorCode::kUnknown);
+ EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::Failed(CLIENT(0), SESSION(1)));
+
+ // Fail running real-time session, should start next real-time session in queue.
+ mController->onError(CLIENT(1), SESSION(0), TranscodingErrorCode::kUnknown);
+ EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::Failed(CLIENT(1), SESSION(0)));
+ EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::Start(CLIENT(0), SESSION(2)));
+
+ // Fail running real-time session, should resume next session (offline session) in queue.
+ mController->onError(CLIENT(0), SESSION(2), TranscodingErrorCode::kUnknown);
+ EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::Failed(CLIENT(0), SESSION(2)));
+ EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::Resume(CLIENT(0), SESSION(0)));
+
+ // Fail running offline session, and test error code propagation.
+ mController->onError(CLIENT(0), SESSION(0), TranscodingErrorCode::kInvalidOperation);
+ EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::Failed(CLIENT(0), SESSION(0)));
+ EXPECT_EQ(mTranscoder->getLastError(), TranscodingErrorCode::kInvalidOperation);
+
+ // Duplicate fail for last session, should be ignored.
+ mController->onError(CLIENT(0), SESSION(0), TranscodingErrorCode::kUnknown);
+ EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::NoEvent);
+}
+
+TEST_F(TranscodingSessionControllerTest, TestTopUidChanged) {
+ ALOGD("TestTopUidChanged");
+
+ // Start with unspecified top UID.
+ // Submit real-time session to CLIENT(0), session should start immediately.
+ mController->submit(CLIENT(0), SESSION(0), UID(0), mRealtimeRequest, mClientCallback0);
+ EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::Start(CLIENT(0), SESSION(0)));
+
+ // Submit offline session to CLIENT(0), should not start.
+ mController->submit(CLIENT(1), SESSION(0), UID(0), mOfflineRequest, mClientCallback1);
+ EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::NoEvent);
+
+ // Move UID(1) to top.
+ mUidPolicy->setTop(UID(1));
+ EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::NoEvent);
+
+ // Submit real-time session to CLIENT(2) in different uid UID(1).
+ // Should pause previous session and start new session.
+ mController->submit(CLIENT(2), SESSION(0), UID(1), mRealtimeRequest, mClientCallback2);
+ EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::Pause(CLIENT(0), SESSION(0)));
+ EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::Start(CLIENT(2), SESSION(0)));
+
+ // Bring UID(0) back to top.
+ mUidPolicy->setTop(UID(0));
+ EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::Pause(CLIENT(2), SESSION(0)));
+ EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::Resume(CLIENT(0), SESSION(0)));
+
+ // Bring invalid uid to top.
+ mUidPolicy->setTop(kInvalidUid);
+ EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::NoEvent);
+
+ // Finish session, next real-time session should resume.
+ mController->onFinish(CLIENT(0), SESSION(0));
+ EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::Finished(CLIENT(0), SESSION(0)));
+ EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::Resume(CLIENT(2), SESSION(0)));
+
+ // Finish session, offline session should start.
+ mController->onFinish(CLIENT(2), SESSION(0));
+ EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::Finished(CLIENT(2), SESSION(0)));
+ EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::Start(CLIENT(1), SESSION(0)));
+}
+
+TEST_F(TranscodingSessionControllerTest, TestTopUidSetChanged) {
+ ALOGD("TestTopUidChanged_MultipleUids");
+
+ // Start with unspecified top UID.
+ // Submit real-time session to CLIENT(0), session should start immediately.
+ mController->submit(CLIENT(0), SESSION(0), UID(0), mRealtimeRequest, mClientCallback0);
+ EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::Start(CLIENT(0), SESSION(0)));
+
+ // Submit offline session to CLIENT(0), should not start.
+ mController->submit(CLIENT(1), SESSION(0), UID(0), mOfflineRequest, mClientCallback1);
+ EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::NoEvent);
+
+ // Set UID(0), UID(1) to top set.
+ // UID(0) should continue to run.
+ mUidPolicy->setTop({UID(0), UID(1)});
+ EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::NoEvent);
+
+ // Submit real-time session to CLIENT(2) in different uid UID(1).
+ // UID(0) should pause and UID(1) should start.
+ mController->submit(CLIENT(2), SESSION(0), UID(1), mRealtimeRequest, mClientCallback2);
+ EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::Pause(CLIENT(0), SESSION(0)));
+ EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::Start(CLIENT(2), SESSION(0)));
+
+ // Remove UID(0) from top set, and only leave UID(1) in the set.
+ // UID(1) should continue to run.
+ mUidPolicy->setTop(UID(1));
+ EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::NoEvent);
+
+ // Set UID(0), UID(2) to top set.
+ // UID(1) should continue to run.
+ mUidPolicy->setTop({UID(1), UID(2)});
+ EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::NoEvent);
+
+ // Bring UID(0) back to top.
+ mUidPolicy->setTop(UID(0));
+ EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::Pause(CLIENT(2), SESSION(0)));
+ EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::Resume(CLIENT(0), SESSION(0)));
+
+ // Bring invalid uid to top.
+ mUidPolicy->setTop(kInvalidUid);
+ EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::NoEvent);
+
+ // Finish session, next real-time session from UID(1) should resume, even if UID(1)
+ // no longer top.
+ mController->onFinish(CLIENT(0), SESSION(0));
+ EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::Finished(CLIENT(0), SESSION(0)));
+ EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::Resume(CLIENT(2), SESSION(0)));
+
+ // Finish session, offline session should start.
+ mController->onFinish(CLIENT(2), SESSION(0));
+ EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::Finished(CLIENT(2), SESSION(0)));
+ EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::Start(CLIENT(1), SESSION(0)));
+}
+
+TEST_F(TranscodingSessionControllerTest, TestResourceLost) {
+ ALOGD("TestResourceLost");
+
+ // Start with unspecified top UID.
+ // Submit real-time session to CLIENT(0), session should start immediately.
+ mController->submit(CLIENT(0), SESSION(0), UID(0), mRealtimeRequest, mClientCallback0);
+ EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::Start(CLIENT(0), SESSION(0)));
+
+ // Submit offline session to CLIENT(0), should not start.
+ mController->submit(CLIENT(1), SESSION(0), UID(0), mOfflineRequest, mClientCallback1);
+ EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::NoEvent);
+
+ // Move UID(1) to top.
+ mUidPolicy->setTop(UID(1));
+ EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::NoEvent);
+
+ // Submit real-time session to CLIENT(2) in different uid UID(1).
+ // Should pause previous session and start new session.
+ mController->submit(CLIENT(2), SESSION(0), UID(1), mRealtimeRequest, mClientCallback2);
+ EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::Pause(CLIENT(0), SESSION(0)));
+ EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::Start(CLIENT(2), SESSION(0)));
+
+ // Test 1: No queue change during resource loss.
+ // Signal resource lost.
+ mController->onResourceLost();
+ EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::NoEvent);
+
+ // Signal resource available, CLIENT(2) should resume.
+ mController->onResourceAvailable();
+ EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::Resume(CLIENT(2), SESSION(0)));
+
+ // Test 2: Change of queue order during resource loss.
+ // Signal resource lost.
+ mController->onResourceLost();
+ EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::NoEvent);
+
+ // Move UID(0) back to top, should have no resume due to no resource.
+ mUidPolicy->setTop(UID(0));
+ EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::NoEvent);
+
+ // Signal resource available, CLIENT(0) should resume.
+ mController->onResourceAvailable();
+ EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::Resume(CLIENT(0), SESSION(0)));
+
+ // Test 3: Adding new queue during resource loss.
+ // Signal resource lost.
+ mController->onResourceLost();
+ EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::NoEvent);
+
+ // Move UID(2) to top.
+ mUidPolicy->setTop(UID(2));
+
+ // Submit real-time session to CLIENT(3) in UID(2), session shouldn't start due to no resource.
+ mController->submit(CLIENT(3), SESSION(0), UID(2), mRealtimeRequest, mClientCallback3);
+ EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::NoEvent);
+
+ // Signal resource available, CLIENT(3)'s session should start.
+ mController->onResourceAvailable();
+ EXPECT_EQ(mTranscoder->popEvent(), TestTranscoder::Start(CLIENT(3), SESSION(0)));
+}
+
+} // namespace android
diff --git a/media/libmediatranscoding/tests/build_and_run_all_unit_tests.sh b/media/libmediatranscoding/tests/build_and_run_all_unit_tests.sh
index ff6df2c..5db9258 100644
--- a/media/libmediatranscoding/tests/build_and_run_all_unit_tests.sh
+++ b/media/libmediatranscoding/tests/build_and_run_all_unit_tests.sh
@@ -29,6 +29,6 @@
#adb shell /data/nativetest64/AdjustableMaxPriorityQueue_tests/AdjustableMaxPriorityQueue_tests
adb shell /data/nativetest/AdjustableMaxPriorityQueue_tests/AdjustableMaxPriorityQueue_tests
-echo "testing TranscodingJobScheduler"
-#adb shell /data/nativetest64/TranscodingJobScheduler_tests/TranscodingJobScheduler_tests
-adb shell /data/nativetest/TranscodingJobScheduler_tests/TranscodingJobScheduler_tests
+echo "testing TranscodingSessionController"
+#adb shell /data/nativetest64/TranscodingSessionController_tests/TranscodingSessionController_tests
+adb shell /data/nativetest/TranscodingSessionController_tests/TranscodingSessionController_tests
diff --git a/media/libmediatranscoding/transcoder/VideoTrackTranscoder.cpp b/media/libmediatranscoding/transcoder/VideoTrackTranscoder.cpp
index 0713eb8..23993ca 100644
--- a/media/libmediatranscoding/transcoder/VideoTrackTranscoder.cpp
+++ b/media/libmediatranscoding/transcoder/VideoTrackTranscoder.cpp
@@ -480,7 +480,7 @@
androidSetThreadPriority(0 /* tid (0 = current) */, ANDROID_PRIORITY_VIDEO);
// Push start decoder and encoder as two messages, so that these are subject to the
- // stop request as well. If the job is cancelled (or paused) immediately after start,
+ // stop request as well. If the session is cancelled (or paused) immediately after start,
// we don't need to waste time start then stop the codecs.
mCodecMessageQueue.push([this] {
media_status_t status = AMediaCodec_start(mDecoder);
diff --git a/services/mediatranscoding/MediaTranscodingService.cpp b/services/mediatranscoding/MediaTranscodingService.cpp
index 9639c55..56f327e 100644
--- a/services/mediatranscoding/MediaTranscodingService.cpp
+++ b/services/mediatranscoding/MediaTranscodingService.cpp
@@ -24,8 +24,8 @@
#include <cutils/properties.h>
#include <media/TranscoderWrapper.h>
#include <media/TranscodingClientManager.h>
-#include <media/TranscodingJobScheduler.h>
#include <media/TranscodingResourcePolicy.h>
+#include <media/TranscodingSessionController.h>
#include <media/TranscodingUidPolicy.h>
#include <utils/Log.h>
#include <utils/Vector.h>
@@ -44,12 +44,13 @@
const std::shared_ptr<TranscoderInterface>& transcoder)
: mUidPolicy(new TranscodingUidPolicy()),
mResourcePolicy(new TranscodingResourcePolicy()),
- mJobScheduler(new TranscodingJobScheduler(transcoder, mUidPolicy, mResourcePolicy)),
- mClientManager(new TranscodingClientManager(mJobScheduler)) {
+ mSessionController(
+ new TranscodingSessionController(transcoder, mUidPolicy, mResourcePolicy)),
+ mClientManager(new TranscodingClientManager(mSessionController)) {
ALOGV("MediaTranscodingService is created");
- transcoder->setCallback(mJobScheduler);
- mUidPolicy->setCallback(mJobScheduler);
- mResourcePolicy->setCallback(mJobScheduler);
+ transcoder->setCallback(mSessionController);
+ mUidPolicy->setCallback(mSessionController);
+ mResourcePolicy->setCallback(mSessionController);
}
MediaTranscodingService::~MediaTranscodingService() {
@@ -78,7 +79,7 @@
Vector<String16> args;
mClientManager->dumpAllClients(fd, args);
- mJobScheduler->dumpAllJobs(fd, args);
+ mSessionController->dumpAllSessions(fd, args);
return OK;
}
diff --git a/services/mediatranscoding/MediaTranscodingService.h b/services/mediatranscoding/MediaTranscodingService.h
index 0fe6864..428f777 100644
--- a/services/mediatranscoding/MediaTranscodingService.h
+++ b/services/mediatranscoding/MediaTranscodingService.h
@@ -26,17 +26,17 @@
using ::aidl::android::media::BnMediaTranscodingService;
using ::aidl::android::media::ITranscodingClient;
using ::aidl::android::media::ITranscodingClientCallback;
-using ::aidl::android::media::TranscodingJobParcel;
using ::aidl::android::media::TranscodingRequestParcel;
+using ::aidl::android::media::TranscodingSessionParcel;
class TranscodingClientManager;
-class TranscodingJobScheduler;
+class TranscodingSessionController;
class TranscoderInterface;
class UidPolicyInterface;
class ResourcePolicyInterface;
class MediaTranscodingService : public BnMediaTranscodingService {
public:
- static constexpr int32_t kInvalidJobId = -1;
+ static constexpr int32_t kInvalidSessionId = -1;
static constexpr int32_t kInvalidClientId = -1;
MediaTranscodingService(const std::shared_ptr<TranscoderInterface>& transcoder);
@@ -61,7 +61,7 @@
std::shared_ptr<UidPolicyInterface> mUidPolicy;
std::shared_ptr<ResourcePolicyInterface> mResourcePolicy;
- std::shared_ptr<TranscodingJobScheduler> mJobScheduler;
+ std::shared_ptr<TranscodingSessionController> mSessionController;
std::shared_ptr<TranscodingClientManager> mClientManager;
};
diff --git a/services/mediatranscoding/SimulatedTranscoder.cpp b/services/mediatranscoding/SimulatedTranscoder.cpp
index 97d5f5f..03ee886 100644
--- a/services/mediatranscoding/SimulatedTranscoder.cpp
+++ b/services/mediatranscoding/SimulatedTranscoder.cpp
@@ -48,58 +48,59 @@
}
void SimulatedTranscoder::start(
- ClientIdType clientId, JobIdType jobId, const TranscodingRequestParcel& request,
+ ClientIdType clientId, SessionIdType sessionId, const TranscodingRequestParcel& request,
const std::shared_ptr<ITranscodingClientCallback>& /*clientCallback*/) {
if (request.testConfig.has_value() && request.testConfig->processingTotalTimeMs > 0) {
- mJobProcessingTimeMs = request.testConfig->processingTotalTimeMs;
+ mSessionProcessingTimeMs = request.testConfig->processingTotalTimeMs;
}
- ALOGV("%s: job {%d}: processingTime: %lld", __FUNCTION__, jobId,
- (long long)mJobProcessingTimeMs);
- queueEvent(Event::Start, clientId, jobId, [=] {
+ ALOGV("%s: session {%d}: processingTime: %lld", __FUNCTION__, sessionId,
+ (long long)mSessionProcessingTimeMs);
+ queueEvent(Event::Start, clientId, sessionId, [=] {
auto callback = mCallback.lock();
if (callback != nullptr) {
- callback->onStarted(clientId, jobId);
+ callback->onStarted(clientId, sessionId);
}
});
}
-void SimulatedTranscoder::pause(ClientIdType clientId, JobIdType jobId) {
- queueEvent(Event::Pause, clientId, jobId, [=] {
+void SimulatedTranscoder::pause(ClientIdType clientId, SessionIdType sessionId) {
+ queueEvent(Event::Pause, clientId, sessionId, [=] {
auto callback = mCallback.lock();
if (callback != nullptr) {
- callback->onPaused(clientId, jobId);
+ callback->onPaused(clientId, sessionId);
}
});
}
void SimulatedTranscoder::resume(
- ClientIdType clientId, JobIdType jobId, const TranscodingRequestParcel& /*request*/,
+ ClientIdType clientId, SessionIdType sessionId, const TranscodingRequestParcel& /*request*/,
const std::shared_ptr<ITranscodingClientCallback>& /*clientCallback*/) {
- queueEvent(Event::Resume, clientId, jobId, [=] {
+ queueEvent(Event::Resume, clientId, sessionId, [=] {
auto callback = mCallback.lock();
if (callback != nullptr) {
- callback->onResumed(clientId, jobId);
+ callback->onResumed(clientId, sessionId);
}
});
}
-void SimulatedTranscoder::stop(ClientIdType clientId, JobIdType jobId) {
- queueEvent(Event::Stop, clientId, jobId, nullptr);
+void SimulatedTranscoder::stop(ClientIdType clientId, SessionIdType sessionId) {
+ queueEvent(Event::Stop, clientId, sessionId, nullptr);
}
-void SimulatedTranscoder::queueEvent(Event::Type type, ClientIdType clientId, JobIdType jobId,
- std::function<void()> runnable) {
- ALOGV("%s: job {%lld, %d}: %s", __FUNCTION__, (long long)clientId, jobId, toString(type));
+void SimulatedTranscoder::queueEvent(Event::Type type, ClientIdType clientId,
+ SessionIdType sessionId, std::function<void()> runnable) {
+ ALOGV("%s: session {%lld, %d}: %s", __FUNCTION__, (long long)clientId, sessionId,
+ toString(type));
auto lock = std::scoped_lock(mLock);
- mQueue.push_back({type, clientId, jobId, runnable});
+ mQueue.push_back({type, clientId, sessionId, runnable});
mCondition.notify_one();
}
void SimulatedTranscoder::threadLoop() {
bool running = false;
- std::chrono::microseconds remainingUs(kJobDurationUs);
+ std::chrono::microseconds remainingUs(kSessionDurationUs);
std::chrono::system_clock::time_point lastRunningTime;
Event lastRunningEvent;
@@ -113,7 +114,7 @@
mCondition.wait(lock);
continue;
}
- // If running, wait for the remaining life of this job. Report finish if timed out.
+ // If running, wait for the remaining life of this session. Report finish if timed out.
std::cv_status status = mCondition.wait_for(lock, remainingUs);
if (status == std::cv_status::timeout) {
running = false;
@@ -121,7 +122,7 @@
auto callback = mCallback.lock();
if (callback != nullptr) {
lock.unlock();
- callback->onFinish(lastRunningEvent.clientId, lastRunningEvent.jobId);
+ callback->onFinish(lastRunningEvent.clientId, lastRunningEvent.sessionId);
lock.lock();
}
} else {
@@ -139,22 +140,22 @@
Event event = *mQueue.begin();
mQueue.pop_front();
- ALOGV("%s: job {%lld, %d}: %s", __FUNCTION__, (long long)event.clientId, event.jobId,
- toString(event.type));
+ ALOGV("%s: session {%lld, %d}: %s", __FUNCTION__, (long long)event.clientId,
+ event.sessionId, toString(event.type));
if (!running && (event.type == Event::Start || event.type == Event::Resume)) {
running = true;
lastRunningTime = std::chrono::system_clock::now();
lastRunningEvent = event;
if (event.type == Event::Start) {
- remainingUs = std::chrono::milliseconds(mJobProcessingTimeMs);
+ remainingUs = std::chrono::milliseconds(mSessionProcessingTimeMs);
}
} else if (running && (event.type == Event::Pause || event.type == Event::Stop)) {
running = false;
remainingUs -= (std::chrono::system_clock::now() - lastRunningTime);
} else {
- ALOGW("%s: discarding bad event: job {%lld, %d}: %s", __FUNCTION__,
- (long long)event.clientId, event.jobId, toString(event.type));
+ ALOGW("%s: discarding bad event: session {%lld, %d}: %s", __FUNCTION__,
+ (long long)event.clientId, event.sessionId, toString(event.type));
continue;
}
diff --git a/services/mediatranscoding/SimulatedTranscoder.h b/services/mediatranscoding/SimulatedTranscoder.h
index 1c359dd..ba2bba0 100644
--- a/services/mediatranscoding/SimulatedTranscoder.h
+++ b/services/mediatranscoding/SimulatedTranscoder.h
@@ -32,8 +32,8 @@
* SimulatedTranscoder is used when useSimulatedTranscoder in TranscodingTestConfig
* is set to true.
*
- * SimulatedTranscoder simulates job execution by reporting finish after kJobDurationUs.
- * Job lifecycle events are reported via progress updates with special progress
+ * SimulatedTranscoder simulates session execution by reporting finish after kSessionDurationUs.
+ * Session lifecycle events are reported via progress updates with special progress
* numbers (equal to the Event's type).
*/
class SimulatedTranscoder : public TranscoderInterface {
@@ -41,22 +41,24 @@
struct Event {
enum Type { NoEvent, Start, Pause, Resume, Stop, Finished, Failed } type;
ClientIdType clientId;
- JobIdType jobId;
+ SessionIdType sessionId;
std::function<void()> runnable;
};
- static constexpr int64_t kJobDurationUs = 1000000;
+ static constexpr int64_t kSessionDurationUs = 1000000;
SimulatedTranscoder();
// TranscoderInterface
void setCallback(const std::shared_ptr<TranscoderCallbackInterface>& cb) override;
- void start(ClientIdType clientId, JobIdType jobId, const TranscodingRequestParcel& request,
+ void start(ClientIdType clientId, SessionIdType sessionId,
+ const TranscodingRequestParcel& request,
const std::shared_ptr<ITranscodingClientCallback>& clientCallback) override;
- void pause(ClientIdType clientId, JobIdType jobId) override;
- void resume(ClientIdType clientId, JobIdType jobId, const TranscodingRequestParcel& request,
+ void pause(ClientIdType clientId, SessionIdType sessionId) override;
+ void resume(ClientIdType clientId, SessionIdType sessionId,
+ const TranscodingRequestParcel& request,
const std::shared_ptr<ITranscodingClientCallback>& clientCallback) override;
- void stop(ClientIdType clientId, JobIdType jobId) override;
+ void stop(ClientIdType clientId, SessionIdType sessionId) override;
// ~TranscoderInterface
private:
@@ -66,10 +68,10 @@
std::list<Event> mQueue GUARDED_BY(mLock);
// Minimum time spent on transcode the video. This is used just for testing.
- int64_t mJobProcessingTimeMs = kJobDurationUs / 1000;
+ int64_t mSessionProcessingTimeMs = kSessionDurationUs / 1000;
static const char* toString(Event::Type type);
- void queueEvent(Event::Type type, ClientIdType clientId, JobIdType jobId,
+ void queueEvent(Event::Type type, ClientIdType clientId, SessionIdType sessionId,
std::function<void()> runnable);
void threadLoop();
};
diff --git a/services/mediatranscoding/tests/MediaTranscodingServiceTestHelper.h b/services/mediatranscoding/tests/MediaTranscodingServiceTestHelper.h
index 6d0b99e..5f4f645 100644
--- a/services/mediatranscoding/tests/MediaTranscodingServiceTestHelper.h
+++ b/services/mediatranscoding/tests/MediaTranscodingServiceTestHelper.h
@@ -20,9 +20,9 @@
#include <aidl/android/media/IMediaTranscodingService.h>
#include <aidl/android/media/ITranscodingClient.h>
#include <aidl/android/media/ITranscodingClientCallback.h>
-#include <aidl/android/media/TranscodingJobParcel.h>
-#include <aidl/android/media/TranscodingJobPriority.h>
#include <aidl/android/media/TranscodingRequestParcel.h>
+#include <aidl/android/media/TranscodingSessionParcel.h>
+#include <aidl/android/media/TranscodingSessionPriority.h>
#include <android-base/logging.h>
#include <android/binder_manager.h>
#include <android/binder_process.h>
@@ -48,9 +48,9 @@
using aidl::android::media::IMediaTranscodingService;
using aidl::android::media::ITranscodingClient;
using aidl::android::media::ITranscodingClientCallback;
-using aidl::android::media::TranscodingJobParcel;
-using aidl::android::media::TranscodingJobPriority;
using aidl::android::media::TranscodingRequestParcel;
+using aidl::android::media::TranscodingSessionParcel;
+using aidl::android::media::TranscodingSessionPriority;
using aidl::android::media::TranscodingVideoTrackFormat;
constexpr int32_t kClientUseCallingPid = IMediaTranscodingService::USE_CALLING_PID;
@@ -112,12 +112,12 @@
struct Event {
enum { NoEvent, Start, Pause, Resume, Finished, Failed } type;
int64_t clientId;
- int32_t jobId;
+ int32_t sessionId;
};
-#define DECLARE_EVENT(action) \
- static Event action(int32_t clientId, int32_t jobId) { \
- return {Event::action, clientId, jobId}; \
+#define DECLARE_EVENT(action) \
+ static Event action(int32_t clientId, int32_t sessionId) { \
+ return {Event::action, clientId, sessionId}; \
}
DECLARE_EVENT(Start);
@@ -149,8 +149,8 @@
default:
return "NoEvent";
}
- return "job {" + std::to_string(event.clientId) + ", " + std::to_string(event.jobId) +
- "}: " + eventStr;
+ return "session {" + std::to_string(event.clientId) + ", " +
+ std::to_string(event.sessionId) + "}: " + eventStr;
}
// Pop 1 event from front, wait for up to timeoutUs if empty.
@@ -238,7 +238,7 @@
// Operators for GTest macros.
bool operator==(const EventTracker::Event& lhs, const EventTracker::Event& rhs) {
- return lhs.type == rhs.type && lhs.clientId == rhs.clientId && lhs.jobId == rhs.jobId;
+ return lhs.type == rhs.type && lhs.clientId == rhs.clientId && lhs.sessionId == rhs.sessionId;
}
std::ostream& operator<<(std::ostream& str, const EventTracker::Event& v) {
@@ -288,40 +288,41 @@
return Status::ok();
}
- Status onTranscodingStarted(int32_t in_jobId) override {
- append(EventTracker::Start(mClientId, in_jobId));
+ Status onTranscodingStarted(int32_t in_sessionId) override {
+ append(EventTracker::Start(mClientId, in_sessionId));
return Status::ok();
}
- Status onTranscodingPaused(int32_t in_jobId) override {
- append(EventTracker::Pause(mClientId, in_jobId));
+ Status onTranscodingPaused(int32_t in_sessionId) override {
+ append(EventTracker::Pause(mClientId, in_sessionId));
return Status::ok();
}
- Status onTranscodingResumed(int32_t in_jobId) override {
- append(EventTracker::Resume(mClientId, in_jobId));
+ Status onTranscodingResumed(int32_t in_sessionId) override {
+ append(EventTracker::Resume(mClientId, in_sessionId));
return Status::ok();
}
Status onTranscodingFinished(
- int32_t in_jobId,
+ int32_t in_sessionId,
const ::aidl::android::media::TranscodingResultParcel& /* in_result */) override {
- append(Finished(mClientId, in_jobId));
+ append(Finished(mClientId, in_sessionId));
return Status::ok();
}
- Status onTranscodingFailed(int32_t in_jobId,
+ Status onTranscodingFailed(int32_t in_sessionId,
::aidl::android::media::TranscodingErrorCode in_errorCode) override {
- append(Failed(mClientId, in_jobId), in_errorCode);
+ append(Failed(mClientId, in_sessionId), in_errorCode);
return Status::ok();
}
- Status onAwaitNumberOfJobsChanged(int32_t /* in_jobId */, int32_t /* in_oldAwaitNumber */,
- int32_t /* in_newAwaitNumber */) override {
+ Status onAwaitNumberOfSessionsChanged(int32_t /* in_sessionId */,
+ int32_t /* in_oldAwaitNumber */,
+ int32_t /* in_newAwaitNumber */) override {
return Status::ok();
}
- Status onProgressUpdate(int32_t /* in_jobId */, int32_t in_progress) override {
+ Status onProgressUpdate(int32_t /* in_sessionId */, int32_t in_progress) override {
updateProgress(in_progress);
return Status::ok();
}
@@ -354,13 +355,13 @@
}
template <bool expectation = success>
- bool submit(int32_t jobId, const char* sourceFilePath, const char* destinationFilePath,
- TranscodingJobPriority priority = TranscodingJobPriority::kNormal,
+ bool submit(int32_t sessionId, const char* sourceFilePath, const char* destinationFilePath,
+ TranscodingSessionPriority priority = TranscodingSessionPriority::kNormal,
int bitrateBps = -1, int overridePid = -1, int overrideUid = -1) {
constexpr bool shouldSucceed = (expectation == success);
bool result;
TranscodingRequestParcel request;
- TranscodingJobParcel job;
+ TranscodingSessionParcel session;
request.sourceFilePath = sourceFilePath;
request.destinationFilePath = destinationFilePath;
@@ -371,22 +372,23 @@
request.requestedVideoTrackFormat.emplace(TranscodingVideoTrackFormat());
request.requestedVideoTrackFormat->bitrateBps = bitrateBps;
}
- Status status = mClient->submitRequest(request, &job, &result);
+ Status status = mClient->submitRequest(request, &session, &result);
EXPECT_TRUE(status.isOk());
EXPECT_EQ(result, shouldSucceed);
if (shouldSucceed) {
- EXPECT_EQ(job.jobId, jobId);
+ EXPECT_EQ(session.sessionId, sessionId);
}
- return status.isOk() && (result == shouldSucceed) && (!shouldSucceed || job.jobId == jobId);
+ return status.isOk() && (result == shouldSucceed) &&
+ (!shouldSucceed || session.sessionId == sessionId);
}
template <bool expectation = success>
- bool cancel(int32_t jobId) {
+ bool cancel(int32_t sessionId) {
constexpr bool shouldSucceed = (expectation == success);
bool result;
- Status status = mClient->cancelJob(jobId, &result);
+ Status status = mClient->cancelSession(sessionId, &result);
EXPECT_TRUE(status.isOk());
EXPECT_EQ(result, shouldSucceed);
@@ -395,23 +397,24 @@
}
template <bool expectation = success>
- bool getJob(int32_t jobId, const char* sourceFilePath, const char* destinationFilePath) {
+ bool getSession(int32_t sessionId, const char* sourceFilePath,
+ const char* destinationFilePath) {
constexpr bool shouldSucceed = (expectation == success);
bool result;
- TranscodingJobParcel job;
- Status status = mClient->getJobWithId(jobId, &job, &result);
+ TranscodingSessionParcel session;
+ Status status = mClient->getSessionWithId(sessionId, &session, &result);
EXPECT_TRUE(status.isOk());
EXPECT_EQ(result, shouldSucceed);
if (shouldSucceed) {
- EXPECT_EQ(job.jobId, jobId);
- EXPECT_EQ(job.request.sourceFilePath, sourceFilePath);
+ EXPECT_EQ(session.sessionId, sessionId);
+ EXPECT_EQ(session.request.sourceFilePath, sourceFilePath);
}
return status.isOk() && (result == shouldSucceed) &&
- (!shouldSucceed ||
- (job.jobId == jobId && job.request.sourceFilePath == sourceFilePath &&
- job.request.destinationFilePath == destinationFilePath));
+ (!shouldSucceed || (session.sessionId == sessionId &&
+ session.request.sourceFilePath == sourceFilePath &&
+ session.request.destinationFilePath == destinationFilePath));
}
int32_t mClientId;
diff --git a/services/mediatranscoding/tests/mediatranscodingservice_real_tests.cpp b/services/mediatranscoding/tests/mediatranscodingservice_real_tests.cpp
index 381bbf5..0550d77 100644
--- a/services/mediatranscoding/tests/mediatranscodingservice_real_tests.cpp
+++ b/services/mediatranscoding/tests/mediatranscodingservice_real_tests.cpp
@@ -34,7 +34,7 @@
namespace media {
constexpr int64_t kPaddingUs = 400000;
-constexpr int64_t kJobWithPaddingUs = 10000000 + kPaddingUs;
+constexpr int64_t kSessionWithPaddingUs = 10000000 + kPaddingUs;
constexpr int32_t kBitRate = 8 * 1000 * 1000; // 8Mbs
constexpr const char* kShortSrcPath =
@@ -59,8 +59,9 @@
const char* dstPath = OUTPATH(TestInvalidSource);
deleteFile(dstPath);
- // Submit one job.
- EXPECT_TRUE(mClient1->submit(0, srcPath, dstPath, TranscodingJobPriority::kNormal, kBitRate));
+ // Submit one session.
+ EXPECT_TRUE(
+ mClient1->submit(0, srcPath, dstPath, TranscodingSessionPriority::kNormal, kBitRate));
// Check expected error.
EXPECT_EQ(mClient1->pop(kPaddingUs), EventTracker::Failed(CLIENT(1), 0));
@@ -75,12 +76,12 @@
const char* dstPath = OUTPATH(TestPassthru);
deleteFile(dstPath);
- // Submit one job.
+ // Submit one session.
EXPECT_TRUE(mClient1->submit(0, kShortSrcPath, dstPath));
- // Wait for job to finish.
+ // Wait for session to finish.
EXPECT_EQ(mClient1->pop(kPaddingUs), EventTracker::Start(CLIENT(1), 0));
- EXPECT_EQ(mClient1->pop(kJobWithPaddingUs), EventTracker::Finished(CLIENT(1), 0));
+ EXPECT_EQ(mClient1->pop(kSessionWithPaddingUs), EventTracker::Finished(CLIENT(1), 0));
unregisterMultipleClients();
}
@@ -91,13 +92,13 @@
const char* dstPath = OUTPATH(TestTranscodeVideo);
deleteFile(dstPath);
- // Submit one job.
- EXPECT_TRUE(
- mClient1->submit(0, kShortSrcPath, dstPath, TranscodingJobPriority::kNormal, kBitRate));
+ // Submit one session.
+ EXPECT_TRUE(mClient1->submit(0, kShortSrcPath, dstPath, TranscodingSessionPriority::kNormal,
+ kBitRate));
- // Wait for job to finish.
+ // Wait for session to finish.
EXPECT_EQ(mClient1->pop(kPaddingUs), EventTracker::Start(CLIENT(1), 0));
- EXPECT_EQ(mClient1->pop(kJobWithPaddingUs), EventTracker::Finished(CLIENT(1), 0));
+ EXPECT_EQ(mClient1->pop(kSessionWithPaddingUs), EventTracker::Finished(CLIENT(1), 0));
unregisterMultipleClients();
}
@@ -108,13 +109,13 @@
const char* dstPath = OUTPATH(TestTranscodeVideoProgress);
deleteFile(dstPath);
- // Submit one job.
- EXPECT_TRUE(
- mClient1->submit(0, kLongSrcPath, dstPath, TranscodingJobPriority::kNormal, kBitRate));
+ // Submit one session.
+ EXPECT_TRUE(mClient1->submit(0, kLongSrcPath, dstPath, TranscodingSessionPriority::kNormal,
+ kBitRate));
- // Wait for job to finish.
+ // Wait for session to finish.
EXPECT_EQ(mClient1->pop(kPaddingUs), EventTracker::Start(CLIENT(1), 0));
- EXPECT_EQ(mClient1->pop(kJobWithPaddingUs), EventTracker::Finished(CLIENT(1), 0));
+ EXPECT_EQ(mClient1->pop(kSessionWithPaddingUs), EventTracker::Finished(CLIENT(1), 0));
// Check the progress update messages are received. For this clip (around ~15 second long),
// expect at least 10 updates, and the last update should be 100.
@@ -133,24 +134,26 @@
const char* srcPath0 = kLongSrcPath;
const char* srcPath1 = kShortSrcPath;
- const char* dstPath0 = OUTPATH(TestCancelImmediately_Job0);
- const char* dstPath1 = OUTPATH(TestCancelImmediately_Job1);
+ const char* dstPath0 = OUTPATH(TestCancelImmediately_Session0);
+ const char* dstPath1 = OUTPATH(TestCancelImmediately_Session1);
deleteFile(dstPath0);
deleteFile(dstPath1);
- // Submit one job, should start immediately.
- EXPECT_TRUE(mClient1->submit(0, srcPath0, dstPath0, TranscodingJobPriority::kNormal, kBitRate));
+ // Submit one session, should start immediately.
+ EXPECT_TRUE(
+ mClient1->submit(0, srcPath0, dstPath0, TranscodingSessionPriority::kNormal, kBitRate));
EXPECT_EQ(mClient1->pop(kPaddingUs), EventTracker::Start(CLIENT(1), 0));
- EXPECT_TRUE(mClient1->getJob(0, srcPath0, dstPath0));
+ EXPECT_TRUE(mClient1->getSession(0, srcPath0, dstPath0));
- // Test cancel job immediately, getJob should fail after cancel.
+ // Test cancel session immediately, getSession should fail after cancel.
EXPECT_TRUE(mClient1->cancel(0));
- EXPECT_TRUE(mClient1->getJob<fail>(0, "", ""));
+ EXPECT_TRUE(mClient1->getSession<fail>(0, "", ""));
- // Submit new job, new job should start immediately and finish.
- EXPECT_TRUE(mClient1->submit(1, srcPath1, dstPath1, TranscodingJobPriority::kNormal, kBitRate));
+ // Submit new session, new session should start immediately and finish.
+ EXPECT_TRUE(
+ mClient1->submit(1, srcPath1, dstPath1, TranscodingSessionPriority::kNormal, kBitRate));
EXPECT_EQ(mClient1->pop(kPaddingUs), EventTracker::Start(CLIENT(1), 1));
- EXPECT_EQ(mClient1->pop(kJobWithPaddingUs), EventTracker::Finished(CLIENT(1), 1));
+ EXPECT_EQ(mClient1->pop(kSessionWithPaddingUs), EventTracker::Finished(CLIENT(1), 1));
unregisterMultipleClients();
}
@@ -163,26 +166,28 @@
const char* srcPath0 = kLongSrcPath;
const char* srcPath1 = kShortSrcPath;
- const char* dstPath0 = OUTPATH(TestCancelWhileRunning_Job0);
- const char* dstPath1 = OUTPATH(TestCancelWhileRunning_Job1);
+ const char* dstPath0 = OUTPATH(TestCancelWhileRunning_Session0);
+ const char* dstPath1 = OUTPATH(TestCancelWhileRunning_Session1);
deleteFile(dstPath0);
deleteFile(dstPath1);
- // Submit two jobs, job 0 should start immediately, job 1 should be queued.
- EXPECT_TRUE(mClient1->submit(0, srcPath0, dstPath0, TranscodingJobPriority::kNormal, kBitRate));
- EXPECT_TRUE(mClient1->submit(1, srcPath1, dstPath1, TranscodingJobPriority::kNormal, kBitRate));
+ // Submit two sessions, session 0 should start immediately, session 1 should be queued.
+ EXPECT_TRUE(
+ mClient1->submit(0, srcPath0, dstPath0, TranscodingSessionPriority::kNormal, kBitRate));
+ EXPECT_TRUE(
+ mClient1->submit(1, srcPath1, dstPath1, TranscodingSessionPriority::kNormal, kBitRate));
EXPECT_EQ(mClient1->pop(kPaddingUs), EventTracker::Start(CLIENT(1), 0));
- EXPECT_TRUE(mClient1->getJob(0, srcPath0, dstPath0));
- EXPECT_TRUE(mClient1->getJob(1, srcPath1, dstPath1));
+ EXPECT_TRUE(mClient1->getSession(0, srcPath0, dstPath0));
+ EXPECT_TRUE(mClient1->getSession(1, srcPath1, dstPath1));
- // Job 0 (longtest) shouldn't finish in 1 seconds.
+ // Session 0 (longtest) shouldn't finish in 1 seconds.
EXPECT_EQ(mClient1->pop(1000000), EventTracker::NoEvent);
- // Now cancel job 0. Job 1 should start immediately and finish.
+ // Now cancel session 0. Session 1 should start immediately and finish.
EXPECT_TRUE(mClient1->cancel(0));
- EXPECT_TRUE(mClient1->getJob<fail>(0, "", ""));
+ EXPECT_TRUE(mClient1->getSession<fail>(0, "", ""));
EXPECT_EQ(mClient1->pop(kPaddingUs), EventTracker::Start(CLIENT(1), 1));
- EXPECT_EQ(mClient1->pop(kJobWithPaddingUs), EventTracker::Finished(CLIENT(1), 1));
+ EXPECT_EQ(mClient1->pop(kSessionWithPaddingUs), EventTracker::Finished(CLIENT(1), 1));
unregisterMultipleClients();
}
@@ -192,48 +197,49 @@
const char* srcPath0 = kLongSrcPath;
const char* srcPath1 = kShortSrcPath;
- const char* dstPath0 = OUTPATH(TestPauseResumeSingleClient_Job0);
- const char* dstPath1 = OUTPATH(TestPauseResumeSingleClient_Job1);
+ const char* dstPath0 = OUTPATH(TestPauseResumeSingleClient_Session0);
+ const char* dstPath1 = OUTPATH(TestPauseResumeSingleClient_Session1);
deleteFile(dstPath0);
deleteFile(dstPath1);
- // Submit one offline job, should start immediately.
- EXPECT_TRUE(mClient1->submit(0, srcPath0, dstPath0, TranscodingJobPriority::kUnspecified,
+ // Submit one offline session, should start immediately.
+ EXPECT_TRUE(mClient1->submit(0, srcPath0, dstPath0, TranscodingSessionPriority::kUnspecified,
kBitRate));
EXPECT_EQ(mClient1->pop(kPaddingUs), EventTracker::Start(CLIENT(1), 0));
- // Test get job after starts.
- EXPECT_TRUE(mClient1->getJob(0, srcPath0, dstPath0));
+ // Test get session after starts.
+ EXPECT_TRUE(mClient1->getSession(0, srcPath0, dstPath0));
- // Submit one realtime job.
- EXPECT_TRUE(mClient1->submit(1, srcPath1, dstPath1, TranscodingJobPriority::kNormal, kBitRate));
+ // Submit one realtime session.
+ EXPECT_TRUE(
+ mClient1->submit(1, srcPath1, dstPath1, TranscodingSessionPriority::kNormal, kBitRate));
- // Offline job should pause.
+ // Offline session should pause.
EXPECT_EQ(mClient1->pop(kPaddingUs), EventTracker::Pause(CLIENT(1), 0));
- EXPECT_TRUE(mClient1->getJob(0, srcPath0, dstPath0));
+ EXPECT_TRUE(mClient1->getSession(0, srcPath0, dstPath0));
- // Realtime job should start immediately, and run to finish.
+ // Realtime session should start immediately, and run to finish.
EXPECT_EQ(mClient1->pop(kPaddingUs), EventTracker::Start(CLIENT(1), 1));
- EXPECT_EQ(mClient1->pop(kJobWithPaddingUs), EventTracker::Finished(CLIENT(1), 1));
+ EXPECT_EQ(mClient1->pop(kSessionWithPaddingUs), EventTracker::Finished(CLIENT(1), 1));
- // Test get job after finish fails.
- EXPECT_TRUE(mClient1->getJob<fail>(1, "", ""));
+ // Test get session after finish fails.
+ EXPECT_TRUE(mClient1->getSession<fail>(1, "", ""));
- // Then offline job should resume.
+ // Then offline session should resume.
EXPECT_EQ(mClient1->pop(kPaddingUs), EventTracker::Resume(CLIENT(1), 0));
- // Test get job after resume.
- EXPECT_TRUE(mClient1->getJob(0, srcPath0, dstPath0));
+ // Test get session after resume.
+ EXPECT_TRUE(mClient1->getSession(0, srcPath0, dstPath0));
- // Offline job should finish.
- EXPECT_EQ(mClient1->pop(kJobWithPaddingUs), EventTracker::Finished(CLIENT(1), 0));
- // Test get job after finish fails.
- EXPECT_TRUE(mClient1->getJob<fail>(0, "", ""));
+ // Offline session should finish.
+ EXPECT_EQ(mClient1->pop(kSessionWithPaddingUs), EventTracker::Finished(CLIENT(1), 0));
+ // Test get session after finish fails.
+ EXPECT_TRUE(mClient1->getSession<fail>(0, "", ""));
unregisterMultipleClients();
}
/*
- * Basic test for pause/resume with two clients, with one job each.
- * Top app's job should preempt the other app's job.
+ * Basic test for pause/resume with two clients, with one session each.
+ * Top app's session should preempt the other app's session.
*/
TEST_F(MediaTranscodingServiceRealTest, TestPauseResumeMultiClients) {
ALOGD("TestPauseResumeMultiClients starting...");
@@ -256,33 +262,35 @@
ALOGD("Moving app A to top...");
EXPECT_TRUE(ShellHelper::Start(kClientPackageA, kTestActivityName));
- // Submit job to Client1.
- ALOGD("Submitting job to client1 (app A) ...");
- EXPECT_TRUE(mClient1->submit(0, srcPath0, dstPath0, TranscodingJobPriority::kNormal, kBitRate));
+ // Submit session to Client1.
+ ALOGD("Submitting session to client1 (app A) ...");
+ EXPECT_TRUE(
+ mClient1->submit(0, srcPath0, dstPath0, TranscodingSessionPriority::kNormal, kBitRate));
- // Client1's job should start immediately.
+ // Client1's session should start immediately.
EXPECT_EQ(mClient1->pop(kPaddingUs), EventTracker::Start(CLIENT(1), 0));
ALOGD("Moving app B to top...");
EXPECT_TRUE(ShellHelper::Start(kClientPackageB, kTestActivityName));
- // Client1's job should continue to run, since Client2 (app B) doesn't have any job.
+ // Client1's session should continue to run, since Client2 (app B) doesn't have any session.
EXPECT_EQ(mClient1->pop(1000000), EventTracker::NoEvent);
- // Submit job to Client2.
- ALOGD("Submitting job to client2 (app B) ...");
- EXPECT_TRUE(mClient2->submit(0, srcPath1, dstPath1, TranscodingJobPriority::kNormal, kBitRate));
+ // Submit session to Client2.
+ ALOGD("Submitting session to client2 (app B) ...");
+ EXPECT_TRUE(
+ mClient2->submit(0, srcPath1, dstPath1, TranscodingSessionPriority::kNormal, kBitRate));
- // Client1's job should pause, client2's job should start.
+ // Client1's session should pause, client2's session should start.
EXPECT_EQ(mClient1->pop(kPaddingUs), EventTracker::Pause(CLIENT(1), 0));
EXPECT_EQ(mClient2->pop(kPaddingUs), EventTracker::Start(CLIENT(2), 0));
- // Client2's job should finish, then Client1's job should resume.
- EXPECT_EQ(mClient2->pop(kJobWithPaddingUs), EventTracker::Finished(CLIENT(2), 0));
+ // Client2's session should finish, then Client1's session should resume.
+ EXPECT_EQ(mClient2->pop(kSessionWithPaddingUs), EventTracker::Finished(CLIENT(2), 0));
EXPECT_EQ(mClient1->pop(kPaddingUs), EventTracker::Resume(CLIENT(1), 0));
- // Client1's job should finish.
- EXPECT_EQ(mClient1->pop(kJobWithPaddingUs), EventTracker::Finished(CLIENT(1), 0));
+ // Client1's session should finish.
+ EXPECT_EQ(mClient1->pop(kSessionWithPaddingUs), EventTracker::Finished(CLIENT(1), 0));
unregisterMultipleClients();
diff --git a/services/mediatranscoding/tests/mediatranscodingservice_resource_tests.cpp b/services/mediatranscoding/tests/mediatranscodingservice_resource_tests.cpp
index 31697d5..bf99efc 100644
--- a/services/mediatranscoding/tests/mediatranscodingservice_resource_tests.cpp
+++ b/services/mediatranscoding/tests/mediatranscodingservice_resource_tests.cpp
@@ -55,13 +55,13 @@
/**
* Basic testing for handling resource lost.
*
- * This test starts a transcoding job (that's somewhat long and takes several seconds),
+ * This test starts a transcoding session (that's somewhat long and takes several seconds),
* then launches an activity that allocates video codec instances until it hits insufficient
* resource error. Because the activity is running in foreground,
* ResourceManager would reclaim codecs from transcoding service which should
- * cause the job to be paused. The activity will hold the codecs for a few seconds
+ * cause the session to be paused. The activity will hold the codecs for a few seconds
* before releasing them, and the transcoding service should be able to resume
- * and complete the job.
+ * and complete the session.
*/
TEST_F(MediaTranscodingServiceResourceTest, TestResourceLost) {
ALOGD("TestResourceLost starting...");
@@ -79,21 +79,22 @@
ALOGD("Moving app A to top...");
EXPECT_TRUE(ShellHelper::Start(kClientPackageA, kTestActivityName));
- // Submit job to Client1.
- ALOGD("Submitting job to client1 (app A) ...");
- EXPECT_TRUE(mClient1->submit(0, srcPath0, dstPath0, TranscodingJobPriority::kNormal, kBitRate));
+ // Submit session to Client1.
+ ALOGD("Submitting session to client1 (app A) ...");
+ EXPECT_TRUE(
+ mClient1->submit(0, srcPath0, dstPath0, TranscodingSessionPriority::kNormal, kBitRate));
- // Client1's job should start immediately.
+ // Client1's session should start immediately.
EXPECT_EQ(mClient1->pop(kPaddingUs), EventTracker::Start(CLIENT(1), 0));
// Launch ResourcePolicyTestActivity, which will try to allocate up to 32
// instances, which should trigger insufficient resources on most devices.
// (Note that it's possible that the device supports a very high number of
- // resource instances, in which case we'll simply require that the job completes.)
+ // resource instances, in which case we'll simply require that the session completes.)
ALOGD("Launch ResourcePolicyTestActivity...");
EXPECT_TRUE(ShellHelper::Start(kClientPackageA, kResourcePolicyTestActivity));
- // The basic requirement is that the job should complete. Wait for finish
+ // The basic requirement is that the session should complete. Wait for finish
// event to come and pop up all events received.
std::list<EventTracker::Event> events;
EXPECT_TRUE(mClient1->waitForSpecificEventAndPop(EventTracker::Finished(CLIENT(1), 0), &events,
diff --git a/services/mediatranscoding/tests/mediatranscodingservice_simulated_tests.cpp b/services/mediatranscoding/tests/mediatranscodingservice_simulated_tests.cpp
index 789b493..7dfda44 100644
--- a/services/mediatranscoding/tests/mediatranscodingservice_simulated_tests.cpp
+++ b/services/mediatranscoding/tests/mediatranscodingservice_simulated_tests.cpp
@@ -23,9 +23,9 @@
#include <aidl/android/media/IMediaTranscodingService.h>
#include <aidl/android/media/ITranscodingClient.h>
#include <aidl/android/media/ITranscodingClientCallback.h>
-#include <aidl/android/media/TranscodingJobParcel.h>
-#include <aidl/android/media/TranscodingJobPriority.h>
#include <aidl/android/media/TranscodingRequestParcel.h>
+#include <aidl/android/media/TranscodingSessionParcel.h>
+#include <aidl/android/media/TranscodingSessionPriority.h>
#include <android-base/logging.h>
#include <android/binder_manager.h>
#include <android/binder_process.h>
@@ -44,15 +44,15 @@
namespace media {
-// Note that -1 is valid and means using calling pid/uid for the service. But only privilege caller could
-// use them. This test is not a privilege caller.
+// Note that -1 is valid and means using calling pid/uid for the service. But only privilege caller
+// could use them. This test is not a privilege caller.
constexpr int32_t kInvalidClientPid = -5;
constexpr int32_t kInvalidClientUid = -10;
constexpr const char* kInvalidClientName = "";
constexpr const char* kInvalidClientOpPackageName = "";
constexpr int64_t kPaddingUs = 1000000;
-constexpr int64_t kJobWithPaddingUs = SimulatedTranscoder::kJobDurationUs + kPaddingUs;
+constexpr int64_t kSessionWithPaddingUs = SimulatedTranscoder::kSessionDurationUs + kPaddingUs;
constexpr const char* kClientOpPackageName = "TestClientPackage";
@@ -135,18 +135,18 @@
unregisterMultipleClients();
}
-TEST_F(MediaTranscodingServiceSimulatedTest, TestJobIdIndependence) {
+TEST_F(MediaTranscodingServiceSimulatedTest, TestSessionIdIndependence) {
registerMultipleClients();
// Submit 2 requests on client1 first.
EXPECT_TRUE(mClient1->submit(0, "test_source_file", "test_destination_file"));
EXPECT_TRUE(mClient1->submit(1, "test_source_file", "test_destination_file"));
- // Submit 2 requests on client2, jobId should be independent for each client.
+ // Submit 2 requests on client2, sessionId should be independent for each client.
EXPECT_TRUE(mClient2->submit(0, "test_source_file", "test_destination_file"));
EXPECT_TRUE(mClient2->submit(1, "test_source_file", "test_destination_file"));
- // Cancel all jobs.
+ // Cancel all sessions.
EXPECT_TRUE(mClient1->cancel(0));
EXPECT_TRUE(mClient1->cancel(1));
EXPECT_TRUE(mClient2->cancel(0));
@@ -155,10 +155,10 @@
unregisterMultipleClients();
}
-TEST_F(MediaTranscodingServiceSimulatedTest, TestSubmitCancelJobs) {
+TEST_F(MediaTranscodingServiceSimulatedTest, TestSubmitCancelSessions) {
registerMultipleClients();
- // Test jobId assignment.
+ // Test sessionId assignment.
EXPECT_TRUE(mClient1->submit(0, "test_source_file_0", "test_destination_file"));
EXPECT_TRUE(mClient1->submit(1, "test_source_file_1", "test_destination_file"));
EXPECT_TRUE(mClient1->submit(2, "test_source_file_2", "test_destination_file"));
@@ -167,33 +167,33 @@
EXPECT_TRUE(mClient1->submit<fail>(0, "", ""));
// Test submit bad request (no valid sourceFilePath) fails.
- EXPECT_TRUE(mClient1->submit<fail>(0, "src", "dst", TranscodingJobPriority::kNormal, 1000000,
- kInvalidClientPid, kInvalidClientUid));
+ EXPECT_TRUE(mClient1->submit<fail>(0, "src", "dst", TranscodingSessionPriority::kNormal,
+ 1000000, kInvalidClientPid, kInvalidClientUid));
- // Test cancel non-existent job fails.
+ // Test cancel non-existent session fails.
EXPECT_TRUE(mClient1->cancel<fail>(100));
- // Job 0 should start immediately and finish in 2 seconds, followed by Job 1 start.
+ // Session 0 should start immediately and finish in 2 seconds, followed by Session 1 start.
EXPECT_EQ(mClient1->pop(kPaddingUs), EventTracker::Start(CLIENT(1), 0));
- EXPECT_EQ(mClient1->pop(kJobWithPaddingUs), EventTracker::Finished(CLIENT(1), 0));
+ EXPECT_EQ(mClient1->pop(kSessionWithPaddingUs), EventTracker::Finished(CLIENT(1), 0));
EXPECT_EQ(mClient1->pop(kPaddingUs), EventTracker::Start(CLIENT(1), 1));
- // Test cancel valid jobId in random order.
- // Test cancel finished job fails.
+ // Test cancel valid sessionId in random order.
+ // Test cancel finished session fails.
EXPECT_TRUE(mClient1->cancel(2));
EXPECT_TRUE(mClient1->cancel<fail>(0));
EXPECT_TRUE(mClient1->cancel(1));
- // Test cancel job again fails.
+ // Test cancel session again fails.
EXPECT_TRUE(mClient1->cancel<fail>(1));
// Test no more events arriving after cancel.
- EXPECT_EQ(mClient1->pop(kJobWithPaddingUs), EventTracker::NoEvent);
+ EXPECT_EQ(mClient1->pop(kSessionWithPaddingUs), EventTracker::NoEvent);
unregisterMultipleClients();
}
-TEST_F(MediaTranscodingServiceSimulatedTest, TestGetJobs) {
+TEST_F(MediaTranscodingServiceSimulatedTest, TestGetSessions) {
registerMultipleClients();
// Submit 3 requests.
@@ -201,69 +201,69 @@
EXPECT_TRUE(mClient1->submit(1, "test_source_file_1", "test_destination_file_1"));
EXPECT_TRUE(mClient1->submit(2, "test_source_file_2", "test_destination_file_2"));
- // Test get jobs by id.
- EXPECT_TRUE(mClient1->getJob(2, "test_source_file_2", "test_destination_file_2"));
- EXPECT_TRUE(mClient1->getJob(1, "test_source_file_1", "test_destination_file_1"));
- EXPECT_TRUE(mClient1->getJob(0, "test_source_file_0", "test_destination_file_0"));
+ // Test get sessions by id.
+ EXPECT_TRUE(mClient1->getSession(2, "test_source_file_2", "test_destination_file_2"));
+ EXPECT_TRUE(mClient1->getSession(1, "test_source_file_1", "test_destination_file_1"));
+ EXPECT_TRUE(mClient1->getSession(0, "test_source_file_0", "test_destination_file_0"));
- // Test get job by invalid id fails.
- EXPECT_TRUE(mClient1->getJob<fail>(100, "", ""));
- EXPECT_TRUE(mClient1->getJob<fail>(-1, "", ""));
+ // Test get session by invalid id fails.
+ EXPECT_TRUE(mClient1->getSession<fail>(100, "", ""));
+ EXPECT_TRUE(mClient1->getSession<fail>(-1, "", ""));
- // Test get job after cancel fails.
+ // Test get session after cancel fails.
EXPECT_TRUE(mClient1->cancel(2));
- EXPECT_TRUE(mClient1->getJob<fail>(2, "", ""));
+ EXPECT_TRUE(mClient1->getSession<fail>(2, "", ""));
- // Job 0 should start immediately and finish in 2 seconds, followed by Job 1 start.
+ // Session 0 should start immediately and finish in 2 seconds, followed by Session 1 start.
EXPECT_EQ(mClient1->pop(kPaddingUs), EventTracker::Start(CLIENT(1), 0));
- EXPECT_EQ(mClient1->pop(kJobWithPaddingUs), EventTracker::Finished(CLIENT(1), 0));
+ EXPECT_EQ(mClient1->pop(kSessionWithPaddingUs), EventTracker::Finished(CLIENT(1), 0));
EXPECT_EQ(mClient1->pop(kPaddingUs), EventTracker::Start(CLIENT(1), 1));
- // Test get job after finish fails.
- EXPECT_TRUE(mClient1->getJob<fail>(0, "", ""));
+ // Test get session after finish fails.
+ EXPECT_TRUE(mClient1->getSession<fail>(0, "", ""));
- // Test get the remaining job 1.
- EXPECT_TRUE(mClient1->getJob(1, "test_source_file_1", "test_destination_file_1"));
+ // Test get the remaining session 1.
+ EXPECT_TRUE(mClient1->getSession(1, "test_source_file_1", "test_destination_file_1"));
- // Cancel remaining job 1.
+ // Cancel remaining session 1.
EXPECT_TRUE(mClient1->cancel(1));
unregisterMultipleClients();
}
-TEST_F(MediaTranscodingServiceSimulatedTest, TestSubmitCancelWithOfflineJobs) {
+TEST_F(MediaTranscodingServiceSimulatedTest, TestSubmitCancelWithOfflineSessions) {
registerMultipleClients();
- // Submit some offline jobs first.
+ // Submit some offline sessions first.
EXPECT_TRUE(mClient1->submit(0, "test_source_file_0", "test_destination_file_0",
- TranscodingJobPriority::kUnspecified));
+ TranscodingSessionPriority::kUnspecified));
EXPECT_TRUE(mClient1->submit(1, "test_source_file_1", "test_destination_file_1",
- TranscodingJobPriority::kUnspecified));
+ TranscodingSessionPriority::kUnspecified));
- // Job 0 should start immediately.
+ // Session 0 should start immediately.
EXPECT_EQ(mClient1->pop(kPaddingUs), EventTracker::Start(CLIENT(1), 0));
- // Submit more real-time jobs.
+ // Submit more real-time sessions.
EXPECT_TRUE(mClient1->submit(2, "test_source_file_2", "test_destination_file_2"));
EXPECT_TRUE(mClient1->submit(3, "test_source_file_3", "test_destination_file_3"));
- // Job 0 should pause immediately and job 2 should start.
+ // Session 0 should pause immediately and session 2 should start.
EXPECT_EQ(mClient1->pop(kPaddingUs), EventTracker::Pause(CLIENT(1), 0));
EXPECT_EQ(mClient1->pop(kPaddingUs), EventTracker::Start(CLIENT(1), 2));
- // Job 2 should finish in 2 seconds and job 3 should start.
- EXPECT_EQ(mClient1->pop(kJobWithPaddingUs), EventTracker::Finished(CLIENT(1), 2));
+ // Session 2 should finish in 2 seconds and session 3 should start.
+ EXPECT_EQ(mClient1->pop(kSessionWithPaddingUs), EventTracker::Finished(CLIENT(1), 2));
EXPECT_EQ(mClient1->pop(kPaddingUs), EventTracker::Start(CLIENT(1), 3));
- // Cancel job 3 now
+ // Cancel session 3 now
EXPECT_TRUE(mClient1->cancel(3));
- // Job 0 should resume and finish in 2 seconds, followed by job 1 start.
+ // Session 0 should resume and finish in 2 seconds, followed by session 1 start.
EXPECT_EQ(mClient1->pop(kPaddingUs), EventTracker::Resume(CLIENT(1), 0));
- EXPECT_EQ(mClient1->pop(kJobWithPaddingUs), EventTracker::Finished(CLIENT(1), 0));
+ EXPECT_EQ(mClient1->pop(kSessionWithPaddingUs), EventTracker::Finished(CLIENT(1), 0));
EXPECT_EQ(mClient1->pop(kPaddingUs), EventTracker::Start(CLIENT(1), 1));
- // Cancel remaining job 1.
+ // Cancel remaining session 1.
EXPECT_TRUE(mClient1->cancel(1));
unregisterMultipleClients();
@@ -280,16 +280,16 @@
EXPECT_TRUE(status.isOk());
// Test various operations on the client, should fail with ERROR_DISCONNECTED.
- TranscodingJobParcel job;
+ TranscodingSessionParcel session;
bool result;
- status = client->getJobWithId(0, &job, &result);
+ status = client->getSessionWithId(0, &session, &result);
EXPECT_EQ(status.getServiceSpecificError(), IMediaTranscodingService::ERROR_DISCONNECTED);
- status = client->cancelJob(0, &result);
+ status = client->cancelSession(0, &result);
EXPECT_EQ(status.getServiceSpecificError(), IMediaTranscodingService::ERROR_DISCONNECTED);
TranscodingRequestParcel request;
- status = client->submitRequest(request, &job, &result);
+ status = client->submitRequest(request, &session, &result);
EXPECT_EQ(status.getServiceSpecificError(), IMediaTranscodingService::ERROR_DISCONNECTED);
}
@@ -308,41 +308,41 @@
EXPECT_TRUE(ShellHelper::Start(kClientPackageA, kTestActivityName));
// Submit 3 requests.
- ALOGD("Submitting job to client1 (app A) ...");
+ ALOGD("Submitting session to client1 (app A) ...");
EXPECT_TRUE(mClient1->submit(0, "test_source_file_0", "test_destination_file_0"));
EXPECT_TRUE(mClient1->submit(1, "test_source_file_1", "test_destination_file_1"));
EXPECT_TRUE(mClient1->submit(2, "test_source_file_2", "test_destination_file_2"));
- // Job 0 should start immediately.
+ // Session 0 should start immediately.
EXPECT_EQ(mClient1->pop(kPaddingUs), EventTracker::Start(CLIENT(1), 0));
ALOGD("Moving app B to top...");
EXPECT_TRUE(ShellHelper::Start(kClientPackageB, kTestActivityName));
- // Job 0 should continue and finish in 2 seconds, then job 1 should start.
- EXPECT_EQ(mClient1->pop(kJobWithPaddingUs), EventTracker::Finished(CLIENT(1), 0));
+ // Session 0 should continue and finish in 2 seconds, then session 1 should start.
+ EXPECT_EQ(mClient1->pop(kSessionWithPaddingUs), EventTracker::Finished(CLIENT(1), 0));
EXPECT_EQ(mClient1->pop(kPaddingUs), EventTracker::Start(CLIENT(1), 1));
- ALOGD("Submitting job to client2 (app B) ...");
+ ALOGD("Submitting session to client2 (app B) ...");
EXPECT_TRUE(mClient2->submit(0, "test_source_file_0", "test_destination_file_0"));
- // Client1's job should pause, client2's job should start.
+ // Client1's session should pause, client2's session should start.
EXPECT_EQ(mClient1->pop(kPaddingUs), EventTracker::Pause(CLIENT(1), 1));
EXPECT_EQ(mClient2->pop(kPaddingUs), EventTracker::Start(CLIENT(2), 0));
ALOGD("Moving app A back to top...");
EXPECT_TRUE(ShellHelper::Start(kClientPackageA, kTestActivityName));
- // Client2's job should pause, client1's job 1 should resume.
+ // Client2's session should pause, client1's session 1 should resume.
EXPECT_EQ(mClient2->pop(kPaddingUs), EventTracker::Pause(CLIENT(2), 0));
EXPECT_EQ(mClient1->pop(kPaddingUs), EventTracker::Resume(CLIENT(1), 1));
- // Client2's job 1 should finish in 2 seconds, then its job 2 should start.
- EXPECT_EQ(mClient1->pop(kJobWithPaddingUs), EventTracker::Finished(CLIENT(1), 1));
+ // Client2's session 1 should finish in 2 seconds, then its session 2 should start.
+ EXPECT_EQ(mClient1->pop(kSessionWithPaddingUs), EventTracker::Finished(CLIENT(1), 1));
EXPECT_EQ(mClient1->pop(kPaddingUs), EventTracker::Start(CLIENT(1), 2));
- // After client2's jobs finish, client1's job should resume.
- EXPECT_EQ(mClient1->pop(kJobWithPaddingUs), EventTracker::Finished(CLIENT(1), 2));
+ // After client2's sessions finish, client1's session should resume.
+ EXPECT_EQ(mClient1->pop(kSessionWithPaddingUs), EventTracker::Finished(CLIENT(1), 2));
EXPECT_EQ(mClient2->pop(kPaddingUs), EventTracker::Resume(CLIENT(2), 0));
unregisterMultipleClients();