summaryrefslogtreecommitdiff
path: root/chromium/media/capture/video/chromeos/video_capture_jpeg_decoder_impl.h
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/media/capture/video/chromeos/video_capture_jpeg_decoder_impl.h')
-rw-r--r--chromium/media/capture/video/chromeos/video_capture_jpeg_decoder_impl.h9
1 files changed, 3 insertions, 6 deletions
diff --git a/chromium/media/capture/video/chromeos/video_capture_jpeg_decoder_impl.h b/chromium/media/capture/video/chromeos/video_capture_jpeg_decoder_impl.h
index 7bb0296b25a..fbc3a41d95e 100644
--- a/chromium/media/capture/video/chromeos/video_capture_jpeg_decoder_impl.h
+++ b/chromium/media/capture/video/chromeos/video_capture_jpeg_decoder_impl.h
@@ -87,11 +87,10 @@ class CAPTURE_EXPORT VideoCaptureJpegDecoderImpl
const base::RepeatingCallback<void(const std::string&)> send_log_message_cb_;
bool has_received_decoded_frame_;
- // Guards |decode_done_closure_| and |decoder_status_|.
- mutable base::Lock lock_;
-
// The closure of |decode_done_cb_| with bound parameters.
- base::OnceClosure decode_done_closure_;
+ mutable base::Lock lock_;
+ STATUS decoder_status_ GUARDED_BY(lock_);
+ base::OnceClosure decode_done_closure_ GUARDED_BY(lock_);
// Next id for input BitstreamBuffer.
int32_t next_task_id_;
@@ -104,8 +103,6 @@ class CAPTURE_EXPORT VideoCaptureJpegDecoderImpl
base::UnsafeSharedMemoryRegion in_shared_region_;
base::WritableSharedMemoryMapping in_shared_mapping_;
- STATUS decoder_status_;
-
SEQUENCE_CHECKER(sequence_checker_);
base::WeakPtrFactory<VideoCaptureJpegDecoderImpl> weak_ptr_factory_{this};