Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MediaEvent should be sent when shared memory info is passed.

Browse Source 
Bug: 191825295
Test: atest android.media.tv.tuner.cts on both AIDL and HIDL HAL.
Test: sampletunertvinput
Change-Id: I4a6bcfd95bff7ecd0a12210f102d92a9b981eae2
This commit is contained in:
Hongguang
2021-08-18 17:42:42 -07:00
parent ecc3279efd
commit fe65288f74
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
media/jni/android_media_tv_Tuner.cpp
View File

@@ -633,7 +633,9 @@ void FilterClientCallbackImpl::getMediaEvent(jobjectArray &arr, const int size,
offset, nullptr, isSecureMemory, avDataId, mpuSequenceNumber,
isPesPrivateData, audioDescriptor);
if (mediaEvent.avMemory.fds.size() > 0 || mediaEvent.avDataId != 0) {
uint64_t avSharedMemSize = mFilterClient->getAvSharedHandleInfo().size;
if (mediaEvent.avMemory.fds.size() > 0 || mediaEvent.avDataId != 0 ||
(dataLength > 0 && (dataLength + offset) < avSharedMemSize)) {
sp<MediaEvent> mediaEventSp =
new MediaEvent(mFilterClient, dupFromAidl(mediaEvent.avMemory),
mediaEvent.avDataId, dataLength + offset, obj);
@@ -1756,15 +1758,16 @@ jobject JTuner::openTimeFilter() {
}
jobject JTuner::openDvr(DvrType type, jlong bufferSize) {
ALOGD("JTuner::openDvr");
ALOGV("JTuner::openDvr");
if (mDemuxClient == nullptr) {
return nullptr;
}
sp<DvrClient> dvrClient;
sp<DvrClientCallbackImpl> callback = new DvrClientCallbackImpl();
dvrClient = mDemuxClient->openDvr(type, (int) bufferSize, callback);
if (dvrClient == nullptr) {
ALOGD("Failed to open Dvr");
return nullptr;
}
@@ -4060,7 +4063,7 @@ static void android_media_tv_Tuner_dvr_set_fd(JNIEnv *env, jobject dvr, jint fd)
ALOGD("Failed to set FD for dvr: dvr client not found");
return;
}
dvrClient->setFd((int)fd);
dvrClient->setFd(fd);
ALOGV("set fd = %d", fd);
}