Mirrors/yuzu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #6146 from lat9nq/vp9_empty_memcpy

Browse source 
vp9: Avoid memcpy with null pointers
This commit is contained in:
bunnei 2021-04-06 21:57:43 -07:00 committed by GitHub
commit 068b2ffbcc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/video_core/command_classes/codecs/vp9.cpp
View file

@ -2,8 +2,9 @@
// Licensed under GPLv2 or any later version // Licensed under GPLv2 or any later version
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include <cstring> // for std::memcpy #include <algorithm> // for std::copy
#include <numeric> #include <numeric>
#include "common/assert.h"
#include "video_core/command_classes/codecs/vp9.h" #include "video_core/command_classes/codecs/vp9.h"
#include "video_core/gpu.h" #include "video_core/gpu.h"
#include "video_core/memory_manager.h" #include "video_core/memory_manager.h"
@ -362,7 +363,8 @@ Vp9PictureInfo VP9::GetVp9PictureInfo(const NvdecCommon::NvdecRegisters& state)
// surface_luma_offset[0:3] contains the address of the reference frame offsets in the following // surface_luma_offset[0:3] contains the address of the reference frame offsets in the following
// order: last, golden, altref, current. It may be worthwhile to track the updates done here // order: last, golden, altref, current. It may be worthwhile to track the updates done here
// to avoid buffering frame data needed for reference frame updating in the header composition. // to avoid buffering frame data needed for reference frame updating in the header composition.
std::memcpy(vp9_info.frame_offsets.data(), state.surface_luma_offset.data(), 4 * sizeof(u64)); std::copy(state.surface_luma_offset.begin(), state.surface_luma_offset.begin() + 4,
vp9_info.frame_offsets.begin());
return vp9_info; return vp9_info;
} }
@ -821,11 +823,11 @@ const std::vector<u8>& VP9::ComposeFrameHeader(const NvdecCommon::NvdecRegisters
// Write headers and frame to buffer // Write headers and frame to buffer
frame.resize(uncompressed_header.size() + compressed_header.size() + bitstream.size()); frame.resize(uncompressed_header.size() + compressed_header.size() + bitstream.size());
std::memcpy(frame.data(), uncompressed_header.data(), uncompressed_header.size()); std::copy(uncompressed_header.begin(), uncompressed_header.end(), frame.begin());
std::memcpy(frame.data() + uncompressed_header.size(), compressed_header.data(), std::copy(compressed_header.begin(), compressed_header.end(),
compressed_header.size()); frame.begin() + uncompressed_header.size());
std::memcpy(frame.data() + uncompressed_header.size() + compressed_header.size(), std::copy(bitstream.begin(), bitstream.end(),
bitstream.data(), bitstream.size()); frame.begin() + uncompressed_header.size() + compressed_header.size());
// keep track of frame number // keep track of frame number
current_frame_number++; current_frame_number++;