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

Side by Side Diff: media/ffmpeg/ffmpeg_common.cc

Issue 25660014: Add alaw codec for .wav files. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 7 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 | Annotate | Revision Log
« no previous file with comments | « media/base/audio_decoder_config.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "media/ffmpeg/ffmpeg_common.h" 5 #include "media/ffmpeg/ffmpeg_common.h"
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/strings/string_number_conversions.h" 9 #include "base/strings/string_number_conversions.h"
10 #include "media/base/decoder_buffer.h" 10 #include "media/base/decoder_buffer.h"
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
77 case AV_CODEC_ID_PCM_S24BE: 77 case AV_CODEC_ID_PCM_S24BE:
78 return kCodecPCM_S24BE; 78 return kCodecPCM_S24BE;
79 case AV_CODEC_ID_FLAC: 79 case AV_CODEC_ID_FLAC:
80 return kCodecFLAC; 80 return kCodecFLAC;
81 case AV_CODEC_ID_AMR_NB: 81 case AV_CODEC_ID_AMR_NB:
82 return kCodecAMR_NB; 82 return kCodecAMR_NB;
83 case AV_CODEC_ID_AMR_WB: 83 case AV_CODEC_ID_AMR_WB:
84 return kCodecAMR_WB; 84 return kCodecAMR_WB;
85 case AV_CODEC_ID_GSM_MS: 85 case AV_CODEC_ID_GSM_MS:
86 return kCodecGSM_MS; 86 return kCodecGSM_MS;
87 case AV_CODEC_ID_PCM_ALAW:
88 return kCodecPCM_ALAW;
87 case AV_CODEC_ID_PCM_MULAW: 89 case AV_CODEC_ID_PCM_MULAW:
88 return kCodecPCM_MULAW; 90 return kCodecPCM_MULAW;
89 case AV_CODEC_ID_OPUS: 91 case AV_CODEC_ID_OPUS:
90 return kCodecOpus; 92 return kCodecOpus;
91 default: 93 default:
92 DVLOG(1) << "Unknown audio CodecID: " << codec_id; 94 DVLOG(1) << "Unknown audio CodecID: " << codec_id;
93 } 95 }
94 return kUnknownAudioCodec; 96 return kUnknownAudioCodec;
95 } 97 }
96 98
(...skipping 25 matching lines...) Expand all
122 case kCodecVorbis: 124 case kCodecVorbis:
123 return AV_CODEC_ID_VORBIS; 125 return AV_CODEC_ID_VORBIS;
124 case kCodecFLAC: 126 case kCodecFLAC:
125 return AV_CODEC_ID_FLAC; 127 return AV_CODEC_ID_FLAC;
126 case kCodecAMR_NB: 128 case kCodecAMR_NB:
127 return AV_CODEC_ID_AMR_NB; 129 return AV_CODEC_ID_AMR_NB;
128 case kCodecAMR_WB: 130 case kCodecAMR_WB:
129 return AV_CODEC_ID_AMR_WB; 131 return AV_CODEC_ID_AMR_WB;
130 case kCodecGSM_MS: 132 case kCodecGSM_MS:
131 return AV_CODEC_ID_GSM_MS; 133 return AV_CODEC_ID_GSM_MS;
134 case kCodecPCM_ALAW:
135 return AV_CODEC_ID_PCM_ALAW;
132 case kCodecPCM_MULAW: 136 case kCodecPCM_MULAW:
133 return AV_CODEC_ID_PCM_MULAW; 137 return AV_CODEC_ID_PCM_MULAW;
134 case kCodecOpus: 138 case kCodecOpus:
135 return AV_CODEC_ID_OPUS; 139 return AV_CODEC_ID_OPUS;
136 default: 140 default:
137 DVLOG(1) << "Unknown AudioCodec: " << audio_codec; 141 DVLOG(1) << "Unknown AudioCodec: " << audio_codec;
138 } 142 }
139 return AV_CODEC_ID_NONE; 143 return AV_CODEC_ID_NONE;
140 } 144 }
141 145
(...skipping 382 matching lines...) Expand 10 before | Expand all | Expand 10 after
524 return PIX_FMT_YUV420P; 528 return PIX_FMT_YUV420P;
525 case VideoFrame::YV12A: 529 case VideoFrame::YV12A:
526 return PIX_FMT_YUVA420P; 530 return PIX_FMT_YUVA420P;
527 default: 531 default:
528 DVLOG(1) << "Unsupported VideoFrame::Format: " << video_format; 532 DVLOG(1) << "Unsupported VideoFrame::Format: " << video_format;
529 } 533 }
530 return PIX_FMT_NONE; 534 return PIX_FMT_NONE;
531 } 535 }
532 536
533 } // namespace media 537 } // namespace media
OLDNEW
« no previous file with comments | « media/base/audio_decoder_config.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698