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

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

Issue 148553003: Clean up histogram'd media enum max values. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add comment to ignore violations of PRESUBMIT. Created 6 years, 10 months 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 (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/metrics/histogram.h" 9 #include "base/metrics/histogram.h"
10 #include "base/strings/string_number_conversions.h" 10 #include "base/strings/string_number_conversions.h"
(...skipping 373 matching lines...) Expand 10 before | Expand all | Expand 10 after
384 profile = VP9PROFILE_MAIN; 384 profile = VP9PROFILE_MAIN;
385 else 385 else
386 profile = ProfileIDToVideoCodecProfile(stream->codec->profile); 386 profile = ProfileIDToVideoCodecProfile(stream->codec->profile);
387 387
388 gfx::Size natural_size = GetNaturalSize( 388 gfx::Size natural_size = GetNaturalSize(
389 visible_rect.size(), aspect_ratio.num, aspect_ratio.den); 389 visible_rect.size(), aspect_ratio.num, aspect_ratio.den);
390 390
391 if (record_stats) { 391 if (record_stats) {
392 UMA_HISTOGRAM_ENUMERATION("Media.VideoColorRange", 392 UMA_HISTOGRAM_ENUMERATION("Media.VideoColorRange",
393 stream->codec->color_range, 393 stream->codec->color_range,
394 AVCOL_RANGE_NB); 394 AVCOL_RANGE_NB); // PRESUBMIT_IGNORE_UMA_MAX
Ami GONE FROM CHROMIUM 2014/02/12 20:26:48 NOTE why IGNORE (like the other comment)
395 } 395 }
396 396
397 VideoFrame::Format format = PixelFormatToVideoFormat(stream->codec->pix_fmt); 397 VideoFrame::Format format = PixelFormatToVideoFormat(stream->codec->pix_fmt);
398 if (codec == kCodecVP9) { 398 if (codec == kCodecVP9) {
399 // TODO(tomfinegan): libavcodec doesn't know about VP9. 399 // TODO(tomfinegan): libavcodec doesn't know about VP9.
400 format = VideoFrame::YV12; 400 format = VideoFrame::YV12;
401 coded_size = natural_size; 401 coded_size = natural_size;
402 } 402 }
403 403
404 bool is_encrypted = false; 404 bool is_encrypted = false;
(...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after
536 return PIX_FMT_YUVJ420P; 536 return PIX_FMT_YUVJ420P;
537 case VideoFrame::YV12A: 537 case VideoFrame::YV12A:
538 return PIX_FMT_YUVA420P; 538 return PIX_FMT_YUVA420P;
539 default: 539 default:
540 DVLOG(1) << "Unsupported VideoFrame::Format: " << video_format; 540 DVLOG(1) << "Unsupported VideoFrame::Format: " << video_format;
541 } 541 }
542 return PIX_FMT_NONE; 542 return PIX_FMT_NONE;
543 } 543 }
544 544
545 } // namespace media 545 } // namespace media
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698