← Back to branch summary

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

« back to all changes in this revision

Viewing changes to avidemux/ADM_audiocodec/ADM_codecfaad.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_audiocodec/ADM_codecfaad.cpp
30
30
#include "faad.h"
31
31
 
32
32
 
33
 
ADM_faad::ADM_faad( uint32_t fourcc ,WAVHeader *info,uint32_t l,uint8_t *d) :   ADM_Audiocodec(fourcc)
 
33
ADM_faad::ADM_faad( uint32_t fourcc ,uint32_t highEfficiency,WAVHeader *info,uint32_t l,uint8_t *d) :   ADM_Audiocodec(fourcc)
34
34
{
35
35
faacDecConfigurationPtr conf;
36
36
#ifdef OLD_FAAD_PROTO
47
47
                // Update the field we know about
48
48
                conf->outputFormat=FAAD_FMT_16BIT;
49
49
                conf->defSampleRate=info->frequency;
50
 
                conf->defObjectType =LC;
 
50
                if(!highEfficiency)
 
51
                {
 
52
                  conf->defObjectType =LC;
 
53
                }else
 
54
                {
 
55
                   conf->defObjectType =HE_AAC;
 
56
                }
51
57
                faacDecSetConfiguration(_instance, conf);
 
58
                printf("[FAAD] using %u bytes of extradata\n",l);
52
59
                // if we have some extra data, it means we can init it from it
53
60
                if(l)
54
61
                {
55
62
                        _inited = 1;
56
63
                        faacDecInit2(_instance, d,l, &srate,&chan);
57
 
                        printf("Found :%d rate %d channels\n",srate,chan);
 
64
                        printf("[FAAD]Found :%d rate %d channels\n",srate,chan);
58
65
                        if(srate!=info->frequency)
59
66
                        {
60
 
                            printf("Frequency mismatch!!! %d to %d (SBR ?)\n",info->frequency,srate);
 
67
                            printf("[FAAD]Frequency mismatch!!! %d to %d (SBR ?)\n",info->frequency,srate);
61
68
                            info->frequency=srate;
62
69
                        }       
63
70
                        if(chan!=info->channels) // Ask for stereo !
64
71
                        {
65
 
                             printf("channel mismatch!!! %d to %d \n",info->channels,chan);
 
72
                             printf("[FAAD]channel mismatch!!! %d to %d \n",info->channels,chan);
66
73
                            info->channels=chan;
67
74
                        }
68
75
                }
80
87
        ch_route.input_type[4] = CH_REAR_RIGHT;
81
88
        ch_route.input_type[5] = CH_LFE;
82
89
 
83
 
                printf("Faad decoder created\n");
 
90
                printf("[FAAD]Faad decoder created\n");
84
91
}
85
92
 
86
93
ADM_faad::~ADM_faad()
165
172
                        {
166
173
                                printf("Faad: Error %d :%s\n",info.error,
167
174
                                        faacDecGetErrorMessage(info.error));
168
 
                                        /*
169
 
                                xin=info.bytesconsumed ;
170
 
                                if(!xin) xin=1;
171
 
                                memmove(_buffer,_buffer+xin,_inbuffer-xin);
172
 
                                _inbuffer-=xin;
173
 
                                return 1;*/
174
 
                                return 0;
 
175
                                printf("Bye consumed %u, bytes dropped %u \n",info.bytesconsumed,_inbuffer);
 
176
 
 
177
                                _inbuffer=0; // Purge buffer
 
178
                                return 1;
175
179
                        }
176
180
                        if(first)
177
181
                        {