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

webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.cc

 /*
  *  Copyright (c) 2015 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 138 matching lines @@
   av_frame->data[kUPlaneIndex] = frame_buffer->MutableDataU();
   av_frame->linesize[kUPlaneIndex] = frame_buffer->StrideU();
   av_frame->data[kVPlaneIndex] = frame_buffer->MutableDataV();
   av_frame->linesize[kVPlaneIndex] = frame_buffer->StrideV();
   RTC_DCHECK_EQ(av_frame->extended_data, av_frame->data);
 
   // Create a VideoFrame object, to keep a reference to the buffer.
   // TODO(nisse): The VideoFrame's timestamp and rotation info is not used.
   // Refactor to do not use a VideoFrame object at all.
   av_frame->buf[0] = av_buffer_create(
-      av_frame->data[kYPlaneIndex],
-      total_size,
-      AVFreeBuffer2,
-      static_cast<void*>(new VideoFrame(frame_buffer,
-                                        0 /* timestamp */,
-                                        0 /* render_time_ms */,
-                                        kVideoRotation_0)),
+      av_frame->data[kYPlaneIndex], total_size, AVFreeBuffer2,
+      static_cast<void*>(new VideoFrame(
+          frame_buffer, 0 /* timestamp */, 0 /* render_time_ms */,
+          kVideoRotation_0, VideoContentType::kDefault)),
       0);
   RTC_CHECK(av_frame->buf[0]);
   return 0;
 }
 
 void H264DecoderImpl::AVFreeBuffer2(void* opaque, uint8_t* data) {
   // The buffer pool recycles the buffer used by |video_frame| when there are no
   // more references to it. |video_frame| is a thin buffer holder and is not
   // recycled.
   VideoFrame* video_frame = static_cast<VideoFrame*>(opaque);
@@ skipping 197 matching lines @@
   if (av_frame_->width != buf->width() || av_frame_->height != buf->height()) {
     rtc::scoped_refptr<VideoFrameBuffer> cropped_buf(
         new rtc::RefCountedObject<WrappedI420Buffer>(
             av_frame_->width, av_frame_->height,
             buf->DataY(), buf->StrideY(),
             buf->DataU(), buf->StrideU(),
             buf->DataV(), buf->StrideV(),
             rtc::KeepRefUntilDone(buf)));
     VideoFrame cropped_frame(
         cropped_buf, video_frame->timestamp(), video_frame->render_time_ms(),
-        video_frame->rotation());
+        video_frame->rotation(), video_frame->content_type());
     // TODO(nisse): Timestamp and rotation are all zero here. Change decoder
     // interface to pass a VideoFrameBuffer instead of a VideoFrame?
     decoded_image_callback_->Decoded(cropped_frame, rtc::Optional<int32_t>(),
                                      qp);
   } else {
     // Return decoded frame.
     decoded_image_callback_->Decoded(*video_frame, rtc::Optional<int32_t>(),
                                      qp);
   }
   // Stop referencing it, possibly freeing |video_frame|.
@@ skipping 23 matching lines @@
 void H264DecoderImpl::ReportError() {
   if (has_reported_error_)
     return;
   RTC_HISTOGRAM_ENUMERATION("WebRTC.Video.H264DecoderImpl.Event",
                             kH264DecoderEventError,
                             kH264DecoderEventMax);
   has_reported_error_ = true;
 }
 
 }  // namespace webrtc