Added FrameDecryptorInterface::Result constructor and IsOk() member function.
Bug: webrtc:10512
Change-Id: I48bdaad57739382b5c1040d94f4e3657e2054e4b
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/131364
Reviewed-by: Steve Anton <steveanton@webrtc.org>
Commit-Queue: Benjamin Wright <benwright@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#27475}
diff --git a/api/crypto/frame_decryptor_interface.h b/api/crypto/frame_decryptor_interface.h
index 84fc615..69f1375 100644
--- a/api/crypto/frame_decryptor_interface.h
+++ b/api/crypto/frame_decryptor_interface.h
@@ -38,8 +38,13 @@
enum class Status { kOk, kRecoverable, kFailedToDecrypt };
struct Result {
- Status status;
- size_t bytes_written;
+ Result(Status status, size_t bytes_written)
+ : status(status), bytes_written(bytes_written) {}
+
+ bool IsOk() const { return status == Status::kOk; }
+
+ const Status status;
+ const size_t bytes_written;
};
~FrameDecryptorInterface() override {}
@@ -73,14 +78,8 @@
size_t bytes_written = 0;
const int status = Decrypt(media_type, csrcs, additional_data,
encrypted_frame, frame, &bytes_written);
- Result decryption_result;
- decryption_result.bytes_written = bytes_written;
- if (status == 0) {
- decryption_result.status = Status::kOk;
- } else {
- decryption_result.status = Status::kFailedToDecrypt;
- }
- return decryption_result;
+ return Result(status == 0 ? Status::kOk : Status::kFailedToDecrypt,
+ bytes_written);
}
// Returns the total required length in bytes for the output of the