Revert of Add accelerated video decoder interface, VP8 and H.264 implementations and hook up to V4L2SVDA

media/filters/h264_parser.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 "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/stl_util.h"
 
 #include "media/base/decrypt_config.h"
 #include "media/filters/h264_parser.h"
@@ skipping 1067 matching lines @@
                                 shdr->chroma_log2_weight_denom,
                                 &shdr->pred_weight_table_l1);
     if (res != kOk)
       return res;
   }
 
   return kOk;
 }
 
 H264Parser::Result H264Parser::ParseDecRefPicMarking(H264SliceHeader* shdr) {
-  size_t bits_left_at_start = br_.NumBitsLeft();
-
   if (shdr->idr_pic_flag) {
     READ_BOOL_OR_RETURN(&shdr->no_output_of_prior_pics_flag);
     READ_BOOL_OR_RETURN(&shdr->long_term_reference_flag);
   } else {
     READ_BOOL_OR_RETURN(&shdr->adaptive_ref_pic_marking_mode_flag);
 
     H264DecRefPicMarking* marking;
     if (shdr->adaptive_ref_pic_marking_mode_flag) {
       size_t i;
       for (i = 0; i < arraysize(shdr->ref_pic_marking); ++i) {
@@ skipping 21 matching lines @@
           return kInvalidStream;
       }
 
       if (i == arraysize(shdr->ref_pic_marking)) {
         DVLOG(1) << "Ran out of dec ref pic marking fields";
         return kUnsupportedStream;
       }
     }
   }
 
-  shdr->dec_ref_pic_marking_bit_size = bits_left_at_start - br_.NumBitsLeft();
   return kOk;
 }
 
 H264Parser::Result H264Parser::ParseSliceHeader(const H264NALU& nalu,
                                                 H264SliceHeader* shdr) {
   // See 7.4.3.
   const H264SPS* sps;
   const H264PPS* pps;
   Result res;
 
@@ skipping 26 matching lines @@
     READ_BOOL_OR_RETURN(&shdr->field_pic_flag);
     if (shdr->field_pic_flag) {
       DVLOG(1) << "Interlaced streams not supported";
       return kUnsupportedStream;
     }
   }
 
   if (shdr->idr_pic_flag)
     READ_UE_OR_RETURN(&shdr->idr_pic_id);
 
-  size_t bits_left_at_pic_order_cnt_start = br_.NumBitsLeft();
   if (sps->pic_order_cnt_type == 0) {
     READ_BITS_OR_RETURN(sps->log2_max_pic_order_cnt_lsb_minus4 + 4,
                         &shdr->pic_order_cnt_lsb);
     if (pps->bottom_field_pic_order_in_frame_present_flag &&
         !shdr->field_pic_flag)
       READ_SE_OR_RETURN(&shdr->delta_pic_order_cnt_bottom);
   }
 
   if (sps->pic_order_cnt_type == 1 && !sps->delta_pic_order_always_zero_flag) {
-    READ_SE_OR_RETURN(&shdr->delta_pic_order_cnt0);
+    READ_SE_OR_RETURN(&shdr->delta_pic_order_cnt[0]);
     if (pps->bottom_field_pic_order_in_frame_present_flag &&
         !shdr->field_pic_flag)
-      READ_SE_OR_RETURN(&shdr->delta_pic_order_cnt1);
+      READ_SE_OR_RETURN(&shdr->delta_pic_order_cnt[1]);
   }
 
-  shdr->pic_order_cnt_bit_size =
-      bits_left_at_pic_order_cnt_start - br_.NumBitsLeft();
-
   if (pps->redundant_pic_cnt_present_flag) {
     READ_UE_OR_RETURN(&shdr->redundant_pic_cnt);
     TRUE_OR_RETURN(shdr->redundant_pic_cnt < 128);
   }
 
   if (shdr->IsBSlice())
     READ_BOOL_OR_RETURN(&shdr->direct_spatial_mv_pred_flag);
 
   if (shdr->IsPSlice() || shdr->IsSPSlice() || shdr->IsBSlice()) {
     READ_BOOL_OR_RETURN(&shdr->num_ref_idx_active_override_flag);
@@ skipping 109 matching lines @@
 
     default:
       DVLOG(4) << "Unsupported SEI message";
       break;
   }
 
   return kOk;
 }
 
 }  // namespace media