Add proper duration to WebmEncoder-created files.

media/webm/chromeos/webm_encoder.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/webm/chromeos/webm_encoder.h"
 
 #include "base/bind.h"
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/memory/scoped_generic_obj.h"
@@ skipping 66 matching lines @@
   DCHECK(!sprite.isNull());
   DCHECK(!sprite.empty());
 
   has_errors_ = false;
   width_ = sprite.width();
   height_ = sprite.width();
   fps_.num = fps_n;
   fps_.den = fps_d;
 
   // Sprite is tiled vertically.
-  size_t frame_count = sprite.height() / width_;
+  frame_count_ = sprite.height() / width_;
 
   vpx_image_t image;
   vpx_img_alloc(&image, VPX_IMG_FMT_I420, width_, height_, 16);
   // Ensure that image is freed after return.
   ScopedGenericObj<vpx_image_t*, VpxImgFreeHelper> image_ptr(&image);
 
   const vpx_codec_iface_t* codec_iface = vpx_codec_vp8_cx();
   DCHECK(codec_iface);
   vpx_codec_err_t ret = vpx_codec_enc_config_default(codec_iface, &config_, 0);
   DCHECK_EQ(VPX_CODEC_OK, ret);
@@ skipping 19 matching lines @@
 
   SkAutoLockPixels lock_sprite(sprite);
 
   const uint8* src = reinterpret_cast<const uint8*>(sprite.getAddr32(0, 0));
   size_t src_frame_size = sprite.getSize();
   int crop_y = 0;
 
   if (!WriteWebmHeader())
     return false;
 
-  for (size_t frame = 0; frame < frame_count && !has_errors_; ++frame) {
+  for (size_t frame = 0; frame < frame_count_ && !has_errors_; ++frame) {
     int res = libyuv::ConvertToI420(
         src, src_frame_size,
         image.planes[VPX_PLANE_Y], image.stride[VPX_PLANE_Y],
         image.planes[VPX_PLANE_U], image.stride[VPX_PLANE_U],
         image.planes[VPX_PLANE_V], image.stride[VPX_PLANE_V],
         0, crop_y,                // src origin
         width_, sprite.height(),  // src size
         width_, height_,          // dest size
         libyuv::kRotate0,
         libyuv::FOURCC_ARGB);
@@ skipping 38 matching lines @@
   }
   EndSubElement();  // EBML
 
   // Single segment with a video track.
   StartSubElement(Segment);
   {
     StartSubElement(Info);
     {
       // All timecodes in the segment will be expressed in milliseconds.
       Ebml_SerializeUnsigned(&ebml_writer_, TimecodeScale, 1000000);
+      double duration = 1000. * frame_count_ * fps_.den / fps_.num;
+      Ebml_SerializeFloat(&ebml_writer_, Segment_Duration, duration);
     }
     EndSubElement();  // Info
 
     StartSubElement(Tracks);
     {
       StartSubElement(TrackEntry);
       {
         Ebml_SerializeUnsigned(&ebml_writer_, TrackNumber, 1);
         Ebml_SerializeUnsigned32(&ebml_writer_, TrackUID, 1);
         Ebml_SerializeUnsigned(&ebml_writer_, TrackType, 1);  // Video
@@ skipping 116 matching lines @@
     case 8:
       return EbmlSerializeHelper(static_cast<const int64_t*>(buffer), len);
     default:
       NOTREACHED() << "Invalid EbmlSerialize length: " << len;
   }
 }
 
 }  // namespace chromeos
 
 }  // namespace media