VAAPI VDA H264 Encoder: explicitly set max_num_reorder_frames to 0 in VUI.

content/common/gpu/media/vaapi_video_encode_accelerator.cc

Index: content/common/gpu/media/vaapi_video_encode_accelerator.cc
diff --git a/content/common/gpu/media/vaapi_video_encode_accelerator.cc b/content/common/gpu/media/vaapi_video_encode_accelerator.cc
index 2e98298fd9b2ee8d21083053907d1c50c4224f54..98f04c47e8df23b31e64fae05a14e61bc2ca890d 100644
--- a/content/common/gpu/media/vaapi_video_encode_accelerator.cc
+++ b/content/common/gpu/media/vaapi_video_encode_accelerator.cc
@@ -972,7 +972,22 @@ void VaapiVideoEncodeAccelerator::GeneratePackedSPS() {
       packed_sps_.AppendBool(current_sps_.low_delay_hrd_flag);
 
     packed_sps_.AppendBool(false);  // pic_struct_present_flag
-    packed_sps_.AppendBool(false);  // bitstream_restriction_flag
+    packed_sps_.AppendBool(true);   // bitstream_restriction_flag
+
+    packed_sps_.AppendBool(false);  // motion_vectors_over_pic_boundaries_flag
+    packed_sps_.AppendUE(0);        // max_bytes_per_pic_denom
+    packed_sps_.AppendUE(0);        // max_bits_per_mb_denom

[Pawel Osciak, 2015/01/13 13:59:44]

I think we probably want to say 2 and 1, respectively, for denoms.
Otherwise we divide by zero. And 2 and 1 seem to be the defaults per spec...

[hshi1, 2015/01/13 18:50:19]

Done.

+    packed_sps_.AppendUE(16);       // log2_max_mv_length_horizontal
+    packed_sps_.AppendUE(16);       // log2_max_mv_length_vertical
+
+    // Disable frame reordering.
+    packed_sps_.AppendUE(0);        // max_num_reorder_frames
+
+    // The value of max_dec_frame_buffering shall be greater than or equal to
+    // max_num_ref_frames.
+    const unsigned int max_dec_frame_buffering =
+        current_sps_.max_num_ref_frames;
+    packed_sps_.AppendUE(max_dec_frame_buffering);
   }
 
   packed_sps_.FinishNALU();