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

Unified Diff: media/base/audio_decoder_config.h

Issue 2752323002: Support Opus Ambisonics playback (Closed)
Patch Set: another fix for unreliable ffmpeg channels vs layout Created 3 years, 7 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 | « no previous file | media/base/audio_decoder_config.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/audio_decoder_config.h
diff --git a/media/base/audio_decoder_config.h b/media/base/audio_decoder_config.h
index 86a8dc1fbb989cff5fae6a701566f2d648f6df50..ba387146ffa927de5ace1c6c258c9b59672b7c54 100644
--- a/media/base/audio_decoder_config.h
+++ b/media/base/audio_decoder_config.h
@@ -63,10 +63,14 @@ class MEDIA_EXPORT AudioDecoderConfig {
// output only.
std::string AsHumanReadableString() const;
+ // Sets the number of channels if |channel_layout_| is CHANNEL_LAYOUT_DISCRETE
+ void SetChannelsForDiscrete(int channels);
+
AudioCodec codec() const { return codec_; }
int bits_per_channel() const { return bytes_per_channel_ * 8; }
int bytes_per_channel() const { return bytes_per_channel_; }
ChannelLayout channel_layout() const { return channel_layout_; }
+ int channels() const { return channels_; }
int samples_per_second() const { return samples_per_second_; }
SampleFormat sample_format() const { return sample_format_; }
int bytes_per_frame() const { return bytes_per_frame_; }
@@ -96,6 +100,7 @@ class MEDIA_EXPORT AudioDecoderConfig {
SampleFormat sample_format_;
int bytes_per_channel_;
ChannelLayout channel_layout_;
+ int channels_;
int samples_per_second_;
int bytes_per_frame_;
std::vector<uint8_t> extra_data_;
« no previous file with comments | « no previous file | media/base/audio_decoder_config.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698