From c9e3abe2060760d71c83a1574559b6e479e637d2 Mon Sep 17 00:00:00 2001
From: ameerj <aj662@drexel.edu>
Date: Thu, 26 Nov 2020 00:18:26 -0500
Subject: Address PR feedback

remove some redundant moves, make deleter match naming guidelines.

Co-Authored-By: LC <712067+lioncash@users.noreply.github.com>
---
 src/video_core/command_classes/codecs/codec.cpp | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'src/video_core/command_classes/codecs/codec.cpp')

diff --git a/src/video_core/command_classes/codecs/codec.cpp b/src/video_core/command_classes/codecs/codec.cpp
index 1a19341c8..412e1e41c 100644
--- a/src/video_core/command_classes/codecs/codec.cpp
+++ b/src/video_core/command_classes/codecs/codec.cpp
@@ -18,7 +18,7 @@ extern "C" {
 
 namespace Tegra {
 
-void av_frame_deleter(AVFrame* ptr) {
+void AVFrameDeleter(AVFrame* ptr) {
     av_frame_unref(ptr);
     av_free(ptr);
 }
@@ -101,7 +101,7 @@ void Codec::Decode() {
 
     if (!vp9_hidden_frame) {
         // Only receive/store visible frames
-        AVFramePtr frame = AVFramePtr{av_frame_alloc(), av_frame_deleter};
+        AVFramePtr frame = AVFramePtr{av_frame_alloc(), AVFrameDeleter};
         avcodec_receive_frame(av_codec_ctx, frame.get());
         av_frames.push(std::move(frame));
     }
@@ -110,12 +110,13 @@ void Codec::Decode() {
 AVFramePtr Codec::GetCurrentFrame() {
     // Sometimes VIC will request more frames than have been decoded.
     // in this case, return a nullptr and don't overwrite previous frame data
-    if (av_frames.size() > 0) {
-        AVFramePtr frame = std::move(av_frames.front());
-        av_frames.pop();
-        return frame;
+    if (av_frames.empty()) {
+        return AVFramePtr{nullptr, AVFrameDeleter};
     }
-    return AVFramePtr{nullptr, av_frame_deleter};
+
+    AVFramePtr frame = std::move(av_frames.front());
+    av_frames.pop();
+    return frame;
 }
 
 NvdecCommon::VideoCodec Codec::GetCurrentCodec() const {
-- 
cgit v1.2.3