mirror of
https://github.com/nyanmisaka/mpp.git
synced 2025-10-06 01:26:49 +08:00
[mpp]: Combine block control and timeout control
Use MppPollType as block control MPP_SET_INPUT_TIMEOUT and MPP_SET_OUTPUT_TIMEOUT 's parameter. Deprecate old block/block_timeout control. Next step is to change MppPollType to RK_S64 for compatible in different platform. Change-Id: I02974f0b8eeb23ff43687448d6c3271ea7dd0a2c Signed-off-by: Herman Chen <herman.chen@rock-chips.com>
This commit is contained in:
@@ -107,7 +107,7 @@ static MPP_RET mpi_decode(MppCtx ctx, MppPacket packet, MppFrame *frame)
|
||||
* If there is frame to return get the frame first
|
||||
* But if the output mode is block then we need to send packet first
|
||||
*/
|
||||
if (!mpp->mOutputBlock || packet_done) {
|
||||
if (!mpp->mOutputTimeout || packet_done) {
|
||||
ret = mpp->get_frame(frame);
|
||||
if (ret || *frame)
|
||||
break;
|
||||
@@ -118,7 +118,7 @@ static MPP_RET mpi_decode(MppCtx ctx, MppPacket packet, MppFrame *frame)
|
||||
break;
|
||||
|
||||
/*
|
||||
* then send input stream with block mode
|
||||
* then send input stream with timeout mode
|
||||
*/
|
||||
ret = mpp->put_packet(packet);
|
||||
if (MPP_OK == ret)
|
||||
|
Reference in New Issue
Block a user