From b1563d0cf99a6ac1dd66d8baabe60b1c859a735a Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Mon, 2 Apr 2012 19:34:44 +0200 Subject: [PATCH 1/7] ivi_common: Initialize a variable at declaration in ff_ivi_decode_blocks(). This simplifies the code a bit and avoids an uninitialized variable warning. --- libavcodec/ivi_common.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/libavcodec/ivi_common.c b/libavcodec/ivi_common.c index b930e1517d..b9ec1c28cd 100644 --- a/libavcodec/ivi_common.c +++ b/libavcodec/ivi_common.c @@ -330,7 +330,7 @@ int ff_ivi_dec_tile_data_size(GetBitContext *gb) int ff_ivi_decode_blocks(GetBitContext *gb, IVIBandDesc *band, IVITile *tile) { int mbn, blk, num_blocks, num_coeffs, blk_size, scan_pos, run, val, - pos, is_intra, mc_type, mv_x, mv_y, col_mask; + pos, is_intra, mc_type = 0, mv_x, mv_y, col_mask; uint8_t col_flags[8]; int32_t prev_dc, trvec[64]; uint32_t cbp, sym, lo, hi, quant, buf_offs, q; @@ -370,9 +370,7 @@ int ff_ivi_decode_blocks(GetBitContext *gb, IVIBandDesc *band, IVITile *tile) if (!is_intra) { mv_x = mb->mv_x; mv_y = mb->mv_y; - if (!band->is_halfpel) { - mc_type = 0; /* we have only fullpel vectors */ - } else { + if (band->is_halfpel) { mc_type = ((mv_y & 1) << 1) | (mv_x & 1); mv_x >>= 1; mv_y >>= 1; /* convert halfpel vectors into fullpel ones */ From f973a85d4af67165dd1661c347f33ac5d1ef51a3 Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Thu, 19 Apr 2012 14:52:10 +0200 Subject: [PATCH 2/7] xxan: Remove write-only variable in xan_decode_frame_type0(). MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit libavcodec/xxan.c:293:13: warning: variable ‘corr_end’ set but not used --- libavcodec/xxan.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/libavcodec/xxan.c b/libavcodec/xxan.c index 3526725f65..575cc34bd1 100644 --- a/libavcodec/xxan.c +++ b/libavcodec/xxan.c @@ -290,11 +290,8 @@ static int xan_decode_frame_type0(AVCodecContext *avctx) } if (corr_off) { - int corr_end, dec_size; + int dec_size; - corr_end = (s->gb.buffer_end - s->gb.buffer_start); - if (chroma_off > corr_off) - corr_end = chroma_off; bytestream2_seek(&s->gb, 8 + corr_off, SEEK_SET); dec_size = xan_unpack(s, s->scratch_buffer, s->buffer_size); if (dec_size < 0) From dc878b96a78c1cc5edc6edc0bf087cf7a3c14ae9 Mon Sep 17 00:00:00 2001 From: Alex Converse Date: Fri, 20 Apr 2012 13:21:28 -0700 Subject: [PATCH 3/7] movenc: Support high sample rates in isomedia formats by setting the sample rate field in stsd to 0. Libisomediafile appears to always set this field to zero. --- libavformat/movenc.c | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/libavformat/movenc.c b/libavformat/movenc.c index dd2598b5ed..35c03ddfef 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -630,7 +630,8 @@ static int mov_write_audio_tag(AVIOContext *pb, MOVTrack *track) avio_wb16(pb, 0); avio_wb16(pb, 0); /* packet size (= 0) */ - avio_wb16(pb, track->enc->sample_rate); + avio_wb16(pb, track->enc->sample_rate <= UINT16_MAX ? + track->enc->sample_rate : 0); avio_wb16(pb, 0); /* Reserved */ } @@ -3122,17 +3123,11 @@ static int mov_write_header(AVFormatContext *s) if (av_get_bits_per_sample(st->codec->codec_id) < 8) { track->audio_vbr = 1; } - if (track->mode != MODE_MOV) { - if (track->timescale > UINT16_MAX) { - av_log(s, AV_LOG_ERROR, "track %d: output format does not support " - "sample rate %dhz\n", i, track->timescale); - goto error; - } - if (track->enc->codec_id == CODEC_ID_MP3 && track->timescale < 16000) { - av_log(s, AV_LOG_ERROR, "track %d: muxing mp3 at %dhz is not supported\n", - i, track->enc->sample_rate); - goto error; - } + if (track->mode != MODE_MOV && + track->enc->codec_id == CODEC_ID_MP3 && track->timescale < 16000) { + av_log(s, AV_LOG_ERROR, "track %d: muxing mp3 at %dhz is not supported\n", + i, track->enc->sample_rate); + goto error; } }else if(st->codec->codec_type == AVMEDIA_TYPE_SUBTITLE){ track->timescale = st->codec->time_base.den; From 7eacd70feac49656d70fce677f4d7b42279338da Mon Sep 17 00:00:00 2001 From: Alex Converse Date: Fri, 20 Apr 2012 14:01:57 -0700 Subject: [PATCH 4/7] aac: Handle HE-AACv2 when sniffing a channel order. --- libavcodec/aacdec.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c index 7cf21954c9..bd5ba00373 100644 --- a/libavcodec/aacdec.c +++ b/libavcodec/aacdec.c @@ -404,6 +404,13 @@ static int output_configure(AACContext *ac, if (ret < 0) return ret; } + if (ac->oc[1].m4ac.ps == 1 && channels == 2) { + if (layout == AV_CH_FRONT_CENTER) { + layout = AV_CH_FRONT_LEFT|AV_CH_FRONT_RIGHT; + } else { + layout = 0; + } + } memcpy(ac->tag_che_map, ac->che, 4 * MAX_ELEM_ID * sizeof(ac->che[0][0])); avctx->channel_layout = ac->oc[1].channel_layout = layout; From b5c3f0b9940f964cdcaf33907eee91f9826c00b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Ekstr=C3=B6m?= Date: Fri, 20 Apr 2012 13:31:26 +0000 Subject: [PATCH 5/7] utvideo: general cosmetics General cosmetics, such as keeping lines under 80 characters, fixing a couple of typos (predition -> prediction) and a general style fix that was pointed out by Derek when I was having my sliced multithreading patch in review by him. Signed-off-by: Derek Buitenhuis --- libavcodec/utvideo.c | 100 +++++++++++++++++++++++-------------------- 1 file changed, 54 insertions(+), 46 deletions(-) diff --git a/libavcodec/utvideo.c b/libavcodec/utvideo.c index 378a1f7c16..a3b0d7cf01 100644 --- a/libavcodec/utvideo.c +++ b/libavcodec/utvideo.c @@ -175,9 +175,10 @@ static int decode_plane(UtvideoContext *c, int plane_no, continue; } - memcpy(c->slice_bits, src + slice_data_start + c->slices * 4, slice_size); + memcpy(c->slice_bits, src + slice_data_start + c->slices * 4, + slice_size); memset(c->slice_bits + slice_size, 0, FF_INPUT_BUFFER_PADDING_SIZE); - c->dsp.bswap_buf((uint32_t*)c->slice_bits, (uint32_t*)c->slice_bits, + c->dsp.bswap_buf((uint32_t *) c->slice_bits, (uint32_t *) c->slice_bits, (slice_data_end - slice_data_start + 3) >> 2); init_get_bits(&gb, c->slice_bits, slice_size * 8); @@ -185,7 +186,8 @@ static int decode_plane(UtvideoContext *c, int plane_no, for (j = sstart; j < send; j++) { for (i = 0; i < width * step; i += step) { if (get_bits_left(&gb) <= 0) { - av_log(c->avctx, AV_LOG_ERROR, "Slice decoding ran out of bits\n"); + av_log(c->avctx, AV_LOG_ERROR, + "Slice decoding ran out of bits\n"); goto fail; } pix = get_vlc2(&gb, vlc.table, vlc.bits, 4); @@ -202,8 +204,8 @@ static int decode_plane(UtvideoContext *c, int plane_no, dest += stride; } if (get_bits_left(&gb) > 32) - av_log(c->avctx, AV_LOG_WARNING, "%d bits left after decoding slice\n", - get_bits_left(&gb)); + av_log(c->avctx, AV_LOG_WARNING, + "%d bits left after decoding slice\n", get_bits_left(&gb)); } ff_free_vlc(&vlc); @@ -216,7 +218,8 @@ fail: static const int rgb_order[4] = { 1, 2, 0, 3 }; -static void restore_rgb_planes(uint8_t *src, int step, int stride, int width, int height) +static void restore_rgb_planes(uint8_t *src, int step, int stride, int width, + int height) { int i, j; uint8_t r, g, b; @@ -243,8 +246,9 @@ static void restore_median(uint8_t *src, int step, int stride, const int cmask = ~rmode; for (slice = 0; slice < slices; slice++) { - slice_start = ((slice * height) / slices) & cmask; - slice_height = ((((slice + 1) * height) / slices) & cmask) - slice_start; + slice_start = ((slice * height) / slices) & cmask; + slice_height = ((((slice + 1) * height) / slices) & cmask) - + slice_start; bsrc = src + slice_start * stride; @@ -253,29 +257,29 @@ static void restore_median(uint8_t *src, int step, int stride, A = bsrc[0]; for (i = step; i < width * step; i += step) { bsrc[i] += A; - A = bsrc[i]; + A = bsrc[i]; } bsrc += stride; if (slice_height == 1) continue; - // second line - first element has top predition, the rest uses median - C = bsrc[-stride]; + // second line - first element has top prediction, the rest uses median + C = bsrc[-stride]; bsrc[0] += C; - A = bsrc[0]; + A = bsrc[0]; for (i = step; i < width * step; i += step) { - B = bsrc[i - stride]; + B = bsrc[i - stride]; bsrc[i] += mid_pred(A, B, (uint8_t)(A + B - C)); - C = B; - A = bsrc[i]; + C = B; + A = bsrc[i]; } bsrc += stride; // the rest of lines use continuous median prediction for (j = 2; j < slice_height; j++) { for (i = 0; i < width * step; i += step) { - B = bsrc[i - stride]; + B = bsrc[i - stride]; bsrc[i] += mid_pred(A, B, (uint8_t)(A + B - C)); - C = B; - A = bsrc[i]; + C = B; + A = bsrc[i]; } bsrc += stride; } @@ -293,67 +297,69 @@ static void restore_median_il(uint8_t *src, int step, int stride, int A, B, C; uint8_t *bsrc; int slice_start, slice_height; - const int cmask = ~(rmode ? 3 : 1); + const int cmask = ~(rmode ? 3 : 1); const int stride2 = stride << 1; for (slice = 0; slice < slices; slice++) { slice_start = ((slice * height) / slices) & cmask; - slice_height = ((((slice + 1) * height) / slices) & cmask) - slice_start; + slice_height = ((((slice + 1) * height) / slices) & cmask) - + slice_start; slice_height >>= 1; bsrc = src + slice_start * stride; // first line - left neighbour prediction bsrc[0] += 0x80; - A = bsrc[0]; + A = bsrc[0]; for (i = step; i < width * step; i += step) { bsrc[i] += A; - A = bsrc[i]; + A = bsrc[i]; } for (i = 0; i < width * step; i += step) { bsrc[stride + i] += A; - A = bsrc[stride + i]; + A = bsrc[stride + i]; } bsrc += stride2; if (slice_height == 1) continue; - // second line - first element has top predition, the rest uses median - C = bsrc[-stride2]; + // second line - first element has top prediction, the rest uses median + C = bsrc[-stride2]; bsrc[0] += C; - A = bsrc[0]; + A = bsrc[0]; for (i = step; i < width * step; i += step) { - B = bsrc[i - stride2]; + B = bsrc[i - stride2]; bsrc[i] += mid_pred(A, B, (uint8_t)(A + B - C)); - C = B; - A = bsrc[i]; + C = B; + A = bsrc[i]; } for (i = 0; i < width * step; i += step) { - B = bsrc[i - stride]; + B = bsrc[i - stride]; bsrc[stride + i] += mid_pred(A, B, (uint8_t)(A + B - C)); - C = B; - A = bsrc[stride + i]; + C = B; + A = bsrc[stride + i]; } bsrc += stride2; // the rest of lines use continuous median prediction for (j = 2; j < slice_height; j++) { for (i = 0; i < width * step; i += step) { - B = bsrc[i - stride2]; + B = bsrc[i - stride2]; bsrc[i] += mid_pred(A, B, (uint8_t)(A + B - C)); - C = B; - A = bsrc[i]; + C = B; + A = bsrc[i]; } for (i = 0; i < width * step; i += step) { - B = bsrc[i - stride]; + B = bsrc[i - stride]; bsrc[i + stride] += mid_pred(A, B, (uint8_t)(A + B - C)); - C = B; - A = bsrc[i + stride]; + C = B; + A = bsrc[i + stride]; } bsrc += stride2; } } } -static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPacket *avpkt) +static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, + AVPacket *avpkt) { const uint8_t *buf = avpkt->data; int buf_size = avpkt->size; @@ -376,7 +382,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPac ff_thread_finish_setup(avctx); - /* parse plane structure to retrieve frame flags and validate slice offsets */ + /* parse plane structure to get frame flags and validate slice offsets */ bytestream2_init(&gb, buf, buf_size); for (i = 0; i < c->planes; i++) { plane_start[i] = gb.buffer; @@ -443,8 +449,8 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPac break; case PIX_FMT_YUV420P: for (i = 0; i < 3; i++) { - ret = decode_plane(c, i, c->pic.data[i], 1, - c->pic.linesize[i], avctx->width >> !!i, avctx->height >> !!i, + ret = decode_plane(c, i, c->pic.data[i], 1, c->pic.linesize[i], + avctx->width >> !!i, avctx->height >> !!i, plane_start[i], c->frame_pred == PRED_LEFT); if (ret) return ret; @@ -464,8 +470,8 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPac break; case PIX_FMT_YUV422P: for (i = 0; i < 3; i++) { - ret = decode_plane(c, i, c->pic.data[i], 1, - c->pic.linesize[i], avctx->width >> !!i, avctx->height, + ret = decode_plane(c, i, c->pic.data[i], 1, c->pic.linesize[i], + avctx->width >> !!i, avctx->height, plane_start[i], c->frame_pred == PRED_LEFT); if (ret) return ret; @@ -502,7 +508,8 @@ static av_cold int decode_init(AVCodecContext *avctx) ff_dsputil_init(&c->dsp, avctx); if (avctx->extradata_size < 16) { - av_log(avctx, AV_LOG_ERROR, "Insufficient extradata size %d, should be at least 16\n", + av_log(avctx, AV_LOG_ERROR, + "Insufficient extradata size %d, should be at least 16\n", avctx->extradata_size); return AVERROR_INVALIDDATA; } @@ -510,7 +517,8 @@ static av_cold int decode_init(AVCodecContext *avctx) av_log(avctx, AV_LOG_DEBUG, "Encoder version %d.%d.%d.%d\n", avctx->extradata[3], avctx->extradata[2], avctx->extradata[1], avctx->extradata[0]); - av_log(avctx, AV_LOG_DEBUG, "Original format %X\n", AV_RB32(avctx->extradata + 4)); + av_log(avctx, AV_LOG_DEBUG, "Original format %X\n", + AV_RB32(avctx->extradata + 4)); c->frame_info_size = AV_RL32(avctx->extradata + 8); c->flags = AV_RL32(avctx->extradata + 12); From 2994913d70050b8951e83b57c12baa7e4cf7e47e Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Wed, 18 Apr 2012 06:53:11 +0200 Subject: [PATCH 6/7] avconv: fix a segfault when default encoder for a format doesn't exist. Fail earlier and with a more descriptive error message. --- avconv.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/avconv.c b/avconv.c index 3da123cd22..a43a6f8ea3 100644 --- a/avconv.c +++ b/avconv.c @@ -2684,8 +2684,16 @@ static int transcode_init(void) abort(); } } else { - if (!ost->enc) - ost->enc = avcodec_find_encoder(ost->st->codec->codec_id); + if (!ost->enc) { + /* should only happen when a default codec is not present. */ + snprintf(error, sizeof(error), "Automatic encoder selection " + "failed for output stream #%d:%d. Default encoder for " + "format %s is probably disabled. Please choose an " + "encoder manually.\n", ost->file_index, ost->index, + oc->oformat->name); + ret = AVERROR(EINVAL); + goto dump_format; + } if (ist) ist->decoding_needed = 1; @@ -2819,12 +2827,6 @@ static int transcode_init(void) if (ost->encoding_needed) { AVCodec *codec = ost->enc; AVCodecContext *dec = NULL; - if (!codec) { - snprintf(error, sizeof(error), "Encoder (codec id %d) not found for output stream #%d:%d", - ost->st->codec->codec_id, ost->file_index, ost->index); - ret = AVERROR(EINVAL); - goto dump_format; - } if ((ist = get_input_stream(ost))) dec = ist->st->codec; From 95510be8c35753da8f48062b28b65e7acdab965f Mon Sep 17 00:00:00 2001 From: Mans Rullgard Date: Fri, 20 Apr 2012 14:31:08 +0100 Subject: [PATCH 7/7] avcodec: remove AVCodecContext.dsp_mask This removes all references to AVCodecContext.dsp_mask and marks it for eviction at the next version bump. It has been superseded by av_set_cpu_flag_mask() which, unlike this field, works everywhere. Signed-off-by: Mans Rullgard --- libavcodec/avcodec.h | 12 +++++------- libavcodec/pthread.c | 1 - libavcodec/version.h | 3 +++ libavcodec/x86/dsputil_mmx.c | 7 ------- 4 files changed, 8 insertions(+), 15 deletions(-) diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 92a5d0a173..9e937d31b1 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -2559,15 +2559,13 @@ typedef struct AVCodecContext { #define FF_IDCT_SIMPLEALPHA 23 #define FF_IDCT_BINK 24 +#if FF_API_DSP_MASK /** - * dsp_mask could be add used to disable unwanted CPU features - * CPU features (i.e. MMX, SSE. ...) - * - * With the FORCE flag you may instead enable given CPU features. - * (Dangerous: Usable in case of misdetection, improper usage however will - * result into program crash.) + * Unused. + * @deprecated use av_set_cpu_flags_mask() instead. */ - unsigned dsp_mask; + attribute_deprecated unsigned dsp_mask; +#endif /** * bits per sample/pixel from the demuxer (needed for huffyuv). diff --git a/libavcodec/pthread.c b/libavcodec/pthread.c index dc9220adc4..1889d2ae91 100644 --- a/libavcodec/pthread.c +++ b/libavcodec/pthread.c @@ -457,7 +457,6 @@ static int update_context_from_user(AVCodecContext *dst, AVCodecContext *src) dst->release_buffer = src->release_buffer; dst->opaque = src->opaque; - dst->dsp_mask = src->dsp_mask; dst->debug = src->debug; dst->debug_mv = src->debug_mv; diff --git a/libavcodec/version.h b/libavcodec/version.h index 58a228c4a2..5119874379 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -68,5 +68,8 @@ #ifndef FF_API_SUB_ID #define FF_API_SUB_ID (LIBAVCODEC_VERSION_MAJOR < 55) #endif +#ifndef FF_API_DSP_MASK +#define FF_API_DSP_MASK (LIBAVCODEC_VERSION_MAJOR < 55) +#endif #endif /* AVCODEC_VERSION_H */ diff --git a/libavcodec/x86/dsputil_mmx.c b/libavcodec/x86/dsputil_mmx.c index 192c5c3b95..6695cafb65 100644 --- a/libavcodec/x86/dsputil_mmx.c +++ b/libavcodec/x86/dsputil_mmx.c @@ -3103,13 +3103,6 @@ void ff_dsputil_init_mmx(DSPContext *c, AVCodecContext *avctx) { int mm_flags = av_get_cpu_flags(); - if (avctx->dsp_mask) { - if (avctx->dsp_mask & AV_CPU_FLAG_FORCE) - mm_flags |= avctx->dsp_mask & 0xffff; - else - mm_flags &= ~(avctx->dsp_mask & 0xffff); - } - #if 0 av_log(avctx, AV_LOG_INFO, "libavcodec: CPU flags:"); if (mm_flags & AV_CPU_FLAG_MMX)