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

content/common/gpu/media/vaapi_video_encode_accelerator.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/common/gpu/media/vaapi_video_encode_accelerator.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/message_loop/message_loop_proxy.h"
@@ skipping 954 matching lines @@
       packed_sps_.AppendBits(5, current_sps_.cpb_removal_delay_length_minus1);
       packed_sps_.AppendBits(5, current_sps_.dpb_output_delay_length_minus1);
       packed_sps_.AppendBits(5, current_sps_.time_offset_length);
     }
 
     packed_sps_.AppendBool(false);  // vcl_hrd_parameters_flag
     if (current_sps_.nal_hrd_parameters_present_flag)
       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

[Pawel Osciak, 2015/01/14 02:04:33]

Nit: per coding style "end-of-line comments should be separated from the code by
2 spaces."

[hshi1, 2015/01/14 02:27:55]

Done.

+
+    packed_sps_.AppendBool(false);  // motion_vectors_over_pic_boundaries_flag
+    packed_sps_.AppendUE(2);        // max_bytes_per_pic_denom
+    packed_sps_.AppendUE(1);        // max_bits_per_mb_denom
+    packed_sps_.AppendUE(16);       // log2_max_mv_length_horizontal
+    packed_sps_.AppendUE(16);       // log2_max_mv_length_vertical
+
+    // Disable frame reordering.

[Pawel Osciak, 2015/01/14 02:04:33]

Nit: this does not disable frame reordering. We "disable" reordering by actually
not doing frame reordering in the encoding process in this whole class. Flipping
this flag would not enable it.

Please update the comment to say so.

[hshi1, 2015/01/14 02:27:55]

Done.

+    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();
 }
 
 void VaapiVideoEncodeAccelerator::UpdatePPS() {
   memset(&current_pps_, 0, sizeof(media::H264PPS));
 
   current_pps_.seq_parameter_set_id = current_sps_.seq_parameter_set_id;
   current_pps_.pic_parameter_set_id = 0;
@@ skipping 78 matching lines @@
 }
 
 VaapiVideoEncodeAccelerator::EncodeJob::EncodeJob()
     : coded_buffer(VA_INVALID_ID), keyframe(false) {
 }
 
 VaapiVideoEncodeAccelerator::EncodeJob::~EncodeJob() {
 }
 
 }  // namespace content