media.c2 aidl: minor fixes
C2 AIDL fixes.
- Allow setting a new output surface as the same surface
- Remove verbose logs from sync fence
- return C2_BLOCKING instead of C2_TIMED_OUT from C2IgbaBlockPool
Bug: 254050314
Change-Id: I4e15853e7fed0dc803db1204c541e7936624cbd3
diff --git a/media/codec2/hal/client/GraphicsTracker.cpp b/media/codec2/hal/client/GraphicsTracker.cpp
index ca2f6e6..01b0678 100644
--- a/media/codec2/hal/client/GraphicsTracker.cpp
+++ b/media/codec2/hal/client/GraphicsTracker.cpp
@@ -254,8 +254,7 @@
ret = igbp->getUniqueId(&bqId);
}
if (ret != ::android::OK ||
- prevCache->mGeneration == generation ||
- (bqId != 0 && prevCache->mBqId == bqId)) {
+ prevCache->mGeneration == generation) {
ALOGE("new surface configure fail due to wrong or same bqId or same generation:"
"igbp(%d:%llu -> %llu), gen(%lu -> %lu)", (bool)igbp,
(unsigned long long)prevCache->mBqId, (unsigned long long)bqId,
diff --git a/media/codec2/vndk/C2Fence.cpp b/media/codec2/vndk/C2Fence.cpp
index 52ebe25..5d50fc3 100644
--- a/media/codec2/vndk/C2Fence.cpp
+++ b/media/codec2/vndk/C2Fence.cpp
@@ -335,7 +335,8 @@
p.reset();
}
} else {
- ALOGE("Create sync fence from invalid fd");
+ ALOGV("Create sync fence from invalid fd");
+ return C2Fence();
}
return C2Fence(p);
}
@@ -531,7 +532,9 @@
p = SyncFenceImpl::CreateFromNativeHandle(handle);
break;
default:
- ALOGD("Unsupported fence type %d", type);
+ ALOGV("Unsupported fence type %d", type);
+ // If this is malformed-handle close the handle here.
+ (void) native_handle_close(handle);
// return a null-fence in this case
break;
}
diff --git a/media/codec2/vndk/platform/C2IgbaBuffer.cpp b/media/codec2/vndk/platform/C2IgbaBuffer.cpp
index 2051e8f..eafdb22 100644
--- a/media/codec2/vndk/platform/C2IgbaBuffer.cpp
+++ b/media/codec2/vndk/platform/C2IgbaBuffer.cpp
@@ -193,7 +193,7 @@
width, height, format, usage, kBlockingFetchTimeoutNs, &origId, block, &fence);
if (res == C2_BLOCKING) {
- return C2_TIMED_OUT;
+ return C2_BLOCKING;
}
if (res != C2_OK) {
return res;