← Back to branch summary

~ubuntu-branches/ubuntu/hardy/avidemux/hardy

« back to all changes in this revision

Viewing changes to avidemux/ADM_audiofilter/audioencoder_aften.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Matvey Kozhev
  • Date: 2007-12-18 13:53:04 UTC
  • mfrom: (1.1.7 upstream)
  • Revision ID: james.westby@ubuntu.com-20071218135304-cdqec2lg2bglyz15
Tags: 1:2.4~preview3-0.0ubuntu1
https://launchpad.net/bugs/163287
https://launchpad.net/bugs/126572
https://launchpad.net/bugs/138854
* Upload to Ubuntu. (LP: #163287, LP: #126572)
* debian/changelog: re-added Ubuntu releases.
* debian/control:
  - Require debhelper >= 5.0.51 (for dh_icons) and imagemagick.
  - Build-depend on libsdl1.2-dev instead of libsdl-dev.
  - Build against newer libx264-dev. (LP: #138854)
  - Removed libamrnb-dev, not in Ubuntu yet.
* debian/rules:
  - Install all icon sizes, using convert (upstream installs none).
  - Added missing calls to dh_installmenu, dh_installman, dh_icons and
    dh_desktop.
* debian/menu, debian/avidemux-qt.menu:
  - Corrected package and executable names.
* debian/avidemux-common.install: Install icons.
* debian/avidemux.common.manpages: Install man/avidemux.1.
* debian/links, debian/avidemux-cli.links, debian/avidemux-gtk.links:
  - Link manpages to avidemux.1.gz.
* debian/install, debian/avidemux-qt.install, debian/avidemux-gtk.desktop,
  debian/avidemux-qt.desktop: Install desktop files.

Show diffs side-by-side

added added

removed removed

Lines of Context:
avidemux/ADM_audiofilter/audioencoder_aften.cpp
25
25
 
26
26
#include <ADM_assert.h>
27
27
 
28
 
#include "ADM_library/default.h"
 
28
#include "ADM_utilities/default.h"
29
29
 
30
30
#include "audioprocess.hxx"
31
31
#include "audioeng_process.h"
33
33
//
34
34
extern "C"
35
35
{
36
 
#include "aften/aften.h"
 
36
#if defined(USE_AFTEN_06)
 
37
        #include "aften.h"
 
38
#else   // Aften 0.05 & 0.07 onwards
 
39
        #include "aften/aften.h"
 
40
#endif
37
41
};
38
42
#include "ADM_audiofilter/audioencoder_aften_param.h"
39
43
#include "ADM_audiofilter/audioencoder_aften.h"
47
51
  memset(_handle,0,sizeof(AftenContext));
48
52
  aften_set_defaults(_HANDLE);
49
53
  _wavheader->encoding=WAV_AC3;
50
 
  
 
54
#if defined(USE_AFTEN_05) || defined(USE_AFTEN_06)
 
55
#elif defined(USE_AFTEN_07)
 
56
  _HANDLE->params.n_threads=1; // MThread collides with avidemux multithreading
 
57
#else
 
58
  _HANDLE->system.n_threads=1;
 
59
#endif
51
60
};
52
61
 
53
62
 
76
85
 
77
86
 
78
87
int ret=0;
 
88
 
 
89
#if defined(USE_AFTEN_05) || defined(USE_AFTEN_06)
79
90
int mask;
 
91
#else
 
92
unsigned int mask;
 
93
#endif
 
94
 
80
95
    _wavheader->byterate=(config->bitrate*1000)/8;
81
96
    _HANDLE->sample_format=A52_SAMPLE_FMT_FLT;
82
97
    _HANDLE->channels=_wavheader->channels;
92
107
        case 5: mask = 0x37;  break;
93
108
        case 6: mask = 0x3F;  break;
94
109
      }
95
 
      aften_wav_chmask_to_acmod(_wavheader->channels, mask, &(_HANDLE->acmod), &(_HANDLE->lfe));
 
110
 
 
111
#if defined(USE_AFTEN_05) || defined(USE_AFTEN_06)
 
112
        aften_wav_chmask_to_acmod(_wavheader->channels, mask, &(_HANDLE->acmod), &(_HANDLE->lfe));
 
113
#else
 
114
        aften_wav_channels_to_acmod(_wavheader->channels, mask, &(_HANDLE->acmod), &(_HANDLE->lfe));
 
115
#endif
 
116
 
96
117
   //   _HANDLE->params.verbose=2;
97
118
    int er= aften_encode_init(_HANDLE);
98
119
    if(er<0)
122
143
        }
123
144
        ptr=(void *)&(tmpbuffer[tmphead]);
124
145
        ADM_assert(tmptail>=tmphead);
125
 
        aften_remap_wav_to_a52(ptr, 256*6, _wavheader->channels,A52_SAMPLE_FMT_FLT,  (_HANDLE->acmod), (_HANDLE->lfe));
 
146
 
 
147
#ifdef USE_AFTEN_05
 
148
                aften_remap_wav_to_a52(ptr, 256*6, _wavheader->channels, A52_SAMPLE_FMT_FLT, _HANDLE->acmod, _HANDLE->lfe);
 
149
#else
 
150
                aften_remap_wav_to_a52(ptr, 256*6, _wavheader->channels, A52_SAMPLE_FMT_FLT, _HANDLE->acmod);
 
151
#endif
126
152
 
127
153
        r=aften_encode_frame(_HANDLE, dest,(void *)ptr);
128
154
        if(r<0)