commit 6979397bb84e938e2853e6ce048b3ff652cec02e
author Wan-Teh Chang <wtc@google.com> Tue Aug 25 17:04:12 2020 -0700
committer Wan-Teh Chang <wtc@google.com> Wed Aug 26 18:09:58 2020 +0000
tree 5901c5931c1262db3c56b97502938666be6e3e91
parent 85f88f85ec164d89a1494d2468c14f8fed2cbf90

Make is_obu_in_current_operating_point match spec

Make the is_obu_in_current_operating_point() function match the spec.
The corresponding part of the spec is the following in Section 5.3.1
(General OBU syntax):

    if ( obu_type != OBU_SEQUENCE_HEADER &&
        obu_type != OBU_TEMPORAL_DELIMITER &&
        OperatingPointIdc != 0 &&
        obu_extension_flag == 1 )
    {
        inTemporalLayer = (OperatingPointIdc >> temporal_id ) & 1
        inSpatialLayer = (OperatingPointIdc >> ( spatial_id + 8 ) ) & 1
        if ( !inTemporalLayer || ! inSpatialLayer ) {
            drop_obu( )
            return
        }
    }

Also pass obu_header to is_obu_in_current_operating_point() by reference
instead of by value.

BUG=aomedia:2794

Change-Id: Id4cb85fdc23eed6c1fb6c01b3bdf93cbecff4ceb

av1/decoder/obu.c

diff --git a/av1/decoder/obu.c b/av1/decoder/obu.c
index 161a33e..82ee3af 100644
--- a/av1/decoder/obu.c
+++ b/av1/decoder/obu.c
@@ -52,13 +52,13 @@
 }
 
 static int is_obu_in_current_operating_point(AV1Decoder *pbi,
-                                             ObuHeader obu_header) {
-  if (!pbi->current_operating_point) {
+                                             const ObuHeader *obu_header) {
+  if (!pbi->current_operating_point || !obu_header->has_extension) {
     return 1;
   }
 
-  if ((pbi->current_operating_point >> obu_header.temporal_layer_id) & 0x1 &&
-      (pbi->current_operating_point >> (obu_header.spatial_layer_id + 8)) &
+  if ((pbi->current_operating_point >> obu_header->temporal_layer_id) & 0x1 &&
+      (pbi->current_operating_point >> (obu_header->spatial_layer_id + 8)) &
           0x1) {
     return 1;
   }
@@ -902,10 +902,9 @@
     cm->spatial_layer_id = obu_header.spatial_layer_id;
 
     if (obu_header.type != OBU_TEMPORAL_DELIMITER &&
-        obu_header.type != OBU_SEQUENCE_HEADER &&
-        obu_header.type != OBU_PADDING) {
+        obu_header.type != OBU_SEQUENCE_HEADER) {
       // don't decode obu if it's not in current operating mode
-      if (!is_obu_in_current_operating_point(pbi, obu_header)) {
+      if (!is_obu_in_current_operating_point(pbi, &obu_header)) {
         data += payload_size;
         continue;
       }