91d6edef35
We must remove dependency on Chromium, i.e. we can't use Chromium's base/logging.h. That means we need to define these macros in WebRTC also when doing Chromium builds. And this causes redefinition. Alternative solutions: * Check if we already have defined e.g. CHECK, and don't define them in that case. This makes us depend on include order in Chromium, which is not acceptable. * Don't allow using the macros in WebRTC headers. Error prone since if someone adds it there by mistake it may compile fine, but later break if a header in added or order is changed in Chromium. That will be confusing and hard to enforce. * Ensure that headers that are included by an embedder don't include our macros. This would require some heavy refactoring to be maintainable and enforcable. * Changes in Chromium for this is obviously not an option. BUG=chromium:468375 NOTRY=true Review URL: https://codereview.webrtc.org/1335923002 Cr-Commit-Position: refs/heads/master@{#9964}
46 lines
1.5 KiB
C++
46 lines
1.5 KiB
C++
/*
|
|
* Copyright (c) 2011 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 <stdio.h>
|
|
|
|
#include "webrtc/base/checks.h"
|
|
#include "webrtc/base/scoped_ptr.h"
|
|
#include "webrtc/test/rtp_file_reader.h"
|
|
#include "webrtc/test/rtp_file_writer.h"
|
|
|
|
using rtc::scoped_ptr;
|
|
using webrtc::test::RtpFileReader;
|
|
using webrtc::test::RtpFileWriter;
|
|
|
|
int main(int argc, char* argv[]) {
|
|
if (argc < 3) {
|
|
printf("Concatenates multiple rtpdump files into one.\n");
|
|
printf("Usage: rtpcat in1.rtp int2.rtp [...] out.rtp\n");
|
|
exit(1);
|
|
}
|
|
|
|
scoped_ptr<RtpFileWriter> output(
|
|
RtpFileWriter::Create(RtpFileWriter::kRtpDump, argv[argc - 1]));
|
|
RTC_CHECK(output.get() != NULL) << "Cannot open output file.";
|
|
printf("Output RTP file: %s\n", argv[argc - 1]);
|
|
|
|
for (int i = 1; i < argc - 1; i++) {
|
|
scoped_ptr<RtpFileReader> input(
|
|
RtpFileReader::Create(RtpFileReader::kRtpDump, argv[i]));
|
|
RTC_CHECK(input.get() != NULL) << "Cannot open input file " << argv[i];
|
|
printf("Input RTP file: %s\n", argv[i]);
|
|
|
|
webrtc::test::RtpPacket packet;
|
|
while (input->NextPacket(&packet))
|
|
RTC_CHECK(output->WritePacket(&packet));
|
|
}
|
|
return 0;
|
|
}
|