| OLD | NEW | 
|    1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. |    1 // Copyright (c) 2013 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/base/android/demuxer_stream_player_params.h" |    5 #include "media/base/android/demuxer_stream_player_params.h" | 
|    6 #include <iomanip> |    6 #include <iomanip> | 
|    7  |    7  | 
|    8 namespace media { |    8 namespace media { | 
|    9  |    9  | 
|   10 DemuxerConfigs::DemuxerConfigs() |   10 DemuxerConfigs::DemuxerConfigs() | 
| (...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|   59     RETURN_STRING(kCodecPCM); |   59     RETURN_STRING(kCodecPCM); | 
|   60     RETURN_STRING(kCodecVorbis); |   60     RETURN_STRING(kCodecVorbis); | 
|   61     RETURN_STRING(kCodecFLAC); |   61     RETURN_STRING(kCodecFLAC); | 
|   62     RETURN_STRING(kCodecAMR_NB); |   62     RETURN_STRING(kCodecAMR_NB); | 
|   63     RETURN_STRING(kCodecAMR_WB); |   63     RETURN_STRING(kCodecAMR_WB); | 
|   64     RETURN_STRING(kCodecPCM_MULAW); |   64     RETURN_STRING(kCodecPCM_MULAW); | 
|   65     RETURN_STRING(kCodecGSM_MS); |   65     RETURN_STRING(kCodecGSM_MS); | 
|   66     RETURN_STRING(kCodecPCM_S16BE); |   66     RETURN_STRING(kCodecPCM_S16BE); | 
|   67     RETURN_STRING(kCodecPCM_S24BE); |   67     RETURN_STRING(kCodecPCM_S24BE); | 
|   68     RETURN_STRING(kCodecOpus); |   68     RETURN_STRING(kCodecOpus); | 
 |   69     RETURN_STRING(kCodecEAC3); | 
|   69     RETURN_STRING(kCodecPCM_ALAW); |   70     RETURN_STRING(kCodecPCM_ALAW); | 
|   70     RETURN_STRING(kCodecALAC); |   71     RETURN_STRING(kCodecALAC); | 
 |   72     RETURN_STRING(kCodecAC3); | 
|   71   } |   73   } | 
|   72   NOTREACHED(); |   74   NOTREACHED(); | 
|   73   return nullptr;  // crash early |   75   return nullptr;  // crash early | 
|   74 } |   76 } | 
|   75  |   77  | 
|   76 const char* AsString(VideoCodec codec) { |   78 const char* AsString(VideoCodec codec) { | 
|   77   switch (codec) { |   79   switch (codec) { | 
|   78     RETURN_STRING(kUnknownVideoCodec); |   80     RETURN_STRING(kUnknownVideoCodec); | 
|   79     RETURN_STRING(kCodecH264); |   81     RETURN_STRING(kCodecH264); | 
|   80     RETURN_STRING(kCodecHEVC); |   82     RETURN_STRING(kCodecHEVC); | 
| (...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  147   } |  149   } | 
|  148  |  150  | 
|  149   if (conf.video_codec != media::kUnknownVideoCodec) { |  151   if (conf.video_codec != media::kUnknownVideoCodec) { | 
|  150     os << " video:" << media::AsString(conf.video_codec) << " " |  152     os << " video:" << media::AsString(conf.video_codec) << " " | 
|  151        << conf.video_size.width() << "x" << conf.video_size.height() |  153        << conf.video_size.width() << "x" << conf.video_size.height() | 
|  152        << (conf.is_video_encrypted ? " encrypted" : ""); |  154        << (conf.is_video_encrypted ? " encrypted" : ""); | 
|  153   } |  155   } | 
|  154  |  156  | 
|  155   return os; |  157   return os; | 
|  156 } |  158 } | 
| OLD | NEW |