shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-11 13:27:06 +09:00
Code Issues Packages Projects Releases Wiki Activity

Revert "amlogic/vvp9: fix amlogic multi dec"

Browse Source 
This reverts commit 2f12708b53a8b685a4ce281b5852f623fde74fa2.

Change-Id: I7749c37937c39ef2486a077e8f78217993a3d574
This commit is contained in:
Dongjin Kim
2019-06-27 11:58:35 +09:00
parent b997e585bd
commit da7c228b4d
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/amlogic/media_modules/frame_provider/decoder/vp9/vvp9.c
View File

@@ -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;