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

Unified Diff: media/filters/h264_parser.cc

Issue 2702973002: h264_parser: Swap the fallback rule A & B for pic scaling matrix. (Closed)
Patch Set: Created 3 years, 10 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/h264_parser.cc
diff --git a/media/filters/h264_parser.cc b/media/filters/h264_parser.cc
index 052f441d258bc77a38f9e313ceb84bcffd5e584c..a037c98e1c5bf346182353c4678e726ddb306027 100644
--- a/media/filters/h264_parser.cc
+++ b/media/filters/h264_parser.cc
@@ -739,7 +739,7 @@ H264Parser::Result H264Parser::ParsePPSScalingLists(const H264SPS& sps,
DefaultScalingList4x4(i, pps->scaling_list4x4);
} else {
- if (sps.seq_scaling_matrix_present_flag) {
+ if (!sps.seq_scaling_matrix_present_flag) {
// Table 7-2 fallback rule A in spec.
FallbackScalingList4x4(
i, kDefault4x4Intra, kDefault4x4Inter, pps->scaling_list4x4);
@@ -768,7 +768,7 @@ H264Parser::Result H264Parser::ParsePPSScalingLists(const H264SPS& sps,
DefaultScalingList8x8(i, pps->scaling_list8x8);
} else {
- if (sps.seq_scaling_matrix_present_flag) {
+ if (!sps.seq_scaling_matrix_present_flag) {
// Table 7-2 fallback rule A in spec.
FallbackScalingList8x8(
i, kDefault8x8Intra, kDefault8x8Inter, pps->scaling_list8x8);
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698