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

Side by Side Diff: webrtc/modules/video_coding/codecs/vp8/simulcast_encoder_adapter.cc

Issue 2253563002: Add codec name to CodecSpecificInfo and get the codec name stats from there instead. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Fix fake_encoder.cc 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 | « no previous file | webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc » ('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) 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 392 matching lines...) Expand 10 before | Expand all | Expand 10 after
403 403
404 return WEBRTC_VIDEO_CODEC_OK; 404 return WEBRTC_VIDEO_CODEC_OK;
405 } 405 }
406 406
407 EncodedImageCallback::Result SimulcastEncoderAdapter::OnEncodedImage( 407 EncodedImageCallback::Result SimulcastEncoderAdapter::OnEncodedImage(
408 size_t stream_idx, 408 size_t stream_idx,
409 const EncodedImage& encodedImage, 409 const EncodedImage& encodedImage,
410 const CodecSpecificInfo* codecSpecificInfo, 410 const CodecSpecificInfo* codecSpecificInfo,
411 const RTPFragmentationHeader* fragmentation) { 411 const RTPFragmentationHeader* fragmentation) {
412 CodecSpecificInfo stream_codec_specific = *codecSpecificInfo; 412 CodecSpecificInfo stream_codec_specific = *codecSpecificInfo;
413 stream_codec_specific.codec_name = implementation_name_.c_str();
413 CodecSpecificInfoVP8* vp8Info = &(stream_codec_specific.codecSpecific.VP8); 414 CodecSpecificInfoVP8* vp8Info = &(stream_codec_specific.codecSpecific.VP8);
414 vp8Info->simulcastIdx = stream_idx; 415 vp8Info->simulcastIdx = stream_idx;
415 416
416 return encoded_complete_callback_->OnEncodedImage( 417 return encoded_complete_callback_->OnEncodedImage(
417 encodedImage, &stream_codec_specific, fragmentation); 418 encodedImage, &stream_codec_specific, fragmentation);
418 } 419 }
419 420
420 uint32_t SimulcastEncoderAdapter::GetStreamBitrate( 421 uint32_t SimulcastEncoderAdapter::GetStreamBitrate(
421 int stream_idx, 422 int stream_idx,
422 size_t total_number_of_streams, 423 size_t total_number_of_streams,
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
521 return false; 522 return false;
522 } 523 }
523 return true; 524 return true;
524 } 525 }
525 526
526 const char* SimulcastEncoderAdapter::ImplementationName() const { 527 const char* SimulcastEncoderAdapter::ImplementationName() const {
527 return implementation_name_.c_str(); 528 return implementation_name_.c_str();
528 } 529 }
529 530
530 } // namespace webrtc 531 } // namespace webrtc
OLDNEW
« no previous file with comments | « no previous file | webrtc/modules/video_coding/codecs/vp8/vp8_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698