Guard against midstream audio configuration changes.

webkit/media/crypto/ppapi/ffmpeg_cdm_audio_decoder.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef WEBKIT_MEDIA_CRYPTO_PPAPI_FFMPEG_CDM_AUDIO_DECODER_H_
 #define WEBKIT_MEDIA_CRYPTO_PPAPI_FFMPEG_CDM_AUDIO_DECODER_H_
 
 #include <vector>
 
 #include "base/basictypes.h"
@@ skipping 51 matching lines @@
 
   cdm::Allocator* const allocator_;
 
   // FFmpeg structures owned by this object.
   AVCodecContext* codec_context_;
   AVFrame* av_frame_;
 
   // Audio format.
   int bits_per_channel_;
   int samples_per_second_;
+  int channels_;
+
+  // AVSampleFormat initially requested; not Chrome's SampleFormat.
+  int av_sample_format_;
 
   // Used for computing output timestamps.
   scoped_ptr<media::AudioTimestampHelper> output_timestamp_helper_;
   int bytes_per_frame_;
   base::TimeDelta last_input_timestamp_;
 
   // We may need to convert the audio data coming out of FFmpeg from planar
   // float to integer.
   scoped_ptr<media::AudioBus> converter_bus_;
 
   // Number of output sample bytes to drop before generating output buffers.
   // This is required for handling negative timestamps when decoding Vorbis
   // audio, for example.
   int output_bytes_to_drop_;
 
   typedef std::vector<uint8_t> SerializedAudioFrames;
   SerializedAudioFrames serialized_audio_frames_;
 
   DISALLOW_COPY_AND_ASSIGN(FFmpegCdmAudioDecoder);
 };
 
 }  // namespace webkit_media
 
 #endif  // WEBKIT_MEDIA_CRYPTO_PPAPI_FFMPEG_CDM_AUDIO_DECODER_H_