har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'qatar/master'

Browse Source 
* qatar/master:
  mpegvideo_enc: only allocate output packet when we know there will be output
  Add names for more channel layouts to the channel layout map.
  sunrast: Add a sample request for RMP_RAW colormap.
  avcodec: do not override pts or duration from the audio encoder
  Add prores regression test.
  Enable already existing rso regression test.
  Add regression test for "sox" format muxer/demuxer.
  Add dpx encoding regression test.
  swscale: K&R formatting cosmetics for PowerPC code (part I/II)
  img2: Use ff_guess_image2_codec(filename) shorthand where appropriate.
  Clarify licensing information about files borrowed from libjpeg.
  Mark mutable static data const where appropriate.
  avplay: fix -threads option
  dvbsubdec: avoid undefined signed left shift in RGBA macro
  mlpdec: use av_log_ask_for_sample()
  gif: K&R formatting cosmetics
  png: make .long_name more descriptive
  movdec: Adjust keyframe flagging in fragmented files
  rv34: change most "int stride" into "ptrdiff_t stride".

Conflicts:
	avprobe.c
	ffplay.c
	libavcodec/mlpdec.c
	libavcodec/mpegvideo_enc.c
	libavcodec/pngenc.c
	libavcodec/x86/v210-init.c
	libavfilter/vf_boxblur.c
	libavfilter/vf_crop.c
	libavfilter/vf_drawtext.c
	libavfilter/vf_lut.c
	libavfilter/vf_overlay.c
	libavfilter/vf_pad.c
	libavfilter/vf_scale.c
	libavfilter/vf_select.c
	libavfilter/vf_setpts.c
	libavfilter/vf_settb.c
	libavformat/img2.c
	libavutil/audioconvert.c
	tests/codec-regression.sh
	tests/lavf-regression.sh
	tests/ref/lavf/dpx
	tests/ref/vsynth1/prores
	tests/ref/vsynth2/prores

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2012-02-22 01:35:41 +01:00
commit 184fc600e1
42 changed files with 545 additions and 486 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
LICENSE
View File

@ -20,8 +20,12 @@ Specifically, the GPL parts of FFmpeg are
There are a handful of files under other licensing terms, namely: There are a handful of files under other licensing terms, namely:
* The files libavcodec/jfdctfst.c, libavcodec/jfdctint.c, libavcodec/jrevdct.c * The files libavcodec/jfdctfst.c, libavcodec/jfdctint_template.c and
are taken from libjpeg, see the top of the files for licensing details. libavcodec/jrevdct.c are taken from libjpeg, see the top of the files for
licensing details. Specifically note that you must credit the IJG in the
documentation accompanying your program if you only distribute executables.
You must also indicate any changes including additions and deletions to
those three files in the documentation.
Should you, for whatever reason, prefer to use version 3 of the (L)GPL, then Should you, for whatever reason, prefer to use version 3 of the (L)GPL, then
the configure parameter --enable-version3 will activate this licensing option the configure parameter --enable-version3 will activate this licensing option

12
ffprobe.c
View File

@ -68,13 +68,13 @@ static const OptionDef options[];
static const char *input_filename; static const char *input_filename;
static AVInputFormat *iformat = NULL; static AVInputFormat *iformat = NULL;
static const char *binary_unit_prefixes [] = { "", "Ki", "Mi", "Gi", "Ti", "Pi" }; static const char *const binary_unit_prefixes [] = { "", "Ki", "Mi", "Gi", "Ti", "Pi" };
static const char *decimal_unit_prefixes[] = { "", "K" , "M" , "G" , "T" , "P" }; static const char *const decimal_unit_prefixes[] = { "", "K" , "M" , "G" , "T" , "P" };
static const char *unit_second_str = "s" ; static const char unit_second_str[] = "s" ;
static const char *unit_hertz_str = "Hz" ; static const char unit_hertz_str[] = "Hz" ;
static const char *unit_byte_str = "byte" ; static const char unit_byte_str[] = "byte" ;
static const char *unit_bit_per_second_str = "bit/s"; static const char unit_bit_per_second_str[] = "bit/s";
static uint64_t *nb_streams_packets; static uint64_t *nb_streams_packets;
static uint64_t *nb_streams_frames; static uint64_t *nb_streams_frames;

2
ffserver.c
View File

@ -1872,7 +1872,7 @@ static int http_parse_request(HTTPContext *c)
static void fmt_bytecount(AVIOContext *pb, int64_t count) static void fmt_bytecount(AVIOContext *pb, int64_t count)
{ {
static const char *suffix = " kMGTP"; static const char suffix[] = " kMGTP";
const char *s; const char *s;
for (s = suffix; count >= 100000 && s[1]; count /= 1000, s++); for (s = suffix; count >= 100000 && s[1]; count /= 1000, s++);

2
libavcodec/aacdec.c
View File

@ -1036,7 +1036,7 @@ static int decode_scalefactors(AACContext *ac, float sf[120], GetBitContext *gb,
int offset[3] = { global_gain, global_gain - 90, 0 }; int offset[3] = { global_gain, global_gain - 90, 0 };
int clipped_offset; int clipped_offset;
int noise_flag = 1; int noise_flag = 1;
static const char *sf_str[3] = { "Global gain", "Noise gain", "Intensity stereo position" }; static const char *const sf_str[3] = { "Global gain", "Noise gain", "Intensity stereo position" };
for (g = 0; g < ics->num_window_groups; g++) { for (g = 0; g < ics->num_window_groups; g++) {
for (i = 0; i < ics->max_sfb;) { for (i = 0; i < ics->max_sfb;) {
int run_end = band_type_run_end[idx]; int run_end = band_type_run_end[idx];

4
libavcodec/arm/rv34dsp_init_neon.c
View File

@ -27,8 +27,8 @@ void ff_rv34_inv_transform_noround_neon(DCTELEM *block);
void ff_rv34_inv_transform_noround_dc_neon(DCTELEM *block); void ff_rv34_inv_transform_noround_dc_neon(DCTELEM *block);
void ff_rv34_idct_add_neon(uint8_t *dst, int stride, DCTELEM *block); void ff_rv34_idct_add_neon(uint8_t *dst, ptrdiff_t stride, DCTELEM *block);
void ff_rv34_idct_dc_add_neon(uint8_t *dst, int stride, int dc); void ff_rv34_idct_dc_add_neon(uint8_t *dst, ptrdiff_t stride, int dc);
void ff_rv34dsp_init_neon(RV34DSPContext *c, DSPContext* dsp) void ff_rv34dsp_init_neon(RV34DSPContext *c, DSPContext* dsp)
{ {

12
libavcodec/arm/rv40dsp_init_neon.c
View File

@ -51,20 +51,20 @@ void ff_put_rv40_chroma_mc4_neon(uint8_t *, uint8_t *, int, int, int, int);
void ff_avg_rv40_chroma_mc8_neon(uint8_t *, uint8_t *, int, int, int, int); void ff_avg_rv40_chroma_mc8_neon(uint8_t *, uint8_t *, int, int, int, int);
void ff_avg_rv40_chroma_mc4_neon(uint8_t *, uint8_t *, int, int, int, int); void ff_avg_rv40_chroma_mc4_neon(uint8_t *, uint8_t *, int, int, int, int);
void ff_rv40_weight_func_16_neon(uint8_t *, uint8_t *, uint8_t *, int, int, int); void ff_rv40_weight_func_16_neon(uint8_t *, uint8_t *, uint8_t *, int, int, ptrdiff_t);
void ff_rv40_weight_func_8_neon(uint8_t *, uint8_t *, uint8_t *, int, int, int); void ff_rv40_weight_func_8_neon(uint8_t *, uint8_t *, uint8_t *, int, int, ptrdiff_t);
int ff_rv40_h_loop_filter_strength_neon(uint8_t *src, int stride, int ff_rv40_h_loop_filter_strength_neon(uint8_t *src, ptrdiff_t stride,
int beta, int beta2, int edge, int beta, int beta2, int edge,
int *p1, int *q1); int *p1, int *q1);
int ff_rv40_v_loop_filter_strength_neon(uint8_t *src, int stride, int ff_rv40_v_loop_filter_strength_neon(uint8_t *src, ptrdiff_t stride,
int beta, int beta2, int edge, int beta, int beta2, int edge,
int *p1, int *q1); int *p1, int *q1);
void ff_rv40_h_weak_loop_filter_neon(uint8_t *src, int stride, int filter_p1, void ff_rv40_h_weak_loop_filter_neon(uint8_t *src, ptrdiff_t stride, int filter_p1,
int filter_q1, int alpha, int beta, int filter_q1, int alpha, int beta,
int lim_p0q0, int lim_q1, int lim_p1); int lim_p0q0, int lim_q1, int lim_p1);
void ff_rv40_v_weak_loop_filter_neon(uint8_t *src, int stride, int filter_p1, void ff_rv40_v_weak_loop_filter_neon(uint8_t *src, ptrdiff_t stride, int filter_p1,
int filter_q1, int alpha, int beta, int filter_q1, int alpha, int beta,
int lim_p0q0, int lim_q1, int lim_p1); int lim_p0q0, int lim_q1, int lim_p1);

2
libavcodec/dvbsubdec.c
View File

@ -150,7 +150,7 @@ static void png_save2(const char *filename, uint32_t *bitmap, int w, int h)
} }
#endif #endif
#define RGBA(r,g,b,a) (((a) << 24) | ((r) << 16) | ((g) << 8) | (b)) #define RGBA(r,g,b,a) (((unsigned)(a) << 24) | ((r) << 16) | ((g) << 8) | (b))
typedef struct DVBSubCLUT { typedef struct DVBSubCLUT {
int id; int id;

2
libavcodec/libvpxenc.c
View File

@ -77,7 +77,7 @@ typedef struct VP8EncoderContext {
} VP8Context; } VP8Context;
/** String mappings for enum vp8e_enc_control_id */ /** String mappings for enum vp8e_enc_control_id */
static const char *ctlidstr[] = { static const char *const ctlidstr[] = {
[VP8E_UPD_ENTROPY] = "VP8E_UPD_ENTROPY", [VP8E_UPD_ENTROPY] = "VP8E_UPD_ENTROPY",
[VP8E_UPD_REFERENCE] = "VP8E_UPD_REFERENCE", [VP8E_UPD_REFERENCE] = "VP8E_UPD_REFERENCE",
[VP8E_USE_REFERENCE] = "VP8E_USE_REFERENCE", [VP8E_USE_REFERENCE] = "VP8E_USE_REFERENCE",

2
libavcodec/libxvid_rc.c
View File

@ -48,7 +48,7 @@ int ff_xvid_rate_control_init(MpegEncContext *s){
} }
for(i=0; i<s->rc_context.num_entries; i++){ for(i=0; i<s->rc_context.num_entries; i++){
static const char *frame_types = " ipbs"; static const char frame_types[] = " ipbs";
char tmp[256]; char tmp[256];
RateControlEntry *rce; RateControlEntry *rce;

30
libavcodec/mlpdec.c
View File

@ -38,12 +38,6 @@
/** number of bits used for VLC lookup - longest Huffman code is 9 */ /** number of bits used for VLC lookup - longest Huffman code is 9 */
#define VLC_BITS 9 #define VLC_BITS 9
static const char* sample_message =
"Please file a bug report following the instructions at "
"http://ffmpeg.org/bugreports.html and include "
"a sample of this file.";
typedef struct SubStream { typedef struct SubStream {
/// Set if a valid restart header has been read. Otherwise the substream cannot be decoded. /// Set if a valid restart header has been read. Otherwise the substream cannot be decoded.
uint8_t restart_seen; uint8_t restart_seen;
@ -308,10 +302,10 @@ static int read_major_sync(MLPDecodeContext *m, GetBitContext *gb)
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
if (mh.num_substreams > MAX_SUBSTREAMS) { if (mh.num_substreams > MAX_SUBSTREAMS) {
av_log(m->avctx, AV_LOG_ERROR, av_log_ask_for_sample(m->avctx,
"Number of substreams %d is larger than the maximum supported " "Number of substreams %d is larger than the maximum supported "
"by the decoder. %s\n", mh.num_substreams, sample_message); "by the decoder.\n", mh.num_substreams);
return AVERROR_INVALIDDATA; return AVERROR_PATCHWELCOME;
} }
m->access_unit_size = mh.access_unit_size; m->access_unit_size = mh.access_unit_size;
@ -410,10 +404,10 @@ static int read_restart_header(MLPDecodeContext *m, GetBitContext *gbp,
/* This should happen for TrueHD streams with >6 channels and MLP's noise /* This should happen for TrueHD streams with >6 channels and MLP's noise
* type. It is not yet known if this is allowed. */ * type. It is not yet known if this is allowed. */
if (s->max_channel > MAX_MATRIX_CHANNEL_MLP && !s->noise_type) { if (s->max_channel > MAX_MATRIX_CHANNEL_MLP && !s->noise_type) {
av_log(m->avctx, AV_LOG_ERROR, av_log_ask_for_sample(m->avctx,
"Number of channels %d is larger than the maximum supported " "Number of channels %d is larger than the maximum supported "
"by the decoder. %s\n", s->max_channel+2, sample_message); "by the decoder.\n", s->max_channel + 2);
return AVERROR_INVALIDDATA; return AVERROR_PATCHWELCOME;
} }
if (s->min_channel > s->max_channel) { if (s->min_channel > s->max_channel) {
@ -455,10 +449,10 @@ static int read_restart_header(MLPDecodeContext *m, GetBitContext *gbp,
for (ch = 0; ch <= s->max_matrix_channel; ch++) { for (ch = 0; ch <= s->max_matrix_channel; ch++) {
int ch_assign = get_bits(gbp, 6); int ch_assign = get_bits(gbp, 6);
if (ch_assign > s->max_matrix_channel) { if (ch_assign > s->max_matrix_channel) {
av_log(m->avctx, AV_LOG_ERROR, av_log_ask_for_sample(m->avctx,
"Assignment of matrix channel %d to invalid output channel %d. %s\n", "Assignment of matrix channel %d to invalid output channel %d.\n",
ch, ch_assign, sample_message); ch, ch_assign);
return AVERROR_INVALIDDATA; return AVERROR_PATCHWELCOME;
} }
s->ch_assign[ch_assign] = ch; s->ch_assign[ch_assign] = ch;
} }
@ -813,8 +807,8 @@ static int read_block_data(MLPDecodeContext *m, GetBitContext *gbp,
if (s->data_check_present) { if (s->data_check_present) {
expected_stream_pos = get_bits_count(gbp); expected_stream_pos = get_bits_count(gbp);
expected_stream_pos += get_bits(gbp, 16); expected_stream_pos += get_bits(gbp, 16);
av_log(m->avctx, AV_LOG_WARNING, "This file contains some features " av_log_ask_for_sample(m->avctx, "This file contains some features "
"we have not tested yet. %s\n", sample_message); "we have not tested yet.\n");
} }
if (s->blockpos + s->blocksize > m->access_unit_size) { if (s->blockpos + s->blocksize > m->access_unit_size) {

22
libavcodec/mpegvideo_enc.c
View File

@ -1395,6 +1395,17 @@ int ff_MPV_encode_picture(AVCodecContext *avctx, AVPacket *pkt,
int i, stuffing_count, ret; int i, stuffing_count, ret;
int context_count = s->slice_context_count; int context_count = s->slice_context_count;
s->picture_in_gop_number++;
if (load_input_picture(s, pic_arg) < 0)
return -1;
if (select_input_picture(s) < 0) {
return -1;
}
/* output? */
if (s->new_picture.f.data[0]) {
if (!pkt->data && if (!pkt->data &&
(ret = ff_alloc_packet(pkt, s->mb_width*s->mb_height*(MAX_MB_BYTES+100)+10000)) < 0) (ret = ff_alloc_packet(pkt, s->mb_width*s->mb_height*(MAX_MB_BYTES+100)+10000)) < 0)
return ret; return ret;
@ -1409,17 +1420,6 @@ int ff_MPV_encode_picture(AVCodecContext *avctx, AVPacket *pkt,
init_put_bits(&s->thread_context[i]->pb, start, end - start); init_put_bits(&s->thread_context[i]->pb, start, end - start);
} }
s->picture_in_gop_number++;
if (load_input_picture(s, pic_arg) < 0)
return -1;
if (select_input_picture(s) < 0) {
return -1;
}
/* output? */
if (s->new_picture.f.data[0]) {
s->pict_type = s->new_picture.f.pict_type; s->pict_type = s->new_picture.f.pict_type;
//emms_c(); //emms_c();
//printf("qs:%f %f %d\n", s->new_picture.quality, //printf("qs:%f %f %d\n", s->new_picture.quality,

2
libavcodec/pngdec.c
View File

@ -732,5 +732,5 @@ AVCodec ff_png_decoder = {
.close = png_dec_end, .close = png_dec_end,
.decode = decode_frame, .decode = decode_frame,
.capabilities = CODEC_CAP_DR1 /*| CODEC_CAP_DRAW_HORIZ_BAND*/, .capabilities = CODEC_CAP_DR1 /*| CODEC_CAP_DRAW_HORIZ_BAND*/,
.long_name = NULL_IF_CONFIG_SMALL("PNG image"), .long_name = NULL_IF_CONFIG_SMALL("PNG (Portable Network Graphics) image"),
}; };

2
libavcodec/pngenc.c
View File

@ -445,5 +445,5 @@ AVCodec ff_png_encoder = {
PIX_FMT_GRAY8, PIX_FMT_GRAY8A, PIX_FMT_GRAY8, PIX_FMT_GRAY8A,
PIX_FMT_GRAY16BE, PIX_FMT_GRAY16BE,
PIX_FMT_MONOBLACK, PIX_FMT_NONE}, PIX_FMT_MONOBLACK, PIX_FMT_NONE},
.long_name= NULL_IF_CONFIG_SMALL("PNG image"), .long_name= NULL_IF_CONFIG_SMALL("PNG (Portable Network Graphics) image"),
}; };

4
libavcodec/rv34dsp.c
View File

@ -53,7 +53,7 @@ static av_always_inline void rv34_row_transform(int temp[16], DCTELEM *block)
* Real Video 3.0/4.0 inverse transform + sample reconstruction * Real Video 3.0/4.0 inverse transform + sample reconstruction
* Code is almost the same as in SVQ3, only scaling is different. * Code is almost the same as in SVQ3, only scaling is different.
*/ */
static void rv34_idct_add_c(uint8_t *dst, int stride, DCTELEM *block){ static void rv34_idct_add_c(uint8_t *dst, ptrdiff_t stride, DCTELEM *block){
int temp[16]; int temp[16];
uint8_t *cm = ff_cropTbl + MAX_NEG_CROP; uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;
int i; int i;
@ -101,7 +101,7 @@ static void rv34_inv_transform_noround_c(DCTELEM *block){
} }
} }
static void rv34_idct_dc_add_c(uint8_t *dst, int stride, int dc) static void rv34_idct_dc_add_c(uint8_t *dst, ptrdiff_t stride, int dc)
{ {
const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP; const uint8_t *cm = ff_cropTbl + MAX_NEG_CROP;
int i, j; int i, j;

12
libavcodec/rv34dsp.h
View File

@ -32,24 +32,24 @@
typedef void (*rv40_weight_func)(uint8_t *dst/*align width (8 or 16)*/, typedef void (*rv40_weight_func)(uint8_t *dst/*align width (8 or 16)*/,
uint8_t *src1/*align width (8 or 16)*/, uint8_t *src1/*align width (8 or 16)*/,
uint8_t *src2/*align width (8 or 16)*/, uint8_t *src2/*align width (8 or 16)*/,
int w1, int w2, int stride); int w1, int w2, ptrdiff_t stride);
typedef void (*rv34_inv_transform_func)(DCTELEM *block); typedef void (*rv34_inv_transform_func)(DCTELEM *block);
typedef void (*rv34_idct_add_func)(uint8_t *dst, int stride, DCTELEM *block); typedef void (*rv34_idct_add_func)(uint8_t *dst, ptrdiff_t stride, DCTELEM *block);
typedef void (*rv34_idct_dc_add_func)(uint8_t *dst, int stride, typedef void (*rv34_idct_dc_add_func)(uint8_t *dst, ptrdiff_t stride,
int dc); int dc);
typedef void (*rv40_weak_loop_filter_func)(uint8_t *src, int stride, typedef void (*rv40_weak_loop_filter_func)(uint8_t *src, ptrdiff_t stride,
int filter_p1, int filter_q1, int filter_p1, int filter_q1,
int alpha, int beta, int alpha, int beta,
int lims, int lim_q1, int lim_p1); int lims, int lim_q1, int lim_p1);
typedef void (*rv40_strong_loop_filter_func)(uint8_t *src, int stride, typedef void (*rv40_strong_loop_filter_func)(uint8_t *src, ptrdiff_t stride,
int alpha, int lims, int alpha, int lims,
int dmode, int chroma); int dmode, int chroma);
typedef int (*rv40_loop_filter_strength_func)(uint8_t *src, int stride, typedef int (*rv40_loop_filter_strength_func)(uint8_t *src, ptrdiff_t stride,
int beta, int beta2, int edge, int beta, int beta2, int edge,
int *p1, int *q1); int *p1, int *q1);

20
libavcodec/rv40dsp.c
View File

@ -278,7 +278,7 @@ RV40_CHROMA_MC(put_, op_put)
RV40_CHROMA_MC(avg_, op_avg) RV40_CHROMA_MC(avg_, op_avg)
#define RV40_WEIGHT_FUNC(size) \ #define RV40_WEIGHT_FUNC(size) \
static void rv40_weight_func_ ## size (uint8_t *dst, uint8_t *src1, uint8_t *src2, int w1, int w2, int stride)\ static void rv40_weight_func_ ## size (uint8_t *dst, uint8_t *src1, uint8_t *src2, int w1, int w2, ptrdiff_t stride)\
{\ {\
int i, j;\ int i, j;\
\ \
@ -316,7 +316,7 @@ static const uint8_t rv40_dither_r[16] = {
*/ */
static av_always_inline void rv40_weak_loop_filter(uint8_t *src, static av_always_inline void rv40_weak_loop_filter(uint8_t *src,
const int step, const int step,
const int stride, const ptrdiff_t stride,
const int filter_p1, const int filter_p1,
const int filter_q1, const int filter_q1,
const int alpha, const int alpha,
@ -362,7 +362,7 @@ static av_always_inline void rv40_weak_loop_filter(uint8_t *src,
} }
} }
static void rv40_h_weak_loop_filter(uint8_t *src, const int stride, static void rv40_h_weak_loop_filter(uint8_t *src, const ptrdiff_t stride,
const int filter_p1, const int filter_q1, const int filter_p1, const int filter_q1,
const int alpha, const int beta, const int alpha, const int beta,
const int lim_p0q0, const int lim_q1, const int lim_p0q0, const int lim_q1,
@ -372,7 +372,7 @@ static void rv40_h_weak_loop_filter(uint8_t *src, const int stride,
alpha, beta, lim_p0q0, lim_q1, lim_p1); alpha, beta, lim_p0q0, lim_q1, lim_p1);
} }
static void rv40_v_weak_loop_filter(uint8_t *src, const int stride, static void rv40_v_weak_loop_filter(uint8_t *src, const ptrdiff_t stride,
const int filter_p1, const int filter_q1, const int filter_p1, const int filter_q1,
const int alpha, const int beta, const int alpha, const int beta,
const int lim_p0q0, const int lim_q1, const int lim_p0q0, const int lim_q1,
@ -384,7 +384,7 @@ static void rv40_v_weak_loop_filter(uint8_t *src, const int stride,
static av_always_inline void rv40_strong_loop_filter(uint8_t *src, static av_always_inline void rv40_strong_loop_filter(uint8_t *src,
const int step, const int step,
const int stride, const ptrdiff_t stride,
const int alpha, const int alpha,
const int lims, const int lims,
const int dmode, const int dmode,
@ -440,14 +440,14 @@ static av_always_inline void rv40_strong_loop_filter(uint8_t *src,
} }
} }
static void rv40_h_strong_loop_filter(uint8_t *src, const int stride, static void rv40_h_strong_loop_filter(uint8_t *src, const ptrdiff_t stride,
const int alpha, const int lims, const int alpha, const int lims,
const int dmode, const int chroma) const int dmode, const int chroma)
{ {
rv40_strong_loop_filter(src, stride, 1, alpha, lims, dmode, chroma); rv40_strong_loop_filter(src, stride, 1, alpha, lims, dmode, chroma);
} }
static void rv40_v_strong_loop_filter(uint8_t *src, const int stride, static void rv40_v_strong_loop_filter(uint8_t *src, const ptrdiff_t stride,
const int alpha, const int lims, const int alpha, const int lims,
const int dmode, const int chroma) const int dmode, const int chroma)
{ {
@ -455,7 +455,7 @@ static void rv40_v_strong_loop_filter(uint8_t *src, const int stride,
} }
static av_always_inline int rv40_loop_filter_strength(uint8_t *src, static av_always_inline int rv40_loop_filter_strength(uint8_t *src,
int step, int stride, int step, ptrdiff_t stride,
int beta, int beta2, int beta, int beta2,
int edge, int edge,
int *p1, int *q1) int *p1, int *q1)
@ -490,14 +490,14 @@ static av_always_inline int rv40_loop_filter_strength(uint8_t *src,
return strong0 && strong1; return strong0 && strong1;
} }
static int rv40_h_loop_filter_strength(uint8_t *src, int stride, static int rv40_h_loop_filter_strength(uint8_t *src, ptrdiff_t stride,
int beta, int beta2, int edge, int beta, int beta2, int edge,
int *p1, int *q1) int *p1, int *q1)
{ {
return rv40_loop_filter_strength(src, stride, 1, beta, beta2, edge, p1, q1); return rv40_loop_filter_strength(src, stride, 1, beta, beta2, edge, p1, q1);
} }
static int rv40_v_loop_filter_strength(uint8_t *src, int stride, static int rv40_v_loop_filter_strength(uint8_t *src, ptrdiff_t stride,
int beta, int beta2, int edge, int beta, int beta2, int edge,
int *p1, int *q1) int *p1, int *q1)
{ {

6
libavcodec/sunrast.c
View File

@ -77,7 +77,11 @@ static int sunrast_decode_frame(AVCodecContext *avctx, void *data,
av_log(avctx, AV_LOG_ERROR, "invalid image size\n"); av_log(avctx, AV_LOG_ERROR, "invalid image size\n");
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
if (maptype & ~1) { if (maptype == RMT_RAW) {
av_log_ask_for_sample(avctx, "unsupported colormap type\n");
return AVERROR_PATCHWELCOME;
}
if (maptype > RMT_RAW) {
av_log(avctx, AV_LOG_ERROR, "invalid colormap type\n"); av_log(avctx, AV_LOG_ERROR, "invalid colormap type\n");
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }

2
libavcodec/utils.c
View File

@ -992,7 +992,9 @@ int attribute_align_arg avcodec_encode_audio2(AVCodecContext *avctx,
ret = avctx->codec->encode2(avctx, avpkt, frame, got_packet_ptr); ret = avctx->codec->encode2(avctx, avpkt, frame, got_packet_ptr);
if (!ret && *got_packet_ptr) { if (!ret && *got_packet_ptr) {
if (!(avctx->codec->capabilities & CODEC_CAP_DELAY)) { if (!(avctx->codec->capabilities & CODEC_CAP_DELAY)) {
if (avpkt->pts == AV_NOPTS_VALUE)
avpkt->pts = frame->pts; avpkt->pts = frame->pts;
if (!avpkt->duration)
avpkt->duration = ff_samples_to_time_base(avctx, avpkt->duration = ff_samples_to_time_base(avctx,
frame->nb_samples); frame->nb_samples);
} }

4
libavcodec/x86/rv34dsp_init.c
View File

@ -26,8 +26,8 @@
void ff_rv34_idct_dc_mmx2(DCTELEM *block); void ff_rv34_idct_dc_mmx2(DCTELEM *block);
void ff_rv34_idct_dc_noround_mmx2(DCTELEM *block); void ff_rv34_idct_dc_noround_mmx2(DCTELEM *block);
void ff_rv34_idct_dc_add_mmx(uint8_t *dst, int stride, int dc); void ff_rv34_idct_dc_add_mmx(uint8_t *dst, ptrdiff_t stride, int dc);
void ff_rv34_idct_dc_add_sse4(uint8_t *dst, int stride, int dc); void ff_rv34_idct_dc_add_sse4(uint8_t *dst, ptrdiff_t stride, int dc);
av_cold void ff_rv34dsp_init_x86(RV34DSPContext* c, DSPContext *dsp) av_cold void ff_rv34dsp_init_x86(RV34DSPContext* c, DSPContext *dsp)
{ {

4
libavcodec/x86/rv40dsp_init.c
View File

@ -42,9 +42,9 @@ void ff_avg_rv40_chroma_mc4_3dnow(uint8_t *dst, uint8_t *src,
#define DECLARE_WEIGHT(opt) \ #define DECLARE_WEIGHT(opt) \
void ff_rv40_weight_func_16_##opt(uint8_t *dst, uint8_t *src1, uint8_t *src2, \ void ff_rv40_weight_func_16_##opt(uint8_t *dst, uint8_t *src1, uint8_t *src2, \
int w1, int w2, int stride); \ int w1, int w2, ptrdiff_t stride); \
void ff_rv40_weight_func_8_##opt (uint8_t *dst, uint8_t *src1, uint8_t *src2, \ void ff_rv40_weight_func_8_##opt (uint8_t *dst, uint8_t *src1, uint8_t *src2, \
int w1, int w2, int stride); int w1, int w2, ptrdiff_t stride);
DECLARE_WEIGHT(mmx) DECLARE_WEIGHT(mmx)
DECLARE_WEIGHT(sse2) DECLARE_WEIGHT(sse2)
DECLARE_WEIGHT(ssse3) DECLARE_WEIGHT(ssse3)

8
libavcodec/x86/v210-init.c
View File

@ -1,18 +1,18 @@
/* /*
* This file is part of Libav. * This file is part of FFmpeg.
* *
* Libav is free software; you can redistribute it and/or * FFmpeg is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public * modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either * License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version. * version 2.1 of the License, or (at your option) any later version.
* *
* Libav is distributed in the hope that it will be useful, * FFmpeg is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details. * Lesser General Public License for more details.
* *
* You should have received a copy of the GNU Lesser General Public * You should have received a copy of the GNU Lesser General Public
* License along with Libav; if not, write to the Free Software * License along with FFmpeg; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/ */

2
libavfilter/vf_boxblur.c
View File

@ -30,7 +30,7 @@
#include "libavutil/pixdesc.h" #include "libavutil/pixdesc.h"
#include "avfilter.h" #include "avfilter.h"
static const char * const var_names[] = { static const char *const var_names[] = {
"w", "w",
"h", "h",
"cw", "cw",

2
libavfilter/vf_crop.c
View File

@ -32,7 +32,7 @@
#include "libavutil/imgutils.h" #include "libavutil/imgutils.h"
#include "libavutil/mathematics.h" #include "libavutil/mathematics.h"
static const char * const var_names[] = { static const char *const var_names[] = {
"in_w", "iw", ///< width of the input video "in_w", "iw", ///< width of the input video
"in_h", "ih", ///< height of the input video "in_h", "ih", ///< height of the input video
"out_w", "ow", ///< width of the cropped video "out_w", "ow", ///< width of the cropped video

6
libavfilter/vf_drawtext.c
View File

@ -51,7 +51,7 @@
#include FT_FREETYPE_H #include FT_FREETYPE_H
#include FT_GLYPH_H #include FT_GLYPH_H
static const char * const var_names[] = { static const char *const var_names[] = {
"main_w", "w", "W", ///< width of the input video "main_w", "w", "W", ///< width of the input video
"main_h", "h", "H", ///< height of the input video "main_h", "h", "H", ///< height of the input video
"tw", "text_w", ///< width of the rendered text "tw", "text_w", ///< width of the rendered text
@ -72,8 +72,8 @@ static const char * const var_names[] = {
NULL NULL
}; };
static const char *fun2_names[] = { static const char *const fun2_names[] = {
"rand", "rand"
}; };
static double drand(void *opaque, double min, double max) static double drand(void *opaque, double min, double max)

2
libavfilter/vf_lut.c
View File

@ -30,7 +30,7 @@
#include "avfilter.h" #include "avfilter.h"
#include "internal.h" #include "internal.h"
static const char * const var_names[] = { static const char *const var_names[] = {
"w", ///< width of the input video "w", ///< width of the input video
"h", ///< height of the input video "h", ///< height of the input video
"val", ///< input value for the pixel "val", ///< input value for the pixel

2
libavfilter/vf_overlay.c
View File

@ -38,7 +38,7 @@
#include "internal.h" #include "internal.h"
#include "drawutils.h" #include "drawutils.h"
static const char * const var_names[] = { static const char *const var_names[] = {
"main_w", "W", ///< width of the main video "main_w", "W", ///< width of the main video
"main_h", "H", ///< height of the main video "main_h", "H", ///< height of the main video
"overlay_w", "w", ///< width of the overlay video "overlay_w", "w", ///< width of the overlay video

2
libavfilter/vf_pad.c
View File

@ -35,7 +35,7 @@
#include "libavutil/mathematics.h" #include "libavutil/mathematics.h"
#include "drawutils.h" #include "drawutils.h"
static const char * const var_names[] = { static const char *const var_names[] = {
"in_w", "iw", "in_w", "iw",
"in_h", "ih", "in_h", "ih",
"out_w", "ow", "out_w", "ow",

2
libavfilter/vf_scale.c
View File

@ -31,7 +31,7 @@
#include "libavutil/avassert.h" #include "libavutil/avassert.h"
#include "libswscale/swscale.h" #include "libswscale/swscale.h"
static const char * const var_names[] = { static const char *const var_names[] = {
"in_w", "iw", "in_w", "iw",
"in_h", "ih", "in_h", "ih",
"out_w", "ow", "out_w", "ow",

2
libavfilter/vf_select.c
View File

@ -27,7 +27,7 @@
#include "libavutil/fifo.h" #include "libavutil/fifo.h"
#include "avfilter.h" #include "avfilter.h"
static const char * const var_names[] = { static const char *const var_names[] = {
"TB", ///< timebase "TB", ///< timebase
"pts", ///< original pts in the file of the frame "pts", ///< original pts in the file of the frame

2
libavfilter/vf_setpts.c
View File

@ -30,7 +30,7 @@
#include "libavutil/mathematics.h" #include "libavutil/mathematics.h"
#include "avfilter.h" #include "avfilter.h"
static const char * const var_names[] = { static const char *const var_names[] = {
"INTERLACED", ///< tell if the current frame is interlaced "INTERLACED", ///< tell if the current frame is interlaced
"N", ///< frame number (starting at zero) "N", ///< frame number (starting at zero)
"POS", ///< original position in the file of the frame "POS", ///< original position in the file of the frame

2
libavfilter/vf_settb.c
View File

@ -30,7 +30,7 @@
#include "avfilter.h" #include "avfilter.h"
#include "internal.h" #include "internal.h"
static const char * const var_names[] = { static const char *const var_names[] = {
"AVTB", /* default timebase 1/AV_TIME_BASE */ "AVTB", /* default timebase 1/AV_TIME_BASE */
"intb", /* input timebase */ "intb", /* input timebase */
NULL NULL

103
libavformat/gif.c
View File

@ -53,7 +53,9 @@
#define GIF_CHUNKS 100 #define GIF_CHUNKS 100
/* slows down the decoding (and some browsers don't like it) */ /* slows down the decoding (and some browsers don't like it) */
/* update on the 'some browsers don't like it issue from above: this was probably due to missing 'Data Sub-block Terminator' (byte 19) in the app_header */ /* update on the 'some browsers don't like it issue from above:
* this was probably due to missing 'Data Sub-block Terminator'
* (byte 19) in the app_header */
#define GIF_ADD_APP_HEADER // required to enable looping of animated gif #define GIF_ADD_APP_HEADER // required to enable looping of animated gif
typedef struct { typedef struct {
@ -65,8 +67,15 @@ typedef struct {
/* we use the standard 216 color palette */ /* we use the standard 216 color palette */
/* this script was used to create the palette: /* this script was used to create the palette:
* for r in 00 33 66 99 cc ff; do for g in 00 33 66 99 cc ff; do echo -n " "; for b in 00 33 66 99 cc ff; do * for r in 00 33 66 99 cc ff; do
* echo -n "{ 0x$r, 0x$g, 0x$b }, "; done; echo ""; done; done * for g in 00 33 66 99 cc ff; do
* echo -n " "
* for b in 00 33 66 99 cc ff; do
* echo -n "{ 0x$r, 0x$g, 0x$b }, "
* done
* echo ""
* done
* done
*/ */
static const rgb_triplet gif_clut[216] = { static const rgb_triplet gif_clut[216] = {
@ -109,9 +118,8 @@ static const rgb_triplet gif_clut[216] = {
}; };
/* GIF header */ /* GIF header */
static int gif_image_write_header(AVIOContext *pb, static int gif_image_write_header(AVIOContext *pb, int width, int height,
int width, int height, int loop_count, int loop_count, uint32_t *palette)
uint32_t *palette)
{ {
int i; int i;
unsigned int v; unsigned int v;
@ -127,11 +135,11 @@ static int gif_image_write_header(AVIOContext *pb,
/* the global palette */ /* the global palette */
if (!palette) { if (!palette) {
avio_write(pb, (const unsigned char *)gif_clut, 216*3); avio_write(pb, (const unsigned char *)gif_clut, 216 * 3);
for(i=0;i<((256-216)*3);i++) for (i = 0; i < ((256 - 216) * 3); i++)
avio_w8(pb, 0); avio_w8(pb, 0);
} else { } else {
for(i=0;i<256;i++) { for (i = 0; i < 256; i++) {
v = palette[i]; v = palette[i];
avio_w8(pb, (v >> 16) & 0xff); avio_w8(pb, (v >> 16) & 0xff);
avio_w8(pb, (v >> 8) & 0xff); avio_w8(pb, (v >> 8) & 0xff);
@ -139,23 +147,23 @@ static int gif_image_write_header(AVIOContext *pb,
} }
} }
/* update: this is the 'NETSCAPE EXTENSION' that allows for looped animated gif /* update: this is the 'NETSCAPE EXTENSION' that allows for looped animated
see http://members.aol.com/royalef/gifabout.htm#net-extension * GIF, see http://members.aol.com/royalef/gifabout.htm#net-extension
*
byte 1 : 33 (hex 0x21) GIF Extension code * byte 1 : 33 (hex 0x21) GIF Extension code
byte 2 : 255 (hex 0xFF) Application Extension Label * byte 2 : 255 (hex 0xFF) Application Extension Label
byte 3 : 11 (hex (0x0B) Length of Application Block * byte 3 : 11 (hex (0x0B) Length of Application Block
(eleven bytes of data to follow) * (eleven bytes of data to follow)
bytes 4 to 11 : "NETSCAPE" * bytes 4 to 11 : "NETSCAPE"
bytes 12 to 14 : "2.0" * bytes 12 to 14 : "2.0"
byte 15 : 3 (hex 0x03) Length of Data Sub-Block * byte 15 : 3 (hex 0x03) Length of Data Sub-Block
(three bytes of data to follow) * (three bytes of data to follow)
byte 16 : 1 (hex 0x01) * byte 16 : 1 (hex 0x01)
bytes 17 to 18 : 0 to 65535, an unsigned integer in * bytes 17 to 18 : 0 to 65535, an unsigned integer in
lo-hi byte format. This indicate the * lo-hi byte format. This indicate the
number of iterations the loop should * number of iterations the loop should
be executed. * be executed.
bytes 19 : 0 (hex 0x00) a Data Sub-block Terminator * bytes 19 : 0 (hex 0x00) a Data Sub-block Terminator
*/ */
/* application extension header */ /* application extension header */
@ -164,7 +172,8 @@ static int gif_image_write_header(AVIOContext *pb,
avio_w8(pb, 0x21); avio_w8(pb, 0x21);
avio_w8(pb, 0xff); avio_w8(pb, 0xff);
avio_w8(pb, 0x0b); avio_w8(pb, 0x0b);
avio_write(pb, "NETSCAPE2.0", sizeof("NETSCAPE2.0") - 1); // bytes 4 to 14 // bytes 4 to 14
avio_write(pb, "NETSCAPE2.0", sizeof("NETSCAPE2.0") - 1);
avio_w8(pb, 0x03); // byte 15 avio_w8(pb, 0x03); // byte 15
avio_w8(pb, 0x01); // byte 16 avio_w8(pb, 0x01); // byte 16
avio_wl16(pb, (uint16_t)loop_count); avio_wl16(pb, (uint16_t)loop_count);
@ -180,7 +189,6 @@ static inline unsigned char gif_clut_index(uint8_t r, uint8_t g, uint8_t b)
return (((r) / 47) % 6) * 6 * 6 + (((g) / 47) % 6) * 6 + (((b) / 47) % 6); return (((r) / 47) % 6) * 6 * 6 + (((g) / 47) % 6) * 6 + (((b) / 47) % 6);
} }
static int gif_image_write_image(AVIOContext *pb, static int gif_image_write_image(AVIOContext *pb,
int x1, int y1, int width, int height, int x1, int y1, int width, int height,
const uint8_t *buf, int linesize, int pix_fmt) const uint8_t *buf, int linesize, int pix_fmt)
@ -201,24 +209,23 @@ static int gif_image_write_image(AVIOContext *pb,
avio_w8(pb, 0x08); avio_w8(pb, 0x08);
left= width * height; left = width * height;
init_put_bits(&p, buffer, 130); init_put_bits(&p, buffer, 130);
/* /*
* the thing here is the bitstream is written as little packets, with a size byte before * the thing here is the bitstream is written as little packets, with a size
* but it's still the same bitstream between packets (no flush !) * byte before but it's still the same bitstream between packets (no flush !)
*/ */
ptr = buf; ptr = buf;
w = width; w = width;
while(left>0) { while (left > 0) {
put_bits(&p, 9, 0x0100); /* clear code */ put_bits(&p, 9, 0x0100); /* clear code */
for(i=(left<GIF_CHUNKS)?left:GIF_CHUNKS;i;i--) { for (i = (left < GIF_CHUNKS) ? left : GIF_CHUNKS; i; i--) {
if (pix_fmt == PIX_FMT_RGB24) { if (pix_fmt == PIX_FMT_RGB24) {
v = gif_clut_index(ptr[0], ptr[1], ptr[2]); v = gif_clut_index(ptr[0], ptr[1], ptr[2]);
ptr+=3; ptr += 3;
} else { } else {
v = *ptr++; v = *ptr++;
} }
@ -230,16 +237,16 @@ static int gif_image_write_image(AVIOContext *pb,
} }
} }
if(left<=GIF_CHUNKS) { if (left <= GIF_CHUNKS) {
put_bits(&p, 9, 0x101); /* end of stream */ put_bits(&p, 9, 0x101); /* end of stream */
flush_put_bits(&p); flush_put_bits(&p);
} }
if(put_bits_ptr(&p) - p.buf > 0) { if (put_bits_ptr(&p) - p.buf > 0) {
avio_w8(pb, put_bits_ptr(&p) - p.buf); /* byte count of the packet */ avio_w8(pb, put_bits_ptr(&p) - p.buf); /* byte count of the packet */
avio_write(pb, p.buf, put_bits_ptr(&p) - p.buf); /* the actual buffer */ avio_write(pb, p.buf, put_bits_ptr(&p) - p.buf); /* the actual buffer */
p.buf_ptr = p.buf; /* dequeue the bytes off the bitstream */ p.buf_ptr = p.buf; /* dequeue the bytes off the bitstream */
} }
left-=GIF_CHUNKS; left -= GIF_CHUNKS;
} }
avio_w8(pb, 0x00); /* end of image block */ avio_w8(pb, 0x00); /* end of image block */
@ -261,14 +268,14 @@ static int gif_write_header(AVFormatContext *s)
int i, width, height /*, rate*/; int i, width, height /*, rate*/;
/* XXX: do we reject audio streams or just ignore them ? /* XXX: do we reject audio streams or just ignore them ?
if(s->nb_streams > 1) * if (s->nb_streams > 1)
return -1; * return -1;
*/ */
gif->time = 0; gif->time = 0;
gif->file_time = 0; gif->file_time = 0;
video_enc = NULL; video_enc = NULL;
for(i=0;i<s->nb_streams;i++) { for (i = 0; i < s->nb_streams; i++) {
enc = s->streams[i]->codec; enc = s->streams[i]->codec;
if (enc->codec_type != AVMEDIA_TYPE_AUDIO) if (enc->codec_type != AVMEDIA_TYPE_AUDIO)
video_enc = enc; video_enc = enc;
@ -284,7 +291,8 @@ static int gif_write_header(AVFormatContext *s)
} }
if (video_enc->pix_fmt != PIX_FMT_RGB24) { if (video_enc->pix_fmt != PIX_FMT_RGB24) {
av_log(s, AV_LOG_ERROR, "ERROR: gif only handles the rgb24 pixel format. Use -pix_fmt rgb24.\n"); av_log(s, AV_LOG_ERROR,
"ERROR: gif only handles the rgb24 pixel format. Use -pix_fmt rgb24.\n");
return AVERROR(EIO); return AVERROR(EIO);
} }
@ -294,8 +302,8 @@ static int gif_write_header(AVFormatContext *s)
return 0; return 0;
} }
static int gif_write_video(AVFormatContext *s, static int gif_write_video(AVFormatContext *s, AVCodecContext *enc,
AVCodecContext *enc, const uint8_t *buf, int size) const uint8_t *buf, int size)
{ {
AVIOContext *pb = s->pb; AVIOContext *pb = s->pb;
int jiffies; int jiffies;
@ -311,7 +319,7 @@ static int gif_write_video(AVFormatContext *s,
/* XXX: should use delay, in order to be more accurate */ /* XXX: should use delay, in order to be more accurate */
/* instead of using the same rounded value each time */ /* instead of using the same rounded value each time */
/* XXX: don't even remember if I really use it for now */ /* XXX: don't even remember if I really use it for now */
jiffies = (70*enc->time_base.num/enc->time_base.den) - 1; jiffies = (70 * enc->time_base.num / enc->time_base.den) - 1;
avio_wl16(pb, jiffies); avio_wl16(pb, jiffies);
@ -346,7 +354,8 @@ static int gif_write_trailer(AVFormatContext *s)
#define OFFSET(x) offsetof(GIFContext, x) #define OFFSET(x) offsetof(GIFContext, x)
#define ENC AV_OPT_FLAG_ENCODING_PARAM #define ENC AV_OPT_FLAG_ENCODING_PARAM
static const AVOption options[] = { static const AVOption options[] = {
{ "loop", "Number of times to loop the output.", OFFSET(loop), AV_OPT_TYPE_INT, {0}, 0, 65535, ENC }, { "loop", "Number of times to loop the output.", OFFSET(loop),
AV_OPT_TYPE_INT, { 0 }, 0, 65535, ENC },
{ NULL }, { NULL },
}; };

16
libavformat/img2.c
View File

@ -138,6 +138,11 @@ static enum CodecID av_str2id(const IdStrMap *tags, const char *str)
return CODEC_ID_NONE; return CODEC_ID_NONE;
} }
enum CodecID ff_guess_image2_codec(const char *filename)
{
return av_str2id(img_tags, filename);
}
/* return -1 if no image found */ /* return -1 if no image found */
static int find_image_range(int *pfirst_index, int *plast_index, static int find_image_range(int *pfirst_index, int *plast_index,
const char *path) const char *path)
@ -194,7 +199,7 @@ static int find_image_range(int *pfirst_index, int *plast_index,
static int read_probe(AVProbeData *p) static int read_probe(AVProbeData *p)
{ {
if (p->filename && av_str2id(img_tags, p->filename)) { if (p->filename && ff_guess_image2_codec(p->filename)) {
if (av_filename_number_test(p->filename)) if (av_filename_number_test(p->filename))
return AVPROBE_SCORE_MAX; return AVPROBE_SCORE_MAX;
else else
@ -203,11 +208,6 @@ static int read_probe(AVProbeData *p)
return 0; return 0;
} }
enum CodecID ff_guess_image2_codec(const char *filename)
{
return av_str2id(img_tags, filename);
}
static int read_header(AVFormatContext *s1) static int read_header(AVFormatContext *s1)
{ {
VideoData *s = s1->priv_data; VideoData *s = s1->priv_data;
@ -277,7 +277,7 @@ static int read_header(AVFormatContext *s1)
const char *str= strrchr(s->path, '.'); const char *str= strrchr(s->path, '.');
s->split_planes = str && !av_strcasecmp(str + 1, "y"); s->split_planes = str && !av_strcasecmp(str + 1, "y");
st->codec->codec_type = AVMEDIA_TYPE_VIDEO; st->codec->codec_type = AVMEDIA_TYPE_VIDEO;
st->codec->codec_id = av_str2id(img_tags, s->path); st->codec->codec_id = ff_guess_image2_codec(s->path);
if (st->codec->codec_id == CODEC_ID_LJPEG) if (st->codec->codec_id == CODEC_ID_LJPEG)
st->codec->codec_id = CODEC_ID_MJPEG; st->codec->codec_id = CODEC_ID_MJPEG;
} }
@ -419,7 +419,7 @@ static int write_packet(AVFormatContext *s, AVPacket *pkt)
avio_close(pb[1]); avio_close(pb[1]);
avio_close(pb[2]); avio_close(pb[2]);
}else{ }else{
if(av_str2id(img_tags, s->filename) == CODEC_ID_JPEG2000){ if (ff_guess_image2_codec(s->filename) == CODEC_ID_JPEG2000) {
AVStream *st = s->streams[0]; AVStream *st = s->streams[0];
if(st->codec->extradata_size > 8 && if(st->codec->extradata_size > 8 &&
AV_RL32(st->codec->extradata+4) == MKTAG('j','p','2','h')){ AV_RL32(st->codec->extradata+4) == MKTAG('j','p','2','h')){

2
libavformat/matroskadec.c
View File

@ -542,7 +542,7 @@ static EbmlSyntax matroska_clusters[] = {
{ 0 } { 0 }
}; };
static const char *matroska_doctypes[] = { "matroska", "webm" }; static const char *const matroska_doctypes[] = { "matroska", "webm" };
static int matroska_resync(MatroskaDemuxContext *matroska, int64_t last_pos) static int matroska_resync(MatroskaDemuxContext *matroska, int64_t last_pos)
{ {

13
libavformat/mov.c
View File

@ -2311,7 +2311,7 @@ static int mov_read_trun(MOVContext *c, AVIOContext *pb, MOVAtom atom)
int64_t dts; int64_t dts;
int data_offset = 0; int data_offset = 0;
unsigned entries, first_sample_flags = frag->flags; unsigned entries, first_sample_flags = frag->flags;
int flags, distance, i; int flags, distance, i, found_keyframe = 0;
for (i = 0; i < c->fc->nb_streams; i++) { for (i = 0; i < c->fc->nb_streams; i++) {
if (c->fc->streams[i]->id == frag->track_id) { if (c->fc->streams[i]->id == frag->track_id) {
@ -2365,7 +2365,7 @@ static int mov_read_trun(MOVContext *c, AVIOContext *pb, MOVAtom atom)
unsigned sample_size = frag->size; unsigned sample_size = frag->size;
int sample_flags = i ? frag->flags : first_sample_flags; int sample_flags = i ? frag->flags : first_sample_flags;
unsigned sample_duration = frag->duration; unsigned sample_duration = frag->duration;
int keyframe; int keyframe = 0;
if (flags & MOV_TRUN_SAMPLE_DURATION) sample_duration = avio_rb32(pb); if (flags & MOV_TRUN_SAMPLE_DURATION) sample_duration = avio_rb32(pb);
if (flags & MOV_TRUN_SAMPLE_SIZE) sample_size = avio_rb32(pb); if (flags & MOV_TRUN_SAMPLE_SIZE) sample_size = avio_rb32(pb);
@ -2374,8 +2374,13 @@ static int mov_read_trun(MOVContext *c, AVIOContext *pb, MOVAtom atom)
sc->ctts_data[sc->ctts_count].duration = (flags & MOV_TRUN_SAMPLE_CTS) ? sc->ctts_data[sc->ctts_count].duration = (flags & MOV_TRUN_SAMPLE_CTS) ?
avio_rb32(pb) : 0; avio_rb32(pb) : 0;
sc->ctts_count++; sc->ctts_count++;
if ((keyframe = st->codec->codec_type == AVMEDIA_TYPE_AUDIO || if (st->codec->codec_type == AVMEDIA_TYPE_AUDIO)
(flags & MOV_TRUN_FIRST_SAMPLE_FLAGS && !i && !(sample_flags & ~MOV_FRAG_SAMPLE_FLAG_DEGRADATION_PRIORITY_MASK)) || sample_flags & MOV_FRAG_SAMPLE_FLAG_DEPENDS_NO)) keyframe = 1;
else if (!found_keyframe)
keyframe = found_keyframe =
!(sample_flags & (MOV_FRAG_SAMPLE_FLAG_IS_NON_SYNC |
MOV_FRAG_SAMPLE_FLAG_DEPENDS_YES));
if (keyframe)
distance = 0; distance = 0;
av_add_index_entry(st, offset, dts, sample_size, distance, av_add_index_entry(st, offset, dts, sample_size, distance,
keyframe ? AVINDEX_KEYFRAME : 0); keyframe ? AVINDEX_KEYFRAME : 0);

17
libavutil/audioconvert.c
View File

@ -65,14 +65,31 @@ static const struct {
{ "mono", 1, AV_CH_LAYOUT_MONO }, { "mono", 1, AV_CH_LAYOUT_MONO },
{ "stereo", 2, AV_CH_LAYOUT_STEREO }, { "stereo", 2, AV_CH_LAYOUT_STEREO },
{ "2.1", 3, AV_CH_LAYOUT_2POINT1 }, { "2.1", 3, AV_CH_LAYOUT_2POINT1 },
{ "3.0", 3, AV_CH_LAYOUT_SURROUND },
{ "3.0(back)", 3, AV_CH_LAYOUT_2_1 },
{ "4.0", 4, AV_CH_LAYOUT_4POINT0 }, { "4.0", 4, AV_CH_LAYOUT_4POINT0 },
{ "quad", 4, AV_CH_LAYOUT_QUAD }, { "quad", 4, AV_CH_LAYOUT_QUAD },
{ "quad(side)", 4, AV_CH_LAYOUT_2_2 },
{ "3.1", 4, AV_CH_LAYOUT_3POINT1 },
{ "5.0", 5, AV_CH_LAYOUT_5POINT0_BACK }, { "5.0", 5, AV_CH_LAYOUT_5POINT0_BACK },
{ "5.0(side)", 5, AV_CH_LAYOUT_5POINT0 }, { "5.0(side)", 5, AV_CH_LAYOUT_5POINT0 },
{ "4.1", 5, AV_CH_LAYOUT_4POINT1 },
{ "5.1", 6, AV_CH_LAYOUT_5POINT1_BACK }, { "5.1", 6, AV_CH_LAYOUT_5POINT1_BACK },
{ "5.1(side)", 6, AV_CH_LAYOUT_5POINT1 }, { "5.1(side)", 6, AV_CH_LAYOUT_5POINT1 },
// { "5.1+downmix", 8, AV_CH_LAYOUT_5POINT1|AV_CH_LAYOUT_STEREO_DOWNMIX, },
{ "6.0", 6, AV_CH_LAYOUT_6POINT0 },
{ "6.0(front)", 6, AV_CH_LAYOUT_6POINT0_FRONT },
{ "hexagonal", 6, AV_CH_LAYOUT_HEXAGONAL },
{ "6.1", 7, AV_CH_LAYOUT_6POINT1 },
{ "6.1", 7, AV_CH_LAYOUT_6POINT1_BACK },
{ "6.1(front)", 7, AV_CH_LAYOUT_6POINT1_FRONT },
// { "6.1+downmix", 9, AV_CH_LAYOUT_6POINT1|AV_CH_LAYOUT_STEREO_DOWNMIX, },
{ "7.0", 7, AV_CH_LAYOUT_7POINT0 },
{ "7.0(front)", 7, AV_CH_LAYOUT_7POINT0_FRONT },
{ "7.1", 8, AV_CH_LAYOUT_7POINT1 }, { "7.1", 8, AV_CH_LAYOUT_7POINT1 },
{ "7.1(wide)", 8, AV_CH_LAYOUT_7POINT1_WIDE }, { "7.1(wide)", 8, AV_CH_LAYOUT_7POINT1_WIDE },
// { "7.1+downmix", 10, AV_CH_LAYOUT_7POINT1|AV_CH_LAYOUT_STEREO_DOWNMIX, },
{ "octagonal", 8, AV_CH_LAYOUT_OCTAGONAL },
{ "downmix", 2, AV_CH_LAYOUT_STEREO_DOWNMIX, }, { "downmix", 2, AV_CH_LAYOUT_STEREO_DOWNMIX, },
}; };

4
libavutil/eval.c
View File

@ -622,13 +622,13 @@ void av_free_expr(AVExpr *e)
#undef printf #undef printf
#include <string.h> #include <string.h>
static double const_values[] = { static const double const_values[] = {
M_PI, M_PI,
M_E, M_E,
0 0
}; };
static const char *const_names[] = { static const char *const const_names[] = {
"PI", "PI",
"E", "E",
0 0

88
libswscale/ppc/swscale_altivec.c
View File

@ -22,6 +22,7 @@
*/ */
#include <inttypes.h> #include <inttypes.h>
#include "config.h" #include "config.h"
#include "libswscale/swscale.h" #include "libswscale/swscale.h"
#include "libswscale/swscale_internal.h" #include "libswscale/swscale_internal.h"
@ -30,8 +31,8 @@
#define vzero vec_splat_s32(0) #define vzero vec_splat_s32(0)
static inline void static inline void altivec_packIntArrayToCharArray(int *val, uint8_t *dest,
altivec_packIntArrayToCharArray(int *val, uint8_t* dest, int dstW) int dstW)
{ {
register int i; register int i;
vector unsigned int altivec_vectorShiftInt19 = vector unsigned int altivec_vectorShiftInt19 =
@ -41,14 +42,14 @@ altivec_packIntArrayToCharArray(int *val, uint8_t* dest, int dstW)
/* and will handle load misalignment on val w/ vec_perm */ /* and will handle load misalignment on val w/ vec_perm */
vector unsigned char perm1; vector unsigned char perm1;
vector signed int v1; vector signed int v1;
for (i = 0 ; (i < dstW) && for (i = 0; (i < dstW) &&
(((uintptr_t)dest + i) % 16) ; i++) { (((uintptr_t)dest + i) % 16); i++) {
int t = val[i] >> 19; int t = val[i] >> 19;
dest[i] = (t < 0) ? 0 : ((t > 255) ? 255 : t); dest[i] = (t < 0) ? 0 : ((t > 255) ? 255 : t);
} }
perm1 = vec_lvsl(i << 2, val); perm1 = vec_lvsl(i << 2, val);
v1 = vec_ld(i << 2, val); v1 = vec_ld(i << 2, val);
for ( ; i < (dstW - 15); i+=16) { for (; i < (dstW - 15); i += 16) {
int offset = i << 2; int offset = i << 2;
vector signed int v2 = vec_ld(offset + 16, val); vector signed int v2 = vec_ld(offset + 16, val);
vector signed int v3 = vec_ld(offset + 32, val); vector signed int v3 = vec_ld(offset + 32, val);
@ -70,7 +71,7 @@ altivec_packIntArrayToCharArray(int *val, uint8_t* dest, int dstW)
v1 = v5; v1 = v5;
} }
} else { // dest is properly aligned, great } else { // dest is properly aligned, great
for (i = 0; i < (dstW - 15); i+=16) { for (i = 0; i < (dstW - 15); i += 16) {
int offset = i << 2; int offset = i << 2;
vector signed int v1 = vec_ld(offset, val); vector signed int v1 = vec_ld(offset, val);
vector signed int v2 = vec_ld(offset + 16, val); vector signed int v2 = vec_ld(offset + 16, val);
@ -86,22 +87,21 @@ altivec_packIntArrayToCharArray(int *val, uint8_t* dest, int dstW)
vec_st(vf, i, dest); vec_st(vf, i, dest);
} }
} }
for ( ; i < dstW ; i++) { for (; i < dstW; i++) {
int t = val[i] >> 19; int t = val[i] >> 19;
dest[i] = (t < 0) ? 0 : ((t > 255) ? 255 : t); dest[i] = (t < 0) ? 0 : ((t > 255) ? 255 : t);
} }
} }
//FIXME remove the usage of scratch buffers. // FIXME remove the usage of scratch buffers.
static void static void yuv2planeX_altivec(const int16_t *filter, int filterSize,
yuv2planeX_altivec(const int16_t *filter, int filterSize,
const int16_t **src, uint8_t *dest, int dstW, const int16_t **src, uint8_t *dest, int dstW,
const uint8_t *dither, int offset) const uint8_t *dither, int offset)
{ {
register int i, j; register int i, j;
DECLARE_ALIGNED(16, int, val)[dstW]; DECLARE_ALIGNED(16, int, val)[dstW];
for (i=0; i<dstW; i++) for (i = 0; i < dstW; i++)
val[i] = dither[(i + offset) & 7] << 12; val[i] = dither[(i + offset) & 7] << 12;
for (j = 0; j < filterSize; j++) { for (j = 0; j < filterSize; j++) {
@ -113,7 +113,7 @@ yuv2planeX_altivec(const int16_t *filter, int filterSize,
perm = vec_lvsl(0, src[j]); perm = vec_lvsl(0, src[j]);
l1 = vec_ld(0, src[j]); l1 = vec_ld(0, src[j]);
for (i = 0; i < (dstW - 7); i+=8) { for (i = 0; i < (dstW - 7); i += 8) {
int offset = i << 2; int offset = i << 2;
vector signed short l2 = vec_ld((i << 1) + 16, src[j]); vector signed short l2 = vec_ld((i << 1) + 16, src[j]);
@ -136,10 +136,9 @@ yuv2planeX_altivec(const int16_t *filter, int filterSize,
l1 = l2; l1 = l2;
} }
for ( ; i < dstW; i++) { for (; i < dstW; i++)
val[i] += src[j][i] * filter[j]; val[i] += src[j][i] * filter[j];
} }
}
altivec_packIntArrayToCharArray(val, dest, dstW); altivec_packIntArrayToCharArray(val, dest, dstW);
} }
@ -151,20 +150,18 @@ static void hScale_altivec_real(SwsContext *c, int16_t *dst, int dstW,
DECLARE_ALIGNED(16, int, tempo)[4]; DECLARE_ALIGNED(16, int, tempo)[4];
if (filterSize % 4) { if (filterSize % 4) {
for (i=0; i<dstW; i++) { for (i = 0; i < dstW; i++) {
register int j; register int j;
register int srcPos = filterPos[i]; register int srcPos = filterPos[i];
register int val = 0; register int val = 0;
for (j=0; j<filterSize; j++) { for (j = 0; j < filterSize; j++)
val += ((int)src[srcPos + j])*filter[filterSize*i + j]; val += ((int)src[srcPos + j]) * filter[filterSize * i + j];
dst[i] = FFMIN(val >> 7, (1 << 15) - 1);
} }
dst[i] = FFMIN(val>>7, (1<<15)-1); } else
}
}
else
switch (filterSize) { switch (filterSize) {
case 4: case 4:
for (i=0; i<dstW; i++) { for (i = 0; i < dstW; i++) {
register int srcPos = filterPos[i]; register int srcPos = filterPos[i];
vector unsigned char src_v0 = vec_ld(srcPos, src); vector unsigned char src_v0 = vec_ld(srcPos, src);
@ -196,12 +193,12 @@ static void hScale_altivec_real(SwsContext *c, int16_t *dst, int dstW,
val_vEven = vec_mule(src_v, filter_v); val_vEven = vec_mule(src_v, filter_v);
val_s = vec_sums(val_vEven, vzero); val_s = vec_sums(val_vEven, vzero);
vec_st(val_s, 0, tempo); vec_st(val_s, 0, tempo);
dst[i] = FFMIN(tempo[3]>>7, (1<<15)-1); dst[i] = FFMIN(tempo[3] >> 7, (1 << 15) - 1);
} }
break; break;
case 8: case 8:
for (i=0; i<dstW; i++) { for (i = 0; i < dstW; i++) {
register int srcPos = filterPos[i]; register int srcPos = filterPos[i];
vector unsigned char src_v0 = vec_ld(srcPos, src); vector unsigned char src_v0 = vec_ld(srcPos, src);
@ -221,12 +218,12 @@ static void hScale_altivec_real(SwsContext *c, int16_t *dst, int dstW,
val_v = vec_msums(src_v, filter_v, (vector signed int)vzero); val_v = vec_msums(src_v, filter_v, (vector signed int)vzero);
val_s = vec_sums(val_v, vzero); val_s = vec_sums(val_v, vzero);
vec_st(val_s, 0, tempo); vec_st(val_s, 0, tempo);
dst[i] = FFMIN(tempo[3]>>7, (1<<15)-1); dst[i] = FFMIN(tempo[3] >> 7, (1 << 15) - 1);
} }
break; break;
case 16: case 16:
for (i=0; i<dstW; i++) { for (i = 0; i < dstW; i++) {
register int srcPos = filterPos[i]; register int srcPos = filterPos[i];
vector unsigned char src_v0 = vec_ld(srcPos, src); vector unsigned char src_v0 = vec_ld(srcPos, src);
@ -248,12 +245,12 @@ static void hScale_altivec_real(SwsContext *c, int16_t *dst, int dstW,
vector signed int val_s = vec_sums(val_v, vzero); vector signed int val_s = vec_sums(val_v, vzero);
vec_st(val_s, 0, tempo); vec_st(val_s, 0, tempo);
dst[i] = FFMIN(tempo[3]>>7, (1<<15)-1); dst[i] = FFMIN(tempo[3] >> 7, (1 << 15) - 1);
} }
break; break;
default: default:
for (i=0; i<dstW; i++) { for (i = 0; i < dstW; i++) {
register int j; register int j;
register int srcPos = filterPos[i]; register int srcPos = filterPos[i];
@ -264,7 +261,7 @@ static void hScale_altivec_real(SwsContext *c, int16_t *dst, int dstW,
vector unsigned char src_v0 = vec_ld(srcPos, src); vector unsigned char src_v0 = vec_ld(srcPos, src);
vector unsigned char permS = vec_lvsl(srcPos, src); vector unsigned char permS = vec_lvsl(srcPos, src);
for (j = 0 ; j < filterSize - 15; j += 16) { for (j = 0; j < filterSize - 15; j += 16) {
vector unsigned char src_v1 = vec_ld(srcPos + j + 16, src); vector unsigned char src_v1 = vec_ld(srcPos + j + 16, src);
vector unsigned char src_vF = vec_perm(src_v0, src_v1, permS); vector unsigned char src_vF = vec_perm(src_v0, src_v1, permS);
@ -285,9 +282,9 @@ static void hScale_altivec_real(SwsContext *c, int16_t *dst, int dstW,
src_v0 = src_v1; src_v0 = src_v1;
} }
if (j < filterSize-7) { if (j < filterSize - 7) {
// loading src_v0 is useless, it's already done above // loading src_v0 is useless, it's already done above
//vector unsigned char src_v0 = vec_ld(srcPos + j, src); // vector unsigned char src_v0 = vec_ld(srcPos + j, src);
vector unsigned char src_v1, src_vF; vector unsigned char src_v1, src_vF;
vector signed short src_v, filter_v1R, filter_v; vector signed short src_v, filter_v1R, filter_v;
if ((((uintptr_t)src + srcPos) % 16) > 8) { if ((((uintptr_t)src + srcPos) % 16) > 8) {
@ -298,7 +295,7 @@ static void hScale_altivec_real(SwsContext *c, int16_t *dst, int dstW,
src_v = // vec_unpackh sign-extends... src_v = // vec_unpackh sign-extends...
(vector signed short)(vec_mergeh((vector unsigned char)vzero, src_vF)); (vector signed short)(vec_mergeh((vector unsigned char)vzero, src_vF));
// loading filter_v0R is useless, it's already done above // loading filter_v0R is useless, it's already done above
//vector signed short filter_v0R = vec_ld((i * 2 * filterSize) + j, filter); // vector signed short filter_v0R = vec_ld((i * 2 * filterSize) + j, filter);
filter_v1R = vec_ld((i * 2 * filterSize) + (j * 2) + 16, filter); filter_v1R = vec_ld((i * 2 * filterSize) + (j * 2) + 16, filter);
filter_v = vec_perm(filter_v0R, filter_v1R, permF); filter_v = vec_perm(filter_v0R, filter_v1R, permF);
@ -308,9 +305,8 @@ static void hScale_altivec_real(SwsContext *c, int16_t *dst, int dstW,
val_s = vec_sums(val_v, vzero); val_s = vec_sums(val_v, vzero);
vec_st(val_s, 0, tempo); vec_st(val_s, 0, tempo);
dst[i] = FFMIN(tempo[3]>>7, (1<<15)-1); dst[i] = FFMIN(tempo[3] >> 7, (1 << 15) - 1);
} }
} }
} }
@ -334,12 +330,24 @@ void ff_sws_init_swScale_altivec(SwsContext *c)
* match what's found in the body of ff_yuv2packedX_altivec() */ * match what's found in the body of ff_yuv2packedX_altivec() */
if (!(c->flags & (SWS_BITEXACT | SWS_FULL_CHR_H_INT)) && !c->alpPixBuf) { if (!(c->flags & (SWS_BITEXACT | SWS_FULL_CHR_H_INT)) && !c->alpPixBuf) {
switch (c->dstFormat) { switch (c->dstFormat) {
case PIX_FMT_ABGR: c->yuv2packedX = ff_yuv2abgr_X_altivec; break; case PIX_FMT_ABGR:
case PIX_FMT_BGRA: c->yuv2packedX = ff_yuv2bgra_X_altivec; break; c->yuv2packedX = ff_yuv2abgr_X_altivec;
case PIX_FMT_ARGB: c->yuv2packedX = ff_yuv2argb_X_altivec; break; break;
case PIX_FMT_RGBA: c->yuv2packedX = ff_yuv2rgba_X_altivec; break; case PIX_FMT_BGRA:
case PIX_FMT_BGR24: c->yuv2packedX = ff_yuv2bgr24_X_altivec; break; c->yuv2packedX = ff_yuv2bgra_X_altivec;
case PIX_FMT_RGB24: c->yuv2packedX = ff_yuv2rgb24_X_altivec; break; break;
case PIX_FMT_ARGB:
c->yuv2packedX = ff_yuv2argb_X_altivec;
break;
case PIX_FMT_RGBA:
c->yuv2packedX = ff_yuv2rgba_X_altivec;
break;
case PIX_FMT_BGR24:
c->yuv2packedX = ff_yuv2bgr24_X_altivec;
break;
case PIX_FMT_RGB24:
c->yuv2packedX = ff_yuv2rgb24_X_altivec;
break;
} }
} }
} }

55
libswscale/ppc/yuv2yuv_altivec.c
View File

@ -22,18 +22,20 @@
*/ */
#include <inttypes.h> #include <inttypes.h>
#include "config.h" #include "config.h"
#include "libswscale/swscale.h" #include "libswscale/swscale.h"
#include "libswscale/swscale_internal.h" #include "libswscale/swscale_internal.h"
#include "libavutil/cpu.h" #include "libavutil/cpu.h"
static int yv12toyuy2_unscaled_altivec(SwsContext *c, const uint8_t* src[], static int yv12toyuy2_unscaled_altivec(SwsContext *c, const uint8_t *src[],
int srcStride[], int srcSliceY, int srcStride[], int srcSliceY,
int srcSliceH, uint8_t* dstParam[], int srcSliceH, uint8_t *dstParam[],
int dstStride_a[]) int dstStride_a[])
{ {
uint8_t *dst=dstParam[0] + dstStride_a[0]*srcSliceY; uint8_t *dst = dstParam[0] + dstStride_a[0] * srcSliceY;
// yv12toyuy2(src[0], src[1], src[2], dst, c->srcW, srcSliceH, srcStride[0], srcStride[1], dstStride[0]); // yv12toyuy2(src[0], src[1], src[2], dst, c->srcW, srcSliceH,
// srcStride[0], srcStride[1], dstStride[0]);
const uint8_t *ysrc = src[0]; const uint8_t *ysrc = src[0];
const uint8_t *usrc = src[1]; const uint8_t *usrc = src[1];
const uint8_t *vsrc = src[2]; const uint8_t *vsrc = src[2];
@ -47,16 +49,16 @@ static int yv12toyuy2_unscaled_altivec(SwsContext *c, const uint8_t* src[],
register unsigned int y; register unsigned int y;
/* This code assumes: /* This code assumes:
*
1) dst is 16 bytes-aligned * 1) dst is 16 bytes-aligned
2) dstStride is a multiple of 16 * 2) dstStride is a multiple of 16
3) width is a multiple of 16 * 3) width is a multiple of 16
4) lum & chrom stride are multiples of 8 * 4) lum & chrom stride are multiples of 8
*/ */
for (y=0; y<height; y++) { for (y = 0; y < height; y++) {
int i; int i;
for (i = 0; i < width - 31; i+= 32) { for (i = 0; i < width - 31; i += 32) {
const unsigned int j = i >> 1; const unsigned int j = i >> 1;
vector unsigned char v_yA = vec_ld(i, ysrc); vector unsigned char v_yA = vec_ld(i, ysrc);
vector unsigned char v_yB = vec_ld(i + 16, ysrc); vector unsigned char v_yB = vec_ld(i + 16, ysrc);
@ -91,7 +93,7 @@ static int yv12toyuy2_unscaled_altivec(SwsContext *c, const uint8_t* src[],
vec_st(v_yuy2_0, (i << 1), dst); vec_st(v_yuy2_0, (i << 1), dst);
vec_st(v_yuy2_1, (i << 1) + 16, dst); vec_st(v_yuy2_1, (i << 1) + 16, dst);
} }
if ((y&(vertLumPerChroma-1)) == vertLumPerChroma-1) { if ((y & (vertLumPerChroma - 1)) == vertLumPerChroma - 1) {
usrc += chromStride; usrc += chromStride;
vsrc += chromStride; vsrc += chromStride;
} }
@ -102,13 +104,14 @@ static int yv12toyuy2_unscaled_altivec(SwsContext *c, const uint8_t* src[],
return srcSliceH; return srcSliceH;
} }
static int yv12touyvy_unscaled_altivec(SwsContext *c, const uint8_t* src[], static int yv12touyvy_unscaled_altivec(SwsContext *c, const uint8_t *src[],
int srcStride[], int srcSliceY, int srcStride[], int srcSliceY,
int srcSliceH, uint8_t* dstParam[], int srcSliceH, uint8_t *dstParam[],
int dstStride_a[]) int dstStride_a[])
{ {
uint8_t *dst=dstParam[0] + dstStride_a[0]*srcSliceY; uint8_t *dst = dstParam[0] + dstStride_a[0] * srcSliceY;
// yv12toyuy2(src[0], src[1], src[2], dst, c->srcW, srcSliceH, srcStride[0], srcStride[1], dstStride[0]); // yv12toyuy2(src[0], src[1], src[2], dst, c->srcW, srcSliceH,
// srcStride[0], srcStride[1], dstStride[0]);
const uint8_t *ysrc = src[0]; const uint8_t *ysrc = src[0];
const uint8_t *usrc = src[1]; const uint8_t *usrc = src[1];
const uint8_t *vsrc = src[2]; const uint8_t *vsrc = src[2];
@ -122,16 +125,16 @@ static int yv12touyvy_unscaled_altivec(SwsContext *c, const uint8_t* src[],
register unsigned int y; register unsigned int y;
/* This code assumes: /* This code assumes:
*
1) dst is 16 bytes-aligned * 1) dst is 16 bytes-aligned
2) dstStride is a multiple of 16 * 2) dstStride is a multiple of 16
3) width is a multiple of 16 * 3) width is a multiple of 16
4) lum & chrom stride are multiples of 8 * 4) lum & chrom stride are multiples of 8
*/ */
for (y=0; y<height; y++) { for (y = 0; y < height; y++) {
int i; int i;
for (i = 0; i < width - 31; i+= 32) { for (i = 0; i < width - 31; i += 32) {
const unsigned int j = i >> 1; const unsigned int j = i >> 1;
vector unsigned char v_yA = vec_ld(i, ysrc); vector unsigned char v_yA = vec_ld(i, ysrc);
vector unsigned char v_yB = vec_ld(i + 16, ysrc); vector unsigned char v_yB = vec_ld(i + 16, ysrc);
@ -166,7 +169,7 @@ static int yv12touyvy_unscaled_altivec(SwsContext *c, const uint8_t* src[],
vec_st(v_uyvy_0, (i << 1), dst); vec_st(v_uyvy_0, (i << 1), dst);
vec_st(v_uyvy_1, (i << 1) + 16, dst); vec_st(v_uyvy_1, (i << 1) + 16, dst);
} }
if ((y&(vertLumPerChroma-1)) == vertLumPerChroma-1) { if ((y & (vertLumPerChroma - 1)) == vertLumPerChroma - 1) {
usrc += chromStride; usrc += chromStride;
vsrc += chromStride; vsrc += chromStride;
} }
@ -184,8 +187,8 @@ void ff_swscale_get_unscaled_altivec(SwsContext *c)
// unscaled YV12 -> packed YUV, we want speed // unscaled YV12 -> packed YUV, we want speed
if (dstFormat == PIX_FMT_YUYV422) if (dstFormat == PIX_FMT_YUYV422)
c->swScale= yv12toyuy2_unscaled_altivec; c->swScale = yv12toyuy2_unscaled_altivec;
else if (dstFormat == PIX_FMT_UYVY422) else if (dstFormat == PIX_FMT_UYVY422)
c->swScale= yv12touyvy_unscaled_altivec; c->swScale = yv12touyvy_unscaled_altivec;
} }
} }

5
tests/codec-regression.sh
View File

@ -283,6 +283,11 @@ do_video_encoding prores.mov "-vcodec prores"
do_video_decoding "" "-pix_fmt yuv420p" do_video_decoding "" "-pix_fmt yuv420p"
fi fi
if [ -n "$do_prores_kostya" ] ; then
do_video_encoding prores_kostya.mov "-vcodec prores_kostya -profile hq"
do_video_decoding "" "-pix_fmt yuv420p"
fi
if [ -n "$do_svq1" ] ; then if [ -n "$do_svq1" ] ; then
do_video_encoding svq1.mov "-an -vcodec svq1 -qscale 3 -pix_fmt yuv410p" do_video_encoding svq1.mov "-an -vcodec svq1 -qscale 3 -pix_fmt yuv410p"
do_video_decoding "" "-pix_fmt yuv420p" do_video_decoding "" "-pix_fmt yuv420p"

4
tests/ref/vsynth1/prores_kostya Normal file
View File

@ -0,0 +1,4 @@
40e7637e04991dbe9a23fe109f95bfc8 *./tests/data/vsynth1/prores_kostya.mov
3858901 ./tests/data/vsynth1/prores_kostya.mov
0a4153637d0cc0a88a8bcbf04cfaf8c6 *./tests/data/prores_kostya.vsynth1.out.yuv
stddev: 3.17 PSNR: 38.09 MAXDIFF: 39 bytes: 7603200/ 7603200

4
tests/ref/vsynth2/prores_kostya Normal file
View File

@ -0,0 +1,4 @@
ed8b8a94da049518af8f95c5da736e57 *./tests/data/vsynth2/prores_kostya.mov
3884586 ./tests/data/vsynth2/prores_kostya.mov
ca2f6c1162635dedfa468c90f1fdc0ef *./tests/data/prores_kostya.vsynth2.out.yuv
stddev: 0.92 PSNR: 48.77 MAXDIFF: 10 bytes: 7603200/ 7603200