virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Code Issues Releases Activity

h264: Replace mpegvideo-specific MAX_THREADS by private define

Browse Source
This commit is contained in:
Vittorio Giovara 2014-02-28 13:21:59 +01:00
parent 5d1c2e53ab
commit e3c2d0f3d4
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/h264.c
View File

@ -1195,7 +1195,7 @@ static void free_tables(H264Context *h, int free_rbsp)
h->cur_pic_ptr = NULL;
for (i = 0; i < MAX_THREADS; i++) {
for (i = 0; i < H264_MAX_THREADS; i++) {
hx = h->thread_context[i];
if (!hx)
continue;
@ -3224,12 +3224,12 @@ static int h264_slice_header_init(H264Context *h, int reinit)
return ret;
}
if (nb_slices > MAX_THREADS || (nb_slices > h->mb_height && h->mb_height)) {
if (nb_slices > H264_MAX_THREADS || (nb_slices > h->mb_height && h->mb_height)) {
int max_slices;
if (h->mb_height)
max_slices = FFMIN(MAX_THREADS, h->mb_height);
max_slices = FFMIN(H264_MAX_THREADS, h->mb_height);
else
max_slices = MAX_THREADS;
max_slices = H264_MAX_THREADS;
av_log(h->avctx, AV_LOG_WARNING, "too many threads/slices %d,"
" reducing to %d\n", nb_slices, max_slices);
nb_slices = max_slices;

3
libavcodec/h264.h
View File

@ -40,6 +40,7 @@
#include "rectangle.h"
#define H264_MAX_PICTURE_COUNT 32
#define H264_MAX_THREADS 16
#define MAX_SPS_COUNT 32
#define MAX_PPS_COUNT 256
@ -580,7 +581,7 @@ typedef struct H264Context {
* @name Members for slice based multithreading
* @{
*/
struct H264Context *thread_context[MAX_THREADS];
struct H264Context *thread_context[H264_MAX_THREADS];
/**
* current slice number, used to initalize slice_num of each thread/context