November 2015 - ffmpeg-cvslog

avformat: unref packet after storing it in internal packet queue
by git＠videolan.org 02 Nov '15

02 Nov '15

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes(a)gmail.com> | Sun Nov 1 11:08:42 2015 +0100| [55abb94b7d9a4dc93bece7ed7bc77daf4cc4a91d] | committer: Hendrik Leppkes avformat: unref packet after storing it in internal packet queue Fixes a memory leak when using genpts > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=55abb94b7d9a4dc93… --- libavformat/utils.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavformat/utils.c b/libavformat/utils.c index 3f82659..5c4d452 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -1559,6 +1559,7 @@ int av_read_frame(AVFormatContext *s, AVPacket *pkt) ret = add_to_pktbuf(&s->internal->packet_buffer, pkt, &s->internal->packet_buffer_end, 1); + av_packet_unref(pkt); if (ret < 0) return ret; }

1 0

avformat: always unref the packet after parsing
by git＠videolan.org 02 Nov '15

02 Nov '15

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes(a)gmail.com> | Sun Nov 1 09:47:34 2015 +0100| [b64fe493717cb2f05a019d9f13778382a78d9d0a] | committer: Hendrik Leppkes avformat: always unref the packet after parsing This fixes a memory leak when side-data is present. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b64fe493717cb2f05… --- libavformat/utils.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/libavformat/utils.c b/libavformat/utils.c index 7e4f54f..3f82659 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -1285,12 +1285,11 @@ static int parse_packet(AVFormatContext *s, AVPacket *pkt, int stream_index) compute_pkt_fields(s, st, st->parser, &out_pkt, next_dts, next_pts); - if ((ret = add_to_pktbuf(&s->internal->parse_queue, &out_pkt, - &s->internal->parse_queue_end, - 1))) { - av_packet_unref(&out_pkt); + ret = add_to_pktbuf(&s->internal->parse_queue, &out_pkt, + &s->internal->parse_queue_end, 1); + av_packet_unref(&out_pkt); + if (ret < 0) goto fail; - } } /* end of the stream => close and free the parser */

1 0

avformat/ipmovie: add context to av_log()
by git＠videolan.org 02 Nov '15

02 Nov '15

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Mon Nov 2 09:00:53 2015 +0100| [83d20a6a7e8fb4ae31b5336ea06f093f9f5d1e5c] | committer: Paul B Mahol avformat/ipmovie: add context to av_log() Signed-off-by: Paul B Mahol <onemda(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=83d20a6a7e8fb4ae3… --- libavformat/ipmovie.c | 76 ++++++++++++++++++++++++------------------------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/libavformat/ipmovie.c b/libavformat/ipmovie.c index df9b8f0..bc5d8cc 100644 --- a/libavformat/ipmovie.c +++ b/libavformat/ipmovie.c @@ -119,7 +119,7 @@ static int load_ipmovie_packet(IPMVEContext *s, AVIOContext *pb, if (s->audio_chunk_offset && s->audio_channels && s->audio_bits) { if (s->audio_type == AV_CODEC_ID_NONE) { - av_log(NULL, AV_LOG_ERROR, "Can not read audio packet before" + av_log(s->avf, AV_LOG_ERROR, "Can not read audio packet before" "audio codec is known\n"); return CHUNK_BAD; } @@ -147,7 +147,7 @@ static int load_ipmovie_packet(IPMVEContext *s, AVIOContext *pb, s->audio_frame_count += (s->audio_chunk_size - 6 - s->audio_channels) / s->audio_channels; - av_log(NULL, AV_LOG_TRACE, "sending audio frame with pts %"PRId64" (%d audio frames)\n", + av_log(s->avf, AV_LOG_TRACE, "sending audio frame with pts %"PRId64" (%d audio frames)\n", pkt->pts, s->audio_frame_count); chunk_type = CHUNK_VIDEO; @@ -197,7 +197,7 @@ static int load_ipmovie_packet(IPMVEContext *s, AVIOContext *pb, pkt->stream_index = s->video_stream_index; pkt->pts = s->video_pts; - av_log(NULL, AV_LOG_TRACE, "sending video frame with pts %"PRId64"\n", pkt->pts); + av_log(s->avf, AV_LOG_TRACE, "sending video frame with pts %"PRId64"\n", pkt->pts); s->video_pts += s->frame_pts_inc; @@ -271,36 +271,36 @@ static int process_ipmovie_chunk(IPMVEContext *s, AVIOContext *pb, chunk_size = AV_RL16(&chunk_preamble[0]); chunk_type = AV_RL16(&chunk_preamble[2]); - av_log(NULL, AV_LOG_TRACE, "chunk type 0x%04X, 0x%04X bytes: ", chunk_type, chunk_size); + av_log(s->avf, AV_LOG_TRACE, "chunk type 0x%04X, 0x%04X bytes: ", chunk_type, chunk_size); switch (chunk_type) { case CHUNK_INIT_AUDIO: - av_log(NULL, AV_LOG_TRACE, "initialize audio\n"); + av_log(s->avf, AV_LOG_TRACE, "initialize audio\n"); break; case CHUNK_AUDIO_ONLY: - av_log(NULL, AV_LOG_TRACE, "audio only\n"); + av_log(s->avf, AV_LOG_TRACE, "audio only\n"); break; case CHUNK_INIT_VIDEO: - av_log(NULL, AV_LOG_TRACE, "initialize video\n"); + av_log(s->avf, AV_LOG_TRACE, "initialize video\n"); break; case CHUNK_VIDEO: - av_log(NULL, AV_LOG_TRACE, "video (and audio)\n"); + av_log(s->avf, AV_LOG_TRACE, "video (and audio)\n"); break; case CHUNK_SHUTDOWN: - av_log(NULL, AV_LOG_TRACE, "shutdown\n"); + av_log(s->avf, AV_LOG_TRACE, "shutdown\n"); break; case CHUNK_END: - av_log(NULL, AV_LOG_TRACE, "end\n"); + av_log(s->avf, AV_LOG_TRACE, "end\n"); break; default: - av_log(NULL, AV_LOG_TRACE, "invalid chunk\n"); + av_log(s->avf, AV_LOG_TRACE, "invalid chunk\n"); chunk_type = CHUNK_BAD; break; @@ -326,29 +326,29 @@ static int process_ipmovie_chunk(IPMVEContext *s, AVIOContext *pb, chunk_size -= OPCODE_PREAMBLE_SIZE; chunk_size -= opcode_size; if (chunk_size < 0) { - av_log(NULL, AV_LOG_TRACE, "chunk_size countdown just went negative\n"); + av_log(s->avf, AV_LOG_TRACE, "chunk_size countdown just went negative\n"); chunk_type = CHUNK_BAD; break; } - av_log(NULL, AV_LOG_TRACE, " opcode type %02X, version %d, 0x%04X bytes: ", + av_log(s->avf, AV_LOG_TRACE, " opcode type %02X, version %d, 0x%04X bytes: ", opcode_type, opcode_version, opcode_size); switch (opcode_type) { case OPCODE_END_OF_STREAM: - av_log(NULL, AV_LOG_TRACE, "end of stream\n"); + av_log(s->avf, AV_LOG_TRACE, "end of stream\n"); avio_skip(pb, opcode_size); break; case OPCODE_END_OF_CHUNK: - av_log(NULL, AV_LOG_TRACE, "end of chunk\n"); + av_log(s->avf, AV_LOG_TRACE, "end of chunk\n"); avio_skip(pb, opcode_size); break; case OPCODE_CREATE_TIMER: - av_log(NULL, AV_LOG_TRACE, "create timer\n"); + av_log(s->avf, AV_LOG_TRACE, "create timer\n"); if ((opcode_version > 0) || (opcode_size != 6)) { - av_log(NULL, AV_LOG_TRACE, "bad create_timer opcode\n"); + av_log(s->avf, AV_LOG_TRACE, "bad create_timer opcode\n"); chunk_type = CHUNK_BAD; break; } @@ -358,15 +358,15 @@ static int process_ipmovie_chunk(IPMVEContext *s, AVIOContext *pb, break; } s->frame_pts_inc = ((uint64_t)AV_RL32(&scratch[0])) * AV_RL16(&scratch[4]); - av_log(NULL, AV_LOG_TRACE, " %.2f frames/second (timer div = %d, subdiv = %d)\n", + av_log(s->avf, AV_LOG_TRACE, " %.2f frames/second (timer div = %d, subdiv = %d)\n", 1000000.0 / s->frame_pts_inc, AV_RL32(&scratch[0]), AV_RL16(&scratch[4])); break; case OPCODE_INIT_AUDIO_BUFFERS: - av_log(NULL, AV_LOG_TRACE, "initialize audio buffers\n"); + av_log(s->avf, AV_LOG_TRACE, "initialize audio buffers\n"); if (opcode_version > 1 || opcode_size > 10 || opcode_size < 6) { - av_log(NULL, AV_LOG_TRACE, "bad init_audio_buffers opcode\n"); + av_log(s->avf, AV_LOG_TRACE, "bad init_audio_buffers opcode\n"); chunk_type = CHUNK_BAD; break; } @@ -388,7 +388,7 @@ static int process_ipmovie_chunk(IPMVEContext *s, AVIOContext *pb, s->audio_type = AV_CODEC_ID_PCM_S16LE; else s->audio_type = AV_CODEC_ID_PCM_U8; - av_log(NULL, AV_LOG_TRACE, "audio: %d bits, %d Hz, %s, %s format\n", + av_log(s->avf, AV_LOG_TRACE, "audio: %d bits, %d Hz, %s, %s format\n", s->audio_bits, s->audio_sample_rate, (s->audio_channels == 2) ? "stereo" : "mono", (s->audio_type == AV_CODEC_ID_INTERPLAY_DPCM) ? @@ -396,16 +396,16 @@ static int process_ipmovie_chunk(IPMVEContext *s, AVIOContext *pb, break; case OPCODE_START_STOP_AUDIO: - av_log(NULL, AV_LOG_TRACE, "start/stop audio\n"); + av_log(s->avf, AV_LOG_TRACE, "start/stop audio\n"); avio_skip(pb, opcode_size); break; case OPCODE_INIT_VIDEO_BUFFERS: - av_log(NULL, AV_LOG_TRACE, "initialize video buffers\n"); + av_log(s->avf, AV_LOG_TRACE, "initialize video buffers\n"); if ((opcode_version > 2) || (opcode_size > 8) || opcode_size < 4 || opcode_version == 2 && opcode_size < 8 ) { - av_log(NULL, AV_LOG_TRACE, "bad init_video_buffers opcode\n"); + av_log(s->avf, AV_LOG_TRACE, "bad init_video_buffers opcode\n"); chunk_type = CHUNK_BAD; break; } @@ -429,7 +429,7 @@ static int process_ipmovie_chunk(IPMVEContext *s, AVIOContext *pb, } else { s->video_bpp = 16; } - av_log(NULL, AV_LOG_TRACE, "video resolution: %d x %d\n", + av_log(s->avf, AV_LOG_TRACE, "video resolution: %d x %d\n", s->video_width, s->video_height); break; @@ -440,17 +440,17 @@ static int process_ipmovie_chunk(IPMVEContext *s, AVIOContext *pb, case OPCODE_UNKNOWN_13: case OPCODE_UNKNOWN_14: case OPCODE_UNKNOWN_15: - av_log(NULL, AV_LOG_TRACE, "unknown (but documented) opcode %02X\n", opcode_type); + av_log(s->avf, AV_LOG_TRACE, "unknown (but documented) opcode %02X\n", opcode_type); avio_skip(pb, opcode_size); break; case OPCODE_SEND_BUFFER: - av_log(NULL, AV_LOG_TRACE, "send buffer\n"); + av_log(s->avf, AV_LOG_TRACE, "send buffer\n"); avio_skip(pb, opcode_size); break; case OPCODE_AUDIO_FRAME: - av_log(NULL, AV_LOG_TRACE, "audio frame\n"); + av_log(s->avf, AV_LOG_TRACE, "audio frame\n"); /* log position and move on for now */ s->audio_chunk_offset = avio_tell(pb); @@ -459,26 +459,26 @@ static int process_ipmovie_chunk(IPMVEContext *s, AVIOContext *pb, break; case OPCODE_SILENCE_FRAME: - av_log(NULL, AV_LOG_TRACE, "silence frame\n"); + av_log(s->avf, AV_LOG_TRACE, "silence frame\n"); avio_skip(pb, opcode_size); break; case OPCODE_INIT_VIDEO_MODE: - av_log(NULL, AV_LOG_TRACE, "initialize video mode\n"); + av_log(s->avf, AV_LOG_TRACE, "initialize video mode\n"); avio_skip(pb, opcode_size); break; case OPCODE_CREATE_GRADIENT: - av_log(NULL, AV_LOG_TRACE, "create gradient\n"); + av_log(s->avf, AV_LOG_TRACE, "create gradient\n"); avio_skip(pb, opcode_size); break; case OPCODE_SET_PALETTE: - av_log(NULL, AV_LOG_TRACE, "set palette\n"); + av_log(s->avf, AV_LOG_TRACE, "set palette\n"); /* check for the logical maximum palette size * (3 * 256 + 4 bytes) */ if (opcode_size > 0x304 || opcode_size < 4) { - av_log(NULL, AV_LOG_TRACE, "demux_ipmovie: set_palette opcode with invalid size\n"); + av_log(s->avf, AV_LOG_TRACE, "demux_ipmovie: set_palette opcode with invalid size\n"); chunk_type = CHUNK_BAD; break; } @@ -493,7 +493,7 @@ static int process_ipmovie_chunk(IPMVEContext *s, AVIOContext *pb, /* sanity check (since they are 16 bit values) */ if ( (first_color > 0xFF) || (last_color > 0xFF) || (last_color - first_color + 1)*3 + 4 > opcode_size) { - av_log(NULL, AV_LOG_TRACE, "demux_ipmovie: set_palette indexes out of range (%d -> %d)\n", + av_log(s->avf, AV_LOG_TRACE, "demux_ipmovie: set_palette indexes out of range (%d -> %d)\n", first_color, last_color); chunk_type = CHUNK_BAD; break; @@ -512,12 +512,12 @@ static int process_ipmovie_chunk(IPMVEContext *s, AVIOContext *pb, break; case OPCODE_SET_PALETTE_COMPRESSED: - av_log(NULL, AV_LOG_TRACE, "set palette compressed\n"); + av_log(s->avf, AV_LOG_TRACE, "set palette compressed\n"); avio_skip(pb, opcode_size); break; case OPCODE_SET_DECODING_MAP: - av_log(NULL, AV_LOG_TRACE, "set decoding map\n"); + av_log(s->avf, AV_LOG_TRACE, "set decoding map\n"); /* log position and move on for now */ s->decode_map_chunk_offset = avio_tell(pb); @@ -526,7 +526,7 @@ static int process_ipmovie_chunk(IPMVEContext *s, AVIOContext *pb, break; case OPCODE_VIDEO_DATA: - av_log(NULL, AV_LOG_TRACE, "set video data\n"); + av_log(s->avf, AV_LOG_TRACE, "set video data\n"); /* log position and move on for now */ s->video_chunk_offset = avio_tell(pb); @@ -535,7 +535,7 @@ static int process_ipmovie_chunk(IPMVEContext *s, AVIOContext *pb, break; default: - av_log(NULL, AV_LOG_TRACE, "*** unknown opcode type\n"); + av_log(s->avf, AV_LOG_TRACE, "*** unknown opcode type\n"); chunk_type = CHUNK_BAD; break;

1 0

avformat/ipmovie: put video decoding_map_size into packet and use it in decoder
by git＠videolan.org 02 Nov '15

02 Nov '15

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Sun Nov 1 17:02:26 2015 +0100| [c293ef258cbb2c058e23651a26edf46e3bc05050] | committer: Paul B Mahol avformat/ipmovie: put video decoding_map_size into packet and use it in decoder The size of decoding map can differ from one calculated internally, producing artifacts while decoding video. Signed-off-by: Paul B Mahol <onemda(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c293ef258cbb2c058… --- libavcodec/interplayvideo.c | 14 +++++++++----- libavformat/ipmovie.c | 7 ++++--- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/libavcodec/interplayvideo.c b/libavcodec/interplayvideo.c index a29b5fe..1460741 100644 --- a/libavcodec/interplayvideo.c +++ b/libavcodec/interplayvideo.c @@ -38,6 +38,7 @@ #include <stdlib.h> #include <string.h> +#include "libavutil/intreadwrite.h" #include "avcodec.h" #include "bytestream.h" #include "hpeldsp.h" @@ -949,7 +950,7 @@ static void ipvideo_decode_opcodes(IpvideoContext *s, AVFrame *frame) } } if (bytestream2_get_bytes_left(&s->stream_ptr) > 1) { - av_log(s->avctx, AV_LOG_ERROR, + av_log(s->avctx, AV_LOG_DEBUG, "decode finished with %d bytes left over\n", bytestream2_get_bytes_left(&s->stream_ptr)); } @@ -987,12 +988,15 @@ static int ipvideo_decode_frame(AVCodecContext *avctx, AVFrame *frame = data; int ret; + if (buf_size < 2) + return AVERROR_INVALIDDATA; + /* decoding map contains 4 bits of information per 8x8 block */ - s->decoding_map_size = avctx->width * avctx->height / (8 * 8 * 2); + s->decoding_map_size = AV_RL16(avpkt->data); /* compressed buffer needs to be large enough to at least hold an entire * decoding map */ - if (buf_size < s->decoding_map_size) + if (buf_size < s->decoding_map_size + 2) return buf_size; if (av_packet_get_side_data(avpkt, AV_PKT_DATA_PARAM_CHANGE, NULL)) { @@ -1000,8 +1004,8 @@ static int ipvideo_decode_frame(AVCodecContext *avctx, av_frame_unref(s->second_last_frame); } - s->decoding_map = buf; - bytestream2_init(&s->stream_ptr, buf + s->decoding_map_size, + s->decoding_map = buf + 2; + bytestream2_init(&s->stream_ptr, buf + 2 + s->decoding_map_size, buf_size - s->decoding_map_size); if ((ret = ff_get_buffer(avctx, frame, AV_GET_BUFFER_FLAG_REF)) < 0) diff --git a/libavformat/ipmovie.c b/libavformat/ipmovie.c index 99b193d..df9b8f0 100644 --- a/libavformat/ipmovie.c +++ b/libavformat/ipmovie.c @@ -156,7 +156,7 @@ static int load_ipmovie_packet(IPMVEContext *s, AVIOContext *pb, /* send both the decode map and the video data together */ - if (av_new_packet(pkt, s->decode_map_chunk_size + s->video_chunk_size)) + if (av_new_packet(pkt, 2 + s->decode_map_chunk_size + s->video_chunk_size)) return CHUNK_NOMEM; if (s->has_palette) { @@ -178,7 +178,8 @@ static int load_ipmovie_packet(IPMVEContext *s, AVIOContext *pb, avio_seek(pb, s->decode_map_chunk_offset, SEEK_SET); s->decode_map_chunk_offset = 0; - if (avio_read(pb, pkt->data, s->decode_map_chunk_size) != + AV_WL16(pkt->data, s->decode_map_chunk_size); + if (avio_read(pb, pkt->data + 2, s->decode_map_chunk_size) != s->decode_map_chunk_size) { av_packet_unref(pkt); return CHUNK_EOF; @@ -187,7 +188,7 @@ static int load_ipmovie_packet(IPMVEContext *s, AVIOContext *pb, avio_seek(pb, s->video_chunk_offset, SEEK_SET); s->video_chunk_offset = 0; - if (avio_read(pb, pkt->data + s->decode_map_chunk_size, + if (avio_read(pb, pkt->data + 2 + s->decode_map_chunk_size, s->video_chunk_size) != s->video_chunk_size) { av_packet_unref(pkt); return CHUNK_EOF;

1 0

vf_boxblur: Templatize blur{8,16}
by git＠videolan.org 02 Nov '15

02 Nov '15

ffmpeg | branch: master | Timothy Gu <timothygu99(a)gmail.com> | Sun Nov 1 10:20:58 2015 -0800| [dee74405312a13a96ae8259221a79a0e78ea7789] | committer: Timothy Gu vf_boxblur: Templatize blur{8,16} Reviewed-by: Michael Niedermayer <michael(a)niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=dee74405312a13a96… --- libavfilter/vf_boxblur.c | 110 +++++++++++++++++++--------------------------- 1 file changed, 44 insertions(+), 66 deletions(-) diff --git a/libavfilter/vf_boxblur.c b/libavfilter/vf_boxblur.c index ef01cf9..6934076 100644 --- a/libavfilter/vf_boxblur.c +++ b/libavfilter/vf_boxblur.c @@ -204,75 +204,53 @@ static int config_input(AVFilterLink *inlink) return 0; } -static inline void blur8(uint8_t *dst, int dst_step, const uint8_t *src, int src_step, - int len, int radius) -{ - /* Naive boxblur would sum source pixels from x-radius .. x+radius - * for destination pixel x. That would be O(radius*width). - * If you now look at what source pixels represent 2 consecutive - * output pixels, then you see they are almost identical and only - * differ by 2 pixels, like: - * src0 111111111 - * dst0 1 - * src1 111111111 - * dst1 1 - * src0-src1 1 -1 - * so when you know one output pixel you can find the next by just adding - * and subtracting 1 input pixel. - * The following code adopts this faster variant. - */ - const int length = radius*2 + 1; - const int inv = ((1<<16) + length/2)/length; - int x, sum = src[radius*src_step]; - - for (x = 0; x < radius; x++) - sum += src[x*src_step]<<1; - - sum = sum*inv + (1<<15); - - for (x = 0; x <= radius; x++) { - sum += (src[(radius+x)*src_step] - src[(radius-x)*src_step])*inv; - dst[x*dst_step] = sum>>16; - } - - for (; x < len-radius; x++) { - sum += (src[(radius+x)*src_step] - src[(x-radius-1)*src_step])*inv; - dst[x*dst_step] = sum >>16; - } - - for (; x < len; x++) { - sum += (src[(2*len-radius-x-1)*src_step] - src[(x-radius-1)*src_step])*inv; - dst[x*dst_step] = sum>>16; - } +/* Naive boxblur would sum source pixels from x-radius .. x+radius + * for destination pixel x. That would be O(radius*width). + * If you now look at what source pixels represent 2 consecutive + * output pixels, then you see they are almost identical and only + * differ by 2 pixels, like: + * src0 111111111 + * dst0 1 + * src1 111111111 + * dst1 1 + * src0-src1 1 -1 + * so when you know one output pixel you can find the next by just adding + * and subtracting 1 input pixel. + * The following code adopts this faster variant. + */ +#define BLUR(type, depth) \ +static inline void blur ## depth(type *dst, int dst_step, const type *src, \ + int src_step, int len, int radius) \ +{ \ + const int length = radius*2 + 1; \ + const int inv = ((1<<16) + length/2)/length; \ + int x, sum = src[radius*src_step]; \ + \ + for (x = 0; x < radius; x++) \ + sum += src[x*src_step]<<1; \ + \ + sum = sum*inv + (1<<15); \ + \ + for (x = 0; x <= radius; x++) { \ + sum += (src[(radius+x)*src_step] - src[(radius-x)*src_step])*inv; \ + dst[x*dst_step] = sum>>16; \ + } \ + \ + for (; x < len-radius; x++) { \ + sum += (src[(radius+x)*src_step] - src[(x-radius-1)*src_step])*inv; \ + dst[x*dst_step] = sum >>16; \ + } \ + \ + for (; x < len; x++) { \ + sum += (src[(2*len-radius-x-1)*src_step] - src[(x-radius-1)*src_step])*inv; \ + dst[x*dst_step] = sum>>16; \ + } \ } -static inline void blur16(uint16_t *dst, int dst_step, const uint16_t *src, int src_step, - int len, int radius) -{ - const int length = radius*2 + 1; - const int inv = ((1<<16) + length/2)/length; - int x, sum = src[radius*src_step]; - - for (x = 0; x < radius; x++) - sum += src[x*src_step]<<1; - - sum = sum*inv + (1<<15); - - for (x = 0; x <= radius; x++) { - sum += (src[(radius+x)*src_step] - src[(radius-x)*src_step])*inv; - dst[x*dst_step] = sum>>16; - } - - for (; x < len-radius; x++) { - sum += (src[(radius+x)*src_step] - src[(x-radius-1)*src_step])*inv; - dst[x*dst_step] = sum >>16; - } +BLUR(uint8_t, 8) +BLUR(uint16_t, 16) - for (; x < len; x++) { - sum += (src[(2*len-radius-x-1)*src_step] - src[(x-radius-1)*src_step])*inv; - dst[x*dst_step] = sum>>16; - } -} +#undef BLUR static inline void blur(uint8_t *dst, int dst_step, const uint8_t *src, int src_step, int len, int radius, int pixsize)

1 0

avutil/eval: minor typo
by git＠videolan.org 02 Nov '15

02 Nov '15

ffmpeg | branch: master | Ganesh Ajjanagadde <gajjanagadde(a)gmail.com> | Sat Oct 31 23:34:15 2015 -0400| [c03044c86ad86e244e85c7f0b7c6fd54c432e74d] | committer: Ganesh Ajjanagadde avutil/eval: minor typo Reviewed-by: Michael Niedermayer <michael(a)niedermayer.cc> Signed-off-by: Ganesh Ajjanagadde <gajjanagadde(a)gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c03044c86ad86e244… --- libavutil/eval.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavutil/eval.h b/libavutil/eval.h index 6159b0f..dacd22b 100644 --- a/libavutil/eval.h +++ b/libavutil/eval.h @@ -102,7 +102,7 @@ void av_expr_free(AVExpr *e); * @param numstr a string representing a number, may contain one of * the International System number postfixes, for example 'K', 'M', * 'G'. If 'i' is appended after the postfix, powers of 2 are used - * instead of powers of 10. The 'B' postfix multiplies the value for + * instead of powers of 10. The 'B' postfix multiplies the value by * 8, and can be appended after another postfix or used alone. This * allows using for example 'KB', 'MiB', 'G' and 'B' as postfix. * @param tail if non-NULL puts here the pointer to the char next

1 0

pixblockdsp: Use AV_COPY128U for get_pixels_16_c
by git＠videolan.org 01 Nov '15

01 Nov '15

ffmpeg | branch: master | Timothy Gu <timothygu99(a)gmail.com> | Tue Sep 29 18:34:28 2015 -0700| [ee20354b29eb570c31238d24d0cea50ab272f8fa] | committer: Timothy Gu pixblockdsp: Use AV_COPY128U for get_pixels_16_c Before: 15543 decicycles in get_pixels, 4193214 runs, 1090 skips After: 5713 decicycles in get_pixels, 8387564 runs, 1044 skips > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ee20354b29eb570c3… --- libavcodec/pixblockdsp.c | 37 +++++++++++++++++++++++++++++----- libavcodec/pixblockdsp_template.c | 40 ------------------------------------- 2 files changed, 32 insertions(+), 45 deletions(-) diff --git a/libavcodec/pixblockdsp.c b/libavcodec/pixblockdsp.c index 322e1dd..f0883d3 100644 --- a/libavcodec/pixblockdsp.c +++ b/libavcodec/pixblockdsp.c @@ -20,15 +20,42 @@ #include "config.h" #include "libavutil/attributes.h" +#include "libavutil/intreadwrite.h" #include "avcodec.h" #include "pixblockdsp.h" -#define BIT_DEPTH 16 -#include "pixblockdsp_template.c" -#undef BIT_DEPTH +static void get_pixels_16_c(int16_t *av_restrict block, const uint8_t *pixels, + ptrdiff_t line_size) +{ + AV_COPY128U(block + 0 * 8, pixels + 0 * line_size); + AV_COPY128U(block + 1 * 8, pixels + 1 * line_size); + AV_COPY128U(block + 2 * 8, pixels + 2 * line_size); + AV_COPY128U(block + 3 * 8, pixels + 3 * line_size); + AV_COPY128U(block + 4 * 8, pixels + 4 * line_size); + AV_COPY128U(block + 5 * 8, pixels + 5 * line_size); + AV_COPY128U(block + 6 * 8, pixels + 6 * line_size); + AV_COPY128U(block + 7 * 8, pixels + 7 * line_size); +} + +static void get_pixels_8_c(int16_t *av_restrict block, const uint8_t *pixels, + ptrdiff_t line_size) +{ + int i; -#define BIT_DEPTH 8 -#include "pixblockdsp_template.c" + /* read the pixels */ + for (i = 0; i < 8; i++) { + block[0] = pixels[0]; + block[1] = pixels[1]; + block[2] = pixels[2]; + block[3] = pixels[3]; + block[4] = pixels[4]; + block[5] = pixels[5]; + block[6] = pixels[6]; + block[7] = pixels[7]; + pixels += line_size; + block += 8; + } +} static void diff_pixels_c(int16_t *av_restrict block, const uint8_t *s1, const uint8_t *s2, int stride) diff --git a/libavcodec/pixblockdsp_template.c b/libavcodec/pixblockdsp_template.c deleted file mode 100644 index d1e9102..0000000 --- a/libavcodec/pixblockdsp_template.c +++ /dev/null @@ -1,40 +0,0 @@ -/* - * This file is part of FFmpeg. - * - * FFmpeg is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * FFmpeg is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with FFmpeg; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#include "bit_depth_template.c" - -static void FUNCC(get_pixels)(int16_t *av_restrict block, const uint8_t *_pixels, - ptrdiff_t line_size) -{ - const pixel *pixels = (const pixel *) _pixels; - int i; - - /* read the pixels */ - for (i = 0; i < 8; i++) { - block[0] = pixels[0]; - block[1] = pixels[1]; - block[2] = pixels[2]; - block[3] = pixels[3]; - block[4] = pixels[4]; - block[5] = pixels[5]; - block[6] = pixels[6]; - block[7] = pixels[7]; - pixels += line_size / sizeof(pixel); - block += 8; - } -}

1 0