| author | gerrit autosubmit <gerrit.autosubmit@scgit.amlogic.com> | 2020-07-30 10:44:20 (GMT) |
|---|---|---|
| committer | Gerrit Code Review <gituser@scgit2.amlogic.com> | 2020-07-30 10:44:20 (GMT) |
| commit | c019706ca490ead79a74d03f93ccd1e375fdd289 (patch) | |
| tree | 17c77c7f840d121d270b61ae2169c7954780f9c5 | |
| parent | 3daf528f25ecbf862eea29b9e2ce7c513d135a22 (diff) | |
| parent | a8aebdb24be18c4deb09079298ceb86d2bc563a7 (diff) | |
| download | media_modules-c019706ca490ead79a74d03f93ccd1e375fdd289.zip media_modules-c019706ca490ead79a74d03f93ccd1e375fdd289.tar.gz media_modules-c019706ca490ead79a74d03f93ccd1e375fdd289.tar.bz2 | |
Merge "media_modules: enable ge2d for sc2 hcode h264 [1/1]" into amlogic-4.9-dev-q
| -rw-r--r-- | drivers/frame_sink/encoder/h264/encoder.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/frame_sink/encoder/h264/encoder.c b/drivers/frame_sink/encoder/h264/encoder.c index 549788d..66a3f6c 100644 --- a/drivers/frame_sink/encoder/h264/encoder.c +++ b/drivers/frame_sink/encoder/h264/encoder.c @@ -2762,7 +2762,7 @@ static void encode_isr_tasklet(ulong data) { struct encode_manager_s *manager = (struct encode_manager_s *)data; - enc_pr(LOG_ERROR, "encoder is done %d\n", manager->encode_hw_status); + enc_pr(LOG_INFO, "encoder is done %d\n", manager->encode_hw_status); if (((manager->encode_hw_status == ENCODER_IDR_DONE) || (manager->encode_hw_status == ENCODER_NON_IDR_DONE) || (manager->encode_hw_status == ENCODER_SEQUENCE_DONE) @@ -2858,11 +2858,6 @@ static s32 convert_request(struct encode_wq_s *wq, u32 *cmd_info) enc_pr(LOG_INFO, "hwenc: force wq->request.scale_enable=%d\n", wq->request.scale_enable); } - if (get_cpu_type() >= MESON_CPU_MAJOR_ID_SC2) { - enc_pr(LOG_INFO, "disable ge2d scale for sc2\n"); - wq->request.scale_enable = 0; - } - wq->request.nr_mode = (nr_mode > 0) ? nr_mode : cmd_info[16]; if (cmd == ENCODER_IDR) |