Support dumping from given position and migrate code
Bug: 286882111
Test: Enable file dump
Merged-In: Ic4d51b6bacec08d93507aee9e0313d46afd3c0fa
Change-Id: Ic4d51b6bacec08d93507aee9e0313d46afd3c0fa
diff --git a/media/codec2/components/dav1d/Android.bp b/media/codec2/components/dav1d/Android.bp
index cff2e96..c9387dd 100644
--- a/media/codec2/components/dav1d/Android.bp
+++ b/media/codec2/components/dav1d/Android.bp
@@ -23,7 +23,7 @@
"-Wno-unused-variable",
],
- srcs: ["C2SoftDav1dDec.cpp"],
+ srcs: ["C2SoftDav1dDec.cpp", "C2SoftDav1dDump.cpp"],
static_libs: [
"libdav1d_8bit",
"libdav1d_16bit",
diff --git a/media/codec2/components/dav1d/C2SoftDav1dDec.cpp b/media/codec2/components/dav1d/C2SoftDav1dDec.cpp
index cfa4e46..f5112f0 100644
--- a/media/codec2/components/dav1d/C2SoftDav1dDec.cpp
+++ b/media/codec2/components/dav1d/C2SoftDav1dDec.cpp
@@ -33,14 +33,6 @@
namespace android {
-// Flag to enable dumping the bitsteram and the decoded pictures to files.
-static const bool ENABLE_DUMPING_FILES_DEFAULT = false;
-static const char ENABLE_DUMPING_FILES_PROPERTY[] = "debug.dav1d.enabledumping";
-
-// The number of frames to dump to a file
-static const int NUM_FRAMES_TO_DUMP_DEFAULT = INT_MAX;
-static const char NUM_FRAMES_TO_DUMP_PROPERTY[] = "debug.dav1d.numframestodump";
-
// The number of threads used for the dav1d decoder.
static const int NUM_THREADS_DAV1D_DEFAULT = 0;
static const char NUM_THREADS_DAV1D_PROPERTY[] = "debug.dav1d.numthreads";
@@ -513,37 +505,8 @@
}
bool C2SoftDav1dDec::initDecoder() {
- nsecs_t now = systemTime();
#ifdef FILE_DUMP_ENABLE
- snprintf(mInDataFileName, 256, "%s_%" PRId64 "d.%s", DUMP_FILE_PATH, now, INPUT_DATA_DUMP_EXT);
- snprintf(mInSizeFileName, 256, "%s_%" PRId64 "d.%s", DUMP_FILE_PATH, now, INPUT_SIZE_DUMP_EXT);
- snprintf(mDav1dOutYuvFileName, 256, "%s_%" PRId64 "dx.%s", DUMP_FILE_PATH, now,
- OUTPUT_YUV_DUMP_EXT);
-
- bool enableDumping = android::base::GetBoolProperty(ENABLE_DUMPING_FILES_PROPERTY,
- ENABLE_DUMPING_FILES_DEFAULT);
-
- num_frames_to_dump =
- android::base::GetIntProperty(NUM_FRAMES_TO_DUMP_PROPERTY, NUM_FRAMES_TO_DUMP_DEFAULT);
-
- if (enableDumping) {
- ALOGD("enableDumping = %d, num_frames_to_dump = %d", enableDumping, num_frames_to_dump);
-
- mInDataFile = fopen(mInDataFileName, "wb");
- if (mInDataFile == nullptr) {
- ALOGD("Could not open file %s", mInDataFileName);
- }
-
- mInSizeFile = fopen(mInSizeFileName, "wb");
- if (mInSizeFile == nullptr) {
- ALOGD("Could not open file %s", mInSizeFileName);
- }
-
- mDav1dOutYuvFile = fopen(mDav1dOutYuvFileName, "wb");
- if (mDav1dOutYuvFile == nullptr) {
- ALOGD("Could not open file %s", mDav1dOutYuvFileName);
- }
- }
+ mC2SoftDav1dDump.initDumping();
#endif
mSignalledError = false;
mSignalledOutputEos = false;
@@ -592,20 +555,7 @@
mInputBufferIndex = 0;
}
#ifdef FILE_DUMP_ENABLE
- if (mInDataFile != nullptr) {
- fclose(mInDataFile);
- mInDataFile = nullptr;
- }
-
- if (mInSizeFile != nullptr) {
- fclose(mInSizeFile);
- mInSizeFile = nullptr;
- }
-
- if (mDav1dOutYuvFile != nullptr) {
- fclose(mDav1dOutYuvFile);
- mDav1dOutYuvFile = nullptr;
- }
+ mC2SoftDav1dDump.destroyDumping();
#endif
}
@@ -737,24 +687,7 @@
// Dump the bitstream data (inputBuffer) if dumping is enabled.
#ifdef FILE_DUMP_ENABLE
- if (mInDataFile) {
- int ret = fwrite(ptr, 1, new_Size, mInDataFile);
-
- if (ret != new_Size) {
- ALOGE("Error in fwrite %s, requested %d, returned %d", mInDataFileName,
- new_Size, ret);
- }
- }
-
- // Dump the size per inputBuffer if dumping is enabled.
- if (mInSizeFile) {
- int ret = fwrite(&new_Size, 1, 4, mInSizeFile);
-
- if (ret != 4) {
- ALOGE("Error in fwrite %s, requested %d, returned %d", mInSizeFileName, 4,
- ret);
- }
- }
+ mC2SoftDav1dDump.dumpInput(ptr, new_Size);
#endif
bool b_draining = false;
@@ -1001,49 +934,6 @@
return true;
}
-#ifdef FILE_DUMP_ENABLE
-void C2SoftDav1dDec::writeDav1dOutYuvFile(const Dav1dPicture& p) {
- if (mDav1dOutYuvFile != NULL) {
- uint8_t* ptr;
- const int hbd = p.p.bpc > 8;
-
- ptr = (uint8_t*)p.data[0];
- for (int y = 0; y < p.p.h; y++) {
- int iSize = p.p.w << hbd;
- int ret = fwrite(ptr, 1, iSize, mDav1dOutYuvFile);
- if (ret != iSize) {
- ALOGE("Error in fwrite %s, requested %d, returned %d", mDav1dOutYuvFileName, iSize,
- ret);
- break;
- }
-
- ptr += p.stride[0];
- }
-
- if (p.p.layout != DAV1D_PIXEL_LAYOUT_I400) {
- // u/v
- const int ss_ver = p.p.layout == DAV1D_PIXEL_LAYOUT_I420;
- const int ss_hor = p.p.layout != DAV1D_PIXEL_LAYOUT_I444;
- const int cw = (p.p.w + ss_hor) >> ss_hor;
- const int ch = (p.p.h + ss_ver) >> ss_ver;
- for (int pl = 1; pl <= 2; pl++) {
- ptr = (uint8_t*)p.data[pl];
- for (int y = 0; y < ch; y++) {
- int iSize = cw << hbd;
- int ret = fwrite(ptr, 1, cw << hbd, mDav1dOutYuvFile);
- if (ret != iSize) {
- ALOGE("Error in fwrite %s, requested %d, returned %d", mDav1dOutYuvFileName,
- iSize, ret);
- break;
- }
- ptr += p.stride[1];
- }
- }
- }
- }
-}
-#endif
-
bool C2SoftDav1dDec::outputBuffer(const std::shared_ptr<C2BlockPool>& pool,
const std::unique_ptr<C2Work>& work) {
if (!(work && pool)) return false;
@@ -1252,40 +1142,15 @@
isMonochrome, convFormat, mTmpFrameBuffer.get(), tmpSize);
}
- // Dump the output buffer if dumping is enabled (debug only).
-#ifdef FILE_DUMP_ENABLE
- FILE* fp_out = mDav1dOutYuvFile;
-
// if(mOutputBufferIndex % 100 == 0)
ALOGV("output a 10bit picture %dx%d from dav1d "
"(mInputBufferIndex=%d,mOutputBufferIndex=%d,format=%d).",
mWidth, mHeight, mInputBufferIndex, mOutputBufferIndex, format);
- if (fp_out && mOutputBufferIndex <= num_frames_to_dump) {
- for (int i = 0; i < mHeight; i++) {
- int ret = fwrite((uint8_t*)srcY + i * srcYStride * 2, 1, mWidth * 2, fp_out);
- if (ret != mWidth * 2) {
- ALOGE("Error in fwrite, requested %d, returned %d", mWidth * 2, ret);
- break;
- }
- }
-
- for (int i = 0; i < mHeight / 2; i++) {
- int ret = fwrite((uint8_t*)srcU + i * srcUStride * 2, 1, mWidth, fp_out);
- if (ret != mWidth) {
- ALOGE("Error in fwrite, requested %d, returned %d", mWidth, ret);
- break;
- }
- }
-
- for (int i = 0; i < mHeight / 2; i++) {
- int ret = fwrite((uint8_t*)srcV + i * srcVStride * 2, 1, mWidth, fp_out);
- if (ret != mWidth) {
- ALOGE("Error in fwrite, requested %d, returned %d", mWidth, ret);
- break;
- }
- }
- }
+ // Dump the output buffer if dumping is enabled (debug only).
+#ifdef FILE_DUMP_ENABLE
+ mC2SoftDav1dDump.dumpOutput<uint16_t>(srcY, srcU, srcV, srcYStride, srcUStride, srcVStride,
+ mWidth, mHeight);
#endif
} else {
const uint8_t* srcY = (const uint8_t*)img.data[0];
@@ -1296,39 +1161,15 @@
size_t srcUStride = img.stride[1];
size_t srcVStride = img.stride[1];
- // Dump the output buffer is dumping is enabled (debug only)
-#ifdef FILE_DUMP_ENABLE
- FILE* fp_out = mDav1dOutYuvFile;
// if(mOutputBufferIndex % 100 == 0)
ALOGV("output a 8bit picture %dx%d from dav1d "
"(mInputBufferIndex=%d,mOutputBufferIndex=%d,format=%d).",
mWidth, mHeight, mInputBufferIndex, mOutputBufferIndex, format);
- if (fp_out && mOutputBufferIndex <= num_frames_to_dump) {
- for (int i = 0; i < mHeight; i++) {
- int ret = fwrite((uint8_t*)srcY + i * srcYStride, 1, mWidth, fp_out);
- if (ret != mWidth) {
- ALOGE("Error in fwrite, requested %d, returned %d", mWidth, ret);
- break;
- }
- }
-
- for (int i = 0; i < mHeight / 2; i++) {
- int ret = fwrite((uint8_t*)srcU + i * srcUStride, 1, mWidth / 2, fp_out);
- if (ret != mWidth / 2) {
- ALOGE("Error in fwrite, requested %d, returned %d", mWidth / 2, ret);
- break;
- }
- }
-
- for (int i = 0; i < mHeight / 2; i++) {
- int ret = fwrite((uint8_t*)srcV + i * srcVStride, 1, mWidth / 2, fp_out);
- if (ret != mWidth / 2) {
- ALOGE("Error in fwrite, requested %d, returned %d", mWidth / 2, ret);
- break;
- }
- }
- }
+ // Dump the output buffer is dumping is enabled (debug only)
+#ifdef FILE_DUMP_ENABLE
+ mC2SoftDav1dDump.dumpOutput<uint8_t>(srcY, srcU, srcV, srcYStride, srcUStride, srcVStride,
+ mWidth, mHeight);
#endif
convertPlanar8ToYV12(dstY, dstU, dstV, srcY, srcU, srcV, srcYStride, srcUStride, srcVStride,
dstYStride, dstUStride, dstVStride, mWidth, mHeight, isMonochrome,
diff --git a/media/codec2/components/dav1d/C2SoftDav1dDec.h b/media/codec2/components/dav1d/C2SoftDav1dDec.h
index 5201456..e3d2a93 100644
--- a/media/codec2/components/dav1d/C2SoftDav1dDec.h
+++ b/media/codec2/components/dav1d/C2SoftDav1dDec.h
@@ -28,12 +28,9 @@
#include <dav1d/dav1d.h>
#include <deque>
+#include <C2SoftDav1dDump.h>
//#define FILE_DUMP_ENABLE 1
-#define DUMP_FILE_PATH "/data/local/tmp/dump"
-#define INPUT_DATA_DUMP_EXT "av1"
-#define INPUT_SIZE_DUMP_EXT "size"
-#define OUTPUT_YUV_DUMP_EXT "yuv"
namespace android {
@@ -122,17 +119,7 @@
void flushDav1d();
#ifdef FILE_DUMP_ENABLE
- char mInDataFileName[256];
- char mInSizeFileName[256];
- char mDav1dOutYuvFileName[256];
-
- FILE* mInDataFile = nullptr;
- FILE* mInSizeFile = nullptr;
- FILE* mDav1dOutYuvFile = nullptr;
-
- void writeDav1dOutYuvFile(const Dav1dPicture& p);
-
- int num_frames_to_dump = 0;
+ C2SoftDav1dDump mC2SoftDav1dDump;
#endif
C2_DO_NOT_COPY(C2SoftDav1dDec);
diff --git a/media/codec2/components/dav1d/C2SoftDav1dDump.cpp b/media/codec2/components/dav1d/C2SoftDav1dDump.cpp
new file mode 100644
index 0000000..ec8d6cd
--- /dev/null
+++ b/media/codec2/components/dav1d/C2SoftDav1dDump.cpp
@@ -0,0 +1,191 @@
+/*
+ * Copyright (C) 2023 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 "C2SoftDav1dDump"
+#include "C2SoftDav1dDump.h"
+
+namespace android {
+
+// Flag to enable dumping the bitsteram and the decoded pictures to files.
+static const bool ENABLE_DUMPING_FILES_DEFAULT = true;
+static const char ENABLE_DUMPING_FILES_PROPERTY[] = "debug.dav1d.enabledumping";
+
+// The number of frames to dump to a file
+static const int NUM_FRAMES_TO_DUMP_DEFAULT = INT_MAX;
+static const char NUM_FRAMES_TO_DUMP_PROPERTY[] = "debug.dav1d.numframestodump";
+
+// start dumping from this frame
+static const int STARTING_FRAME_TO_DUMP_DEFAULT = 0;
+static const char STARTING_FRAME_TO_DUMP_PROPERTY[] = "debug.dav1d.startingframetodump";
+
+void C2SoftDav1dDump::initDumping() {
+ nsecs_t now = systemTime();
+ snprintf(mInDataFileName, kFileNameLength, "%s_%" PRId64 "d.%s", DUMP_FILE_PATH, now,
+ INPUT_DATA_DUMP_EXT);
+ snprintf(mInSizeFileName, kFileNameLength, "%s_%" PRId64 "d.%s", DUMP_FILE_PATH, now,
+ INPUT_SIZE_DUMP_EXT);
+ snprintf(mDav1dOutYuvFileName, kFileNameLength, "%s_%" PRId64 "dx.%s", DUMP_FILE_PATH, now,
+ OUTPUT_YUV_DUMP_EXT);
+
+ mFramesToDump =
+ android::base::GetIntProperty(NUM_FRAMES_TO_DUMP_PROPERTY, NUM_FRAMES_TO_DUMP_DEFAULT);
+ mFirstFrameToDump = android::base::GetIntProperty(STARTING_FRAME_TO_DUMP_PROPERTY,
+ STARTING_FRAME_TO_DUMP_DEFAULT);
+ bool enableDumping = android::base::GetBoolProperty(ENABLE_DUMPING_FILES_PROPERTY,
+ ENABLE_DUMPING_FILES_DEFAULT);
+ ALOGD("enableDumping = %d, mFramesToDump = %d", enableDumping, mFramesToDump);
+
+ if (enableDumping) {
+ mInDataFile = fopen(mInDataFileName, "wb");
+ if (mInDataFile == nullptr) {
+ ALOGD("Could not open file %s", mInDataFileName);
+ }
+
+ mInSizeFile = fopen(mInSizeFileName, "wb");
+ if (mInSizeFile == nullptr) {
+ ALOGD("Could not open file %s", mInSizeFileName);
+ }
+
+ mDav1dOutYuvFile = fopen(mDav1dOutYuvFileName, "wb");
+ if (mDav1dOutYuvFile == nullptr) {
+ ALOGD("Could not open file %s", mDav1dOutYuvFileName);
+ }
+ }
+}
+
+void C2SoftDav1dDump::destroyDumping() {
+ if (mInDataFile != nullptr) {
+ fclose(mInDataFile);
+ mInDataFile = nullptr;
+ }
+
+ if (mInSizeFile != nullptr) {
+ fclose(mInSizeFile);
+ mInSizeFile = nullptr;
+ }
+
+ if (mDav1dOutYuvFile != nullptr) {
+ fclose(mDav1dOutYuvFile);
+ mDav1dOutYuvFile = nullptr;
+ }
+}
+
+void C2SoftDav1dDump::dumpInput(uint8_t* ptr, int size) {
+ if (mInDataFile) {
+ int ret = fwrite(ptr, 1, size, mInDataFile);
+
+ if (ret != size) {
+ ALOGE("Error in fwrite %s, requested %d, returned %d", mInDataFileName, size, ret);
+ }
+ }
+
+ // Dump the size per inputBuffer if dumping is enabled.
+ if (mInSizeFile) {
+ int ret = fwrite(&size, 1, 4, mInSizeFile);
+
+ if (ret != 4) {
+ ALOGE("Error in fwrite %s, requested %d, returned %d", mInSizeFileName, 4, ret);
+ }
+ }
+}
+
+template <typename T>
+void C2SoftDav1dDump::dumpOutput(const T* srcY, const T* srcU, const T* srcV, size_t srcYStride,
+ size_t srcUStride, size_t srcVStride, int width, int height) {
+ mOutputCount++;
+ FILE* fp_out = mDav1dOutYuvFile;
+ int typeSize = sizeof(T);
+ if (fp_out && mOutputCount >= mFirstFrameToDump &&
+ mOutputCount <= (mFirstFrameToDump + mFramesToDump - 1)) {
+ for (int i = 0; i < height; i++) {
+ int ret =
+ fwrite((uint8_t*)srcY + i * srcYStride * typeSize, 1, width * typeSize, fp_out);
+ if (ret != width * typeSize) {
+ ALOGE("Error in fwrite, requested %d, returned %d", width * typeSize, ret);
+ break;
+ }
+ }
+
+ for (int i = 0; i < height / 2; i++) {
+ int ret = fwrite((uint8_t*)srcU + i * srcUStride * typeSize, 1, width * typeSize / 2,
+ fp_out);
+ if (ret != width * typeSize / 2) {
+ ALOGE("Error in fwrite, requested %d, returned %d", width * typeSize / 2, ret);
+ break;
+ }
+ }
+
+ for (int i = 0; i < height / 2; i++) {
+ int ret = fwrite((uint8_t*)srcV + i * srcVStride * typeSize, 1, width * typeSize / 2,
+ fp_out);
+ if (ret != width * typeSize / 2) {
+ ALOGE("Error in fwrite, requested %d, returned %d", width * typeSize / 2, ret);
+ break;
+ }
+ }
+ }
+}
+
+void C2SoftDav1dDump::writeDav1dOutYuvFile(const Dav1dPicture& p) {
+ if (mDav1dOutYuvFile != NULL) {
+ uint8_t* ptr;
+ const int hbd = p.p.bpc > 8;
+
+ ptr = (uint8_t*)p.data[0];
+ for (int y = 0; y < p.p.h; y++) {
+ int iSize = p.p.w << hbd;
+ int ret = fwrite(ptr, 1, iSize, mDav1dOutYuvFile);
+ if (ret != iSize) {
+ ALOGE("Error in fwrite %s, requested %d, returned %d", mDav1dOutYuvFileName, iSize,
+ ret);
+ break;
+ }
+
+ ptr += p.stride[0];
+ }
+
+ if (p.p.layout != DAV1D_PIXEL_LAYOUT_I400) {
+ // u/v
+ const int ss_ver = p.p.layout == DAV1D_PIXEL_LAYOUT_I420;
+ const int ss_hor = p.p.layout != DAV1D_PIXEL_LAYOUT_I444;
+ const int cw = (p.p.w + ss_hor) >> ss_hor;
+ const int ch = (p.p.h + ss_ver) >> ss_ver;
+ for (int pl = 1; pl <= 2; pl++) {
+ ptr = (uint8_t*)p.data[pl];
+ for (int y = 0; y < ch; y++) {
+ int iSize = cw << hbd;
+ int ret = fwrite(ptr, 1, cw << hbd, mDav1dOutYuvFile);
+ if (ret != iSize) {
+ ALOGE("Error in fwrite %s, requested %d, returned %d", mDav1dOutYuvFileName,
+ iSize, ret);
+ break;
+ }
+ ptr += p.stride[1];
+ }
+ }
+ }
+ }
+}
+
+template void C2SoftDav1dDump::dumpOutput<uint8_t>(const uint8_t* srcY, const uint8_t* srcU,
+ const uint8_t* srcV, size_t srcYStride,
+ size_t srcUStride, size_t srcVStride, int width,
+ int height);
+template void C2SoftDav1dDump::dumpOutput<uint16_t>(const uint16_t* srcY, const uint16_t* srcU,
+ const uint16_t* srcV, size_t srcYStride,
+ size_t srcUStride, size_t srcVStride, int width,
+ int height);
+} // namespace android
\ No newline at end of file
diff --git a/media/codec2/components/dav1d/C2SoftDav1dDump.h b/media/codec2/components/dav1d/C2SoftDav1dDump.h
new file mode 100644
index 0000000..ea7a48a
--- /dev/null
+++ b/media/codec2/components/dav1d/C2SoftDav1dDump.h
@@ -0,0 +1,52 @@
+/*
+ * Copyright (C) 2023 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.
+ */
+#include <android-base/properties.h>
+#include <Codec2CommonUtils.h>
+#include <Codec2Mapper.h>
+#include <dav1d/dav1d.h>
+
+#define DUMP_FILE_PATH "/data/local/tmp/dump"
+#define INPUT_DATA_DUMP_EXT "av1"
+#define INPUT_SIZE_DUMP_EXT "size"
+#define OUTPUT_YUV_DUMP_EXT "yuv"
+
+namespace android {
+constexpr size_t kFileNameLength = 256;
+
+class C2SoftDav1dDump {
+ public:
+ void initDumping();
+ void destroyDumping();
+ void dumpInput(uint8_t* ptr, int new_size);
+ template <typename T>
+ void dumpOutput(const T* srcY, const T* srcU, const T* srcV, size_t srcYStride,
+ size_t srcUStride, size_t srcVStride, int width, int height);
+ void writeDav1dOutYuvFile(const Dav1dPicture& p);
+
+ private:
+ int mFramesToDump = 0;
+ int mFirstFrameToDump = 0;
+ int mOutputCount = 0;
+
+ char mInDataFileName[kFileNameLength];
+ char mInSizeFileName[kFileNameLength];
+ char mDav1dOutYuvFileName[kFileNameLength];
+
+ FILE* mInDataFile = nullptr;
+ FILE* mInSizeFile = nullptr;
+ FILE* mDav1dOutYuvFile = nullptr;
+};
+} // namespace android