media: Fix WebM keyframe detection in BlockGroup

media/filters/chunk_demuxer_unittest.cc

 // Copyright (c) 2012 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 "media/filters/chunk_demuxer.h"
 
 #include <stddef.h>
 #include <stdint.h>
 #include <algorithm>
 #include <utility>
@@ skipping 599 matching lines @@
 
       if (blocks[i].duration) {
         if (blocks[i].track_number == kVideoTrackNum ||
             blocks[i].track_number == kAlternateVideoTrackNum) {
           AddVideoBlockGroup(&cb,
                              blocks[i].track_number, blocks[i].timestamp_in_ms,
                              blocks[i].duration, blocks[i].flags);
         } else {
           cb.AddBlockGroup(blocks[i].track_number, blocks[i].timestamp_in_ms,
                            blocks[i].duration, blocks[i].flags,
-                           &data[0], data.size());
+                           blocks[i].flags & kWebMFlagKeyframe, &data[0],
+                           data.size());
         }
       } else {
         cb.AddSimpleBlock(blocks[i].track_number, blocks[i].timestamp_in_ms,
                           blocks[i].flags,
                           &data[0], data.size());
       }
     }
 
     return unknown_size ? cb.FinishWithUnknownSize() : cb.Finish();
   }
@@ skipping 372 matching lines @@
 
   void AddVideoBlockGroup(ClusterBuilder* cb,
                           int track_num,
                           int64_t timecode,
                           int duration,
                           int flags) {
     const uint8_t* data =
         (flags & kWebMFlagKeyframe) != 0 ? kVP8Keyframe : kVP8Interframe;
     int size = (flags & kWebMFlagKeyframe) != 0 ? sizeof(kVP8Keyframe) :
         sizeof(kVP8Interframe);
-    cb->AddBlockGroup(track_num, timecode, duration, flags, data, size);
+    cb->AddBlockGroup(track_num, timecode, duration, flags,
+                      flags & kWebMFlagKeyframe, data, size);
   }
 
   std::unique_ptr<Cluster> GenerateCluster(int first_audio_timecode,
                                            int first_video_timecode,
                                            int block_count) {
     return GenerateCluster(first_audio_timecode, first_video_timecode,
                            block_count, false);
   }
   std::unique_ptr<Cluster> GenerateCluster(int first_audio_timecode,
                                            int first_video_timecode,
@@ skipping 65 matching lines @@
       cb.AddSimpleBlock(track_number, timecode, kWebMFlagKeyframe,
                         &data[0], data.size());
       timecode += block_duration;
     }
 
     if (track_number == kVideoTrackNum) {
       AddVideoBlockGroup(&cb, track_number, timecode, block_duration,
                          kWebMFlagKeyframe);
     } else {
       cb.AddBlockGroup(track_number, timecode, block_duration,
-                       kWebMFlagKeyframe, &data[0], data.size());
+                       kWebMFlagKeyframe, static_cast<bool>(kWebMFlagKeyframe),
+                       &data[0], data.size());
     }
 
     return cb.Finish();
   }
 
   void Read(DemuxerStream::Type type, const DemuxerStream::ReadCB& read_cb) {
     demuxer_->GetStream(type)->Read(read_cb);
     message_loop_.RunUntilIdle();
   }
 
@@ skipping 3566 matching lines @@
              cluster->size() - video_start);
 
   CheckExpectedRanges(DemuxerStream::AUDIO, "{ [30,90) }");
   CheckExpectedRanges(DemuxerStream::VIDEO, "{ [0,91) }");
   CheckExpectedRanges("{ [30,90) }");
   CheckExpectedBuffers(audio_stream, "30K 40K 50K 60K 70K 80K");
   CheckExpectedBuffers(video_stream, "71K 81");
 }
 
 }  // namespace media