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

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

Index: webrtc/modules/video_coding/codecs/test/video_codec_test.h
diff --git a/webrtc/modules/video_coding/codecs/test/video_codec_test.h b/webrtc/modules/video_coding/codecs/test/video_codec_test.h
index 961927353facf62c3695569c7e00b500b2d91430..be37afe4d824e901f62d78c4cd26f0a431f013d5 100644
--- a/webrtc/modules/video_coding/codecs/test/video_codec_test.h
+++ b/webrtc/modules/video_coding/codecs/test/video_codec_test.h
@@ -18,6 +18,7 @@
 #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 {
@@ -71,10 +72,14 @@ class VideoCodecTest : public ::testing::Test {
 
   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_;
@@ -89,6 +94,7 @@ class VideoCodecTest : public ::testing::Test {
   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_;