RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-27 01:42:20 +00:00
Code Issues Projects Releases Wiki Activity

Merge commit 'e3c2d0f3d41f79f7be7ba944aaca2e287c7d5c7c'

Browse Source 
* commit 'e3c2d0f3d41f79f7be7ba944aaca2e287c7d5c7c':
  h264: Replace mpegvideo-specific MAX_THREADS by private define

Conflicts:
	libavcodec/h264.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-03-17 06:16:18 +01:00
commit bb3c0571d3
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

@ -1243,7 +1243,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;
@ -3342,12 +3342,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 36
#define H264_MAX_THREADS 32
#define MAX_SPS_COUNT 32
#define MAX_PPS_COUNT 256
@ -617,7 +618,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 initialize slice_num of each thread/context