From da7c228b4dcad11f0d3099e151849f7bb2b71c14 Mon Sep 17 00:00:00 2001 From: Dongjin Kim Date: Thu, 27 Jun 2019 11:58:35 +0900 Subject: [PATCH] Revert "amlogic/vvp9: fix amlogic multi dec" This reverts commit 2f12708b53a8b685a4ce281b5852f623fde74fa2. Change-Id: I7749c37937c39ef2486a077e8f78217993a3d574 --- .../amlogic/media_modules/frame_provider/decoder/vp9/vvp9.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/amlogic/media_modules/frame_provider/decoder/vp9/vvp9.c b/drivers/amlogic/media_modules/frame_provider/decoder/vp9/vvp9.c index 9c9e8351455f..cba58451788c 100644 --- a/drivers/amlogic/media_modules/frame_provider/decoder/vp9/vvp9.c +++ b/drivers/amlogic/media_modules/frame_provider/decoder/vp9/vvp9.c @@ -6889,7 +6889,7 @@ static int prepare_display_buf(struct VP9Decoder_s *pbi, kfifo_put(&pbi->display_q, (const struct vframe_s *)vf); ATRACE_COUNTER(MODULE_NAME, vf->pts); pbi->vf_pre_count++; -#ifdef CONFIG_AMLOGIC_MEDIA_MULTI_DEC +#ifndef CONFIG_AMLOGIC_MEDIA_MULTI_DEC /*count info*/ gvs->frame_dur = pbi->frame_dur; vdec_count_info(gvs, 0, stream_offset); @@ -7816,7 +7816,7 @@ int vvp9_dec_status(struct vdec_s *vdec, struct vdec_info *vstatus) vstatus->error_count = 0; vstatus->status = vp9->stat | vp9->fatal_error; vstatus->frame_dur = vp9->frame_dur; -#ifdef CONFIG_AMLOGIC_MEDIA_MULTI_DEC +#ifndef CONFIG_AMLOGIC_MEDIA_MULTI_DEC vstatus->bit_rate = gvs->bit_rate; vstatus->frame_data = gvs->frame_data; vstatus->total_data = gvs->total_data;