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

Side by Side Diff: chromecast/media/cma/base/decoder_config_adapter.cc

Issue 2503233003: Add enumerations for compressed (E)AC3 sample format (Closed)
Patch Set: Fix proto Created 4 years, 1 month 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 unified diff | Download patch
« no previous file with comments | « no previous file | content/browser/media/media_internals.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chromecast/media/cma/base/decoder_config_adapter.h" 5 #include "chromecast/media/cma/base/decoder_config_adapter.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "chromecast/media/base/media_codec_support.h" 8 #include "chromecast/media/base/media_codec_support.h"
9 #include "media/base/channel_layout.h" 9 #include "media/base/channel_layout.h"
10 10
(...skipping 26 matching lines...) Expand all
37 return kCodecAC3; 37 return kCodecAC3;
38 default: 38 default:
39 LOG(ERROR) << "Unsupported audio codec " << audio_codec; 39 LOG(ERROR) << "Unsupported audio codec " << audio_codec;
40 } 40 }
41 return kAudioCodecUnknown; 41 return kAudioCodecUnknown;
42 } 42 }
43 43
44 SampleFormat ToSampleFormat(const ::media::SampleFormat sample_format) { 44 SampleFormat ToSampleFormat(const ::media::SampleFormat sample_format) {
45 switch (sample_format) { 45 switch (sample_format) {
46 case ::media::kUnknownSampleFormat: 46 case ::media::kUnknownSampleFormat:
47 case ::media::kSampleFormatAc3:
48 case ::media::kSampleFormatEac3:
47 return kUnknownSampleFormat; 49 return kUnknownSampleFormat;
48 case ::media::kSampleFormatU8: 50 case ::media::kSampleFormatU8:
49 return kSampleFormatU8; 51 return kSampleFormatU8;
50 case ::media::kSampleFormatS16: 52 case ::media::kSampleFormatS16:
51 return kSampleFormatS16; 53 return kSampleFormatS16;
52 case ::media::kSampleFormatS24: 54 case ::media::kSampleFormatS24:
53 return kSampleFormatS24; 55 return kSampleFormatS24;
54 case ::media::kSampleFormatS32: 56 case ::media::kSampleFormatS32:
55 return kSampleFormatS32; 57 return kSampleFormatS32;
56 case ::media::kSampleFormatF32: 58 case ::media::kSampleFormatF32:
(...skipping 266 matching lines...) Expand 10 before | Expand all | Expand 10 after
323 STATIC_ASSERT_ENUM(MatrixID::BT2020_NCL, MatrixID::BT2020_NCL); 325 STATIC_ASSERT_ENUM(MatrixID::BT2020_NCL, MatrixID::BT2020_NCL);
324 STATIC_ASSERT_ENUM(MatrixID::BT2020_CL, MatrixID::BT2020_CL); 326 STATIC_ASSERT_ENUM(MatrixID::BT2020_CL, MatrixID::BT2020_CL);
325 327
326 STATIC_ASSERT_ENUM(RangeID::UNSPECIFIED, RangeID::UNSPECIFIED); 328 STATIC_ASSERT_ENUM(RangeID::UNSPECIFIED, RangeID::UNSPECIFIED);
327 STATIC_ASSERT_ENUM(RangeID::LIMITED, RangeID::LIMITED); 329 STATIC_ASSERT_ENUM(RangeID::LIMITED, RangeID::LIMITED);
328 STATIC_ASSERT_ENUM(RangeID::FULL, RangeID::FULL); 330 STATIC_ASSERT_ENUM(RangeID::FULL, RangeID::FULL);
329 STATIC_ASSERT_ENUM(RangeID::DERIVED, RangeID::DERIVED); 331 STATIC_ASSERT_ENUM(RangeID::DERIVED, RangeID::DERIVED);
330 332
331 } // namespace media 333 } // namespace media
332 } // namespace chromecast 334 } // namespace chromecast
OLDNEW
« no previous file with comments | « no previous file | content/browser/media/media_internals.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698