Piteball/android_kernel_google_msm
1
0
Fork 0
mirror of https://github.com/followmsi/android_kernel_google_msm.git synced 2024-11-06 23:17:41 +00:00
Code Issues Projects Releases Wiki Activity

media: dvb: Fix invocation of secure-demux when playing from TSIF

Browse source 
secure-demux processing function expects to receive a fixed
start address aligned to 4KB along with a read pointer, the
code provided the current address along with a read pointer
set to 0 as fixed value. This may cause the start address not
to be aligned to 4KB.

Change-Id: Ibd4a4c70c3b874df328de9d3fea0437cbdf53028
Signed-off-by: Hamad Kadmany <hkadmany@codeaurora.org>
This commit is contained in:
Hamad Kadmany 2013-01-29 19:43:43 +02:00 committed by Iliyan Malchev
parent 1a87f0e437
commit 700389fad0
1 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
drivers/media/dvb/mpq/demux/mpq_dmx_plugin_tspp_v1.c
View file

@ -244,12 +244,13 @@ static void mpq_dmx_tspp_aggregated_process(int tsif, int channel_id)
struct sdmx_buff_descr input;
size_t aggregate_len = 0;
size_t aggregate_count = 0;
phys_addr_t start_addr = 0;
phys_addr_t buff_start_addr;
phys_addr_t buff_current_addr;
int i;
while ((tspp_data_desc = tspp_get_buffer(0, channel_id)) != NULL) {
if (0 == aggregate_count)
start_addr = tspp_data_desc->phys_base;
buff_current_addr = tspp_data_desc->phys_base;
mpq_dmx_tspp_info.tsif[tsif].aggregate_ids[aggregate_count] =
tspp_data_desc->id;
aggregate_len += tspp_data_desc->size;
@ -261,12 +262,19 @@ static void mpq_dmx_tspp_aggregated_process(int tsif, int channel_id)
if (!aggregate_count)
return;
buff_start_addr = mpq_dmx_tspp_info.tsif[tsif].ch_mem_heap_phys_base;
input.base_addr = (void *)buff_start_addr;
input.size = mpq_dmx_tspp_info.tsif[tsif].buffer_count *
TSPP_DESCRIPTOR_SIZE;
MPQ_DVB_DBG_PRINT(
"%s: Processing %d descriptors: %d bytes at start address 0x%x\n",
__func__, aggregate_count, aggregate_len, start_addr);
input.base_addr = (void *)start_addr;
input.size = aggregate_len;
mpq_sdmx_process(mpq_demux, &input, aggregate_len, 0);
"%s: Processing %d descriptors: %d bytes at start address 0x%x, read offset %d\n",
__func__, aggregate_count, aggregate_len,
(unsigned int)input.base_addr,
buff_current_addr - buff_start_addr);
mpq_sdmx_process(mpq_demux, &input, aggregate_len,
buff_current_addr - buff_start_addr);
for (i = 0; i < aggregate_count; i++)
tspp_release_buffer(0, channel_id,