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

Side by Side Diff: webrtc/video/video_receive_stream.cc

Issue 2185953002: Add decoder-specific settings with proper lifetime. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Add h264_extra_settings to VideoReceiveStream::Decoder::ToString() Created 4 years, 4 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/engine/webrtcvideoengine2_unittest.cc ('k') | webrtc/video_receive_stream.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) 2013 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2013 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 29 matching lines...) Expand all
40 return true; 40 return true;
41 } 41 }
42 return false; 42 return false;
43 } 43 }
44 44
45 std::string VideoReceiveStream::Decoder::ToString() const { 45 std::string VideoReceiveStream::Decoder::ToString() const {
46 std::stringstream ss; 46 std::stringstream ss;
47 ss << "{decoder: " << (decoder ? "(VideoDecoder)" : "nullptr"); 47 ss << "{decoder: " << (decoder ? "(VideoDecoder)" : "nullptr");
48 ss << ", payload_type: " << payload_type; 48 ss << ", payload_type: " << payload_type;
49 ss << ", payload_name: " << payload_name; 49 ss << ", payload_name: " << payload_name;
50 ss << ", decoder_specific: {";
51 ss << " h264_extra_settings: "
52 << (decoder_specific.h264_extra_settings ? "(h264_extra_settings)"
53 : "nullptr");
54 ss << '}';
50 ss << '}'; 55 ss << '}';
51 56
52 return ss.str(); 57 return ss.str();
53 } 58 }
54 59
55 std::string VideoReceiveStream::Config::ToString() const { 60 std::string VideoReceiveStream::Config::ToString() const {
56 std::stringstream ss; 61 std::stringstream ss;
57 ss << "{decoders: ["; 62 ss << "{decoders: [";
58 for (size_t i = 0; i < decoders.size(); ++i) { 63 for (size_t i = 0; i < decoders.size(); ++i) {
59 ss << decoders[i].ToString(); 64 ss << decoders[i].ToString();
(...skipping 305 matching lines...) Expand 10 before | Expand all | Expand 10 after
365 const std::vector<uint16_t>& sequence_numbers) { 370 const std::vector<uint16_t>& sequence_numbers) {
366 rtp_stream_receiver_.RequestPacketRetransmit(sequence_numbers); 371 rtp_stream_receiver_.RequestPacketRetransmit(sequence_numbers);
367 } 372 }
368 373
369 void VideoReceiveStream::RequestKeyFrame() { 374 void VideoReceiveStream::RequestKeyFrame() {
370 rtp_stream_receiver_.RequestKeyFrame(); 375 rtp_stream_receiver_.RequestKeyFrame();
371 } 376 }
372 377
373 } // namespace internal 378 } // namespace internal
374 } // namespace webrtc 379 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/media/engine/webrtcvideoengine2_unittest.cc ('k') | webrtc/video_receive_stream.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698