Revert of Deprecate VCMPacketizationCallback::SendData and use EncodedImageCallback instead.

webrtc/modules/video_coding/utility/ivf_file_writer.cc

 /*
  *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
  *
  *  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/modules/video_coding/utility/ivf_file_writer.h"
 
 #include "webrtc/base/checks.h"
 #include "webrtc/base/logging.h"
 #include "webrtc/modules/rtp_rtcp/source/byte_io.h"
 
 namespace webrtc {
 
 IvfFileWriter::IvfFileWriter(const std::string& file_name,
                              std::unique_ptr<FileWrapper> file,
-                             VideoCodecType codec_type)
+                             RtpVideoCodecTypes codec_type)
     : codec_type_(codec_type),
       num_frames_(0),
       width_(0),
       height_(0),
       last_timestamp_(-1),
       using_capture_timestamps_(false),
       file_name_(file_name),
       file_(std::move(file)) {}
 
 IvfFileWriter::~IvfFileWriter() {
   Close();
 }
 
 const size_t kIvfHeaderSize = 32;
 
-std::unique_ptr<IvfFileWriter> IvfFileWriter::Open(const std::string& file_name,
-                                                   VideoCodecType codec_type) {
+std::unique_ptr<IvfFileWriter> IvfFileWriter::Open(
+    const std::string& file_name,
+    RtpVideoCodecTypes codec_type) {
   std::unique_ptr<IvfFileWriter> file_writer;
   std::unique_ptr<FileWrapper> file(FileWrapper::Create());
   if (file->OpenFile(file_name.c_str(), false) != 0)
     return file_writer;
 
   file_writer.reset(new IvfFileWriter(
       file_name, std::unique_ptr<FileWrapper>(std::move(file)), codec_type));
   if (!file_writer->WriteHeader())
     file_writer.reset();
 
   return file_writer;
 }
 
 bool IvfFileWriter::WriteHeader() {
   if (file_->Rewind() != 0) {
     LOG(LS_WARNING) << "Unable to rewind output file " << file_name_;
     return false;
   }
 
   uint8_t ivf_header[kIvfHeaderSize] = {0};
   ivf_header[0] = 'D';
   ivf_header[1] = 'K';
   ivf_header[2] = 'I';
   ivf_header[3] = 'F';
   ByteWriter<uint16_t>::WriteLittleEndian(&ivf_header[4], 0);   // Version.
   ByteWriter<uint16_t>::WriteLittleEndian(&ivf_header[6], 32);  // Header size.
 
   switch (codec_type_) {
-    case kVideoCodecVP8:
+    case kRtpVideoVp8:
       ivf_header[8] = 'V';
       ivf_header[9] = 'P';
       ivf_header[10] = '8';
       ivf_header[11] = '0';
       break;
-    case kVideoCodecVP9:
+    case kRtpVideoVp9:
       ivf_header[8] = 'V';
       ivf_header[9] = 'P';
       ivf_header[10] = '9';
       ivf_header[11] = '0';
       break;
-    case kVideoCodecH264:
+    case kRtpVideoH264:
       ivf_header[8] = 'H';
       ivf_header[9] = '2';
       ivf_header[10] = '6';
       ivf_header[11] = '4';
       break;
     default:
       LOG(LS_ERROR) << "Unknown CODEC type: " << codec_type_;
       return false;
   }
 
@@ skipping 97 matching lines @@
     if (remove(file_name_.c_str()) != 0)
       LOG(LS_WARNING) << "Failed to remove empty IVF file " << file_name_;
 
     return true;
   }
 
   return WriteHeader() && (file_->CloseFile() == 0);
 }
 
 }  // namespace webrtc