Fixes a duplication and bad name choice for logging media information.

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 <string>
 
 #include "base/base64.h"
@@ skipping 577 matching lines @@
     SampleFormat sample_format = audio_config.sample_format();
     std::string sample_name = SampleFormatToString(sample_format);
 
     media_log_->SetStringProperty("audio_sample_format", sample_name);
 
     AVCodec* codec = avcodec_find_decoder(audio_codec->codec_id);
     if (codec) {
       media_log_->SetStringProperty("audio_codec_name", codec->name);
     }
 
-    media_log_->SetIntegerProperty("audio_sample_rate",
-                                   audio_codec->sample_rate);

[Ty Overby, 2013/09/05 22:10:57]

audio_codec->sample_rate gives you the same information as
audio_config.samples_per_second() which we already log.  

My reason for choosing to use audio_config is that audio_config is  maintained
by chrome audio while audio_codec is from ffmpeg.

     media_log_->SetIntegerProperty("audio_channels_count",
                                    audio_codec->channels);
     media_log_->SetIntegerProperty("audio_samples_per_second",
                                    audio_config.samples_per_second());
   } else {
     media_log_->SetBooleanProperty("found_audio_stream", false);
   }
 
   // Video logging
   if (video_stream) {
@@ skipping 20 matching lines @@
         "video_format", VideoFrame::FormatToString(video_config.format()));
     media_log_->SetBooleanProperty("video_is_encrypted",
                                    video_config.is_encrypted());
   } else {
     media_log_->SetBooleanProperty("found_video_stream", false);
   }
 
 
   media_log_->SetDoubleProperty("max_duration", max_duration.InSecondsF());
   media_log_->SetDoubleProperty("start_time", start_time_.InSecondsF());
-  media_log_->SetDoubleProperty("filesize_in_bytes",
+  media_log_->SetDoubleProperty("total_bytes",

[Ty Overby, 2013/09/05 22:10:57]

"total_bytes" is used by the network infrastructure, so this will match with the
name provided by the network.

[scherkus (not reviewing), 2013/09/06 20:47:57]

I would remove logging this if the it's already handled by the networking layer
instead of having to match the key name

[Ty Overby, 2013/09/09 17:29:04]

Sometimes the networking layer doesn't report it, (I think this happens when
there is a cache?).

[scherkus (not reviewing), 2013/09/09 17:56:50]

ah I thought by network infrastructure you were referring to
Buffered{DataSource,ResourceLoader}, which is where filesize_in_bytes comes from
but it looks like we don't have much logging there yet

disregard my comment then

                                 static_cast<double>(filesize_in_bytes));
   media_log_->SetIntegerProperty("bitrate", bitrate_);
 
   status_cb.Run(PIPELINE_OK);
 }
 
 void FFmpegDemuxer::OnSeekFrameDone(const PipelineStatusCB& cb, int result) {
   DCHECK(message_loop_->BelongsToCurrentThread());
   CHECK(pending_seek_);
   pending_seek_ = false;
@@ skipping 187 matching lines @@
   }
   for (size_t i = 0; i < buffered.size(); ++i)
     host_->AddBufferedTimeRange(buffered.start(i), buffered.end(i));
 }
 
 void FFmpegDemuxer::OnDataSourceError() {
   host_->OnDemuxerError(PIPELINE_ERROR_READ);
 }
 
 }  // namespace media