diff options
| author | android-build-prod (mdb) <android-build-team-robot@google.com> | 2020-09-17 17:53:56 +0000 |
|---|---|---|
| committer | android-build-prod (mdb) <android-build-team-robot@google.com> | 2020-09-17 17:53:56 +0000 |
| commit | db6a1b563f4fba4764a04fe3dbe321d0e8b957d9 (patch) | |
| tree | 8e5b696fce666fca16062e54a831801d2789cf75 | |
| parent | e99f976672bb083376d0d563f8bd52805d678773 (diff) | |
| parent | 50a807f052cbd834071ac116349a320399005417 (diff) | |
| download | platform_external_libmpeg2-simpleperf-release.tar.gz platform_external_libmpeg2-simpleperf-release.tar.bz2 platform_external_libmpeg2-simpleperf-release.zip | |
Snap for 6844436 from 50a807f052cbd834071ac116349a320399005417 to simpleperf-releasesimpleperf-release
Change-Id: I5bcb0b9aff974b845ee6dd608869acbe87be2eca
| -rw-r--r-- | OWNERS | 4 | ||||
| -rw-r--r-- | PREUPLOAD.cfg | 2 | ||||
| -rw-r--r-- | common/armv8/impeg2_format_conv.s | 6 | ||||
| -rw-r--r-- | decoder/impeg2d_pic_proc.c | 2 | ||||
| -rw-r--r-- | test/decoder/main.c | 2 |
5 files changed, 10 insertions, 6 deletions
@@ -1,3 +1,3 @@ -marcone@google.com -lajos@google.com +# owners for external/libmpeg2 +include platform/frameworks/av:/media/janitors/OWNERS-codecs essick@google.com diff --git a/PREUPLOAD.cfg b/PREUPLOAD.cfg new file mode 100644 index 0000000..ecf8b8e --- /dev/null +++ b/PREUPLOAD.cfg @@ -0,0 +1,2 @@ +[Hook Scripts] +mainline_hook = ${REPO_ROOT}/frameworks/av/tools/mainline_hook_project.sh diff --git a/common/armv8/impeg2_format_conv.s b/common/armv8/impeg2_format_conv.s index ec76e29..44afcab 100644 --- a/common/armv8/impeg2_format_conv.s +++ b/common/armv8/impeg2_format_conv.s @@ -136,6 +136,7 @@ impeg2_fmt_conv_yuv420p_to_yuv420sp_uv_av8: ldr w14, [sp, #112] //// Load convert_uv_only cmp w14, #1 + mov x9, x5 beq yuv420sp_uv_chroma ///* Do the preprocessing before the main loops start */ //// Load the parameters from stack @@ -195,7 +196,7 @@ yuv420sp_uv_chroma: sub x8, x8, x6 //// Destination increment lsr x6, x6, #1 - lsr x5, x5, #1 + lsr x5, x9, #1 yuv420sp_uv_row_loop_uv: mov x16, x6 @@ -312,6 +313,7 @@ impeg2_fmt_conv_yuv420p_to_yuv420sp_vu_av8: ldr w14, [sp, #112] //// Load convert_uv_only cmp w14, #1 + mov x9, x5 beq yuv420sp_vu_chroma ///* Do the preprocessing before the main loops start */ @@ -373,7 +375,7 @@ yuv420sp_vu_chroma: sub x8, x8, x6 //// Destination increment lsr x6, x6, #1 - lsr x5, x5, #1 + lsr x5, x9, #1 yuv420sp_vu_row_loop_uv: mov x16, x6 diff --git a/decoder/impeg2d_pic_proc.c b/decoder/impeg2d_pic_proc.c index 4689f95..ac29f9b 100644 --- a/decoder/impeg2d_pic_proc.c +++ b/decoder/impeg2d_pic_proc.c @@ -121,7 +121,7 @@ void impeg2d_format_convert(dec_state_t *ps_dec, if(1 == ps_dec->u4_share_disp_buf) convert_uv_only = 1; - if(pu1_src_y == pu1_dst_y) + if(ps_src_pic->pu1_y == ps_disp_frm_buf->pv_y_buf) convert_uv_only = 1; if(ps_dec->i4_chromaFormat == IV_YUV_420SP_UV) diff --git a/test/decoder/main.c b/test/decoder/main.c index 0a249ac..51f2c44 100644 --- a/test/decoder/main.c +++ b/test/decoder/main.c @@ -3112,8 +3112,8 @@ int main(WORD32 argc, CHAR *argv[]) { ithread_join(s_app_ctx.display_thread_handle, NULL); } - free(s_app_ctx.display_thread_handle); } + free(s_app_ctx.display_thread_handle); { iv_retrieve_mem_rec_ip_t s_retrieve_dec_ip; |