| 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 "content/browser/media/media_internals.h" | 5 #include "content/browser/media/media_internals.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include <memory> | 9 #include <memory> |
| 10 #include <tuple> | 10 #include <tuple> |
| (...skipping 13 matching lines...) Expand all Loading... |
| 24 #include "content/public/browser/notification_service.h" | 24 #include "content/public/browser/notification_service.h" |
| 25 #include "content/public/browser/notification_types.h" | 25 #include "content/public/browser/notification_types.h" |
| 26 #include "content/public/browser/render_frame_host.h" | 26 #include "content/public/browser/render_frame_host.h" |
| 27 #include "content/public/browser/render_process_host.h" | 27 #include "content/public/browser/render_process_host.h" |
| 28 #include "content/public/browser/web_contents.h" | 28 #include "content/public/browser/web_contents.h" |
| 29 #include "content/public/browser/web_ui.h" | 29 #include "content/public/browser/web_ui.h" |
| 30 #include "media/base/audio_parameters.h" | 30 #include "media/base/audio_parameters.h" |
| 31 #include "media/base/media_log_event.h" | 31 #include "media/base/media_log_event.h" |
| 32 #include "media/filters/gpu_video_decoder.h" | 32 #include "media/filters/gpu_video_decoder.h" |
| 33 | 33 |
| 34 #if !defined(DISABLE_FFMPEG_VIDEO_DECODERS) | 34 #if !defined(OS_ANDROID) |
| 35 #include "media/filters/decrypting_video_decoder.h" | 35 #include "media/filters/decrypting_video_decoder.h" |
| 36 #endif | 36 #endif |
| 37 | 37 |
| 38 namespace { | 38 namespace { |
| 39 | 39 |
| 40 base::string16 SerializeUpdate(const std::string& function, | 40 base::string16 SerializeUpdate(const std::string& function, |
| 41 const base::Value* value) { | 41 const base::Value* value) { |
| 42 return content::WebUI::GetJavascriptCall( | 42 return content::WebUI::GetJavascriptCall( |
| 43 function, std::vector<const base::Value*>(1, value)); | 43 function, std::vector<const base::Value*>(1, value)); |
| 44 } | 44 } |
| (...skipping 472 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 517 if (player_info.video_codec_name == "vp8") { | 517 if (player_info.video_codec_name == "vp8") { |
| 518 uma_name += "VP8."; | 518 uma_name += "VP8."; |
| 519 } else if (player_info.video_codec_name == "vp9") { | 519 } else if (player_info.video_codec_name == "vp9") { |
| 520 uma_name += "VP9."; | 520 uma_name += "VP9."; |
| 521 } else if (player_info.video_codec_name == "h264") { | 521 } else if (player_info.video_codec_name == "h264") { |
| 522 uma_name += "H264."; | 522 uma_name += "H264."; |
| 523 } else { | 523 } else { |
| 524 return uma_name + "Other"; | 524 return uma_name + "Other"; |
| 525 } | 525 } |
| 526 | 526 |
| 527 #if !defined(DISABLE_FFMPEG_VIDEO_DECODERS) | 527 #if !defined(OS_ANDROID) |
| 528 if (player_info.video_decoder == | 528 if (player_info.video_decoder == |
| 529 media::DecryptingVideoDecoder::kDecoderName) { | 529 media::DecryptingVideoDecoder::kDecoderName) { |
| 530 return uma_name + "DVD"; | 530 return uma_name + "DVD"; |
| 531 } | 531 } |
| 532 #endif | 532 #endif |
| 533 | 533 |
| 534 if (player_info.video_dds) { | 534 if (player_info.video_dds) { |
| 535 uma_name += "DDS."; | 535 uma_name += "DDS."; |
| 536 } | 536 } |
| 537 | 537 |
| (...skipping 329 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 867 audio_streams_cached_data_.GetDictionary(cache_key, &existing_dict)); | 867 audio_streams_cached_data_.GetDictionary(cache_key, &existing_dict)); |
| 868 existing_dict->MergeDictionary(value); | 868 existing_dict->MergeDictionary(value); |
| 869 } | 869 } |
| 870 } | 870 } |
| 871 | 871 |
| 872 if (CanUpdate()) | 872 if (CanUpdate()) |
| 873 SendUpdate(SerializeUpdate(function, value)); | 873 SendUpdate(SerializeUpdate(function, value)); |
| 874 } | 874 } |
| 875 | 875 |
| 876 } // namespace content | 876 } // namespace content |
| OLD | NEW |