Reland of Add content type information to encoded images and corresponding rtp extension header

webrtc/video/video_stream_decoder.h

Index: webrtc/video/video_stream_decoder.h
diff --git a/webrtc/video/video_stream_decoder.h b/webrtc/video/video_stream_decoder.h
index 4bca3edfc348f5c70adde8cb224649fa056ea302..6f64934fc78141f11a08af161ee4444cc366b6be 100644
--- a/webrtc/video/video_stream_decoder.h
+++ b/webrtc/video/video_stream_decoder.h
@@ -57,9 +57,12 @@ class VideoStreamDecoder : public VCMReceiveCallback,
       rtc::VideoSinkInterface<VideoFrame>* incoming_video_stream);
   ~VideoStreamDecoder();
 
+  // TODO(ilnik): remove this once deprecated API is removed.
+  using VCMReceiveCallback::FrameToRender;
   // Implements VCMReceiveCallback.
   int32_t FrameToRender(VideoFrame& video_frame,
-                        rtc::Optional<uint8_t> qp) override;
+                        rtc::Optional<uint8_t> qp,
+                        VideoContentType content_type) override;
   int32_t ReceivedDecodedReferenceFrame(const uint64_t picture_id) override;
   void OnIncomingPayloadType(int payload_type) override;
   void OnDecoderImplementationName(const char* implementation_name) override;