Remove VideoDecoder::natural_size() & added VideoFrame::natural_size().

media/tools/player_wtl/view.h

 // 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.
 
 #ifndef MEDIA_TOOLS_PLAYER_WTL_VIEW_H_
 #define MEDIA_TOOLS_PLAYER_WTL_VIEW_H_
 
 #include <stdio.h>
 #include <process.h>
 #include <string.h>
@@ skipping 126 matching lines @@
   // Convert the video frame to RGB and Blit.
   void ConvertFrame(media::VideoFrame* video_frame) {
     BITMAP bm;
     bmp_.GetBitmap(&bm);
     int dibwidth = bm.bmWidth;
     int dibheight = bm.bmHeight;
 
     uint8 *movie_dib_bits = reinterpret_cast<uint8 *>(bm.bmBits) +
         bm.bmWidthBytes * (bm.bmHeight - 1);
     int dibrowbytes = -bm.bmWidthBytes;
-    int clipped_width = video_frame->width();
+    int clipped_width = video_frame->data_size().width();
     if (dibwidth < clipped_width) {
       clipped_width = dibwidth;
     }
-    int clipped_height = video_frame->height();
+    int clipped_height = video_frame->data_size().height();
     if (dibheight < clipped_height) {
       clipped_height = dibheight;
     }
 
     int scaled_width = clipped_width;
     int scaled_height = clipped_height;
     switch (view_size_) {
       case 0:
         scaled_width = clipped_width / 4;
         scaled_height = clipped_height / 4;
@@ skipping 74 matching lines @@
   }
 
   void DoPaint(CDCHandle dc) {
     AllocateVideoBitmap(dc);
     if (!bmp_.IsNull()) {
       scoped_refptr<media::VideoFrame> frame;
       renderer_->GetCurrentFrame(&frame);
       if (frame) {
         // Size the window the first time we get a frame.
         if (!last_frame_)
-          SetSize(frame->width(), frame->height());
+          SetSize(frame->data_size().width(), frame->data_size().height());
 
         base::TimeDelta frame_timestamp = frame->GetTimestamp();
         if (frame != last_frame_ || frame_timestamp != last_timestamp_) {
           last_frame_ = frame;
           last_timestamp_ = frame_timestamp;
           ConvertFrame(frame);
         }
       }
       renderer_->PutCurrentFrame(frame);
 
@@ skipping 171 matching lines @@
                              view_rotate_,
                              view_filter_);
     }
   }
 
   // Diagnostic function to write out YUV in format compatible with PYUV tool.
   void DumpYUV(const media::VideoFrame* video_frame) {
     FILE * file_yuv = fopen("raw.yuv", "ab+");  // Open for append binary.
     if (file_yuv != NULL) {
       fseek(file_yuv, 0, SEEK_END);
-      const size_t frame_size =
-        video_frame->width() * video_frame->height();
-      for (size_t y = 0; y < video_frame->height(); ++y)
+      const int frame_size =
+        video_frame->data_size().width() * video_frame->data_size().height();
+      for (int y = 0; y < video_frame->data_size().height(); ++y)
         fwrite(video_frame->data(0) + video_frame->stride(0)*y,
-          video_frame->width(), sizeof(uint8), file_yuv);
-      for (size_t y = 0; y < video_frame->height()/2; ++y)
+          video_frame->data_size().width(), sizeof(uint8), file_yuv);
+      for (int y = 0; y < video_frame->data_size().height()/2; ++y)
         fwrite(video_frame->data(1) + video_frame->stride(1)*y,
-          video_frame->width() / 2, sizeof(uint8), file_yuv);
-      for (size_t y = 0; y < video_frame->height()/2; ++y)
+          video_frame->data_size().width() / 2, sizeof(uint8), file_yuv);
+      for (int y = 0; y < video_frame->data_size().height()/2; ++y)
         fwrite(video_frame->data(2) + video_frame->stride(2)*y,
-          video_frame->width() / 2, sizeof(uint8), file_yuv);
+          video_frame->data_size().width() / 2, sizeof(uint8), file_yuv);
       fclose(file_yuv);
 
 #if TESTING
       static int frame_dump_count = 0;
       char outputbuf[512];
       _snprintf_s(outputbuf, sizeof(outputbuf), "yuvdump %4d %dx%d stride %d\n",
-                  frame_dump_count, video_frame->width(),
-                  video_frame->height(),
+                  frame_dump_count, video_frame->data_size().width(),
+                  video_frame->data_size().height(),
                   video_frame->stride(0));
       OutputDebugStringA(outputbuf);
       ++frame_dump_count;
 #endif
     }
   }
 
   media::VideoFrame* last_frame_;
   base::TimeDelta last_timestamp_;
 
   DISALLOW_COPY_AND_ASSIGN(WtlVideoWindow);
 };
 
 #endif  // MEDIA_TOOLS_PLAYER_WTL_VIEW_H_