From abf2d6b881c931357dfbcc9c3a91200da4807442 Mon Sep 17 00:00:00 2001 From: Harish Mahendrakar Date: Wed, 17 Jul 2019 16:13:33 -0700 Subject: Fix memory leak in test application s_app_ctxt.display_thread_handle in main() was allocated unconditionally, but freed only if s_app_ctxt.display was 1. Now free is unconditional. Test: poc in bug Bug: 137794044 Change-Id: I2c92e88d1cd808d4ce29f7c449918699062cd335 --- test/decoder/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/decoder/main.c b/test/decoder/main.c index 9502dec..4364047 100644 --- a/test/decoder/main.c +++ b/test/decoder/main.c @@ -3110,8 +3110,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; -- cgit v1.2.3 From 6ca4b5feb05157b2af8ff63079ab47e04a87f826 Mon Sep 17 00:00:00 2001 From: Harish Mahendrakar Date: Thu, 14 Apr 2016 17:13:27 +0530 Subject: Fix in armv8 420p to 420sp format conversion assembly Stride for UV was wrongly updated Test: poc in bug Bug: 138149075 Change-Id: I49a51b652f3780400bda9794813a0fb69ea9cb8b --- common/armv8/impeg2_format_conv.s | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/common/armv8/impeg2_format_conv.s b/common/armv8/impeg2_format_conv.s index 48baf04..97772ec 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 @@ -191,7 +192,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 @@ -308,6 +309,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 */ @@ -364,7 +366,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 -- cgit v1.2.3 From 6f9b564b9e407e401bc2e6c1c24ff50a3ca00fde Mon Sep 17 00:00:00 2001 From: Harish Mahendrakar Date: Mon, 22 Jul 2019 14:40:52 -0700 Subject: Add support for handling odd dimensions Test: poc in bug Bug: 137798382 Change-Id: I9df6b869eeb9857799789397615dcb264f73614f --- common/arm/impeg2_format_conv.s | 8 ++++++-- common/armv8/impeg2_format_conv.s | 9 +++++++++ common/impeg2_format_conv.c | 4 ++-- decoder/impeg2d_api_main.c | 38 +++++++++++++++++--------------------- 4 files changed, 34 insertions(+), 25 deletions(-) diff --git a/common/arm/impeg2_format_conv.s b/common/arm/impeg2_format_conv.s index c07edda..bd9a81a 100644 --- a/common/arm/impeg2_format_conv.s +++ b/common/arm/impeg2_format_conv.s @@ -170,9 +170,11 @@ yuv420sp_uv_chroma: ldr r3, [sp, #24] @// Load pu1_dest_uv from stack ldr r4, [sp, #28] @// Load u2_height from stack + add r4, r4, 1 ldr r5, [sp, #32] @// Load u2_width from stack - + add r5, r5, 1 + bic r5, r5, #1 ldr r7, [sp, #40] @// Load u2_strideu from stack @@ -332,9 +334,11 @@ yuv420sp_vu_chroma: ldr r3, [sp, #24] @// Load pu1_dest_uv from stack ldr r4, [sp, #28] @// Load u2_height from stack + add r4, r4, 1 ldr r5, [sp, #32] @// Load u2_width from stack - + add r5, r5, 1 + bic r5, r5, #1 ldr r7, [sp, #40] @// Load u2_strideu from stack diff --git a/common/armv8/impeg2_format_conv.s b/common/armv8/impeg2_format_conv.s index 97772ec..44afcab 100644 --- a/common/armv8/impeg2_format_conv.s +++ b/common/armv8/impeg2_format_conv.s @@ -186,6 +186,10 @@ yuv420sp_uv_chroma: ldr w8, [sp, #104] //// Load u2_dest_stride_uv from stack sxtw x8, w8 + add x6, x6, 1 + bic x6, x6, #1 + + add x9, x9, 1 sub x7, x7, x6, lsr #1 //// Source increment @@ -361,6 +365,11 @@ yuv420sp_vu_chroma: ldr w8, [sp, #104] //// Load u2_dest_stride_uv from stack sxtw x8, w8 + add x6, x6, 1 + bic x6, x6, #1 + + add x9, x9, 1 + sub x7, x7, x6, lsr #1 //// Source increment sub x8, x8, x6 //// Destination increment diff --git a/common/impeg2_format_conv.c b/common/impeg2_format_conv.c index ec0bcfb..b4d62cc 100644 --- a/common/impeg2_format_conv.c +++ b/common/impeg2_format_conv.c @@ -321,7 +321,7 @@ void impeg2_fmt_conv_yuv420p_to_yuv420sp_vu(UWORD8 *pu1_y, UWORD8 *pu1_u, UWORD8 pu1_src_u = pu1_u; pu1_src_v = pu1_v; pu1_dst = pu1_dest_uv ; - + u4_width = ((u4_width + 1) >> 1) << 1; u4_height = (u4_height + 1) >> 1; u2_width_uv = (u4_width + 1) >> 1; for(i = 0; i < u4_height ; i++) @@ -379,7 +379,7 @@ void impeg2_fmt_conv_yuv420p_to_yuv420sp_uv(UWORD8 *pu1_y, UWORD8 *pu1_u, UWORD8 pu1_src_u = pu1_u; pu1_src_v = pu1_v; pu1_dst = pu1_dest_uv ; - + u4_width = ((u4_width + 1) >> 1) << 1; u4_height = (u4_height + 1) >> 1; u2_width_uv = (u4_width + 1) >> 1; for(i = 0; i < u4_height ; i++) diff --git a/decoder/impeg2d_api_main.c b/decoder/impeg2d_api_main.c index 33a7281..44e1708 100644 --- a/decoder/impeg2d_api_main.c +++ b/decoder/impeg2d_api_main.c @@ -1500,10 +1500,8 @@ UWORD32 impeg2d_get_outbuf_size(WORD32 pic_wd,UWORD32 pic_ht, WORD32 u1_chroma_f if(u1_chroma_format == IV_YUV_420P) { p_buf_size[0] = (pic_wd * pic_ht); - p_buf_size[1] = (pic_wd * pic_ht) - >> 2; - p_buf_size[2] = (pic_wd * pic_ht) - >> 2; + p_buf_size[1] = ((pic_wd + 1) >> 1) * ((pic_ht + 1) >> 1); + p_buf_size[2] = ((pic_wd + 1) >> 1) * ((pic_ht + 1) >> 1); } else if(u1_chroma_format == IV_YUV_422ILE) { @@ -1523,11 +1521,9 @@ UWORD32 impeg2d_get_outbuf_size(WORD32 pic_wd,UWORD32 pic_ht, WORD32 u1_chroma_f || (u1_chroma_format == IV_YUV_420SP_VU)) { p_buf_size[0] = (pic_wd * pic_ht); - p_buf_size[1] = (pic_wd * pic_ht) - >> 1; + p_buf_size[1] = ((pic_wd + 1) >> 1) * ((pic_ht + 1) >> 1) * 2; p_buf_size[2] = 0; } - return u4_min_num_out_bufs; } @@ -3330,20 +3326,20 @@ IV_API_CALL_STATUS_T impeg2d_api_entity(iv_obj_t *ps_dechdl, ps_dec_op->s_ivd_video_decode_op_t.s_disp_frm_buf.u4_y_strd = ps_dec_state->u4_frm_buf_stride; ps_dec_op->s_ivd_video_decode_op_t.s_disp_frm_buf.u4_y_ht = ps_dec_state->u2_vertical_size; - ps_dec_op->s_ivd_video_decode_op_t.s_disp_frm_buf.u4_u_wd = ps_dec_state->u2_horizontal_size >> 1; - ps_dec_op->s_ivd_video_decode_op_t.s_disp_frm_buf.u4_u_strd = ps_dec_state->u4_frm_buf_stride >> 1; - ps_dec_op->s_ivd_video_decode_op_t.s_disp_frm_buf.u4_u_ht = ps_dec_state->u2_vertical_size >> 1; + ps_dec_op->s_ivd_video_decode_op_t.s_disp_frm_buf.u4_u_wd = (ps_dec_state->u2_horizontal_size + 1) >> 1; + ps_dec_op->s_ivd_video_decode_op_t.s_disp_frm_buf.u4_u_strd = (ps_dec_state->u4_frm_buf_stride + 1) >> 1; + ps_dec_op->s_ivd_video_decode_op_t.s_disp_frm_buf.u4_u_ht = (ps_dec_state->u2_vertical_size + 1) >> 1; - ps_dec_op->s_ivd_video_decode_op_t.s_disp_frm_buf.u4_v_wd = ps_dec_state->u2_horizontal_size >> 1; - ps_dec_op->s_ivd_video_decode_op_t.s_disp_frm_buf.u4_v_strd = ps_dec_state->u4_frm_buf_stride >> 1; - ps_dec_op->s_ivd_video_decode_op_t.s_disp_frm_buf.u4_v_ht = ps_dec_state->u2_vertical_size >> 1; + ps_dec_op->s_ivd_video_decode_op_t.s_disp_frm_buf.u4_v_wd = (ps_dec_state->u2_horizontal_size + 1) >> 1; + ps_dec_op->s_ivd_video_decode_op_t.s_disp_frm_buf.u4_v_strd = (ps_dec_state->u4_frm_buf_stride + 1) >> 1; + ps_dec_op->s_ivd_video_decode_op_t.s_disp_frm_buf.u4_v_ht = (ps_dec_state->u2_vertical_size + 1) >> 1; ps_dec_op->s_ivd_video_decode_op_t.s_disp_frm_buf.u4_size = sizeof(ps_dec_op->s_ivd_video_decode_op_t.s_disp_frm_buf); switch(ps_dec_state->i4_chromaFormat) { case IV_YUV_420SP_UV: case IV_YUV_420SP_VU: - ps_dec_op->s_ivd_video_decode_op_t.s_disp_frm_buf.u4_u_wd = ps_dec_state->u2_horizontal_size; + ps_dec_op->s_ivd_video_decode_op_t.s_disp_frm_buf.u4_u_wd = (((ps_dec_state->u2_horizontal_size + 1) >> 1) << 1); ps_dec_op->s_ivd_video_decode_op_t.s_disp_frm_buf.u4_u_strd = ps_dec_state->u4_frm_buf_stride; break; case IV_YUV_422ILE: @@ -3418,20 +3414,20 @@ IV_API_CALL_STATUS_T impeg2d_api_entity(iv_obj_t *ps_dechdl, ps_dec_op->s_ivd_video_decode_op_t.s_disp_frm_buf.u4_y_strd = ps_dec_state->u4_frm_buf_stride; ps_dec_op->s_ivd_video_decode_op_t.s_disp_frm_buf.u4_y_ht = ps_dec_state->u2_vertical_size; - ps_dec_op->s_ivd_video_decode_op_t.s_disp_frm_buf.u4_u_wd = ps_dec_state->u2_horizontal_size >> 1; - ps_dec_op->s_ivd_video_decode_op_t.s_disp_frm_buf.u4_u_strd = ps_dec_state->u4_frm_buf_stride >> 1; - ps_dec_op->s_ivd_video_decode_op_t.s_disp_frm_buf.u4_u_ht = ps_dec_state->u2_vertical_size >> 1; + ps_dec_op->s_ivd_video_decode_op_t.s_disp_frm_buf.u4_u_wd = (ps_dec_state->u2_horizontal_size + 1) >> 1; + ps_dec_op->s_ivd_video_decode_op_t.s_disp_frm_buf.u4_u_strd = (ps_dec_state->u4_frm_buf_stride + 1) >> 1; + ps_dec_op->s_ivd_video_decode_op_t.s_disp_frm_buf.u4_u_ht = (ps_dec_state->u2_vertical_size + 1) >> 1; - ps_dec_op->s_ivd_video_decode_op_t.s_disp_frm_buf.u4_v_wd = ps_dec_state->u2_horizontal_size >> 1; - ps_dec_op->s_ivd_video_decode_op_t.s_disp_frm_buf.u4_v_strd = ps_dec_state->u4_frm_buf_stride >> 1; - ps_dec_op->s_ivd_video_decode_op_t.s_disp_frm_buf.u4_v_ht = ps_dec_state->u2_vertical_size >> 1; + ps_dec_op->s_ivd_video_decode_op_t.s_disp_frm_buf.u4_v_wd = (ps_dec_state->u2_horizontal_size + 1) >> 1; + ps_dec_op->s_ivd_video_decode_op_t.s_disp_frm_buf.u4_v_strd = (ps_dec_state->u4_frm_buf_stride + 1) >> 1; + ps_dec_op->s_ivd_video_decode_op_t.s_disp_frm_buf.u4_v_ht = (ps_dec_state->u2_vertical_size + 1) >> 1; ps_dec_op->s_ivd_video_decode_op_t.s_disp_frm_buf.u4_size = sizeof(ps_dec_op->s_ivd_video_decode_op_t.s_disp_frm_buf); switch(ps_dec_state->i4_chromaFormat) { case IV_YUV_420SP_UV: case IV_YUV_420SP_VU: - ps_dec_op->s_ivd_video_decode_op_t.s_disp_frm_buf.u4_u_wd = ps_dec_state->u2_horizontal_size; + ps_dec_op->s_ivd_video_decode_op_t.s_disp_frm_buf.u4_u_wd = (((ps_dec_state->u2_horizontal_size + 1) >> 1) << 1); ps_dec_op->s_ivd_video_decode_op_t.s_disp_frm_buf.u4_u_strd = ps_dec_state->u4_frm_buf_stride; break; case IV_YUV_422ILE: -- cgit v1.2.3 From f8baa89d5707fe879f1a56664b9dfde41d578e77 Mon Sep 17 00:00:00 2001 From: Harish Mahendrakar Date: Wed, 17 Jul 2019 15:58:21 -0700 Subject: Fix overlapped memcpy in format conversion Base address of source picture and destination picture should be compared instead of comparing pointers corresponding to current rows. This is necessary as source and destination strides aren't guaranteed to be equal. Bug: 137794014 Test: poc in bug Change-Id: Ib0bc4fd34c4862dff7107d94bc5db985e1335a94 --- decoder/impeg2d_pic_proc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/decoder/impeg2d_pic_proc.c b/decoder/impeg2d_pic_proc.c index 6826def..332ab0f 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) -- cgit v1.2.3 From c8911af17e9bfdf456ea4b5c6d2addd54f938f9c Mon Sep 17 00:00:00 2001 From: Harish Mahendrakar Date: Fri, 12 Jul 2019 17:20:54 -0700 Subject: Fix integer overflow error in deinterlacer In deinterlacer, in few cases previous fields pointer was derived using some uninitialized strides. This value was never used later. Avoiding the unnecessary pointer increment fixes the integer overflow. Bug: 136697219 Test: poc in bug Change-Id: I79805694aef5c4923cd4459bebbd13462be039ce --- common/ideint.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/common/ideint.c b/common/ideint.c index 24e4e72..af6d15e 100644 --- a/common/ideint.c +++ b/common/ideint.c @@ -206,7 +206,7 @@ IDEINT_ERROR_T ideint_process(void *pv_ctxt, for(i = 0; i < num_comp; i++) { - UWORD8 *pu1_prv, *pu1_out; + UWORD8 *pu1_prv = NULL, *pu1_out; UWORD8 *pu1_top, *pu1_bot, *pu1_dst; WORD32 cur_strd, out_strd, dst_strd; @@ -255,14 +255,16 @@ IDEINT_ERROR_T ideint_process(void *pv_ctxt, { disable_cac_sad = 1; } - for(row = comp_row_start; row < comp_row_end; row++) { pu1_out = ps_out_frm->apu1_buf[i]; pu1_out += (ps_out_frm->ai4_strd[i] * row << 3); - pu1_prv = ps_prv_fld->apu1_buf[i]; - pu1_prv += (ps_prv_fld->ai4_strd[i] * row << 2); + if(0 == disable_cac_sad) + { + pu1_prv = ps_prv_fld->apu1_buf[i]; + pu1_prv += (ps_prv_fld->ai4_strd[i] * row << 2); + } if(ps_ctxt->s_params.i4_cur_fld_top) { @@ -408,7 +410,10 @@ IDEINT_ERROR_T ideint_process(void *pv_ctxt, memcpy(pu1_out + j * out_strd, au1_dst + j * BLK_WD, blk_wd); } } - pu1_prv += 8; + if(NULL != pu1_prv) + { + pu1_prv += 8; + } pu1_top += 8; pu1_bot += 8; pu1_out += 8; -- cgit v1.2.3 From 5e15457fadb59bfc75077ef9e2592f835185a32b Mon Sep 17 00:00:00 2001 From: Harish Mahendrakar Date: Fri, 12 Jul 2019 16:45:12 -0700 Subject: Fix missing initialization of deinterlace intermediate buffer When color format is other than 420p, deinterlacer uses intermediate buffer for storing chroma output. For multi-threaded cases, this intermediate buffer was not initialized in all thread contexts. Bug: 136697219 Test: poc in bug Change-Id: I45d4e7634ed0e2c126a5508aea011617b6c6cc25 --- decoder/impeg2d_dec_hdr.c | 1 + 1 file changed, 1 insertion(+) diff --git a/decoder/impeg2d_dec_hdr.c b/decoder/impeg2d_dec_hdr.c index b60f488..3c974a5 100644 --- a/decoder/impeg2d_dec_hdr.c +++ b/decoder/impeg2d_dec_hdr.c @@ -1253,6 +1253,7 @@ static WORD32 impeg2d_init_thread_dec_ctxt(dec_state_t *ps_dec, ps_dec_thd->ps_func_forw_or_back = ps_dec->ps_func_forw_or_back; ps_dec_thd->pv_deinterlacer_ctxt = ps_dec->pv_deinterlacer_ctxt; ps_dec_thd->ps_deint_pic = ps_dec->ps_deint_pic; + ps_dec_thd->pu1_deint_fmt_buf = ps_dec->pu1_deint_fmt_buf; return 0; } -- cgit v1.2.3 From 05d8b853766a2b708768baf8b68823c951de0f8a Mon Sep 17 00:00:00 2001 From: Dongwon Kang Date: Fri, 6 Dec 2019 12:11:19 -0800 Subject: Add a repo upload hook for checking the mainline code change. Test: repo upload w/ and wo/ changes in mainline path. Change-Id: I7cff3ffecb855fb7bdea49e1efdd5f7c544d2f13 --- PREUPLOAD.cfg | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 PREUPLOAD.cfg diff --git a/PREUPLOAD.cfg b/PREUPLOAD.cfg new file mode 100644 index 0000000..86b6de3 --- /dev/null +++ b/PREUPLOAD.cfg @@ -0,0 +1,2 @@ +[Hook Scripts] +mainline_hook = ${REPO_ROOT}/frameworks/av/tools/mainline_hook.sh -- cgit v1.2.3 From ba0e64bfd62e571fd96c0e658e3ad457b6df51bf Mon Sep 17 00:00:00 2001 From: Jooyung Han Date: Thu, 16 Apr 2020 18:48:29 +0900 Subject: Set min_sdk_version to be part of mainline modules Modules contributing mainline modules (APK/APEX) should set min_sdk_version as well as apex_available. For now setting min_sdk_version doesn't change build outputs. But build-time checks will be added soon. Bug: 152655956 Test: m Merged-In: I0551ad05d83f27a0462a79aa6cf4a1001460c2ba Change-Id: I0551ad05d83f27a0462a79aa6cf4a1001460c2ba (cherry picked from commit 01d937ccb89ab76ae3cb8f895e3e39da4d969e78) --- Android.bp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Android.bp b/Android.bp index afbb2bb..1c2d7de 100644 --- a/Android.bp +++ b/Android.bp @@ -218,6 +218,11 @@ cc_library_static { // cfi: true, blacklist: "libmpeg2dec_blacklist.txt", }, + apex_available: [ + "//apex_available:platform", + "com.android.media.swcodec", + ], + min_sdk_version: "29", } subdirs = ["test"] -- cgit v1.2.3 From 42ec6dac451929258c4bc6e826d8233da9e73b04 Mon Sep 17 00:00:00 2001 From: Harish Mahendrakar Date: Tue, 19 May 2020 06:27:12 +0530 Subject: decoder: Returned frame_decoded true after decoding both fields Bug: 157035821 Test: atest android.mediav2.cts Change-Id: I2cb0f3e2c692b117ca394e73145af055622bf5fb --- decoder/impeg2d_pic_proc.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/decoder/impeg2d_pic_proc.c b/decoder/impeg2d_pic_proc.c index 332ab0f..ac29f9b 100644 --- a/decoder/impeg2d_pic_proc.c +++ b/decoder/impeg2d_pic_proc.c @@ -375,13 +375,17 @@ IMPEG2D_ERROR_CODES_T impeg2d_pre_pic_dec_proc(dec_state_t *ps_dec) if(ps_dec->u4_deinterlace) impeg2_buf_mgr_set_status((buf_mgr_t *)ps_dec->pv_pic_buf_mg, ps_dec->i4_cur_buf_id, MPEG2_BUF_MGR_DEINT); - ps_pic_buf->u4_ts = ps_dec->u4_inp_ts; ps_pic_buf->e_pic_type = ps_dec->e_pic_type; ps_dec->ps_cur_pic = ps_pic_buf; ps_dec->s_cur_frm_buf.pu1_y = ps_pic_buf->pu1_y; ps_dec->s_cur_frm_buf.pu1_u = ps_pic_buf->pu1_u; ps_dec->s_cur_frm_buf.pu1_v = ps_pic_buf->pu1_v; } + else + { + /* Timestamp associated with second field is associated with the current picture */ + ps_dec->ps_cur_pic->u4_ts = ps_dec->u4_inp_ts; + } if(ps_dec->u2_picture_structure == TOP_FIELD) { -- cgit v1.2.3 From a29648291cf3b9be5b0de9503bf961bd56e81380 Mon Sep 17 00:00:00 2001 From: Ray Essick Date: Tue, 26 May 2020 15:18:05 -0700 Subject: point to new repo hooks for mainline uploads Bug: 157501573 Test: upload Change-Id: Ib58b37a18a9d2b6bd2b41f5c3d46f8f9f163278d --- PREUPLOAD.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PREUPLOAD.cfg b/PREUPLOAD.cfg index 86b6de3..ecf8b8e 100644 --- a/PREUPLOAD.cfg +++ b/PREUPLOAD.cfg @@ -1,2 +1,2 @@ [Hook Scripts] -mainline_hook = ${REPO_ROOT}/frameworks/av/tools/mainline_hook.sh +mainline_hook = ${REPO_ROOT}/frameworks/av/tools/mainline_hook_project.sh -- cgit v1.2.3 From 75351bbedf8bbfdd8dfef263025fb0c8720c9dff Mon Sep 17 00:00:00 2001 From: Ray Essick Date: Thu, 6 Aug 2020 14:17:12 -0700 Subject: Include a shared media team OWNERS for easier management Bug: 162786146 Test: n Change-Id: Icb027b7bfead5dfe6a224fea7877da785cc5910d --- OWNERS | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OWNERS b/OWNERS index 3b88fc5..2de9622 100644 --- a/OWNERS +++ b/OWNERS @@ -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 -- cgit v1.2.3