Move talk/media to webrtc/media

webrtc/media/base/testutils.cc

 /*
- * libjingle
- * Copyright 2004 Google Inc.
+ *  Copyright 2004 The WebRTC Project Authors. All rights reserved.
  *
- * 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,
- *     this list of conditions and the following disclaimer in the documentation
- *     and/or other materials provided with the distribution.
- *  3. The name of the author may not be used to endorse or promote products
- *     derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
- * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *  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 "talk/media/base/testutils.h"
+#include "webrtc/media/base/testutils.h"
 
 #include <math.h>
 #include <algorithm>
 
-#include "talk/media/base/executablehelpers.h"
-#include "talk/media/base/rtpdump.h"
-#include "talk/media/base/videocapturer.h"
-#include "talk/media/base/videoframe.h"
 #include "webrtc/base/bytebuffer.h"
 #include "webrtc/base/fileutils.h"
 #include "webrtc/base/gunit.h"
 #include "webrtc/base/pathutils.h"
 #include "webrtc/base/stream.h"
 #include "webrtc/base/stringutils.h"
 #include "webrtc/base/testutils.h"
+#include "webrtc/media/base/executablehelpers.h"
+#include "webrtc/media/base/rtpdump.h"
+#include "webrtc/media/base/videocapturer.h"
+#include "webrtc/media/base/videoframe.h"
 
 namespace cricket {
 
 /////////////////////////////////////////////////////////////////////////
 // Implementation of RawRtpPacket
 /////////////////////////////////////////////////////////////////////////
 void RawRtpPacket::WriteToByteBuffer(uint32_t in_ssrc,
                                      rtc::ByteBuffer* buf) const {
   if (!buf) return;
 
@@ skipping 197 matching lines @@
   if (1 == frame_count_) {
     frame_fourcc_ = frame->fourcc;
     frame_width_ = frame->width;
     frame_height_ = frame->height;
     frame_size_ = frame->data_size;
   } else if (frame_width_ != frame->width || frame_height_ != frame->height) {
     resolution_changed_ = true;
   }
 }
 
-// Returns the absolute path to a file in the testdata/ directory.
+// Returns the absolute path to a file in the resources/ directory.
 std::string GetTestFilePath(const std::string& filename) {
   // Locate test data directory.
 #ifdef ENABLE_WEBRTC
   rtc::Pathname path = rtc::GetExecutablePath();
   EXPECT_FALSE(path.empty());
-  path.AppendPathname("../../talk/");
+  path.AppendPathname("../../resources/");
 #else
   rtc::Pathname path = testing::GetTalkDirectory();
   EXPECT_FALSE(path.empty());  // must be run from inside "talk"
 #endif
-  path.AppendFolder("media/testdata/");
+  path.AppendFolder("media/");
   path.SetFilename(filename);
   return path.pathname();
 }
 
 // Loads the image with the specified prefix and size into |out|.
 bool LoadPlanarYuvTestImage(const std::string& prefix,
                             int width,
                             int height,
                             uint8_t* out) {
   std::stringstream ss;
@@ skipping 93 matching lines @@
     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