package/mpp
1
0
Fork 0
mirror of https://github.com/nyanmisaka/mpp.git synced 2025-10-05 17:16:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

[dec_test]: Optimizing mt/multi test

Browse Source 
1. Add FileReader
2. Implement frame_num(-n) param setting

Signed-off-by: Yandong Lin <yandong.lin@rock-chips.com>
Change-Id: I15c169e6d8a8ce74f838402d4360436ecd0a1829
This commit is contained in:
Yandong Lin
2021-01-13 22:02:35 +08:00
committed by Herman Chen
parent 82691156fd
commit 4d82e3e9ab
2 changed files with 53 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
test/mpi_dec_mt_test.c
View File

@@ -52,6 +52,8 @@ typedef struct {
FILE *fp_input; FILE *fp_input;
FILE *fp_output; FILE *fp_output;
RK_U64 frame_count; RK_U64 frame_count;
RK_S32 frame_num;
FileReader reader;
} MpiDecLoopData; } MpiDecLoopData;
void *thread_input(void *arg) void *thread_input(void *arg)
@@ -61,26 +63,23 @@ void *thread_input(void *arg)
MppApi *mpi = data->mpi; MppApi *mpi = data->mpi;
char *buf = data->buf; char *buf = data->buf;
MppPacket packet = data->packet; MppPacket packet = data->packet;
FileReader reader = data->reader;
mpp_log("put packet thread start\n"); mpp_log("put packet thread start\n");
do { do {
RK_U32 pkt_done = 0; RK_U32 pkt_done = 0;
RK_U32 pkt_eos = 0; RK_U32 pkt_eos = 0;
size_t read_size = fread(buf, 1, data->packet_size, data->fp_input); size_t read_size = 0;
if (read_size != data->packet_size || feof(data->fp_input)) { pkt_eos = reader_read(reader, &buf, &read_size);
// setup eos flag
pkt_eos = 1;
// reset file to start and clear eof / ferror if (pkt_eos)
clearerr(data->fp_input); reader_rewind(reader);
rewind(data->fp_input);
}
// write data to packet mpp_packet_set_data(packet, buf);
mpp_packet_write(packet, 0, buf, read_size); if (read_size > mpp_packet_get_size(packet))
// reset pos and set valid length mpp_packet_set_size(packet, read_size);
mpp_packet_set_pos(packet, buf); mpp_packet_set_pos(packet, buf);
mpp_packet_set_length(packet, read_size); mpp_packet_set_length(packet, read_size);
// setup eos flag // setup eos flag
@@ -187,7 +186,7 @@ void *thread_output(void *arg)
} else { } else {
// found normal output frame // found normal output frame
RK_U32 err_info = mpp_frame_get_errinfo(frame) | mpp_frame_get_discard(frame); RK_U32 err_info = mpp_frame_get_errinfo(frame) | mpp_frame_get_discard(frame);
if (0/*err_info*/) if (err_info)
mpp_log("decoder_get_frame get err info:%d discard:%d.\n", mpp_log("decoder_get_frame get err info:%d discard:%d.\n",
mpp_frame_get_errinfo(frame), mpp_frame_get_discard(frame)); mpp_frame_get_errinfo(frame), mpp_frame_get_discard(frame));
@@ -213,7 +212,7 @@ void *thread_output(void *arg)
mpp_log("decoded %10lld frame %7.2f fps\n", mpp_log("decoded %10lld frame %7.2f fps\n",
data->frame_count, fps); data->frame_count, fps);
last_time = now + 1000000; last_time = now;
last_count = data->frame_count; last_count = data->frame_count;
} }
} }
@@ -221,7 +220,7 @@ void *thread_output(void *arg)
} }
if (mpp_frame_get_eos(frame)) { if (mpp_frame_get_eos(frame)) {
// mpp_log("found last frame\n"); mpp_log("found last frame loop again\n");
// when get a eos status mpp need a reset to restart decoding // when get a eos status mpp need a reset to restart decoding
ret = mpi->reset(ctx); ret = mpi->reset(ctx);
if (MPP_OK != ret) if (MPP_OK != ret)
@@ -230,6 +229,11 @@ void *thread_output(void *arg)
mpp_frame_deinit(&frame); mpp_frame_deinit(&frame);
frame = NULL; frame = NULL;
if (data->frame_num > 0 && data->frame_count >= (RK_U32)data->frame_num) {
data->loop_end = 1;
mpp_log("%p reach max frame number %d\n", ctx, data->frame_count);
break;
}
} }
} while (!data->loop_end); } while (!data->loop_end);
@@ -260,9 +264,9 @@ int mpi_dec_test_decode(MpiDecTestCmd *cmd)
RK_U32 width = cmd->width; RK_U32 width = cmd->width;
RK_U32 height = cmd->height; RK_U32 height = cmd->height;
MppCodingType type = cmd->type; MppCodingType type = cmd->type;
FileReader reader = NULL;
// resources // resources
char *buf = NULL;
size_t packet_size = MPI_DEC_STREAM_SIZE; size_t packet_size = MPI_DEC_STREAM_SIZE;
pthread_t thd_in; pthread_t thd_in;
@@ -283,6 +287,7 @@ int mpi_dec_test_decode(MpiDecTestCmd *cmd)
fseek(data.fp_input, 0L, SEEK_END); fseek(data.fp_input, 0L, SEEK_END);
file_size = ftell(data.fp_input); file_size = ftell(data.fp_input);
rewind(data.fp_input); rewind(data.fp_input);
reader_init(&reader, cmd->file_input, data.fp_input);
mpp_log("input file size %ld\n", file_size); mpp_log("input file size %ld\n", file_size);
} }
@@ -294,13 +299,7 @@ int mpi_dec_test_decode(MpiDecTestCmd *cmd)
} }
} }
buf = mpp_malloc(char, packet_size); ret = mpp_packet_init(&packet, NULL, 0);
if (NULL == buf) {
mpp_err("mpi_dec_test malloc input stream buffer failed\n");
goto MPP_TEST_OUT;
}
ret = mpp_packet_init(&packet, buf, packet_size);
if (ret) { if (ret) {
mpp_err("mpp_packet_init failed\n"); mpp_err("mpp_packet_init failed\n");
goto MPP_TEST_OUT; goto MPP_TEST_OUT;
@@ -347,11 +346,12 @@ int mpi_dec_test_decode(MpiDecTestCmd *cmd)
data.ctx = ctx; data.ctx = ctx;
data.mpi = mpi; data.mpi = mpi;
data.loop_end = 0; data.loop_end = 0;
data.buf = buf;
data.packet = packet; data.packet = packet;
data.packet_size = packet_size; data.packet_size = packet_size;
data.frame = frame; data.frame = frame;
data.frame_count = 0; data.frame_count = 0;
data.frame_num = cmd->frame_num;
data.reader = reader;
pthread_attr_init(&attr); pthread_attr_init(&attr);
pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_JOINABLE); pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_JOINABLE);
@@ -367,12 +367,11 @@ int mpi_dec_test_decode(MpiDecTestCmd *cmd)
mpp_err("failed to create thread for output ret %d\n", ret); mpp_err("failed to create thread for output ret %d\n", ret);
goto THREAD_END; goto THREAD_END;
} }
msleep(500);
// wait for input then quit decoding // wait for input then quit decoding
mpp_log("*******************************************\n"); mpp_log("*******************************************\n");
mpp_log("**** Press Enter to stop loop decoding ****\n"); mpp_log("**** Press Enter to stop loop decoding ****\n");
mpp_log("*******************************************\n"); mpp_log("*******************************************\n");
getc(stdin); getc(stdin);
data.loop_end = 1; data.loop_end = 1;
ret = mpi->reset(ctx); ret = mpi->reset(ctx);
@@ -397,6 +396,8 @@ MPP_TEST_OUT:
packet = NULL; packet = NULL;
} }
reader_deinit(&reader);
if (frame) { if (frame) {
mpp_frame_deinit(&frame); mpp_frame_deinit(&frame);
frame = NULL; frame = NULL;
@@ -407,11 +408,6 @@ MPP_TEST_OUT:
ctx = NULL; ctx = NULL;
} }
if (buf) {
mpp_free(buf);
buf = NULL;
}
if (data.frm_grp) { if (data.frm_grp) {
mpp_buffer_group_put(data.frm_grp); mpp_buffer_group_put(data.frm_grp);
data.frm_grp = NULL; data.frm_grp = NULL;

47
test/mpi_dec_multi_test.c
View File

@@ -57,6 +57,8 @@ typedef struct {
RK_S64 first_pkt; RK_S64 first_pkt;
RK_S64 first_frm; RK_S64 first_frm;
RK_S32 frame_num;
FileReader reader;
} MpiDecCtx; } MpiDecCtx;
/* For each instance thread return value */ /* For each instance thread return value */
@@ -85,18 +87,23 @@ static int decode_simple(MpiDecCtx *data)
char *buf = data->buf; char *buf = data->buf;
MppPacket packet = data->packet; MppPacket packet = data->packet;
MppFrame frame = NULL; MppFrame frame = NULL;
size_t read_size = fread(buf, 1, data->packet_size, data->fp_input); FileReader reader = data->reader;
size_t read_size = 0;
if (read_size != data->packet_size || feof(data->fp_input)) { data->eos = pkt_eos = reader_read(reader, &buf, &read_size);
// mpp_log("found last packet\n"); if (pkt_eos) {
if (data->frame_num < 0) {
// setup eos flag mpp_log("%p loop again\n", ctx);
data->eos = pkt_eos = 1; reader_rewind(reader);
data->eos = pkt_eos = 0;
} else {
mpp_log("%p found last packet\n", ctx);
}
} }
// write data to packet mpp_packet_set_data(packet, buf);
mpp_packet_write(packet, 0, buf, read_size); if (read_size > mpp_packet_get_size(packet))
// reset pos and set valid length mpp_packet_set_size(packet, read_size);
mpp_packet_set_pos(packet, buf); mpp_packet_set_pos(packet, buf);
mpp_packet_set_length(packet, read_size); mpp_packet_set_length(packet, read_size);
// setup eos flag // setup eos flag
@@ -195,7 +202,7 @@ static int decode_simple(MpiDecCtx *data)
mpp_log("decoder_get_frame get err info:%d discard:%d.\n", mpp_log("decoder_get_frame get err info:%d discard:%d.\n",
mpp_frame_get_errinfo(frame), mpp_frame_get_discard(frame)); mpp_frame_get_errinfo(frame), mpp_frame_get_discard(frame));
} }
//mpp_log("decode_get_frame get frame %d\n", data->frame_count); mpp_log("decode_get_frame get frame %d\n", data->frame_count);
data->frame_count++; data->frame_count++;
if (data->fp_output && !err_info) if (data->fp_output && !err_info)
dump_mpp_frame_to_file(frame, data->fp_output); dump_mpp_frame_to_file(frame, data->fp_output);
@@ -216,6 +223,10 @@ static int decode_simple(MpiDecCtx *data)
// mpp_log("found last frame\n"); // mpp_log("found last frame\n");
break; break;
} }
if (data->frame_num > 0 && data->frame_count >= (RK_U32)data->frame_num) {
data->eos = 1;
break;
}
if (get_frm) if (get_frm)
continue; continue;
@@ -367,6 +378,7 @@ void* mpi_dec_test_decode(void *cmd_ctx)
size_t packet_size = MPI_DEC_STREAM_SIZE; size_t packet_size = MPI_DEC_STREAM_SIZE;
MppBuffer pkt_buf = NULL; MppBuffer pkt_buf = NULL;
MppBuffer frm_buf = NULL; MppBuffer frm_buf = NULL;
FileReader reader = NULL;
// mpp_log("mpi_dec_test start\n"); // mpp_log("mpi_dec_test start\n");
@@ -392,13 +404,9 @@ void* mpi_dec_test_decode(void *cmd_ctx)
} }
if (cmd->simple) { if (cmd->simple) {
buf = mpp_malloc(char, packet_size); reader_init(&reader, cmd->file_input, dec_ctx->fp_input);
if (NULL == buf) {
mpp_err("mpi_dec_test malloc input stream buffer failed\n");
goto MPP_TEST_OUT;
}
ret = mpp_packet_init(&packet, buf, packet_size); ret = mpp_packet_init(&packet, NULL, 0);
if (ret) { if (ret) {
mpp_err("mpp_packet_init failed\n"); mpp_err("mpp_packet_init failed\n");
goto MPP_TEST_OUT; goto MPP_TEST_OUT;
@@ -500,6 +508,8 @@ void* mpi_dec_test_decode(void *cmd_ctx)
dec_ctx->packet_size = packet_size; dec_ctx->packet_size = packet_size;
dec_ctx->frame = frame; dec_ctx->frame = frame;
dec_ctx->frame_count = 0; dec_ctx->frame_count = 0;
dec_ctx->frame_num = cmd->frame_num;
dec_ctx->reader = reader;
RK_S64 t_s, t_e; RK_S64 t_s, t_e;
@@ -543,10 +553,7 @@ MPP_TEST_OUT:
} }
if (cmd->simple) { if (cmd->simple) {
if (buf) { reader_deinit(&reader);
mpp_free(buf);
buf = NULL;
}
} else { } else {
if (pkt_buf) { if (pkt_buf) {
mpp_buffer_put(pkt_buf); mpp_buffer_put(pkt_buf);