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

Unified Diff: webkit/media/crypto/ppapi/ffmpeg_cdm_audio_decoder.h

Issue 12224114: Guard against midstream audio configuration changes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Comments. Created 7 years, 10 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/filters/pipeline_integration_test.cc ('k') | webkit/media/crypto/ppapi/ffmpeg_cdm_audio_decoder.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/media/crypto/ppapi/ffmpeg_cdm_audio_decoder.h
diff --git a/webkit/media/crypto/ppapi/ffmpeg_cdm_audio_decoder.h b/webkit/media/crypto/ppapi/ffmpeg_cdm_audio_decoder.h
index d10ce4ce11682e6445ffe5a40630a073cef5df81..56be2297f91f7ad84ffee58ccac91cb052aebf47 100644
--- a/webkit/media/crypto/ppapi/ffmpeg_cdm_audio_decoder.h
+++ b/webkit/media/crypto/ppapi/ffmpeg_cdm_audio_decoder.h
@@ -69,6 +69,10 @@ class FFmpegCdmAudioDecoder {
// 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_;
« no previous file with comments | « media/filters/pipeline_integration_test.cc ('k') | webkit/media/crypto/ppapi/ffmpeg_cdm_audio_decoder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698