From bdd0e6c4d34030ab3d83ae9fd59e72fa5948a112 Mon Sep 17 00:00:00 2001 From: Oliver Endriss Date: Mon, 10 Jan 2011 06:36:12 -0300 Subject: [PATCH] --- yaml --- r: 241799 b: refs/heads/master c: ac9725d224544954a8d3413a2a66bdf49f735d8b h: refs/heads/master i: 241797: 78b6ce2fea692762b6de6470ee7bf2e77e1588b1 241795: ad28b290e100efd1ae31884a372d4febc7dc1d63 241791: 65a31bf80c1dfe75fbac882072950bcdf5561662 v: v3 --- [refs] | 2 +- trunk/drivers/media/dvb/ngene/ngene-core.c | 4 ++-- trunk/drivers/media/dvb/ngene/ngene-dvb.c | 5 ++++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 5f180b927d4f..672ac43ebea1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 09961aae7b3ea8640051e464b346ed3984521de8 +refs/heads/master: ac9725d224544954a8d3413a2a66bdf49f735d8b diff --git a/trunk/drivers/media/dvb/ngene/ngene-core.c b/trunk/drivers/media/dvb/ngene/ngene-core.c index cd5b1f3e902d..8764647e55f3 100644 --- a/trunk/drivers/media/dvb/ngene/ngene-core.c +++ b/trunk/drivers/media/dvb/ngene/ngene-core.c @@ -143,7 +143,7 @@ static void demux_tasklet(unsigned long data) } } else { if (chan->HWState == HWSTATE_RUN) { - u32 Flags = 0; + u32 Flags = chan->DataFormatFlags; IBufferExchange *exch1 = chan->pBufferExchange; IBufferExchange *exch2 = chan->pBufferExchange2; if (Cur->ngeneBuffer.SR.Flags & 0x01) @@ -474,7 +474,7 @@ static u8 SPDIFConfiguration[10] = { /* Set NGENE I2S Config to transport stream compatible mode */ -static u8 TS_I2SConfiguration[4] = { 0x3E, 0x1A, 0x00, 0x00 }; /*3e 18 00 00 ?*/ +static u8 TS_I2SConfiguration[4] = { 0x3E, 0x18, 0x00, 0x00 }; static u8 TS_I2SOutConfiguration[4] = { 0x80, 0x20, 0x00, 0x00 }; diff --git a/trunk/drivers/media/dvb/ngene/ngene-dvb.c b/trunk/drivers/media/dvb/ngene/ngene-dvb.c index 3832e5983c19..8bb159370c70 100644 --- a/trunk/drivers/media/dvb/ngene/ngene-dvb.c +++ b/trunk/drivers/media/dvb/ngene/ngene-dvb.c @@ -65,8 +65,11 @@ void *tsin_exchange(void *priv, void *buf, u32 len, u32 clock, u32 flags) struct ngene_channel *chan = priv; - if (chan->users > 0) + if (chan->users > 0) { + if (flags & DF_SWAP32) + swap_buffer(buf, len); dvb_dmx_swfilter(&chan->demux, buf, len); + } return NULL; }