Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(16)

Side by Side Diff: remoting/codec/audio_encoder_speex.cc

Issue 10831246: Speex encoding/decoding. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Addressed comments Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
(Empty)
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file.
4
5 #include "remoting/codec/audio_encoder_speex.h"
6
7 #include <string>
8 #include <sstream>
9
10 #include "base/basictypes.h"
11 #include "base/logging.h"
12 #include "base/stl_util.h"
13 #include "remoting/proto/audio.pb.h"
14 #include "third_party/speex/speex.h"
15
16 namespace {
17 const int kSpeexQuality = 8;
18 const int kEncodedDataBufferSize = 0xFF;
19 } // namespace
20
21 namespace remoting {
22
23 AudioEncoderSpeex::AudioEncoderSpeex()
24 : leftover_samples_(0) {
25 // Create and initialize the Speex structures.
26 speex_bits_.reset(new SpeexBits());
27 speex_bits_init(speex_bits_.get());
28 speex_state_ = speex_encoder_init(&speex_wb_mode);
29
30 // Set the encoding quality.
31 int quality = kSpeexQuality;
32 speex_encoder_ctl(speex_state_, SPEEX_SET_QUALITY, &quality);
33
34 // Get the frame size and construct the input buffer accordingly.
35 speex_encoder_ctl(speex_state_, SPEEX_GET_FRAME_SIZE, &speex_frame_size_);
36 raw_data_buffer_.reset(new int16[speex_frame_size_]);
37 }
38
39 AudioEncoderSpeex::~AudioEncoderSpeex() {
40 speex_encoder_destroy(speex_state_);
41 speex_bits_destroy(speex_bits_.get());
42 }
43
44 scoped_ptr<AudioPacket> AudioEncoderSpeex::Encode(
45 scoped_ptr<AudioPacket> packet) {
46 DCHECK_EQ(AudioPacket::ENCODING_RAW, packet->encoding());
47 DCHECK_EQ(AudioPacket::BYTES_PER_SAMPLE_2, packet->bytes_per_sample());
48 DCHECK_EQ(1, packet->data_size());
49
50 // Put the samples onto the queue.
51 int samples_left = packet->data(0).size() / packet->bytes_per_sample();
Sergey Ulanov 2012/08/17 21:52:18 This is not correct because we normally have two c
kxing 2012/08/20 21:50:21 Done.
52 const int16* next_sample =
53 reinterpret_cast<const int16*>(packet->data(0).data());
54
55 // Create a new packet of encoded data.
56 scoped_ptr<AudioPacket> encoded_packet(new AudioPacket());
57 encoded_packet->set_encoding(AudioPacket::ENCODING_SPEEX);
58 encoded_packet->set_sampling_rate(packet->sampling_rate());
59 encoded_packet->set_bytes_per_sample(packet->bytes_per_sample());
60 encoded_packet->set_channels(packet->channels());
61
62 while (leftover_samples_ + samples_left >= speex_frame_size_) {
63 if (leftover_samples_ > 0) {
64 int samples_needed = speex_frame_size_ - leftover_samples_;
65
66 memcpy(raw_data_buffer_.get() + leftover_samples_,
67 next_sample,
68 packet->bytes_per_sample() * samples_needed);
69
70 // Encode the frame, treating all samples as integers.
71 speex_encode_int(speex_state_, raw_data_buffer_.get(), speex_bits_.get());
72
73 leftover_samples_ = 0;
74 next_sample += samples_needed;
75 samples_left -= samples_needed;
76 } else {
77 // Encode the frame, treating all samples as integers.
78 speex_encode_int(speex_state_,
79 const_cast<int16*>(next_sample),
80 speex_bits_.get());
81 }
82
83 std::string* new_data = encoded_packet->add_data();
84 new_data->resize(speex_bits_nbytes(speex_bits_.get()));
85
86 // Copy the encoded data from the bits structure into the buffer.
87 int bytes_written = speex_bits_write(speex_bits_.get(),
88 string_as_array(new_data),
89 new_data->size());
90
91 // Expect that the bytes are all written.
92 DCHECK_EQ(bytes_written, static_cast<int>(new_data->size()));
93
94 next_sample += speex_frame_size_;
95 samples_left -= speex_frame_size_;
96
97 // Reset the bits structure for this frame.
98 speex_bits_reset(speex_bits_.get());
99 }
100
101 // Store the leftover samples.
102 if (samples_left > 0) {
103 memcpy(raw_data_buffer_.get() + leftover_samples_,
Sergey Ulanov 2012/08/17 21:52:18 Need to verify that there is always space in the b
kxing 2012/08/20 21:50:21 Done.
104 next_sample,
105 packet->bytes_per_sample() * samples_left);
106 leftover_samples_ += samples_left;
107 }
108
109 return encoded_packet.Pass();
110 }
111
112 } // namespace remoting
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698