Skip to content

Improvements for Rockchip ffmpeg #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
zillevdr wants to merge 9 commits into
base: rockchip
Choose a base branch
from
Open

Improvements for Rockchip ffmpeg #4

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
9e5abe3
[PATCH v7] Add support for RockChip Media Process Platform
LongChair Sep 24, 2017
c6e5e78
Add MPEG2 Decoder
LongChair Sep 23, 2017
ee8067a
Add more debug info
LongChair Sep 23, 2017
64ebcff
add rkmpp to AVHWAccel
zillevdr Oct 3, 2017
47235e7
with this the frames are in a wrong pts order
zillevdr Oct 3, 2017
8d6ad12
remove unnecessary code
zillevdr Oct 3, 2017
12354fb
if there no frame send the next packet and look at the next cycle
zillevdr Oct 3, 2017
a1ba2e4
wait for frame EOS
zillevdr Oct 3, 2017
30c267e
change a loglevel
zillevdr Oct 4, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion libavcodec/rkmppdec.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,7 +337,6 @@ static int rkmpp_retrieve_frame(AVCodecContext *avctx, AVFrame *frame)
MppBuffer buffer = NULL;
AVDRMFrameDescriptor *desc = NULL;
AVDRMLayerDescriptor *layer = NULL;
int retrycount = 0;
int format, mode;

// on start of decoding, MPP can return -1, which is supposed to be expected
Expand All @@ -352,6 +351,18 @@ static int rkmpp_retrieve_frame(AVCodecContext *avctx, AVFrame *frame)
goto fail;
}
Copy link
Owner

@LongChair LongChair Oct 5, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This would happen almost at each start and was confirmed by rk, we don't want error log in normal conditions at each start


if (decoder->eos_reached && !mpp_frame_get_eos(mppframe)) {
if (mppframe)
mpp_frame_deinit(&mppframe);
usleep(10000);
goto retry_get_frame;
}
Copy link
Owner

@LongChair LongChair Oct 5, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Mpp frames are all released upon avframe relase. Realeasing some here dosn't make sene

if (mppframe && mpp_frame_get_eos(mppframe)) {
av_log(avctx, AV_LOG_DEBUG, "EOS frame found\n");
ret = AVERROR_EXIT;
goto fail;
}

Copy link
Owner

@LongChair LongChair Oct 5, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That return code is not appropriate here. Once again i have already upstreamed those changes and if you feel that a few things should be changed, you need to send those patches to ffmpeg upstream, as the reference code is there now :)

if (mppframe) {
// Check wether we have a special frame or not
if (mpp_frame_get_info_change(mppframe)) {
Expand Down