← Back to branch summary

~ubuntu-branches/ubuntu/lucid/mythtv/lucid

« back to all changes in this revision

Viewing changes to libs/libmythfreesurround/freesurround.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Mario Limonciello
  • Date: 2009-10-02 00:23:18 UTC
  • mfrom: (1.1.36 upstream)
  • Revision ID: james.westby@ubuntu.com-20091002002318-5qu2fr0gxl59egft
Tags: 0.22.0~trunk22167-0ubuntu1
* New upstream checkout (r22167).
  - Fixes some segfaults.

Show diffs side-by-side

added added

removed removed

Lines of Context:
libs/libmythfreesurround/freesurround.cpp
329
329
                    for (i=0;(i<numSamples) && (ic < bs);i++,ic++)
330
330
                    {
331
331
                        int16bufs->l[ic] = *samples++ >> 1;
 
332
                        int16bufs->r[ic] = *samples++ >> 1;
332
333
                        int16bufs->c[ic] = *samples++ >> 1;
333
 
                        int16bufs->r[ic] = *samples++ >> 1;
 
334
                        int16bufs->lfe[ic] = *samples++ >> 1;
334
335
                        int16bufs->ls[ic] = *samples++ >> 1;
335
336
                        int16bufs->rs[ic] = *samples++ >> 1;
336
 
                        int16bufs->lfe[ic] = *samples++ >> 1;
337
337
                    }
338
338
                    break;
339
339
            }
391
391
                        for (i=0;i<numSamples;i++)
392
392
                        {
393
393
                            *l++ = *samples++ >> 1;
 
394
                            *r++ = *samples++ >> 1;
394
395
                            *c++ = *samples++ >> 1;
395
 
                            *r++ = *samples++ >> 1;
 
396
                            *lfe++ = *samples++ >> 1;
396
397
                            *ls++ = *samples++ >> 1;
397
398
                            *rs++ = *samples++ >> 1;
398
 
                            *lfe++ = *samples++ >> 1;
399
399
                        }
400
400
                        } break;
401
401
                }
479
479
                    for (i=0;(i<numSamples) && (ic < bs);i++,ic++)
480
480
                    {
481
481
                        int16bufs->l[ic] = *samples++ << 7;
 
482
                        int16bufs->r[ic] = *samples++ << 7;
482
483
                        int16bufs->c[ic] = *samples++ << 7;
483
 
                        int16bufs->r[ic] = *samples++ << 7;
 
484
                        int16bufs->lfe[ic] = *samples++ << 7;
484
485
                        int16bufs->ls[ic] = *samples++ << 7;
485
486
                        int16bufs->rs[ic] = *samples++ << 7;
486
 
                        int16bufs->lfe[ic] = *samples++ << 7;
487
487
                    }
488
488
                    break;
489
489
            }
541
541
                        for (i=0;i<numSamples;i++)
542
542
                        {
543
543
                            *l++ = *samples++ << 7;
 
544
                            *r++ = *samples++ << 7;
544
545
                            *c++ = *samples++ << 7;
545
 
                            *r++ = *samples++ << 7;
 
546
                            *lfe++ = *samples++ << 7;
546
547
                            *ls++ = *samples++ << 7;
547
548
                            *rs++ = *samples++ << 7;
548
 
                            *lfe++ = *samples++ << 7;
549
549
                        }
550
550
                        } break;
551
551
                }
588
588
            {
589
589
                *output++ = int16bufs->l[outindex];
590
590
                *output++ = int16bufs->r[outindex];
 
591
                *output++ = int16bufs->c[outindex];
 
592
                *output++ = int16bufs->lfe[outindex];
591
593
                *output++ = int16bufs->ls[outindex];
592
594
                *output++ = int16bufs->rs[outindex];
593
 
                *output++ = int16bufs->c[outindex];
594
 
                *output++ = int16bufs->lfe[outindex];
595
595
                oc--;
596
596
                outindex++;
597
597
            }
611
611
                {
612
612
                    *output++ = lrintf(*l++ INV_MASTER_GAIN);
613
613
                    *output++ = lrintf(*r++ INV_MASTER_GAIN);
 
614
                    *output++ = lrintf(*c++ INV_MASTER_GAIN);
 
615
                    *output++ = lrintf(*lfe++ INV_MASTER_GAIN);
614
616
                    *output++ = lrintf(*ls++ INV_MASTER_GAIN);
615
617
                    *output++ = lrintf(*rs++ INV_MASTER_GAIN);
616
 
                    *output++ = lrintf(*c++ INV_MASTER_GAIN);
617
 
                    *output++ = lrintf(*lfe++ INV_MASTER_GAIN);
618
618
                }
619
619
                oc -= maxSamples;
620
620
                outindex += maxSamples;
631
631
                {
632
632
                    *output++ = *l++;
633
633
                    *output++ = *r++;
 
634
                    *output++ = *c++;
 
635
                    *output++ = *lfe++;
634
636
                    *output++ = *ls++;
635
637
                    *output++ = *rs++;
636
 
                    *output++ = *c++;
637
 
                    *output++ = *lfe++;
638
638
                }
639
639
                oc -= maxSamples;
640
640
                outindex += maxSamples;