Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(55)

Side by Side Diff: content/common/gpu/media/h264_parser.cc

Issue 10837058: Make H264BitReader ignore trailing zero bytes and stop bit. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Address CR comments. Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/common/gpu/media/h264_parser.h" 5 #include "content/common/gpu/media/h264_parser.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "base/stl_util.h" 9 #include "base/stl_util.h"
10 10
(...skipping 706 matching lines...) Expand 10 before | Expand all | Expand 10 after
717 IN_RANGE_OR_RETURN(pps->pic_init_qs_minus26, -26, 25); 717 IN_RANGE_OR_RETURN(pps->pic_init_qs_minus26, -26, 25);
718 718
719 READ_SE_OR_RETURN(&pps->chroma_qp_index_offset); 719 READ_SE_OR_RETURN(&pps->chroma_qp_index_offset);
720 IN_RANGE_OR_RETURN(pps->chroma_qp_index_offset, -12, 12); 720 IN_RANGE_OR_RETURN(pps->chroma_qp_index_offset, -12, 12);
721 pps->second_chroma_qp_index_offset = pps->chroma_qp_index_offset; 721 pps->second_chroma_qp_index_offset = pps->chroma_qp_index_offset;
722 722
723 READ_BOOL_OR_RETURN(&pps->deblocking_filter_control_present_flag); 723 READ_BOOL_OR_RETURN(&pps->deblocking_filter_control_present_flag);
724 READ_BOOL_OR_RETURN(&pps->constrained_intra_pred_flag); 724 READ_BOOL_OR_RETURN(&pps->constrained_intra_pred_flag);
725 READ_BOOL_OR_RETURN(&pps->redundant_pic_cnt_present_flag); 725 READ_BOOL_OR_RETURN(&pps->redundant_pic_cnt_present_flag);
726 726
727 if (br_.HasMoreRBSPData()) { 727 int temp;
728 READ_BOOL_OR_RETURN(&pps->transform_8x8_mode_flag); 728 if (br_.ReadBits(1, &temp)) {
729 pps->transform_8x8_mode_flag = temp != 0;
Ami GONE FROM CHROMIUM 2012/08/02 19:49:48 !=0 unnecessary
xiaomings 2012/08/03 00:37:58 Done.
729 READ_BOOL_OR_RETURN(&pps->pic_scaling_matrix_present_flag); 730 READ_BOOL_OR_RETURN(&pps->pic_scaling_matrix_present_flag);
730 731
731 if (pps->pic_scaling_matrix_present_flag) { 732 if (pps->pic_scaling_matrix_present_flag) {
732 DVLOG(4) << "Picture scaling matrix present"; 733 DVLOG(4) << "Picture scaling matrix present";
733 res = ParsePPSScalingLists(*sps, pps.get()); 734 res = ParsePPSScalingLists(*sps, pps.get());
734 if (res != kOk) 735 if (res != kOk)
735 return res; 736 return res;
736 } 737 }
737 738
738 READ_SE_OR_RETURN(&pps->second_chroma_qp_index_offset); 739 READ_SE_OR_RETURN(&pps->second_chroma_qp_index_offset);
(...skipping 376 matching lines...) Expand 10 before | Expand all | Expand 10 after
1115 1116
1116 default: 1117 default:
1117 DVLOG(4) << "Unsupported SEI message"; 1118 DVLOG(4) << "Unsupported SEI message";
1118 break; 1119 break;
1119 } 1120 }
1120 1121
1121 return kOk; 1122 return kOk;
1122 } 1123 }
1123 1124
1124 } // namespace content 1125 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698