Remove VideoFrameFeedback from media::VideoFrame

Bug: chromium:1134073
Change-Id: I8caa32dcc0443519981e3f8206701c2649819385
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2529356
Auto-Submit: Ilya Nikolaevskiy <ilnik@chromium.org>
Commit-Queue: Dale Curtis <dalecurtis@chromium.org>
Reviewed-by: Dale Curtis <dalecurtis@chromium.org>
Cr-Commit-Position: refs/heads/master@{#825893}

media/base/video_frame.cc

@@ -1307,12 +1307,6 @@ VideoFrame::~VideoFrame() {
     std::move(mailbox_holders_release_cb_).Run(release_sync_token);
   }
 
-  // Someone might be monitoring original wrapped frame for feedback.
-  // Ensure all accumulated feedback is propagated to the original frame.
-  if (wrapped_frame_) {
-    wrapped_frame_->feedback()->Combine(feedback_);
-  }
-
   for (auto& callback : done_callbacks_)
     std::move(callback).Run();
 }

media/base/video_frame.h

@@ -27,7 +27,6 @@
 #include "build/build_config.h"
 #include "gpu/command_buffer/common/mailbox_holder.h"
 #include "gpu/ipc/common/vulkan_ycbcr_info.h"
-#include "media/base/video_frame_feedback.h"
 #include "media/base/video_frame_layout.h"
 #include "media/base/video_frame_metadata.h"
 #include "media/base/video_types.h"
@@ -568,9 +567,6 @@ class MEDIA_EXPORT VideoFrame : public base::RefCountedThreadSafe<VideoFrame> {
   // Resets |metadata_|.
   void clear_metadata() { set_metadata(VideoFrameMetadata()); }
 
-  const VideoFrameFeedback* feedback() const { return &feedback_; }
-  VideoFrameFeedback* feedback() { return &feedback_; }
-
   // The time span between the current frame and the first frame of the stream.
   // This is the media timestamp, and not the reference time.
   // See VideoFrameMetadata::REFERENCE_TIME for details.
@@ -724,8 +720,6 @@ class MEDIA_EXPORT VideoFrame : public base::RefCountedThreadSafe<VideoFrame> {
 
   VideoFrameMetadata metadata_;
 
-  VideoFrameFeedback feedback_;
-
   // Generated at construction time.
   const int unique_id_;
 

media/capture/video/video_capture_device.h

@@ -27,6 +27,7 @@
 #include "base/time/time.h"
 #include "build/build_config.h"
 #include "media/base/video_frame.h"
+#include "media/base/video_frame_feedback.h"
 #include "media/capture/capture_export.h"
 #include "media/capture/mojom/image_capture.mojom.h"
 #include "media/capture/video/video_capture_buffer_handle.h"