Remove cricket::VideoFrame::Set/GetElapsedTime()

talk/media/devices/filevideocapturer.cc

 /*
  * libjingle
  * Copyright 2004 Google Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *
  *  1. Redistributions of source code must retain the above copyright notice,
  *     this list of conditions and the following disclaimer.
  *  2. Redistributions in binary form must reproduce the above copyright notice,
@@ skipping 56 matching lines @@
   }
 
   if (write_header_) {
     // Convert the frame header to bytebuffer.
     rtc::ByteBuffer buffer;
     buffer.WriteUInt32(frame.width);
     buffer.WriteUInt32(frame.height);
     buffer.WriteUInt32(frame.fourcc);
     buffer.WriteUInt32(frame.pixel_width);
     buffer.WriteUInt32(frame.pixel_height);
-    buffer.WriteUInt64(frame.elapsed_time);
+    // Elapsed time is deprecated.
+    const uint64_t dummy_elapsed_time = 0;
+    buffer.WriteUInt64(dummy_elapsed_time);
     buffer.WriteUInt64(frame.time_stamp);
     buffer.WriteUInt32(size);
 
     // Write the bytebuffer to file.
     if (rtc::SR_SUCCESS != video_file_.Write(buffer.Data(),
                                                    buffer.Length(),
                                                    NULL,
                                                    NULL)) {
       LOG(LS_ERROR) << "Failed to write frame header";
       return false;
@@ skipping 68 matching lines @@
 /////////////////////////////////////////////////////////////////////
 // Implementation of class FileVideoCapturer
 /////////////////////////////////////////////////////////////////////
 static const int64 kNumNanoSecsPerMilliSec = 1000000;
 const char* FileVideoCapturer::kVideoFileDevicePrefix = "video-file:";
 
 FileVideoCapturer::FileVideoCapturer()
     : frame_buffer_size_(0),
       file_read_thread_(NULL),
       repeat_(0),
-      start_time_ns_(0),
       last_frame_timestamp_ns_(0),
       ignore_framerate_(false) {
 }
 
 FileVideoCapturer::~FileVideoCapturer() {
   Stop();
   delete[] static_cast<char*>(captured_frame_.data);
 }
 
 bool FileVideoCapturer::Init(const Device& device) {
@@ skipping 59 matching lines @@
     LOG(LS_ERROR) << "File not opened yet";
     return CS_NO_DEVICE;
   } else if (!video_file_.SetPosition(0)) {
     LOG(LS_ERROR) << "Failed to seek back to beginning of the file";
     return CS_FAILED;
   }
 
   SetCaptureFormat(&capture_format);
   // Create a thread to read the file.
   file_read_thread_ = new FileReadThread(this);
-  start_time_ns_ = kNumNanoSecsPerMilliSec *
-      static_cast<int64>(rtc::Time());
   bool ret = file_read_thread_->Start();
   if (ret) {
     LOG(LS_INFO) << "File video capturer '" << GetId() << "' started";
     return CS_RUNNING;
   } else {
     LOG(LS_ERROR) << "File video capturer '" << GetId() << "' failed to start";
     return CS_FAILED;
   }
 }
 
@@ skipping 37 matching lines @@
   if (rtc::SR_SUCCESS == sr) {
     if (CapturedFrame::kFrameHeaderSize != bytes_read) {
       return rtc::SR_EOS;
     }
     rtc::ByteBuffer buffer(header, CapturedFrame::kFrameHeaderSize);
     buffer.ReadUInt32(reinterpret_cast<uint32*>(&frame->width));
     buffer.ReadUInt32(reinterpret_cast<uint32*>(&frame->height));
     buffer.ReadUInt32(&frame->fourcc);
     buffer.ReadUInt32(&frame->pixel_width);
     buffer.ReadUInt32(&frame->pixel_height);
-    buffer.ReadUInt64(reinterpret_cast<uint64*>(&frame->elapsed_time));
+    // Elapsed time is deprecated.
+    uint64 dummy_elapsed_time;
+    buffer.ReadUInt64(&dummy_elapsed_time);
     buffer.ReadUInt64(reinterpret_cast<uint64*>(&frame->time_stamp));
     buffer.ReadUInt32(&frame->data_size);
   }
 
   return sr;
 }
 
 // Executed in the context of FileReadThread.
 bool FileVideoCapturer::ReadFrame(bool first_frame, int* wait_time_ms) {
   uint32 start_read_time_ms = rtc::Time();
 
   // 1. Signal the previously read frame to downstream.
   if (!first_frame) {
     captured_frame_.time_stamp = kNumNanoSecsPerMilliSec *
         static_cast<int64>(start_read_time_ms);
-    captured_frame_.elapsed_time = captured_frame_.time_stamp - start_time_ns_;
     SignalFrameCaptured(this, &captured_frame_);
   }
 
   // 2. Read the next frame.
   if (rtc::SS_CLOSED == video_file_.GetState()) {
     LOG(LS_ERROR) << "File not opened yet";
     return false;
   }
   // 2.1 Read the frame header.
   rtc::StreamResult result = ReadFrameHeader(&captured_frame_);
@@ skipping 44 matching lines @@
     if (interval_ms > 0) {
       *wait_time_ms = interval_ms;
     }
   }
   // Keep the original timestamp read from the file.
   last_frame_timestamp_ns_ = captured_frame_.time_stamp;
   return true;
 }
 
 }  // namespace cricket