Use width,height for coded_{width,height} in AVStreamToVideoDecoderConfig

media/filters/ffmpeg_demuxer.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/filters/ffmpeg_demuxer.h"
 
 #include <algorithm>
 #include <memory>
 #include <set>
 #include <utility>
@@ skipping 143 matching lines @@
                                             GetCodecName(video_config.codec()));
 
   UMA_HISTOGRAM_ENUMERATION("Media.VideoCodec", video_config.codec(),
                             kVideoCodecMax + 1);
 
   // Drop UNKNOWN because U_H_E() uses one bucket for all values less than 1.
   if (video_config.profile() >= 0) {
     UMA_HISTOGRAM_ENUMERATION("Media.VideoCodecProfile", video_config.profile(),
                               VIDEO_CODEC_PROFILE_MAX + 1);
   }
-  UMA_HISTOGRAM_COUNTS_10000("Media.VideoCodedWidth",

[DaleCurtis, 2016/11/15 19:18:22]

Mark histograms.xml entries as deprecated.

[wolenetz, 2016/11/15 20:03:01]

Done.

-                             video_config.coded_size().width());
-  UmaHistogramAspectRatio("Media.VideoCodedAspectRatio",
-                          video_config.coded_size());
   UMA_HISTOGRAM_COUNTS_10000("Media.VideoVisibleWidth",
                              video_config.visible_rect().width());
   UmaHistogramAspectRatio("Media.VideoVisibleAspectRatio",
                           video_config.visible_rect());
   UMA_HISTOGRAM_ENUMERATION("Media.VideoPixelFormatUnion",
                             video_config.format(), PIXEL_FORMAT_MAX + 1);
   UMA_HISTOGRAM_ENUMERATION("Media.VideoFrameColorSpace",
                             video_config.color_space(), COLOR_SPACE_MAX + 1);
 
   // Note the PRESUBMIT_IGNORE_UMA_MAX below, this silences the PRESUBMIT.py
@@ skipping 1324 matching lines @@
     } else if (stream->type() == DemuxerStream::VIDEO) {
       ++video_track_count;
       std::string suffix = "";
       if (video_track_count > 1)
         suffix = "_track" + base::IntToString(video_track_count);
       const AVCodecContext* video_codec = avctx->streams[i]->codec;
       const VideoDecoderConfig& video_config = stream->video_decoder_config();
       params.SetString("video_codec_name" + suffix, GetCodecName(video_codec));
       params.SetInteger("width" + suffix, video_codec->width);
       params.SetInteger("height" + suffix, video_codec->height);
-      params.SetInteger("coded_width" + suffix, video_codec->coded_width);
-      params.SetInteger("coded_height" + suffix, video_codec->coded_height);
       params.SetString("time_base" + suffix,
                        base::StringPrintf("%d/%d", video_codec->time_base.num,
                                           video_codec->time_base.den));
       params.SetString("video_format" + suffix,
                        VideoPixelFormatToString(video_config.format()));
       params.SetBoolean("video_is_encrypted" + suffix,
                         video_config.is_encrypted());
     }
   }
   params.SetBoolean("found_audio_stream", (audio_track_count > 0));
@@ skipping 264 matching lines @@
 
 void FFmpegDemuxer::SetLiveness(DemuxerStream::Liveness liveness) {
   DCHECK(task_runner_->BelongsToCurrentThread());
   for (const auto& stream : streams_) {
     if (stream)
       stream->SetLiveness(liveness);
   }
 }
 
 }  // namespace media