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

Side by Side Diff: webrtc/media/base/codec_unittest.cc

Issue 2969623003: Update includes for webrtc/{base => rtc_base} rename (2/3) (Closed)
Patch Set: Rebased onto 224e65939af87443addfc5bb500fbf434728bd1c and restored sorting in clock.cc Created 3 years, 5 months 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/media/base/codec.cc ('k') | webrtc/media/base/device.h » ('j') | 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) 2009 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2009 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
11 #include "webrtc/base/gunit.h"
12 #include "webrtc/media/base/codec.h" 11 #include "webrtc/media/base/codec.h"
12 #include "webrtc/rtc_base/gunit.h"
13 13
14 using cricket::AudioCodec; 14 using cricket::AudioCodec;
15 using cricket::Codec; 15 using cricket::Codec;
16 using cricket::DataCodec; 16 using cricket::DataCodec;
17 using cricket::FeedbackParam; 17 using cricket::FeedbackParam;
18 using cricket::VideoCodec; 18 using cricket::VideoCodec;
19 using cricket::kCodecParamAssociatedPayloadType; 19 using cricket::kCodecParamAssociatedPayloadType;
20 using cricket::kCodecParamMaxBitrate; 20 using cricket::kCodecParamMaxBitrate;
21 using cricket::kCodecParamMinBitrate; 21 using cricket::kCodecParamMinBitrate;
22 22
(...skipping 295 matching lines...) Expand 10 before | Expand all | Expand 10 after
318 EXPECT_EQ(rtc::Optional<int>(), codec_params_1.num_channels); 318 EXPECT_EQ(rtc::Optional<int>(), codec_params_1.num_channels);
319 319
320 const AudioCodec a(97, "A", 44100, 20000, 2); 320 const AudioCodec a(97, "A", 44100, 20000, 2);
321 webrtc::RtpCodecParameters codec_params_2 = a.ToCodecParameters(); 321 webrtc::RtpCodecParameters codec_params_2 = a.ToCodecParameters();
322 EXPECT_EQ(97, codec_params_2.payload_type); 322 EXPECT_EQ(97, codec_params_2.payload_type);
323 EXPECT_EQ(cricket::MEDIA_TYPE_AUDIO, codec_params_2.kind); 323 EXPECT_EQ(cricket::MEDIA_TYPE_AUDIO, codec_params_2.kind);
324 EXPECT_EQ("A", codec_params_2.name); 324 EXPECT_EQ("A", codec_params_2.name);
325 EXPECT_EQ(rtc::Optional<int>(44100), codec_params_2.clock_rate); 325 EXPECT_EQ(rtc::Optional<int>(44100), codec_params_2.clock_rate);
326 EXPECT_EQ(rtc::Optional<int>(2), codec_params_2.num_channels); 326 EXPECT_EQ(rtc::Optional<int>(2), codec_params_2.num_channels);
327 } 327 }
OLDNEW
« no previous file with comments | « webrtc/media/base/codec.cc ('k') | webrtc/media/base/device.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698