Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(124)

Side by Side Diff: webrtc/modules/audio_coding/neteq/tools/rtp_file_source.cc

Issue 1427923003: Re-enable PCAP reading in neteq_rtpplay (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « webrtc/modules/audio_coding/neteq/tools/rtp_file_source.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2014 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 14 matching lines...) Expand all
25 25
26 namespace webrtc { 26 namespace webrtc {
27 namespace test { 27 namespace test {
28 28
29 RtpFileSource* RtpFileSource::Create(const std::string& file_name) { 29 RtpFileSource* RtpFileSource::Create(const std::string& file_name) {
30 RtpFileSource* source = new RtpFileSource(); 30 RtpFileSource* source = new RtpFileSource();
31 RTC_CHECK(source->OpenFile(file_name)); 31 RTC_CHECK(source->OpenFile(file_name));
32 return source; 32 return source;
33 } 33 }
34 34
35 bool RtpFileSource::ValidRtpDump(const std::string& file_name) {
36 rtc::scoped_ptr<RtpFileReader> temp_file(
37 RtpFileReader::Create(RtpFileReader::kRtpDump, file_name));
38 return !!temp_file;
ivoc 2015/11/02 15:27:09 I have a hard time understanding the !!, is there
hlundin-webrtc 2015/11/02 15:41:21 I blame kwiberg for recruiting me to the dark side
kwiberg-webrtc 2015/11/02 19:24:59 !x is true if x is false, false if x is true. So !
hlundin-webrtc 2015/11/03 06:44:41 Thanks for providing that invaluable truth table.
39 }
40
41 bool RtpFileSource::ValidPcap(const std::string& file_name) {
42 rtc::scoped_ptr<RtpFileReader> temp_file(
43 RtpFileReader::Create(RtpFileReader::kPcap, file_name));
44 return !!temp_file;
45 }
46
35 RtpFileSource::~RtpFileSource() { 47 RtpFileSource::~RtpFileSource() {
36 } 48 }
37 49
38 bool RtpFileSource::RegisterRtpHeaderExtension(RTPExtensionType type, 50 bool RtpFileSource::RegisterRtpHeaderExtension(RTPExtensionType type,
39 uint8_t id) { 51 uint8_t id) {
40 assert(parser_.get()); 52 assert(parser_.get());
41 return parser_->RegisterRtpHeaderExtension(type, id); 53 return parser_->RegisterRtpHeaderExtension(type, id);
42 } 54 }
43 55
44 Packet* RtpFileSource::NextPacket() { 56 Packet* RtpFileSource::NextPacket() {
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
81 rtp_reader_.reset(RtpFileReader::Create(RtpFileReader::kPcap, file_name)); 93 rtp_reader_.reset(RtpFileReader::Create(RtpFileReader::kPcap, file_name));
82 if (!rtp_reader_) { 94 if (!rtp_reader_) {
83 FATAL() << "Couldn't open input file as either a rtpdump or .pcap. Note " 95 FATAL() << "Couldn't open input file as either a rtpdump or .pcap. Note "
84 "that .pcapng is not supported."; 96 "that .pcapng is not supported.";
85 } 97 }
86 return true; 98 return true;
87 } 99 }
88 100
89 } // namespace test 101 } // namespace test
90 } // namespace webrtc 102 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/modules/audio_coding/neteq/tools/rtp_file_source.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698