| Message ID | HE1PR06MB4011EAB6F0965D47A20AF805ACBF0@HE1PR06MB4011.eurprd06.prod.outlook.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | media: hantro: H264 fixes and improvements | expand |
Hello Jonas, Thank you for the patch. On Sun, 2019-09-01 at 12:45 +0000, Jonas Karlman wrote: > TRM specify supported image size 48x48 to 4096x2304 at step size 16 pixels, > change frmsize max_width/max_height to match TRM. > The RK3288 TRM v1.1 (2015-8-20) I have here mentions a maximum of 3840x2160. I must admit I haven't tested with actual content this size to verify it, have you checked it? Thanks, Ezequiel > Fixes: 760327930e10 ("media: hantro: Enable H264 decoding on rk3288") > Signed-off-by: Jonas Karlman <jonas@kwiboo.se> > --- > drivers/staging/media/hantro/rk3288_vpu_hw.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/staging/media/hantro/rk3288_vpu_hw.c b/drivers/staging/media/hantro/rk3288_vpu_hw.c > index 6bfcc47d1e58..ebb017b8a334 100644 > --- a/drivers/staging/media/hantro/rk3288_vpu_hw.c > +++ b/drivers/staging/media/hantro/rk3288_vpu_hw.c > @@ -67,10 +67,10 @@ static const struct hantro_fmt rk3288_vpu_dec_fmts[] = { > .max_depth = 2, > .frmsize = { > .min_width = 48, > - .max_width = 3840, > + .max_width = 4096, > .step_width = H264_MB_DIM, > .min_height = 48, > - .max_height = 2160, > + .max_height = 2304, > .step_height = H264_MB_DIM, > }, > },
On 2019-09-04 15:07, Ezequiel Garcia wrote: > Hello Jonas, > > Thank you for the patch. > > On Sun, 2019-09-01 at 12:45 +0000, Jonas Karlman wrote: >> TRM specify supported image size 48x48 to 4096x2304 at step size 16 pixels, >> change frmsize max_width/max_height to match TRM. >> > The RK3288 TRM v1.1 (2015-8-20) I have here mentions a maximum > of 3840x2160. > > I must admit I haven't tested with actual content this size > to verify it, have you checked it? I can confirm that one of my test samples (PUPPIES BATH IN 4K) is 4096x2304 and can be decoded after this patch. However the decoding speed is not optimal at 400Mhz, if I recall correctly you need to set the VPU1 clock to 600Mhz for 4K decoding on RK3288. The RK3288 TRM vcodec chapter from [1], unknown revision and date, lists 48x48 to 4096x2304 step size 16 pixels under 25.5.1 H.264 decoder. [1] http://www.t-firefly.com/download/firefly-rk3288/docs/TRM/rk3288-chapter-25-video-encoder-decoder-unit-(vcodec).pdf Regards, Jonas > > Thanks, > Ezequiel > >> Fixes: 760327930e10 ("media: hantro: Enable H264 decoding on rk3288") >> Signed-off-by: Jonas Karlman <jonas@kwiboo.se> >> --- >> drivers/staging/media/hantro/rk3288_vpu_hw.c | 4 ++-- >> 1 file changed, 2 insertions(+), 2 deletions(-) >> >> diff --git a/drivers/staging/media/hantro/rk3288_vpu_hw.c b/drivers/staging/media/hantro/rk3288_vpu_hw.c >> index 6bfcc47d1e58..ebb017b8a334 100644 >> --- a/drivers/staging/media/hantro/rk3288_vpu_hw.c >> +++ b/drivers/staging/media/hantro/rk3288_vpu_hw.c >> @@ -67,10 +67,10 @@ static const struct hantro_fmt rk3288_vpu_dec_fmts[] = { >> .max_depth = 2, >> .frmsize = { >> .min_width = 48, >> - .max_width = 3840, >> + .max_width = 4096, >> .step_width = H264_MB_DIM, >> .min_height = 48, >> - .max_height = 2160, >> + .max_height = 2304, >> .step_height = H264_MB_DIM, >> }, >> }, >
diff --git a/drivers/staging/media/hantro/rk3288_vpu_hw.c b/drivers/staging/media/hantro/rk3288_vpu_hw.c index 6bfcc47d1e58..ebb017b8a334 100644 --- a/drivers/staging/media/hantro/rk3288_vpu_hw.c +++ b/drivers/staging/media/hantro/rk3288_vpu_hw.c @@ -67,10 +67,10 @@ static const struct hantro_fmt rk3288_vpu_dec_fmts[] = { .max_depth = 2, .frmsize = { .min_width = 48, - .max_width = 3840, + .max_width = 4096, .step_width = H264_MB_DIM, .min_height = 48, - .max_height = 2160, + .max_height = 2304, .step_height = H264_MB_DIM, }, },
TRM specify supported image size 48x48 to 4096x2304 at step size 16 pixels, change frmsize max_width/max_height to match TRM. Fixes: 760327930e10 ("media: hantro: Enable H264 decoding on rk3288") Signed-off-by: Jonas Karlman <jonas@kwiboo.se> --- drivers/staging/media/hantro/rk3288_vpu_hw.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)