From c5aa9f6b0e994ad3f5828fa062ca4ba84b875516 Mon Sep 17 00:00:00 2001 From: Deepak Verma Date: Tue, 25 Feb 2014 16:37:07 +0530 Subject: [PATCH] msm: vidc: No need to allocate metadata by default If metadata is not enabled by client, there is no need to enable it by default. Change-Id: I6d5bd1c04dcdf78549afac57bcaceb82602da270 Signed-off-by: Deepak Verma --- drivers/video/msm/vidc/1080p/ddl/vcd_ddl_metadata.c | 4 +--- drivers/video/msm/vidc/1080p/ddl/vcd_ddl_metadata.h | 3 +-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/drivers/video/msm/vidc/1080p/ddl/vcd_ddl_metadata.c b/drivers/video/msm/vidc/1080p/ddl/vcd_ddl_metadata.c index c2e01a1d94ed..3a7bcc11f8ba 100644 --- a/drivers/video/msm/vidc/1080p/ddl/vcd_ddl_metadata.c +++ b/drivers/video/msm/vidc/1080p/ddl/vcd_ddl_metadata.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2010-2013, The Linux Foundation. All rights reserved. +/* Copyright (c) 2010-2014, The Linux Foundation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -199,8 +199,6 @@ void ddl_set_default_decoder_metadata_buffer_size(struct ddl_decoder_data u32 flag = decoder->meta_data_enable_flag; u32 suffix = 0, size = 0; if (!flag) { - output_buf_req->meta_buffer_size = - DDL_SECURE_METADATA_DEFAULT_SIZE; decoder->suffix = 0; return; } diff --git a/drivers/video/msm/vidc/1080p/ddl/vcd_ddl_metadata.h b/drivers/video/msm/vidc/1080p/ddl/vcd_ddl_metadata.h index f133df6d08f2..37f661eb11f2 100644 --- a/drivers/video/msm/vidc/1080p/ddl/vcd_ddl_metadata.h +++ b/drivers/video/msm/vidc/1080p/ddl/vcd_ddl_metadata.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2010-2013, The Linux Foundation. All rights reserved. +/* Copyright (c) 2010-2014, The Linux Foundation. All rights reserved. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 and @@ -19,7 +19,6 @@ #define DDL_METADATA_EXTRAPAD_SIZE 256 #define DDL_METADATA_HDR_SIZE 20 #define DDL_METADATA_EXTRADATANONE_SIZE 24 -#define DDL_SECURE_METADATA_DEFAULT_SIZE 8192 #define DDL_METADATA_ALIGNSIZE(x) ((x) = (((x) + 0x7) & ~0x7)) #define DDL_METADATA_MANDATORY \ (VCD_METADATA_DATANONE | VCD_METADATA_QCOMFILLER)