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

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

 /*
  *  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.
  */
 
 #ifndef WEBRTC_MODULES_VIDEO_CODING_CODECS_TEST_VIDEO_CODEC_TEST_H_
 #define WEBRTC_MODULES_VIDEO_CODING_CODECS_TEST_VIDEO_CODEC_TEST_H_
 
 #include <memory>
 
 #include "webrtc/api/video_codecs/video_decoder.h"
 #include "webrtc/api/video_codecs/video_encoder.h"
 #include "webrtc/base/criticalsection.h"
 #include "webrtc/base/event.h"
 #include "webrtc/base/thread_annotations.h"
+#include "webrtc/modules/video_coding/include/video_codec_interface.h"
 #include "webrtc/test/gtest.h"
 
 namespace webrtc {
 
 class VideoCodecTest : public ::testing::Test {
  public:
   VideoCodecTest()
       : encode_complete_callback_(this),
         decode_complete_callback_(this),
         encoded_frame_event_(false /* manual reset */,
@@ skipping 33 matching lines @@
    private:
     VideoCodecTest* const test_;
   };
 
   virtual VideoEncoder* CreateEncoder() = 0;
   virtual VideoDecoder* CreateDecoder() = 0;
   virtual VideoCodec codec_settings() = 0;
 
   void SetUp() override;
 
-  bool WaitForEncodedFrame(EncodedImage* frame);
+  bool WaitForEncodedFrame(EncodedImage* frame,
+                           CodecSpecificInfo* codec_specific_info);
   bool WaitForDecodedFrame(std::unique_ptr<VideoFrame>* frame,
                            rtc::Optional<uint8_t>* qp);
 
+  // Populated by InitCodecs().
+  VideoCodec codec_inst_;

[stefan-webrtc, 2017/05/02 07:21:50]

codec_inst_ has always been a strange name to me. Should we use codec_settings_
or something else instead? :)

[brandtr, 2017/05/02 07:48:50]

Sounds good to me. I have never understood what |inst_| means either...
Instance?

+
   std::unique_ptr<VideoFrame> input_frame_;
 
   std::unique_ptr<VideoEncoder> encoder_;
   std::unique_ptr<VideoDecoder> decoder_;
 
  private:
   void InitCodecs();
 
   FakeEncodeCompleteCallback encode_complete_callback_;
   FakeDecodeCompleteCallback decode_complete_callback_;
 
   rtc::Event encoded_frame_event_;
   rtc::CriticalSection encoded_frame_section_;
   rtc::Optional<EncodedImage> encoded_frame_ GUARDED_BY(encoded_frame_section_);
+  CodecSpecificInfo codec_specific_info_ GUARDED_BY(encoded_frame_section_);
 
   rtc::Event decoded_frame_event_;
   rtc::CriticalSection decoded_frame_section_;
   rtc::Optional<VideoFrame> decoded_frame_ GUARDED_BY(decoded_frame_section_);
   rtc::Optional<uint8_t> decoded_qp_ GUARDED_BY(decoded_frame_section_);
 };
 
 }  // namespace webrtc
 
 #endif  // WEBRTC_MODULES_VIDEO_CODING_CODECS_TEST_VIDEO_CODEC_TEST_H_