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

[mpi]: Add poll interface to mpi

Browse Source 
1. Add poll with timeout. Support three mode: block/non-block/timeout.
2. Change control MPP_SET_INPUT_BLOCK and MPP_SET_OUTPUT_BLOCK.
3. Remove msleep in most mpp interface.

Change-Id: I39d9a261b6f1da66c6cb944abd71d1e7f4928d2d
Signed-off-by: Herman Chen <herman.chen@rock-chips.com>
This commit is contained in:
Herman Chen
2016-12-20 15:10:17 +08:00
parent 1bbd1dcce6
commit d8ed1f4eb1
13 changed files with 599 additions and 419 deletions
Download Patch File Download Diff File Expand all files Collapse all files

114
test/mpi_enc_test.c
View File

@@ -461,26 +461,25 @@ int mpi_enc_test(MpiEncTestCmd *cmd)
mpp_packet_init_with_buffer(&packet, pkt_buf_out);
do {
ret = mpi->dequeue(ctx, MPP_PORT_INPUT, &task);
if (ret) {
mpp_err("mpp task input dequeue failed\n");
goto MPP_TEST_OUT;
}
if (task == NULL) {
mpp_log("mpi dequeue from MPP_PORT_INPUT fail, task equal with NULL!");
msleep(3);
} else {
MppFrame frame_out = NULL;
ret = mpi->poll(ctx, MPP_PORT_INPUT, MPP_POLL_BLOCK);
if (ret) {
mpp_err("mpp task input poll failed ret %d\n", ret);
goto MPP_TEST_OUT;
}
mpp_task_meta_get_frame(task, KEY_INPUT_FRAME, &frame_out);
if (frame_out)
mpp_assert(frame_out == frame);
ret = mpi->dequeue(ctx, MPP_PORT_INPUT, &task);
if (ret || NULL == task) {
mpp_err("mpp task input dequeue failed ret %d task %p\n", ret, task);
goto MPP_TEST_OUT;
}
break;
}
} while (1);
if (task) {
MppFrame frame_out = NULL;
mpp_task_meta_get_frame(task, KEY_INPUT_FRAME, &frame_out);
if (frame_out)
mpp_assert(frame_out == frame);
}
mpp_task_meta_set_frame (task, KEY_INPUT_FRAME, frame);
mpp_task_meta_set_packet(task, KEY_OUTPUT_PACKET, packet);
@@ -513,50 +512,51 @@ int mpi_enc_test(MpiEncTestCmd *cmd)
goto MPP_TEST_OUT;
}
msleep(20);
ret = mpi->poll(ctx, MPP_PORT_OUTPUT, MPP_POLL_BLOCK);
if (ret) {
mpp_err("mpp task output poll failed ret %d\n", ret);
goto MPP_TEST_OUT;
}
do {
ret = mpi->dequeue(ctx, MPP_PORT_OUTPUT, &task);
ret = mpi->dequeue(ctx, MPP_PORT_OUTPUT, &task);
if (ret || NULL == task) {
mpp_err("mpp task output dequeue failed ret %d task %p\n", ret, task);
goto MPP_TEST_OUT;
}
if (task) {
MppFrame packet_out = NULL;
mpp_task_meta_get_packet(task, KEY_OUTPUT_PACKET, &packet_out);
mpp_assert(packet_out == packet);
if (packet) {
// write packet to file here
void *ptr = mpp_packet_get_pos(packet);
size_t len = mpp_packet_get_length(packet);
pkt_eos = mpp_packet_get_eos(packet);
if (fp_output)
fwrite(ptr, 1, len, fp_output);
mpp_packet_deinit(&packet);
mpp_log_f("encoded frame %d size %d\n", frame_count, len);
stream_size += len;
if (pkt_eos) {
mpp_log("found last packet\n");
mpp_assert(frm_eos);
}
}
frame_count++;
ret = mpi->enqueue(ctx, MPP_PORT_OUTPUT, task);
if (ret) {
mpp_err("mpp task output dequeue failed\n");
mpp_err("mpp task output enqueue failed\n");
goto MPP_TEST_OUT;
}
if (task) {
MppFrame packet_out = NULL;
mpp_task_meta_get_packet(task, KEY_OUTPUT_PACKET, &packet_out);
mpp_assert(packet_out == packet);
if (packet) {
// write packet to file here
void *ptr = mpp_packet_get_pos(packet);
size_t len = mpp_packet_get_length(packet);
pkt_eos = mpp_packet_get_eos(packet);
if (fp_output)
fwrite(ptr, 1, len, fp_output);
mpp_packet_deinit(&packet);
mpp_log_f("encoded frame %d size %d\n", frame_count, len);
stream_size += len;
if (pkt_eos) {
mpp_log("found last packet\n");
mpp_assert(frm_eos);
}
}
frame_count++;
ret = mpi->enqueue(ctx, MPP_PORT_OUTPUT, task);
if (ret) {
mpp_err("mpp task output enqueue failed\n");
goto MPP_TEST_OUT;
}
break;
}
} while (1);
}
if (num_frames && frame_count >= num_frames) {
mpp_log_f("encode max %d frames", frame_count);