| OLD | NEW | 
|---|
| 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 "media/base/decoder_buffer.h" | 9 #include "media/base/decoder_buffer.h" | 
| 10 #include "media/base/video_frame.h" | 10 #include "media/base/video_frame.h" | 
| (...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 76     case AV_CODEC_ID_PCM_S24BE: | 76     case AV_CODEC_ID_PCM_S24BE: | 
| 77       return kCodecPCM_S24BE; | 77       return kCodecPCM_S24BE; | 
| 78     case AV_CODEC_ID_FLAC: | 78     case AV_CODEC_ID_FLAC: | 
| 79       return kCodecFLAC; | 79       return kCodecFLAC; | 
| 80     case AV_CODEC_ID_AMR_NB: | 80     case AV_CODEC_ID_AMR_NB: | 
| 81       return kCodecAMR_NB; | 81       return kCodecAMR_NB; | 
| 82     case AV_CODEC_ID_AMR_WB: | 82     case AV_CODEC_ID_AMR_WB: | 
| 83       return kCodecAMR_WB; | 83       return kCodecAMR_WB; | 
| 84     case AV_CODEC_ID_GSM_MS: | 84     case AV_CODEC_ID_GSM_MS: | 
| 85       return kCodecGSM_MS; | 85       return kCodecGSM_MS; | 
|  | 86     case AV_CODEC_ID_PCM_ALAW: | 
|  | 87       return kCodecPCM_ALAW; | 
| 86     case AV_CODEC_ID_PCM_MULAW: | 88     case AV_CODEC_ID_PCM_MULAW: | 
| 87       return kCodecPCM_MULAW; | 89       return kCodecPCM_MULAW; | 
| 88     case AV_CODEC_ID_OPUS: | 90     case AV_CODEC_ID_OPUS: | 
| 89       return kCodecOpus; | 91       return kCodecOpus; | 
| 90     default: | 92     default: | 
| 91       DVLOG(1) << "Unknown audio CodecID: " << codec_id; | 93       DVLOG(1) << "Unknown audio CodecID: " << codec_id; | 
| 92   } | 94   } | 
| 93   return kUnknownAudioCodec; | 95   return kUnknownAudioCodec; | 
| 94 } | 96 } | 
| 95 | 97 | 
| (...skipping 25 matching lines...) Expand all  Loading... | 
| 121     case kCodecVorbis: | 123     case kCodecVorbis: | 
| 122       return AV_CODEC_ID_VORBIS; | 124       return AV_CODEC_ID_VORBIS; | 
| 123     case kCodecFLAC: | 125     case kCodecFLAC: | 
| 124       return AV_CODEC_ID_FLAC; | 126       return AV_CODEC_ID_FLAC; | 
| 125     case kCodecAMR_NB: | 127     case kCodecAMR_NB: | 
| 126       return AV_CODEC_ID_AMR_NB; | 128       return AV_CODEC_ID_AMR_NB; | 
| 127     case kCodecAMR_WB: | 129     case kCodecAMR_WB: | 
| 128       return AV_CODEC_ID_AMR_WB; | 130       return AV_CODEC_ID_AMR_WB; | 
| 129     case kCodecGSM_MS: | 131     case kCodecGSM_MS: | 
| 130       return AV_CODEC_ID_GSM_MS; | 132       return AV_CODEC_ID_GSM_MS; | 
|  | 133     case kCodecPCM_ALAW: | 
|  | 134       return AV_CODEC_ID_PCM_ALAW; | 
| 131     case kCodecPCM_MULAW: | 135     case kCodecPCM_MULAW: | 
| 132       return AV_CODEC_ID_PCM_MULAW; | 136       return AV_CODEC_ID_PCM_MULAW; | 
| 133     case kCodecOpus: | 137     case kCodecOpus: | 
| 134       return AV_CODEC_ID_OPUS; | 138       return AV_CODEC_ID_OPUS; | 
| 135     default: | 139     default: | 
| 136       DVLOG(1) << "Unknown AudioCodec: " << audio_codec; | 140       DVLOG(1) << "Unknown AudioCodec: " << audio_codec; | 
| 137   } | 141   } | 
| 138   return AV_CODEC_ID_NONE; | 142   return AV_CODEC_ID_NONE; | 
| 139 } | 143 } | 
| 140 | 144 | 
| (...skipping 370 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 511       return PIX_FMT_YUV420P; | 515       return PIX_FMT_YUV420P; | 
| 512     case VideoFrame::YV12A: | 516     case VideoFrame::YV12A: | 
| 513       return PIX_FMT_YUVA420P; | 517       return PIX_FMT_YUVA420P; | 
| 514     default: | 518     default: | 
| 515       DVLOG(1) << "Unsupported VideoFrame::Format: " << video_format; | 519       DVLOG(1) << "Unsupported VideoFrame::Format: " << video_format; | 
| 516   } | 520   } | 
| 517   return PIX_FMT_NONE; | 521   return PIX_FMT_NONE; | 
| 518 } | 522 } | 
| 519 | 523 | 
| 520 }  // namespace media | 524 }  // namespace media | 
| OLD | NEW | 
|---|