cricket::VideoFrame cleanup. New width() and height(). Deleted GetChroma* methods.

webrtc/media/base/testutils.cc

 /*
  *  Copyright (c) 2004 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.
  */
 
@@ skipping 288 matching lines @@
                              int w,
                              int h) {
   rtc::FileStream fs;
   char filename[256];
   rtc::sprintfn(filename, sizeof(filename), "%s.%dx%d_ARGB.raw",
                       prefix.c_str(), w, h);
   fs.Open(filename, "wb", NULL);
   fs.Write(img, ARGB_SIZE(w, h), NULL, NULL);
 }
 
-bool VideoFrameEqual(const VideoFrame* frame0, const VideoFrame* frame1) {
-  const uint8_t* y0 = frame0->GetYPlane();
-  const uint8_t* u0 = frame0->GetUPlane();
-  const uint8_t* v0 = frame0->GetVPlane();
-  const uint8_t* y1 = frame1->GetYPlane();
-  const uint8_t* u1 = frame1->GetUPlane();
-  const uint8_t* v1 = frame1->GetVPlane();
-
-  for (size_t i = 0; i < frame0->GetHeight(); ++i) {
-    if (0 != memcmp(y0, y1, frame0->GetWidth())) {
-      return false;
-    }
-    y0 += frame0->GetYPitch();
-    y1 += frame1->GetYPitch();
-  }
-
-  for (size_t i = 0; i < frame0->GetChromaHeight(); ++i) {
-    if (0 != memcmp(u0, u1, frame0->GetChromaWidth())) {
-      return false;
-    }
-    if (0 != memcmp(v0, v1, frame0->GetChromaWidth())) {
-      return false;
-    }
-    u0 += frame0->GetUPitch();
-    v0 += frame0->GetVPitch();
-    u1 += frame1->GetUPitch();
-    v1 += frame1->GetVPitch();
-  }
-
-  return true;
-}
-
 cricket::StreamParams CreateSimStreamParams(
     const std::string& cname,
     const std::vector<uint32_t>& ssrcs) {
   cricket::StreamParams sp;
   cricket::SsrcGroup sg(cricket::kSimSsrcGroupSemantics, ssrcs);
   sp.ssrcs = ssrcs;
   sp.ssrc_groups.push_back(sg);
   sp.cname = cname;
   return sp;
 }
 
 // There should be an rtx_ssrc per ssrc.
 cricket::StreamParams CreateSimWithRtxStreamParams(
     const std::string& cname,
     const std::vector<uint32_t>& ssrcs,
     const std::vector<uint32_t>& rtx_ssrcs) {
   cricket::StreamParams sp = CreateSimStreamParams(cname, ssrcs);
   for (size_t i = 0; i < ssrcs.size(); ++i) {
     sp.ssrcs.push_back(rtx_ssrcs[i]);
     std::vector<uint32_t> fid_ssrcs;
     fid_ssrcs.push_back(ssrcs[i]);
     fid_ssrcs.push_back(rtx_ssrcs[i]);
     cricket::SsrcGroup fid_group(cricket::kFidSsrcGroupSemantics, fid_ssrcs);
     sp.ssrc_groups.push_back(fid_group);
   }
   return sp;
 }
 
 }  // namespace cricket