scottk/UltraGrid
1
0
Fork 0
mirror of https://github.com/outbackdingo/UltraGrid.git synced 2026-03-21 11:40:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

video_decoders: use PADDING not MAX_PADDING

Browse Source 
But set the padding as the maximum of AV_INPUT_BUFFER_PADDING_SIZE
(if there is include) and MAX_PADDING (both are currently 64).

Use __has_include() instead of HAVE_LIBAVCODEC_H.
This commit is contained in:
Martin Pulec
2024-09-23 08:56:50 +02:00
parent d794c28b2d
commit 36d5affe8e
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/rtp/video_decoders.cpp
View File

@@ -135,8 +135,11 @@
#include <sstream>
#include <thread>
#ifdef HAVE_LIBAVCODEC_AVCODEC_H
#if __has_include(<libavcodec/avcodec.h>)
#include <libavcodec/avcodec.h> // AV_INPUT_BUFFER_PADDING_SIZE
constexpr int PADDING = max<int>(MAX_PADDING, AV_INPUT_BUFFER_PADDING_SIZE);
#else
constexpr int PADDING = MAX_PADDING;
#endif
#define MOD_NAME "[video dec.] "
@@ -177,12 +180,6 @@ static int sum_map(map<int, int> const & m) {
}
namespace {
#ifdef HAVE_LIBAVCODEC_AVCODEC_H
constexpr int PADDING = AV_INPUT_BUFFER_PADDING_SIZE;
#else
constexpr int PADDING = 0;
#endif
/**
* Enumerates 2 possibilities how to decode arriving data.
*/
@@ -630,7 +627,7 @@ static void *decompress_thread(void *args) {
unique_ptr<char[]> tmp;
if (decoder->out_codec == VIDEO_CODEC_END) {
tmp = unique_ptr<char[]>(new char[tile_height * (tile_width * MAX_BPS + MAX_PADDING)]);
tmp = unique_ptr<char[]>(new char[tile_height * (tile_width * MAX_BPS + PADDING)]);
}
if(decoder->decoder_type == EXTERNAL_DECODER) {