summaryrefslogtreecommitdiffstats
path: root/remoting/codec/audio_decoder_verbatim.cc
diff options
context:
space:
mode:
authorkxing@chromium.org <kxing@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-21 16:42:30 +0000
committerkxing@chromium.org <kxing@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-21 16:42:30 +0000
commit922ecc32c5f8f0f87ac121f7ff5523e18da5d976 (patch)
tree46986181b7bc4aeff4786275eeaccf6da31b3235 /remoting/codec/audio_decoder_verbatim.cc
parentd335fb395a4b57c7b307b0421e26cde7b4f6c301 (diff)
downloadchromium_src-922ecc32c5f8f0f87ac121f7ff5523e18da5d976.zip
chromium_src-922ecc32c5f8f0f87ac121f7ff5523e18da5d976.tar.gz
chromium_src-922ecc32c5f8f0f87ac121f7ff5523e18da5d976.tar.bz2
Added more error checking for audio packets.
BUG= Review URL: https://chromiumcodereview.appspot.com/10823420 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@152578 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/codec/audio_decoder_verbatim.cc')
-rw-r--r--remoting/codec/audio_decoder_verbatim.cc4
1 files changed, 3 insertions, 1 deletions
diff --git a/remoting/codec/audio_decoder_verbatim.cc b/remoting/codec/audio_decoder_verbatim.cc
index 903cb3f..e8143fa 100644
--- a/remoting/codec/audio_decoder_verbatim.cc
+++ b/remoting/codec/audio_decoder_verbatim.cc
@@ -21,7 +21,9 @@ scoped_ptr<AudioPacket> AudioDecoderVerbatim::Decode(
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)) {
+ (packet->bytes_per_sample() != AudioPacket::BYTES_PER_SAMPLE_2) ||
+ (packet->channels() != AudioPacket::CHANNELS_STEREO)) {
+ LOG(WARNING) << "Verbatim decoder received an invalid packet.";
return scoped_ptr<AudioPacket>();
}
return packet.Pass();