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

webrtc/video/vie_encoder.h

 /*
  *  Copyright (c) 2012 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_VIDEO_VIE_ENCODER_H_
 #define WEBRTC_VIDEO_VIE_ENCODER_H_
 
 #include <memory>
 #include <string>
 #include <vector>
 
 #include "webrtc/api/video/video_rotation.h"
+#include "webrtc/api/video/video_content_type.h"
 #include "webrtc/base/criticalsection.h"
 #include "webrtc/base/event.h"
 #include "webrtc/base/sequenced_task_checker.h"
 #include "webrtc/base/task_queue.h"
 #include "webrtc/call/call.h"
 #include "webrtc/common_types.h"
 #include "webrtc/common_video/include/video_bitrate_allocator.h"
 #include "webrtc/media/base/videosinkinterface.h"
 #include "webrtc/modules/video_coding/include/video_coding_defines.h"
 #include "webrtc/modules/video_coding/utility/quality_scaler.h"
@@ skipping 32 matching lines @@
         int min_transmit_bitrate_bps) = 0;
   };
 
   // Downscale resolution at most 2 times for CPU reasons.
   static const int kMaxCpuDowngrades = 2;
 
   ViEEncoder(uint32_t number_of_cores,
              SendStatisticsProxy* stats_proxy,
              const VideoSendStream::Config::EncoderSettings& settings,
              rtc::VideoSinkInterface<VideoFrame>* pre_encode_callback,
-             EncodedFrameObserver* encoder_timing);
+             EncodedFrameObserver* encoder_timing,
+             VideoEncoderConfig::ContentType content_type);
   ~ViEEncoder();
   // RegisterProcessThread register |module_process_thread| with those objects
   // that use it. Registration has to happen on the thread where
   // |module_process_thread| was created (libjingle's worker thread).
   // TODO(perkj): Replace the use of |module_process_thread| with a TaskQueue.
   void RegisterProcessThread(ProcessThread* module_process_thread);
   void DeRegisterProcessThread();
 
   // Sets the source that will provide I420 video frames.
   // |degradation_preference| control whether or not resolution or frame rate
@@ skipping 44 matching lines @@
  private:
   class ConfigureEncoderTask;
   class EncodeTask;
   class VideoSourceProxy;
 
   class VideoFrameInfo {
    public:
     VideoFrameInfo(int width,
                    int height,
                    VideoRotation rotation,
+                   VideoContentTypeId content_type,
                    bool is_texture)
         : width(width),
           height(height),
           rotation(rotation),
+          content_type_(content_type),
           is_texture(is_texture) {}
     int width;
     int height;
     VideoRotation rotation;
+    VideoContentTypeId content_type_;
     bool is_texture;
     int pixel_count() const { return width * height; }
   };
 
   void ConfigureEncoderOnTaskQueue(VideoEncoderConfig config,
                                    size_t max_data_payload_length,
                                    bool nack_enabled);
   void ReconfigureEncoder();
 
   void ConfigureQualityScaler();
@@ skipping 23 matching lines @@
   rtc::Event shutdown_event_;
 
   const uint32_t number_of_cores_;
   // Counts how many frames we've dropped in the initial rampup phase.
   int initial_rampup_;
 
   const std::unique_ptr<VideoSourceProxy> source_proxy_;
   EncoderSink* sink_;
   const VideoSendStream::Config::EncoderSettings settings_;
   const VideoCodecType codec_type_;
+  const VideoEncoderConfig::ContentType content_type_;
 
   vcm::VideoSender video_sender_ ACCESS_ON(&encoder_queue_);
   OveruseFrameDetector overuse_detector_ ACCESS_ON(&encoder_queue_);
   std::unique_ptr<QualityScaler> quality_scaler_ ACCESS_ON(&encoder_queue_);
 
   SendStatisticsProxy* const stats_proxy_;
   rtc::VideoSinkInterface<VideoFrame>* const pre_encode_callback_;
   ProcessThread* module_process_thread_;
   rtc::ThreadChecker module_process_thread_checker_;
   // |thread_checker_| checks that public methods that are related to lifetime
@@ skipping 54 matching lines @@
   // All public methods are proxied to |encoder_queue_|. It must must be
   // destroyed first to make sure no tasks are run that use other members.
   rtc::TaskQueue encoder_queue_;
 
   RTC_DISALLOW_COPY_AND_ASSIGN(ViEEncoder);
 };
 
 }  // namespace webrtc
 
 #endif  // WEBRTC_VIDEO_VIE_ENCODER_H_