summaryrefslogtreecommitdiff
path: root/chromium/media/base/video_frame.h
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2020-10-12 14:27:29 +0200
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2020-10-13 09:35:20 +0000
commitc30a6232df03e1efbd9f3b226777b07e087a1122 (patch)
treee992f45784689f373bcc38d1b79a239ebe17ee23 /chromium/media/base/video_frame.h
parent7b5b123ac58f58ffde0f4f6e488bcd09aa4decd3 (diff)
downloadqtwebengine-chromium-85-based.tar.gz
BASELINE: Update Chromium to 85.0.4183.14085-based
Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/media/base/video_frame.h')
-rw-r--r--chromium/media/base/video_frame.h10
1 files changed, 9 insertions, 1 deletions
diff --git a/chromium/media/base/video_frame.h b/chromium/media/base/video_frame.h
index 271fcdf19fd..51515be694a 100644
--- a/chromium/media/base/video_frame.h
+++ b/chromium/media/base/video_frame.h
@@ -14,8 +14,8 @@
#include <vector>
#include "base/callback.h"
+#include "base/check_op.h"
#include "base/hash/md5.h"
-#include "base/logging.h"
#include "base/macros.h"
#include "base/memory/aligned_memory.h"
#include "base/memory/ref_counted.h"
@@ -535,8 +535,16 @@ class MEDIA_EXPORT VideoFrame : public base::RefCountedThreadSafe<VideoFrame> {
//
// TODO(miu): Move some of the "extra" members of VideoFrame (below) into
// here as a later clean-up step.
+ //
+ // TODO(https://crbug.com/1096727): change the return type to const&.
const VideoFrameMetadata* metadata() const { return &metadata_; }
VideoFrameMetadata* metadata() { return &metadata_; }
+ void set_metadata(const VideoFrameMetadata& metadata) {
+ metadata_ = metadata;
+ }
+
+ // Resets |metadata_|.
+ void clear_metadata() { set_metadata(VideoFrameMetadata()); }
// The time span between the current frame and the first frame of the stream.
// This is the media timestamp, and not the reference time.