diff options
| author | kxing@chromium.org <kxing@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-16 01:59:49 +0000 |
|---|---|---|
| committer | kxing@chromium.org <kxing@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-16 01:59:49 +0000 |
| commit | a88e2dbe01cf2d00bbff782e7f59ad349d5a8c04 (patch) | |
| tree | 319232b87af5032dbe02f0ecd8a8d8d59115c908 /remoting/codec | |
| parent | 3559a632a525d348f561399fac8b5dea7fa5d742 (diff) | |
| download | chromium_src-a88e2dbe01cf2d00bbff782e7f59ad349d5a8c04.zip chromium_src-a88e2dbe01cf2d00bbff782e7f59ad349d5a8c04.tar.gz chromium_src-a88e2dbe01cf2d00bbff782e7f59ad349d5a8c04.tar.bz2 | |
Changed AudioPacket data to a repeated field.
BUG=
Review URL: https://chromiumcodereview.appspot.com/10827324
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@151825 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/codec')
| -rw-r--r-- | remoting/codec/audio_decoder_verbatim.cc | 8 | ||||
| -rw-r--r-- | remoting/codec/audio_encoder_verbatim.cc | 1 |
2 files changed, 8 insertions, 1 deletions
diff --git a/remoting/codec/audio_decoder_verbatim.cc b/remoting/codec/audio_decoder_verbatim.cc index 8a69705..903cb3f 100644 --- a/remoting/codec/audio_decoder_verbatim.cc +++ b/remoting/codec/audio_decoder_verbatim.cc @@ -17,7 +17,13 @@ AudioDecoderVerbatim::~AudioDecoderVerbatim() { scoped_ptr<AudioPacket> AudioDecoderVerbatim::Decode( scoped_ptr<AudioPacket> packet) { - DCHECK_EQ(AudioPacket::ENCODING_RAW, packet->encoding()); + // Return a null scoped_ptr if we get a corrupted packet. + if ((packet->encoding() != AudioPacket::ENCODING_RAW) || + (packet->data_size() != 1) || + (packet->sampling_rate() == AudioPacket::SAMPLING_RATE_INVALID) || + (packet->bytes_per_sample() == AudioPacket::BYTES_PER_SAMPLE_INVALID)) { + return scoped_ptr<AudioPacket>(); + } return packet.Pass(); } diff --git a/remoting/codec/audio_encoder_verbatim.cc b/remoting/codec/audio_encoder_verbatim.cc index b81486b..52e578a 100644 --- a/remoting/codec/audio_encoder_verbatim.cc +++ b/remoting/codec/audio_encoder_verbatim.cc @@ -16,6 +16,7 @@ AudioEncoderVerbatim::~AudioEncoderVerbatim() {} scoped_ptr<AudioPacket> AudioEncoderVerbatim::Encode( scoped_ptr<AudioPacket> packet) { DCHECK_EQ(AudioPacket::ENCODING_RAW, packet->encoding()); + DCHECK_EQ(1, packet->data_size()); return packet.Pass(); } |