Don't re-randomize picture_id/tl0_pic_idx when re-initializing internal encoders.

webrtc/modules/video_coding/codecs/test/video_codec_test.cc

 /*
  *  Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 15 matching lines @@
 
 namespace webrtc {
 
 EncodedImageCallback::Result
 VideoCodecTest::FakeEncodeCompleteCallback::OnEncodedImage(
     const EncodedImage& frame,
     const CodecSpecificInfo* codec_specific_info,
     const RTPFragmentationHeader* fragmentation) {
   rtc::CritScope lock(&test_->encoded_frame_section_);
   test_->encoded_frame_.emplace(frame);
+  RTC_DCHECK(codec_specific_info);
+  test_->codec_specific_info_.codecType = codec_specific_info->codecType;
+  // Skip |codec_name|, to avoid allocating.
+  test_->codec_specific_info_.codecSpecific =
+      codec_specific_info->codecSpecific;
   test_->encoded_frame_event_.Set();
   return Result(Result::OK);
 }
 
 void VideoCodecTest::FakeDecodeCompleteCallback::Decoded(
     VideoFrame& frame,
     rtc::Optional<int32_t> decode_time_ms,
     rtc::Optional<uint8_t> qp) {
   rtc::CritScope lock(&test_->decoded_frame_section_);
   test_->decoded_frame_.emplace(frame);
@@ skipping 12 matching lines @@
   fclose(source_file_);
 
   encoder_.reset(CreateEncoder());
   decoder_.reset(CreateDecoder());
   encoder_->RegisterEncodeCompleteCallback(&encode_complete_callback_);
   decoder_->RegisterDecodeCompleteCallback(&decode_complete_callback_);
 
   InitCodecs();
 }
 
-bool VideoCodecTest::WaitForEncodedFrame(EncodedImage* frame) {
+bool VideoCodecTest::WaitForEncodedFrame(
+    EncodedImage* frame,
+    CodecSpecificInfo* codec_specific_info) {
   bool ret = encoded_frame_event_.Wait(kEncodeTimeoutMs);
   EXPECT_TRUE(ret) << "Timed out while waiting for an encoded frame.";
   // This becomes unsafe if there are multiple threads waiting for frames.
   rtc::CritScope lock(&encoded_frame_section_);
   EXPECT_TRUE(encoded_frame_);
   if (encoded_frame_) {
     *frame = std::move(*encoded_frame_);
     encoded_frame_.reset();
+    RTC_DCHECK(codec_specific_info);
+    codec_specific_info->codecType = codec_specific_info_.codecType;
+    codec_specific_info->codecSpecific = codec_specific_info_.codecSpecific;
     return true;
   } else {
     return false;
   }
 }
 
 bool VideoCodecTest::WaitForDecodedFrame(std::unique_ptr<VideoFrame>* frame,
                                          rtc::Optional<uint8_t>* qp) {
   bool ret = decoded_frame_event_.Wait(kDecodeTimeoutMs);
   EXPECT_TRUE(ret) << "Timed out while waiting for a decoded frame.";
   // This becomes unsafe if there are multiple threads waiting for frames.
   rtc::CritScope lock(&decoded_frame_section_);
   EXPECT_TRUE(decoded_frame_);
   if (decoded_frame_) {
     frame->reset(new VideoFrame(std::move(*decoded_frame_)));
     *qp = decoded_qp_;
     decoded_frame_.reset();
     return true;
   } else {
     return false;
   }
 }
 
 void VideoCodecTest::InitCodecs() {
-  VideoCodec codec_inst = codec_settings();
-  codec_inst.startBitrate = kStartBitrate;
-  codec_inst.targetBitrate = kTargetBitrate;
-  codec_inst.maxBitrate = kMaxBitrate;
-  codec_inst.maxFramerate = kMaxFramerate;
-  codec_inst.width = kWidth;
-  codec_inst.height = kHeight;
+  codec_inst_ = codec_settings();
+  codec_inst_.startBitrate = kStartBitrate;
+  codec_inst_.targetBitrate = kTargetBitrate;
+  codec_inst_.maxBitrate = kMaxBitrate;
+  codec_inst_.maxFramerate = kMaxFramerate;
+  codec_inst_.width = kWidth;
+  codec_inst_.height = kHeight;
   EXPECT_EQ(WEBRTC_VIDEO_CODEC_OK,
-            encoder_->InitEncode(&codec_inst, 1 /* number of cores */,
+            encoder_->InitEncode(&codec_inst_, 1 /* number of cores */,
                                  0 /* max payload size (unused) */));
   EXPECT_EQ(WEBRTC_VIDEO_CODEC_OK,
-            decoder_->InitDecode(&codec_inst, 1 /* number of cores */));
+            decoder_->InitDecode(&codec_inst_, 1 /* number of cores */));
 }
 
 }  // namespace webrtc