Modifying video_frame.cc to copy all metadata values, instead of only END_OF_STREAM, and updating u…

media/base/video_frame_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/base/video_frame.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include "base/bind.h"
@@ skipping 211 matching lines @@
 
 static void FrameNoLongerNeededCallback(
     const scoped_refptr<media::VideoFrame>& frame,
     bool* triggered) {
   *triggered = true;
 }
 
 TEST(VideoFrame, WrapVideoFrame) {
   const int kWidth = 4;
   const int kHeight = 4;
+  const base::TimeDelta kFrameDuration = base::TimeDelta::FromMicroseconds(42);
+
   scoped_refptr<media::VideoFrame> frame;
   bool done_callback_was_run = false;
   {
     scoped_refptr<media::VideoFrame> wrapped_frame =
         VideoFrame::CreateBlackFrame(gfx::Size(kWidth, kHeight));
     ASSERT_TRUE(wrapped_frame.get());
 
     gfx::Rect visible_rect(1, 1, 1, 1);
     gfx::Size natural_size = visible_rect.size();
-    frame = media::VideoFrame::WrapVideoFrame(
-        wrapped_frame, visible_rect, natural_size);
-    frame->AddDestructionObserver(
-        base::Bind(&FrameNoLongerNeededCallback, wrapped_frame,
-                   &done_callback_was_run));
+    wrapped_frame->metadata()->SetTimeDelta(
+        media::VideoFrameMetadata::FRAME_DURATION, kFrameDuration);
+    frame = media::VideoFrame::WrapVideoFrame(wrapped_frame, visible_rect,
+                                              natural_size);
+    frame->AddDestructionObserver(base::Bind(
+        &FrameNoLongerNeededCallback, wrapped_frame, &done_callback_was_run));
+
     EXPECT_EQ(wrapped_frame->coded_size(), frame->coded_size());
     EXPECT_EQ(wrapped_frame->data(media::VideoFrame::kYPlane),
               frame->data(media::VideoFrame::kYPlane));
     EXPECT_NE(wrapped_frame->visible_rect(), frame->visible_rect());
     EXPECT_EQ(visible_rect, frame->visible_rect());
     EXPECT_NE(wrapped_frame->natural_size(), frame->natural_size());
     EXPECT_EQ(natural_size, frame->natural_size());
+
+    // Verify metada was copied to the wrapped frame

[watk, 2016/03/02 21:25:16]

s/metada/metadata

Full stop.

[tguilbert, 2016/03/03 21:42:04]

Done.

+    base::TimeDelta frame_duration;
+    bool frame_has_duration = frame->metadata()->GetTimeDelta(
+        media::VideoFrameMetadata::FRAME_DURATION, &frame_duration);
+
+    EXPECT_TRUE(frame_has_duration);
+    if (frame_has_duration) {

[watk, 2016/03/02 21:25:16]

No need to handle !frame_has_duration because that's a test failure anyway. You
could change l.260 to ASSERT_TRUE to abort the test if the metadata isn't there:

ASSERT_TRUE(frame->metadata()->GetTimeDelta(
            media::VideoFrameMetadata::FRAME_DURATION, &frame_duration);

[tguilbert, 2016/03/03 21:42:04]

Good to know, thank you for the tip.

+      EXPECT_EQ(frame_duration, kFrameDuration);
+
+      // Verify the metadata copy was a deep copy

[watk, 2016/03/02 21:25:16]

Full stop.

[tguilbert, 2016/03/03 21:42:04]

Done.

+      wrapped_frame->metadata()->Clear();
+      EXPECT_NE(
+          wrapped_frame->metadata()->HasKey(
+              media::VideoFrameMetadata::FRAME_DURATION),
+          frame->metadata()->HasKey(media::VideoFrameMetadata::FRAME_DURATION));
+    }
   }
 
   EXPECT_FALSE(done_callback_was_run);
   frame = NULL;
   EXPECT_TRUE(done_callback_was_run);
 }
 
 // Ensure each frame is properly sized and allocated.  Will trigger OOB reads
 // and writes as well as incorrect frame hashes otherwise.
 TEST(VideoFrame, CheckFrameExtents) {
@@ skipping 226 matching lines @@
 
   for (int i = 0; i < VideoFrameMetadata::NUM_KEYS; ++i) {
     const VideoFrameMetadata::Key key = static_cast<VideoFrameMetadata::Key>(i);
     int value = -1;
     EXPECT_TRUE(result.GetInteger(key, &value));
     EXPECT_EQ(i, value);
   }
 }
 
 }  // namespace media