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

webrtc/api/video/video_frame.h

 /*
  *  Copyright (c) 2014 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_API_VIDEO_VIDEO_FRAME_H_
 #define WEBRTC_API_VIDEO_VIDEO_FRAME_H_
 
 #include <stdint.h>
 
 #include "webrtc/api/video/video_rotation.h"
+#include "webrtc/api/video/video_content_type.h"
 #include "webrtc/api/video/video_frame_buffer.h"
 
 // TODO(nisse): Transition hack, some downstream applications expect
 // that including this file also defines base/timeutils.h constants.
 // Delete after applications are fixed to include the right headers.
 #include "webrtc/base/timeutils.h"
 
 namespace webrtc {
 
 class VideoFrame {
  public:
   // TODO(nisse): This constructor is consistent with the now deleted
   // cricket::WebRtcVideoFrame. We should consider whether or not we
   // want to stick to this style and deprecate the other constructor.
   VideoFrame(const rtc::scoped_refptr<VideoFrameBuffer>& buffer,
              webrtc::VideoRotation rotation,
+             VideoContentTypeId content_type,
              int64_t timestamp_us);
 
   // Preferred constructor.
   VideoFrame(const rtc::scoped_refptr<VideoFrameBuffer>& buffer,
              uint32_t timestamp,
              int64_t render_time_ms,
-             VideoRotation rotation);
+             VideoRotation rotation,
+             VideoContentTypeId content_type);
 
   ~VideoFrame();
 
   // Support move and copy.
   VideoFrame(const VideoFrame&);
   VideoFrame(VideoFrame&&);
   VideoFrame& operator=(const VideoFrame&);
   VideoFrame& operator=(VideoFrame&&);
 
   // Get frame width.
@@ skipping 35 matching lines @@
   // "pending rotation" or "pending" = a frame that has a VideoRotation > 0.
   //
   // "not pending" = a frame that has a VideoRotation == 0.
   //
   // "apply rotation" = modify a frame from being "pending" to being "not
   //                    pending" rotation (a no-op for "unrotated").
   //
   VideoRotation rotation() const { return rotation_; }
   void set_rotation(VideoRotation rotation) { rotation_ = rotation; }
 
+  VideoContentTypeId content_type() const { return content_type_; }
+  void set_content_type(VideoContentTypeId content_type) {
+    content_type_ = content_type;
+  }
+
   // Get render time in milliseconds.
   // TODO(nisse): Deprecated. Migrate all users to timestamp_us().
   int64_t render_time_ms() const;
 
   // Return the underlying buffer. Never nullptr for a properly
   // initialized VideoFrame.
   rtc::scoped_refptr<webrtc::VideoFrameBuffer> video_frame_buffer() const;
 
   // TODO(nisse): Deprecated.
   // Return true if the frame is stored in a texture.
   bool is_texture() const {
     return video_frame_buffer()->native_handle() != nullptr;
   }
 
  private:
   // An opaque reference counted handle that stores the pixel data.
   rtc::scoped_refptr<webrtc::VideoFrameBuffer> video_frame_buffer_;
   uint32_t timestamp_rtp_;
   int64_t ntp_time_ms_;
   int64_t timestamp_us_;
   VideoRotation rotation_;
+  VideoContentTypeId content_type_;
 };
 
 }  // namespace webrtc
 
 #endif  // WEBRTC_API_VIDEO_VIDEO_FRAME_H_