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

Side by Side Diff: media/base/audio_codecs.h

Issue 2466463005: Support (E)AC3 passthrough
Patch Set: Improve CastMediaClient::IsSupportedPassthroughAudio() 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
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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 #ifndef MEDIA_BASE_AUDIO_CODECS_H_ 5 #ifndef MEDIA_BASE_AUDIO_CODECS_H_
6 #define MEDIA_BASE_AUDIO_CODECS_H_ 6 #define MEDIA_BASE_AUDIO_CODECS_H_
7 7
8 #include <string> 8 #include <string>
9 #include "media/base/media_export.h" 9 #include "media/base/media_export.h"
10 10
(...skipping 14 matching lines...) Expand all
25 kCodecAMR_WB = 7, 25 kCodecAMR_WB = 7,
26 kCodecPCM_MULAW = 8, 26 kCodecPCM_MULAW = 8,
27 kCodecGSM_MS = 9, 27 kCodecGSM_MS = 9,
28 kCodecPCM_S16BE = 10, 28 kCodecPCM_S16BE = 10,
29 kCodecPCM_S24BE = 11, 29 kCodecPCM_S24BE = 11,
30 kCodecOpus = 12, 30 kCodecOpus = 12,
31 kCodecEAC3 = 13, 31 kCodecEAC3 = 13,
32 kCodecPCM_ALAW = 14, 32 kCodecPCM_ALAW = 14,
33 kCodecALAC = 15, 33 kCodecALAC = 15,
34 kCodecAC3 = 16, 34 kCodecAC3 = 16,
35 kCodecRaw = 17,
DaleCurtis 2016/11/01 23:05:13 I don't think this is quite what we want. The corr
AndyWu 2016/11/04 18:04:24 Let's focus on encrypted case first, since that's
DaleCurtis 2016/11/04 21:17:33 I think whether Raw is used or not needs to be par
AndyWu 2016/11/08 00:04:21 OK, done. I will create a separate CL for review.
35 // DO NOT ADD RANDOM AUDIO CODECS! 36 // DO NOT ADD RANDOM AUDIO CODECS!
36 // 37 //
37 // The only acceptable time to add a new codec is if there is production code 38 // The only acceptable time to add a new codec is if there is production code
38 // that uses said codec in the same CL. 39 // that uses said codec in the same CL.
39 40
40 // Must always be equal to the largest entry ever logged. 41 // Must always be equal to the largest entry ever logged.
41 kAudioCodecMax = kCodecAC3, 42 kAudioCodecMax = kCodecRaw,
42 }; 43 };
43 44
44 std::string MEDIA_EXPORT GetCodecName(AudioCodec codec); 45 std::string MEDIA_EXPORT GetCodecName(AudioCodec codec);
45 46
46 MEDIA_EXPORT AudioCodec StringToAudioCodec(const std::string& codec_id); 47 MEDIA_EXPORT AudioCodec StringToAudioCodec(const std::string& codec_id);
47 48
48 } // namespace media 49 } // namespace media
49 50
50 #endif // MEDIA_BASE_AUDIO_CODECS_H_ 51 #endif // MEDIA_BASE_AUDIO_CODECS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698