[EXPERIMENTAL] Generic stereo codec with index header sending merged frames

webrtc/modules/video_coding/rtp_frame_reference_finder.cc

Index: webrtc/modules/video_coding/rtp_frame_reference_finder.cc
diff --git a/webrtc/modules/video_coding/rtp_frame_reference_finder.cc b/webrtc/modules/video_coding/rtp_frame_reference_finder.cc
index 66e57b06ed0add046de2b63f05d9df9051d7ef59..c0620b55d331ac329e2bbd656d6bf43b5ba016ac 100644
--- a/webrtc/modules/video_coding/rtp_frame_reference_finder.cc
+++ b/webrtc/modules/video_coding/rtp_frame_reference_finder.cc
@@ -100,6 +100,8 @@ RtpFrameReferenceFinder::ManageFrameInternal(RtpFrameObject* frame) {
     case kVideoCodecI420:
     case kVideoCodecGeneric:
       return ManageFrameGeneric(frame, kNoPictureId);
+    case kVideoCodecStereo:
+      return ManageFrameVp9(frame);
   }
 
   // If not all code paths return a value it makes the win compiler sad.
@@ -404,13 +406,12 @@ RtpFrameReferenceFinder::FrameDecision RtpFrameReferenceFinder::ManageFrameVp9(
 
   if (codec_header.picture_id == kNoPictureId ||
       codec_header.temporal_idx == kNoTemporalIdx) {
-    return ManageFrameGeneric(std::move(frame), codec_header.picture_id);
+    return ManageFrameGeneric(std::move(frame), kNoPictureId);
   }
 
   frame->spatial_layer = codec_header.spatial_idx;
   frame->inter_layer_predicted = codec_header.inter_layer_predicted;
   frame->picture_id = codec_header.picture_id % kPicIdLength;
-
   if (last_unwrap_ == -1)
     last_unwrap_ = codec_header.picture_id;