Move key frame flag from StreamParserBuffer to DecoderBuffer

media/filters/decrypting_demuxer_stream.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/decrypting_demuxer_stream.h"
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/location.h"
 #include "base/logging.h"
@@ skipping 223 matching lines @@
     state_ = kIdle;
     base::ResetAndReturn(&read_cb_).Run(status, buffer);
     return;
   }
 
   DCHECK(buffer->decrypt_config());
   // An empty iv string signals that the frame is unencrypted.
   if (buffer->decrypt_config()->iv().empty()) {
     DVLOG(2) << "DoDecryptBuffer() - clear buffer.";
     scoped_refptr<DecoderBuffer> decrypted = DecoderBuffer::CopyFrom(
-        buffer->data(), buffer->data_size());
+        buffer->data(), buffer->data_size(), buffer->is_keyframe());
     decrypted->set_timestamp(buffer->timestamp());
     decrypted->set_duration(buffer->duration());
     state_ = kIdle;
     base::ResetAndReturn(&read_cb_).Run(kOk, decrypted);
     return;
   }
 
   pending_buffer_to_decrypt_ = buffer;
   state_ = kPendingDecrypt;
   DecryptPendingBuffer();
@@ skipping 45 matching lines @@
       // The |state_| is still kPendingDecrypt.
       DecryptPendingBuffer();
       return;
     }
 
     state_ = kWaitingForKey;
     return;
   }
 
   DCHECK_EQ(status, Decryptor::kSuccess);
+
+  // Copy the keyframe flag from the encrypted to decrypted buffer, assuming
+  // that the decryptor initialized the flag to false.
+  if (pending_buffer_to_decrypt_->is_keyframe())
+    decrypted_buffer->set_is_keyframe(true);
+
   pending_buffer_to_decrypt_ = NULL;
   state_ = kIdle;
+
   base::ResetAndReturn(&read_cb_).Run(kOk, decrypted_buffer);
 }
 
 void DecryptingDemuxerStream::OnKeyAdded() {
   DCHECK(task_runner_->BelongsToCurrentThread());
 
   if (state_ == kPendingDecrypt) {
     key_added_while_decrypt_pending_ = true;
     return;
   }
@@ skipping 63 matching lines @@
       break;
     }
 
     default:
       NOTREACHED();
       return;
   }
 }
 
 }  // namespace media