Move VideoFrame and related declarations to webrtc/api/video.

webrtc/api/video/video_frame.cc

 /*
- *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
+ *  Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.

[magjed_webrtc, 2016/11/29 15:43:49]

2016?

[nisse-webrtc, 2016/11/29 15:56:14]

I just copied the copyright header along with the contents.

I think I've read somewhere that we don't try to keep copyright years accurate.
(Projects that do try, e.g., the GNU project, list all years when there have
been changes to the file).

[magjed_webrtc, 2016/11/29 16:40:26]

The year has been changed from 2012 to 2014. This is technically a new file, so
I don't know if you should update the year to 2016 or leave it untouched.

[kjellander_webrtc, 2016/11/30 07:19:12]

Year should be current year if it's a new file, then never changed:
https://chromium.googlesource.com/chromium/src/+/master/styleguide/c++/c++.md...
If it's a moved file, don't change it.

[nisse-webrtc, 2016/11/30 11:26:03]

It's moving parts of webrtc/video_frame.h, which has a 2012 copyright header
(while the header file is dated 2014). Does that count as a "new" file? 

  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-#include "webrtc/video_frame.h"
+#include "webrtc/api/video/video_frame.h"
 
-#include <string.h>
-
-#include <algorithm>  // swap
-
-#include "webrtc/base/bind.h"
 #include "webrtc/base/checks.h"
+#include "webrtc/base/timeutils.h"

[pthatcher1, 2016/11/30 00:48:28]

Does this need to eventually be moved to webrtc/api to avoid webrtc/api =>
webrtc/base dependencies?  

[nisse-webrtc, 2016/11/30 11:26:03]

This is the implementation file. As far as I understand dependencis on internal
things should be fine here.

That said, we've been discussing moving a stripped down timeutils.h to api/.

 
 namespace webrtc {
 
-// FFmpeg's decoder, used by H264DecoderImpl, requires up to 8 bytes padding due
-// to optimized bitstream readers. See avcodec_decode_video2.
-const size_t EncodedImage::kBufferPaddingBytesH264 = 8;
-
 VideoFrame::VideoFrame()
     : video_frame_buffer_(nullptr),
       timestamp_rtp_(0),
       ntp_time_ms_(0),
       timestamp_us_(0),
       rotation_(kVideoRotation_0) {}
 
 VideoFrame::VideoFrame(const rtc::scoped_refptr<VideoFrameBuffer>& buffer,
                        webrtc::VideoRotation rotation,
                        int64_t timestamp_us)
     : video_frame_buffer_(buffer),
       timestamp_rtp_(0),
       ntp_time_ms_(0),
       timestamp_us_(timestamp_us),
       rotation_(rotation) {}
 
 VideoFrame::VideoFrame(const rtc::scoped_refptr<VideoFrameBuffer>& buffer,
                        uint32_t timestamp,
                        int64_t render_time_ms,
                        VideoRotation rotation)
     : video_frame_buffer_(buffer),
       timestamp_rtp_(timestamp),
       ntp_time_ms_(0),
       timestamp_us_(render_time_ms * rtc::kNumMicrosecsPerMillisec),
       rotation_(rotation) {
   RTC_DCHECK(buffer);
 }
 
+VideoFrame::~VideoFrame() {}

[magjed_webrtc, 2016/11/29 15:43:49]

maybe '= default' is better?

[nisse-webrtc, 2016/11/29 15:56:15]

Makes sense.

[nisse-webrtc, 2016/11/30 11:26:03]

Done.

+
+VideoFrame::VideoFrame(const VideoFrame&) = default;
+VideoFrame::VideoFrame(VideoFrame&&) = default;
+VideoFrame& VideoFrame::operator=(const VideoFrame&) = default;
+VideoFrame& VideoFrame::operator=(VideoFrame&&) = default;
+
 int VideoFrame::width() const {
   return video_frame_buffer_ ? video_frame_buffer_->width() : 0;
 }
 
 int VideoFrame::height() const {
   return video_frame_buffer_ ? video_frame_buffer_->height() : 0;
 }
 
 bool VideoFrame::IsZeroSize() const {
   return !video_frame_buffer_;
 }
 
 rtc::scoped_refptr<VideoFrameBuffer> VideoFrame::video_frame_buffer() const {
   return video_frame_buffer_;
 }
 
-size_t EncodedImage::GetBufferPaddingBytes(VideoCodecType codec_type) {
-  switch (codec_type) {
-    case kVideoCodecVP8:
-    case kVideoCodecVP9:
-      return 0;
-    case kVideoCodecH264:
-      return kBufferPaddingBytesH264;
-    case kVideoCodecI420:
-    case kVideoCodecRED:
-    case kVideoCodecULPFEC:
-    case kVideoCodecFlexfec:
-    case kVideoCodecGeneric:
-    case kVideoCodecUnknown:
-      return 0;
-  }
-  RTC_NOTREACHED();
-  return 0;
+void VideoFrame::set_render_time_ms(int64_t render_time_ms) {
+  set_timestamp_us(render_time_ms * rtc::kNumMicrosecsPerMillisec);
+  ;

[magjed_webrtc, 2016/11/29 15:43:49]

nit: remove lonely semicolon.

[nisse-webrtc, 2016/11/30 11:26:03]

Done.

+}
+
+int64_t VideoFrame::render_time_ms() const {
+  return timestamp_us() / rtc::kNumMicrosecsPerMillisec;
 }
 
 }  // namespace webrtc