H.264 packetization mode 0 (try 3)

webrtc/modules/video_coding/codecs/h264/h264_encoder_impl.h

Index: webrtc/modules/video_coding/codecs/h264/h264_encoder_impl.h
diff --git a/webrtc/modules/video_coding/codecs/h264/h264_encoder_impl.h b/webrtc/modules/video_coding/codecs/h264/h264_encoder_impl.h
index ca28eb325006bd3be6d427f7416c6bf2a3c61e3c..fe2ea1d9bfd4b0e8e053e9d6dcda2bae3b98ce58 100644
--- a/webrtc/modules/video_coding/codecs/h264/h264_encoder_impl.h
+++ b/webrtc/modules/video_coding/codecs/h264/h264_encoder_impl.h
@@ -27,7 +27,7 @@ namespace webrtc {
 
 class H264EncoderImpl : public H264Encoder {
  public:
-  H264EncoderImpl();
+  explicit H264EncoderImpl(const cricket::VideoCodec& codec);
   ~H264EncoderImpl() override;
 
   // |max_payload_size| is ignored.
@@ -39,7 +39,7 @@ class H264EncoderImpl : public H264Encoder {
   // - height
   int32_t InitEncode(const VideoCodec* codec_settings,
                      int32_t number_of_cores,
-                     size_t /*max_payload_size*/) override;
+                     size_t max_payload_size) override;
   int32_t Release() override;
 
   int32_t RegisterEncodeCompleteCallback(
@@ -60,6 +60,11 @@ class H264EncoderImpl : public H264Encoder {
   int32_t SetPeriodicKeyFrames(bool enable) override;
   void OnDroppedFrame() override;
 
+  // Exposed for testing.
+  H264PacketizationMode PacketizationModeForTesting() const {
+    return packetization_mode_;
+  }

[sprang_webrtc, 2016/12/01 16:58:57]

Can we get around this somehow?

[hta-webrtc, 2016/12/01 18:26:28]

We could expose PacketizationModeEqualsForTesting(mode) (returning
packetization_mode_ == mode), but I dont' see how it makes either the test or
the code more readable.

I don't like friend classes.

+
  private:
   bool IsInitialized() const;
   SEncParamExt CreateEncoderParams() const;
@@ -81,7 +86,9 @@ class H264EncoderImpl : public H264Encoder {
   // H.264 specifc parameters
   bool frame_dropping_on_;
   int key_frame_interval_;
+  H264PacketizationMode packetization_mode_;
 
+  size_t max_payload_size_;
   int32_t number_of_cores_;
 
   EncodedImage encoded_image_;