virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-08 13:22:53 +02:00
Code Issues Releases Activity

Merge commit '3fd22538bc0e0de84b31335266b4b1577d3d609e'

Browse Source 
* commit '3fd22538bc0e0de84b31335266b4b1577d3d609e':
  prores: Change type of stride parameters to ptrdiff_t

Merged-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2017-03-19 15:30:13 -03:00
commit 663640d745
5 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/proresdsp.c
View File

@ -36,11 +36,11 @@
/** /**
* Add bias value, clamp and output pixels of a slice * Add bias value, clamp and output pixels of a slice
*/ */
static void put_pixels(uint16_t *dst, int stride, const int16_t *in) static void put_pixels(uint16_t *dst, ptrdiff_t linesize, const int16_t *in)
{ {
int x, y, src_offset, dst_offset; int x, y, src_offset, dst_offset;
for (y = 0, dst_offset = 0; y < 8; y++, dst_offset += stride) { for (y = 0, dst_offset = 0; y < 8; y++, dst_offset += linesize) {
for (x = 0; x < 8; x++) { for (x = 0; x < 8; x++) {
src_offset = (y << 3) + x; src_offset = (y << 3) + x;
@ -49,7 +49,7 @@ static void put_pixels(uint16_t *dst, int stride, const int16_t *in)
} }
} }
static void prores_idct_put_c(uint16_t *out, int linesize, int16_t *block, const int16_t *qmat) static void prores_idct_put_c(uint16_t *out, ptrdiff_t linesize, int16_t *block, const int16_t *qmat)
{ {
ff_prores_idct(block, qmat); ff_prores_idct(block, qmat);
put_pixels(out, linesize >> 1, block); put_pixels(out, linesize >> 1, block);

3
libavcodec/proresdsp.h
View File

@ -23,6 +23,7 @@
#ifndef AVCODEC_PRORESDSP_H #ifndef AVCODEC_PRORESDSP_H
#define AVCODEC_PRORESDSP_H #define AVCODEC_PRORESDSP_H
#include <stddef.h>
#include <stdint.h> #include <stdint.h>
#include "avcodec.h" #include "avcodec.h"
@ -31,7 +32,7 @@
typedef struct ProresDSPContext { typedef struct ProresDSPContext {
int idct_permutation_type; int idct_permutation_type;
uint8_t idct_permutation[64]; uint8_t idct_permutation[64];
void (* idct_put) (uint16_t *out, int linesize, int16_t *block, const int16_t *qmat); void (*idct_put)(uint16_t *out, ptrdiff_t linesize, int16_t *block, const int16_t *qmat);
} ProresDSPContext; } ProresDSPContext;
void ff_proresdsp_init(ProresDSPContext *dsp, AVCodecContext *avctx); void ff_proresdsp_init(ProresDSPContext *dsp, AVCodecContext *avctx);

19
libavcodec/proresenc_kostya.c
View File

@ -196,7 +196,7 @@ typedef struct ProresContext {
const uint8_t *scantable; const uint8_t *scantable;
void (*fdct)(FDCTDSPContext *fdsp, const uint16_t *src, void (*fdct)(FDCTDSPContext *fdsp, const uint16_t *src,
int linesize, int16_t *block); ptrdiff_t linesize, int16_t *block);
FDCTDSPContext fdsp; FDCTDSPContext fdsp;
const AVFrame *pic; const AVFrame *pic;
@ -227,13 +227,13 @@ typedef struct ProresContext {
} ProresContext; } ProresContext;
static void get_slice_data(ProresContext *ctx, const uint16_t *src, static void get_slice_data(ProresContext *ctx, const uint16_t *src,
int linesize, int x, int y, int w, int h, ptrdiff_t linesize, int x, int y, int w, int h,
int16_t *blocks, uint16_t *emu_buf, int16_t *blocks, uint16_t *emu_buf,
int mbs_per_slice, int blocks_per_mb, int is_chroma) int mbs_per_slice, int blocks_per_mb, int is_chroma)
{ {
const uint16_t *esrc; const uint16_t *esrc;
const int mb_width = 4 * blocks_per_mb; const int mb_width = 4 * blocks_per_mb;
int elinesize; ptrdiff_t elinesize;
int i, j, k; int i, j, k;
for (i = 0; i < mbs_per_slice; i++, src += mb_width) { for (i = 0; i < mbs_per_slice; i++, src += mb_width) {
@ -298,7 +298,7 @@ static void get_slice_data(ProresContext *ctx, const uint16_t *src,
} }
static void get_alpha_data(ProresContext *ctx, const uint16_t *src, static void get_alpha_data(ProresContext *ctx, const uint16_t *src,
int linesize, int x, int y, int w, int h, ptrdiff_t linesize, int x, int y, int w, int h,
int16_t *blocks, int mbs_per_slice, int abits) int16_t *blocks, int mbs_per_slice, int abits)
{ {
const int slice_width = 16 * mbs_per_slice; const int slice_width = 16 * mbs_per_slice;
@ -421,7 +421,7 @@ static void encode_acs(PutBitContext *pb, int16_t *blocks,
} }
static int encode_slice_plane(ProresContext *ctx, PutBitContext *pb, static int encode_slice_plane(ProresContext *ctx, PutBitContext *pb,
const uint16_t *src, int linesize, const uint16_t *src, ptrdiff_t linesize,
int mbs_per_slice, int16_t *blocks, int mbs_per_slice, int16_t *blocks,
int blocks_per_mb, int plane_size_factor, int blocks_per_mb, int plane_size_factor,
const int16_t *qmat) const int16_t *qmat)
@ -514,7 +514,8 @@ static int encode_slice(AVCodecContext *avctx, const AVFrame *pic,
int total_size = 0; int total_size = 0;
const uint16_t *src; const uint16_t *src;
int slice_width_factor = av_log2(mbs_per_slice); int slice_width_factor = av_log2(mbs_per_slice);
int num_cblocks, pwidth, linesize, line_add; int num_cblocks, pwidth, line_add;
ptrdiff_t linesize;
int plane_factor, is_chroma; int plane_factor, is_chroma;
uint16_t *qmat; uint16_t *qmat;
@ -670,7 +671,7 @@ static int estimate_acs(int *error, int16_t *blocks, int blocks_per_slice,
} }
static int estimate_slice_plane(ProresContext *ctx, int *error, int plane, static int estimate_slice_plane(ProresContext *ctx, int *error, int plane,
const uint16_t *src, int linesize, const uint16_t *src, ptrdiff_t linesize,
int mbs_per_slice, int mbs_per_slice,
int blocks_per_mb, int plane_size_factor, int blocks_per_mb, int plane_size_factor,
const int16_t *qmat, ProresThreadData *td) const int16_t *qmat, ProresThreadData *td)
@ -703,7 +704,7 @@ static int est_alpha_diff(int cur, int prev, int abits)
} }
static int estimate_alpha_plane(ProresContext *ctx, int *error, static int estimate_alpha_plane(ProresContext *ctx, int *error,
const uint16_t *src, int linesize, const uint16_t *src, ptrdiff_t linesize,
int mbs_per_slice, int quant, int mbs_per_slice, int quant,
int16_t *blocks) int16_t *blocks)
{ {
@ -1103,7 +1104,7 @@ static av_cold int encode_close(AVCodecContext *avctx)
} }
static void prores_fdct(FDCTDSPContext *fdsp, const uint16_t *src, static void prores_fdct(FDCTDSPContext *fdsp, const uint16_t *src,
int linesize, int16_t *block) ptrdiff_t linesize, int16_t *block)
{ {
int x, y; int x, y;
const uint16_t *tsrc = src; const uint16_t *tsrc = src;

4
libavcodec/x86/proresdsp_init.c
View File

@ -25,9 +25,9 @@
#include "libavcodec/idctdsp.h" #include "libavcodec/idctdsp.h"
#include "libavcodec/proresdsp.h" #include "libavcodec/proresdsp.h"
void ff_prores_idct_put_10_sse2(uint16_t *dst, int linesize, void ff_prores_idct_put_10_sse2(uint16_t *dst, ptrdiff_t linesize,
int16_t *block, const int16_t *qmat); int16_t *block, const int16_t *qmat);
void ff_prores_idct_put_10_avx (uint16_t *dst, int linesize, void ff_prores_idct_put_10_avx (uint16_t *dst, ptrdiff_t linesize,
int16_t *block, const int16_t *qmat); int16_t *block, const int16_t *qmat);
av_cold void ff_proresdsp_init_x86(ProresDSPContext *dsp, AVCodecContext *avctx) av_cold void ff_proresdsp_init_x86(ProresDSPContext *dsp, AVCodecContext *avctx)

2
libavcodec/x86/simple_idct10_template.asm
View File

@ -211,7 +211,7 @@
SUMSUB_SHPK m2, m3, m4, m5, m6, m7, %2 SUMSUB_SHPK m2, m3, m4, m5, m6, m7, %2
%endmacro %endmacro
; void ff_prores_idct_put_10_<opt>(uint8_t *pixels, int stride, ; void ff_prores_idct_put_10_<opt>(uint8_t *pixels, ptrdiff_t stride,
; int16_t *block, const int16_t *qmat); ; int16_t *block, const int16_t *qmat);
; %1 = row shift ; %1 = row shift