← Back to branch summary

~ubuntu-branches/ubuntu/saucy/sflphone/saucy

« back to all changes in this revision

Viewing changes to sflphone-common/src/audio/codecs/celtcodec.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Francois Marier
  • Date: 2010-12-24 16:33:55 UTC
  • mfrom: (1.1.2 upstream)
  • Revision ID: james.westby@ubuntu.com-20101224163355-tkvvikqxbrbav6up
Tags: 0.9.11-1
* New upstream release
* Add new build dependencies on libwebkit-dev and libyaml-dev

* Bump Standards-Version up to 3.9.1
* Bump debhelper compatibility to 8
* Patch another typo in the upstream code (lintian notice)

Show diffs side-by-side

added added

removed removed

Lines of Context:
sflphone-common/src/audio/codecs/celtcodec.cpp
53
53
        Celt& operator= (const Celt&);
54
54
 
55
55
        void initCelt() {
56
 
            printf ("Celt: Init Celt codec");
57
56
 
58
57
            int error = 0;
59
58
 
60
59
            _mode = celt_mode_create (_clockRate, _frameSize, &error);
61
60
 
62
 
            if(error != CELT_OK) {
63
 
                switch(error) {
64
 
                case CELT_BAD_ARG:
65
 
                        printf("Celt: Error: An (or more) invalid argument (e.g. out of range)\n");
66
 
                        break;
67
 
                case CELT_INVALID_MODE:
68
 
                        printf("Celt: Error: The mode struct passed is invalid\n");
69
 
                        break;
70
 
                case CELT_INTERNAL_ERROR:
71
 
                        printf("Celt: Error: An internal error was detected\n");
72
 
                        break;
73
 
                case CELT_CORRUPTED_DATA:
74
 
                        printf("Celt: Error: The data passed (e.g. compressed data to decoder) is corrupted\n");
75
 
                        break;
76
 
                case CELT_UNIMPLEMENTED:
77
 
                        printf("Celt: Error: Invalid/unsupported request numbe\n");
78
 
                        break;
79
 
                case CELT_INVALID_STATE:
80
 
                        printf("Celt: Error: An encoder or decoder structure is invalid or already freed\n");
81
 
                        break;
82
 
                case CELT_ALLOC_FAIL:
83
 
                                        printf("Celt: Error: Memory allocation has failed\n");
84
 
                                        break;
85
 
                default:
86
 
                                        printf("Celt: Error");
87
 
                }
 
61
            if (error != CELT_OK) {
 
62
                switch (error) {
 
63
                    case CELT_BAD_ARG:
 
64
                        printf ("Celt: Error: An (or more) invalid argument (e.g. out of range)\n");
 
65
                        break;
 
66
                    case CELT_INVALID_MODE:
 
67
                        printf ("Celt: Error: The mode struct passed is invalid\n");
 
68
                        break;
 
69
                    case CELT_INTERNAL_ERROR:
 
70
                        printf ("Celt: Error: An internal error was detected\n");
 
71
                        break;
 
72
                    case CELT_CORRUPTED_DATA:
 
73
                        printf ("Celt: Error: The data passed (e.g. compressed data to decoder) is corrupted\n");
 
74
                        break;
 
75
                    case CELT_UNIMPLEMENTED:
 
76
                        printf ("Celt: Error: Invalid/unsupported request numbe\n");
 
77
                        break;
 
78
                    case CELT_INVALID_STATE:
 
79
                        printf ("Celt: Error: An encoder or decoder structure is invalid or already freed\n");
 
80
                        break;
 
81
                    case CELT_ALLOC_FAIL:
 
82
                        printf ("Celt: Error: Memory allocation has failed\n");
 
83
                        break;
 
84
                    default:
 
85
                        printf ("Celt: Error");
 
86
                }
88
87
 
89
88
            }
90
89
 
106
105
            _dec = celt_decoder_create (_mode, _channel, &error);
107
106
 
108
107
            celt_encoder_ctl (_enc, CELT_SET_COMPLEXITY (2));
109
 
            celt_decoder_ctl(_dec, CELT_SET_COMPLEXITY (2));
 
108
            celt_decoder_ctl (_dec, CELT_SET_COMPLEXITY (2));
110
109
 
111
 
            celt_encoder_ctl (_enc, CELT_SET_PREDICTION(2));
112
 
            celt_decoder_ctl(_dec, CELT_SET_PREDICTION(2));
 
110
            celt_encoder_ctl (_enc, CELT_SET_PREDICTION (2));
 
111
            celt_decoder_ctl (_dec, CELT_SET_PREDICTION (2));
113
112
 
114
113
        }
115
114
 
122
121
            celt_encoder_destroy (_enc);
123
122
            celt_decoder_destroy (_dec);
124
123
 
125
 
            celt_mode_destroy(_mode);
 
124
            celt_mode_destroy (_mode);
126
125
        }
127
126
 
128
127
        virtual int codecDecode (short *dst, unsigned char *src, unsigned int size) {