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

Side by Side Diff: webrtc/modules/audio_coding/codecs/audio_encoder.h

Issue 1896953004: Roll chromium_revision 212f976fef..61ed337cfe (387882:388120) (Closed) Base URL: https://chromium.googlesource.com/external/webrtc@master
Patch Set: Fix Clang warnings Created 4 years, 8 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
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 27 matching lines...) Expand all
38 // total number of |encoded_bytes|, the |encoded_timestamp| and the 38 // total number of |encoded_bytes|, the |encoded_timestamp| and the
39 // |payload_type|. If the packet contains redundant encodings, the |redundant| 39 // |payload_type|. If the packet contains redundant encodings, the |redundant|
40 // vector will be populated with EncodedInfoLeaf structs. Each struct in the 40 // vector will be populated with EncodedInfoLeaf structs. Each struct in the
41 // vector represents one encoding; the order of structs in the vector is the 41 // vector represents one encoding; the order of structs in the vector is the
42 // same as the order in which the actual payloads are written to the byte 42 // same as the order in which the actual payloads are written to the byte
43 // stream. When EncoderInfoLeaf structs are present in the vector, the main 43 // stream. When EncoderInfoLeaf structs are present in the vector, the main
44 // struct's |encoded_bytes| will be the sum of all the |encoded_bytes| in the 44 // struct's |encoded_bytes| will be the sum of all the |encoded_bytes| in the
45 // vector. 45 // vector.
46 struct EncodedInfo : public EncodedInfoLeaf { 46 struct EncodedInfo : public EncodedInfoLeaf {
47 EncodedInfo(); 47 EncodedInfo();
48 EncodedInfo(const EncodedInfo&);
kwiberg-webrtc 2016/04/19 09:21:02 This class has a std::vector member variable, so p
48 ~EncodedInfo(); 49 ~EncodedInfo();
49 50
50 std::vector<EncodedInfoLeaf> redundant; 51 std::vector<EncodedInfoLeaf> redundant;
51 }; 52 };
52 53
53 virtual ~AudioEncoder() = default; 54 virtual ~AudioEncoder() = default;
54 55
55 // Returns the input sample rate in Hz and the number of input channels. 56 // Returns the input sample rate in Hz and the number of input channels.
56 // These are constants set at instantiation time. 57 // These are constants set at instantiation time.
57 virtual int SampleRateHz() const = 0; 58 virtual int SampleRateHz() const = 0;
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
136 // This function is deprecated. It was used to return the maximum number of 137 // This function is deprecated. It was used to return the maximum number of
137 // bytes that can be produced by the encoder at each Encode() call. Since the 138 // bytes that can be produced by the encoder at each Encode() call. Since the
138 // Encode interface was changed to use rtc::Buffer, this is no longer 139 // Encode interface was changed to use rtc::Buffer, this is no longer
139 // applicable. It is only kept in to avoid breaking subclasses that still have 140 // applicable. It is only kept in to avoid breaking subclasses that still have
140 // it implemented (with the override attribute). It will be removed as soon 141 // it implemented (with the override attribute). It will be removed as soon
141 // as these subclasses have been given a chance to change. 142 // as these subclasses have been given a chance to change.
142 virtual size_t MaxEncodedBytes() const; 143 virtual size_t MaxEncodedBytes() const;
143 }; 144 };
144 } // namespace webrtc 145 } // namespace webrtc
145 #endif // WEBRTC_MODULES_AUDIO_CODING_CODECS_AUDIO_ENCODER_H_ 146 #endif // WEBRTC_MODULES_AUDIO_CODING_CODECS_AUDIO_ENCODER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698